ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

(Apple HID) Handle iOHIDDeviceOpen not returning success

This commit is contained in:
Twinaphex 2015-03-31 16:55:23 +02:00
parent d93854a924
commit b9da2bc32f
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
input/drivers_hid/apple_hid.c
View File

@ -242,6 +242,7 @@ static uint16_t apple_hid_get_product_id(IOHIDDeviceRef device)
static void add_device(void* context, IOReturn result, static void add_device(void* context, IOReturn result,
void* sender, IOHIDDeviceRef device) void* sender, IOHIDDeviceRef device)
{ {
IOReturn ret;
uint16_t dev_vid, dev_pid; uint16_t dev_vid, dev_pid;
CFStringRef device_name_ref; CFStringRef device_name_ref;
autoconfig_params_t params = {{0}}; autoconfig_params_t params = {{0}};
@ -255,7 +256,10 @@ static void add_device(void* context, IOReturn result,
connection->device_handle = device; connection->device_handle = device;
connection->slot = MAX_USERS; connection->slot = MAX_USERS;
IOHIDDeviceOpen(device, kIOHIDOptionsTypeNone); ret = IOHIDDeviceOpen(device, kIOHIDOptionsTypeNone);
if (ret != kIOReturnSuccess)
goto error;
/* Move the device's run loop to this thread. */ /* Move the device's run loop to this thread. */
IOHIDDeviceScheduleWithRunLoop(device, CFRunLoopGetCurrent(), IOHIDDeviceScheduleWithRunLoop(device, CFRunLoopGetCurrent(),
@ -297,6 +301,9 @@ static void add_device(void* context, IOReturn result,
input_config_autoconfigure_joypad(&params); input_config_autoconfigure_joypad(&params);
RARCH_LOG("Port %d: %s.\n", connection->slot, connection->device_name); RARCH_LOG("Port %d: %s.\n", connection->slot, connection->device_name);
error:
return;
} }
static void append_matching_dictionary(CFMutableArrayRef array, static void append_matching_dictionary(CFMutableArrayRef array,