implement wiiuse_os_find for mac
This commit is contained in:
Lysann Schlegel
184
src/os_mac.m
184
src/os_mac.m
@@ -37,6 +37,15 @@
|
||||
#import "events.h"
|
||||
#import "os.h"
|
||||
|
||||
|
||||
#define BLUETOOTH_VERSION_USE_CURRENT
|
||||
#import <IOBluetooth/IOBluetoothUtilities.h>
|
||||
#import <IOBluetooth/objc/IOBluetoothDevice.h>
|
||||
#import <IOBluetooth/objc/IOBluetoothHostController.h>
|
||||
#import <IOBluetooth/objc/IOBluetoothDeviceInquiry.h>
|
||||
#import <IOBluetooth/objc/IOBluetoothL2CAPChannel.h>
|
||||
|
||||
|
||||
#if defined(MAC_OS_X_VERSION_10_7) && MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_7
|
||||
#define WIIUSE_MAC_OS_X_VERSION_10_7_OR_ABOVE 1
|
||||
#else
|
||||
@@ -44,18 +53,175 @@
|
||||
#endif
|
||||
|
||||
|
||||
void wiiuse_init_platform_fields(struct wiimote_t* wm) {
|
||||
#pragma mark -
|
||||
#pragma mark wiiuse_os_find
|
||||
|
||||
@interface WiiuseDeviceInquiry : NSObject<IOBluetoothDeviceInquiryDelegate> {
|
||||
wiimote** wiimotes;
|
||||
NSUInteger maxDevices;
|
||||
int timeout;
|
||||
|
||||
BOOL _running;
|
||||
NSUInteger _foundDevices;
|
||||
BOOL _inquiryComplete;
|
||||
}
|
||||
|
||||
void wiiuse_cleanup_platform_fields(struct wiimote_t* wm) {
|
||||
- (id) initWithMemory:(wiimote**)wiimotes maxDevices:(int)maxDevices timeout:(int)timeout;
|
||||
- (int) run;
|
||||
|
||||
@end
|
||||
|
||||
@implementation WiiuseDeviceInquiry
|
||||
|
||||
- (id) initWithMemory:(wiimote**)wiimotes_ maxDevices:(int)maxDevices_ timeout:(int)timeout_ {
|
||||
self = [super init];
|
||||
if(self) {
|
||||
wiimotes = wiimotes_;
|
||||
maxDevices = maxDevices_;
|
||||
timeout = timeout_;
|
||||
|
||||
_running = NO;
|
||||
}
|
||||
return self;
|
||||
}
|
||||
|
||||
// creates and starts inquiry. the returned object is in the current autorelease pool.
|
||||
- (IOBluetoothDeviceInquiry*) start {
|
||||
|
||||
// reset state variables
|
||||
_foundDevices = 0;
|
||||
_inquiryComplete = NO;
|
||||
|
||||
// create inquiry
|
||||
IOBluetoothDeviceInquiry* inquiry = [IOBluetoothDeviceInquiry inquiryWithDelegate: self];
|
||||
|
||||
// refine search & set timeout
|
||||
[inquiry setSearchCriteria:kBluetoothServiceClassMajorAny
|
||||
majorDeviceClass:WM_DEV_MAJOR_CLASS
|
||||
minorDeviceClass:WM_DEV_MINOR_CLASS];
|
||||
[inquiry setUpdateNewDeviceNames: NO];
|
||||
if(timeout > 0)
|
||||
[inquiry setInquiryLength:timeout];
|
||||
|
||||
// start inquiry
|
||||
IOReturn status = [inquiry start];
|
||||
if (status != kIOReturnSuccess) {
|
||||
WIIUSE_ERROR("Unable to start bluetooth device inquiry.");
|
||||
if(![inquiry stop]) {
|
||||
WIIUSE_ERROR("Unable to stop bluetooth device inquiry.");
|
||||
} else {
|
||||
WIIUSE_DEBUG("Bluetooth device inquiry stopped.");
|
||||
}
|
||||
return nil;
|
||||
}
|
||||
|
||||
return inquiry;
|
||||
}
|
||||
|
||||
- (void) wait {
|
||||
// wait for the inquiry to complete
|
||||
NSRunLoop *runLoop = [NSRunLoop currentRunLoop];
|
||||
while(!_inquiryComplete &&
|
||||
[runLoop runMode:NSDefaultRunLoopMode beforeDate:[NSDate distantFuture]]) {
|
||||
// no-op
|
||||
}
|
||||
}
|
||||
|
||||
- (NSUInteger) collectResultsOf: (IOBluetoothDeviceInquiry*) inquiry {
|
||||
// read found device information
|
||||
NSArray* devices = [inquiry foundDevices];
|
||||
for(NSUInteger i = 0; i < [devices count]; i++) {
|
||||
IOBluetoothDevice* device = [devices objectAtIndex:i];
|
||||
#if WIIUSE_MAC_OS_X_VERSION_10_7_OR_ABOVE
|
||||
IOBluetoothDeviceRef deviceRef = (IOBluetoothDeviceRef)device;
|
||||
#else
|
||||
IOBluetoothDeviceRef deviceRef = [device getDeviceRef];
|
||||
#endif
|
||||
|
||||
// save the device in the wiimote structure
|
||||
wiimotes[i]->device = deviceRef;
|
||||
[device retain]; // must retain it for later access through its ref
|
||||
|
||||
// mark as found
|
||||
WIIMOTE_ENABLE_STATE(wiimotes[i], WIIMOTE_STATE_DEV_FOUND);
|
||||
NSString* address = IOBluetoothNSStringFromDeviceAddress([device getAddress]);
|
||||
const char* address_str = [address cStringUsingEncoding:NSMacOSRomanStringEncoding];
|
||||
WIIUSE_INFO("Found Wiimote (%s) [id %i]", address_str, wiimotes[i]->unid);
|
||||
}
|
||||
|
||||
return [devices count];
|
||||
}
|
||||
|
||||
- (int) run {
|
||||
int result = -1;
|
||||
|
||||
if(maxDevices == 0) {
|
||||
result = 0;
|
||||
} else if(!_running) {
|
||||
_running = YES;
|
||||
|
||||
if (![IOBluetoothHostController defaultController]) {
|
||||
WIIUSE_ERROR("Unable to find any bluetooth receiver on your host.");
|
||||
} else {
|
||||
IOBluetoothDeviceInquiry* inquiry = [self start];
|
||||
if(inquiry) {
|
||||
[self wait];
|
||||
result = [self collectResultsOf: inquiry];
|
||||
WIIUSE_INFO("Found %i Wiimote device(s).", result);
|
||||
}
|
||||
}
|
||||
|
||||
_running = NO;
|
||||
} else { // if(_running)
|
||||
WIIUSE_ERROR("Device inquiry already running - won't start it again.");
|
||||
}
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
- (void) deviceInquiryDeviceFound:(IOBluetoothDeviceInquiry *) inquiry device:(IOBluetoothDevice *) device {
|
||||
|
||||
WIIUSE_DEBUG("Found a wiimote");
|
||||
|
||||
_foundDevices++;
|
||||
if(_foundDevices >= maxDevices) {
|
||||
// reached maximum number of devices
|
||||
if(![inquiry stop])
|
||||
WIIUSE_ERROR("Unable to stop bluetooth device inquiry.");
|
||||
_inquiryComplete = YES;
|
||||
}
|
||||
}
|
||||
|
||||
- (void) deviceInquiryComplete:(IOBluetoothDeviceInquiry*) inquiry error:(IOReturn) error aborted:(BOOL) aborted
|
||||
{
|
||||
WIIUSE_DEBUG("Inquiry complete, error=%i, aborted=%s", error, aborted ? "YES" : "NO");
|
||||
|
||||
// mark completion
|
||||
_inquiryComplete = YES;
|
||||
|
||||
// print error message if we stop due to an error
|
||||
if ((error != kIOReturnSuccess) && !aborted) {
|
||||
WIIUSE_ERROR("Bluetooth device inquiry not completed due to unexpected errors. Try increasing the timeout.");
|
||||
}
|
||||
}
|
||||
|
||||
@end
|
||||
|
||||
int wiiuse_os_find(struct wiimote_t** wm, int max_wiimotes, int timeout) {
|
||||
return 0;
|
||||
int result;
|
||||
|
||||
NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init];
|
||||
|
||||
WiiuseDeviceInquiry* inquiry = [[WiiuseDeviceInquiry alloc] initWithMemory:wm maxDevices:max_wiimotes timeout:timeout];
|
||||
result = [inquiry run];
|
||||
[inquiry release];
|
||||
|
||||
[pool drain];
|
||||
return result;
|
||||
}
|
||||
|
||||
#pragma mark -
|
||||
|
||||
int wiiuse_os_connect(struct wiimote_t** wm, int wiimotes) {
|
||||
return 0;
|
||||
}
|
||||
@@ -64,6 +230,8 @@ void wiiuse_os_disconnect(struct wiimote_t* wm) {
|
||||
|
||||
}
|
||||
|
||||
#pragma mark -
|
||||
|
||||
int wiiuse_os_poll(struct wiimote_t** wm, int wiimotes) {
|
||||
int i;
|
||||
|
||||
@@ -85,4 +253,14 @@ int wiiuse_os_write(struct wiimote_t* wm, byte* buf, int len) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
#pragma mark -
|
||||
|
||||
void wiiuse_init_platform_fields(struct wiimote_t* wm) {
|
||||
|
||||
}
|
||||
|
||||
void wiiuse_cleanup_platform_fields(struct wiimote_t* wm) {
|
||||
|
||||
}
|
||||
|
||||
#endif // __APPLE__
|
||||
|
||||
12
src/wiiuse.h
12
src/wiiuse.h
@@ -101,6 +101,7 @@
|
||||
#endif
|
||||
#ifdef WIIUSE_MAC
|
||||
/* mac */
|
||||
#include <IOBluetooth/IOBluetoothUserLib.h>
|
||||
#endif
|
||||
|
||||
#ifndef WCONST
|
||||
@@ -700,6 +701,7 @@ typedef struct wiimote_t {
|
||||
#ifdef WIIUSE_BLUEZ
|
||||
/** @name Linux-specific (BlueZ) members */
|
||||
/** @{ */
|
||||
WCONST char bdaddr_str[18]; /**< readable bt address */
|
||||
WCONST bdaddr_t bdaddr; /**< bt address */
|
||||
WCONST int out_sock; /**< output socket */
|
||||
WCONST int in_sock; /**< input socket */
|
||||
@@ -721,13 +723,7 @@ typedef struct wiimote_t {
|
||||
#ifdef WIIUSE_MAC
|
||||
/** @name Mac OS X-specific members */
|
||||
/** @{ */
|
||||
/** @} */
|
||||
#endif
|
||||
|
||||
#if defined(WIIUSE_BLUEZ) || defined(WIIUSE_MAC)
|
||||
/** @name Linux (BlueZ) and Mac OS X shared members */
|
||||
/** @{ */
|
||||
WCONST char bdaddr_str[18]; /**< readable bt address */
|
||||
WCONST IOBluetoothDeviceRef device; /** Device reference object */
|
||||
/** @} */
|
||||
#endif
|
||||
|
||||
@@ -738,7 +734,7 @@ typedef struct wiimote_t {
|
||||
WCONST int flags; /**< options flag */
|
||||
|
||||
WCONST byte handshake_state; /**< the state of the connection handshake */
|
||||
WCONST byte expansion_state; /**< the state of the expansion handshake */
|
||||
WCONST byte expansion_state; /**< the state of the expansion handshake */
|
||||
WCONST struct data_req_t* data_req; /**< list of data read requests */
|
||||
|
||||
WCONST struct read_req_t* read_req; /**< list of data read requests */
|
||||
|
||||
Reference in New Issue
Block a user