mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-10 15:45:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

(Apple input) Cleanups

Browse Source
This commit is contained in:
twinaphex 2014-05-13 14:02:56 +02:00
parent 277b1f6702
commit fad218ea75
2 changed files with 36 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
input/apple_hid_pad.c
View File

@ -33,33 +33,42 @@ void apple_pad_send_control(struct apple_pad_connection* connection, uint8_t* da
// NOTE: I pieced this together through trial and error, any corrections are welcome // NOTE: I pieced this together through trial and error, any corrections are welcome
static void hid_device_input_callback(void* context, IOReturn result, void* sender, IOHIDValueRef value) static void hid_device_input_callback(void* context, IOReturn result, void* sender, IOHIDValueRef value)
{ {
IOHIDElementRef element;
uint32_t type, page, use;
struct apple_pad_connection* connection = (struct apple_pad_connection*)context; struct apple_pad_connection* connection = (struct apple_pad_connection*)context;
IOHIDElementRef element = IOHIDValueGetElement(value); element = IOHIDValueGetElement(value);
uint32_t type = IOHIDElementGetType(element); type = IOHIDElementGetType(element);
uint32_t page = IOHIDElementGetUsagePage(element); page = IOHIDElementGetUsagePage(element);
uint32_t use = IOHIDElementGetUsage(element); use = IOHIDElementGetUsage(element);
// Joystick handler: TODO: Can GamePad work the same? // Joystick handler: TODO: Can GamePad work the same?
if (type == kIOHIDElementTypeInput_Button && page == kHIDPage_Button) if (type == kIOHIDElementTypeInput_Button && page == kHIDPage_Button)
{ {
CFIndex state = IOHIDValueGetIntegerValue(value); CFIndex state = IOHIDValueGetIntegerValue(value);
if (state) g_current_input_data.pad_buttons[connection->slot] |= (1 << (use - 1)); if (state)
else g_current_input_data.pad_buttons[connection->slot] &= ~(1 << (use - 1)); g_current_input_data.pad_buttons[connection->slot] |= (1 << (use - 1));
else
g_current_input_data.pad_buttons[connection->slot] &= ~(1 << (use - 1));
} }
else if (type == kIOHIDElementTypeInput_Misc && page == kHIDPage_GenericDesktop) else if (type == kIOHIDElementTypeInput_Misc && page == kHIDPage_GenericDesktop)
{ {
static const uint32_t axis_use_ids[4] = { 48, 49, 50, 53 }; static const uint32_t axis_use_ids[4] = { 48, 49, 50, 53 };
for (int i = 0; i < 4; i ++) int i;
for (i = 0; i < 4; i ++)
{ {
if (use == axis_use_ids[i]) if (use == axis_use_ids[i])
{ {
CFIndex min = IOHIDElementGetPhysicalMin(element); CFIndex min, max, state;
CFIndex max = IOHIDElementGetPhysicalMax(element) - min; float val;
CFIndex state = IOHIDValueGetIntegerValue(value) - min;
min = IOHIDElementGetPhysicalMin(element);
max = IOHIDElementGetPhysicalMax(element) - min;
state = IOHIDValueGetIntegerValue(value) - min;
float val = (float)state / (float)max; val = (float)state / (float)max;
g_current_input_data.pad_axis[connection->slot][i] = ((val * 2.0f) - 1.0f) * 32767.0f; g_current_input_data.pad_axis[connection->slot][i] = ((val * 2.0f) - 1.0f) * 32767.0f;
} }
} }
@ -91,6 +100,7 @@ static void hid_device_report(void* context, IOReturn result, void *sender, IOHI
static void hid_manager_device_attached(void* context, IOReturn result, void* sender, IOHIDDeviceRef device) static void hid_manager_device_attached(void* context, IOReturn result, void* sender, IOHIDDeviceRef device)
{ {
char device_name[1024]; char device_name[1024];
CFStringRef device_name_ref;
struct apple_pad_connection* connection = calloc(1, sizeof(struct apple_pad_connection)); struct apple_pad_connection* connection = calloc(1, sizeof(struct apple_pad_connection));
connection->device = device; connection->device = device;
@ -100,7 +110,7 @@ static void hid_manager_device_attached(void* context, IOReturn result, void* se
IOHIDDeviceScheduleWithRunLoop(device, CFRunLoopGetCurrent(), kCFRunLoopCommonModes); IOHIDDeviceScheduleWithRunLoop(device, CFRunLoopGetCurrent(), kCFRunLoopCommonModes);
IOHIDDeviceRegisterRemovalCallback(device, hid_device_removed, connection); IOHIDDeviceRegisterRemovalCallback(device, hid_device_removed, connection);
CFStringRef device_name_ref = IOHIDDeviceGetProperty(device, CFSTR(kIOHIDProductKey)); device_name_ref = IOHIDDeviceGetProperty(device, CFSTR(kIOHIDProductKey));
CFStringGetCString(device_name_ref, device_name, sizeof(device_name), kCFStringEncodingUTF8); CFStringGetCString(device_name_ref, device_name, sizeof(device_name), kCFStringEncodingUTF8);
connection->slot = apple_joypad_connect(device_name, connection); connection->slot = apple_joypad_connect(device_name, connection);
@ -113,13 +123,16 @@ static void hid_manager_device_attached(void* context, IOReturn result, void* se
static void append_matching_dictionary(CFMutableArrayRef array, uint32_t page, uint32_t use) static void append_matching_dictionary(CFMutableArrayRef array, uint32_t page, uint32_t use)
{ {
CFMutableDictionaryRef matcher = CFDictionaryCreateMutable(kCFAllocatorDefault, 0, &kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks); CFNumberRef pagen, usen;
CFMutableDictionaryRef matcher;
matcher = CFDictionaryCreateMutable(kCFAllocatorDefault, 0, &kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks);
CFNumberRef pagen = CFNumberCreate(kCFAllocatorDefault, kCFNumberIntType, &page); pagen = CFNumberCreate(kCFAllocatorDefault, kCFNumberIntType, &page);
CFDictionarySetValue(matcher, CFSTR(kIOHIDDeviceUsagePageKey), pagen); CFDictionarySetValue(matcher, CFSTR(kIOHIDDeviceUsagePageKey), pagen);
CFRelease(pagen); CFRelease(pagen);
CFNumberRef usen = CFNumberCreate(kCFAllocatorDefault, kCFNumberIntType, &use); usen = CFNumberCreate(kCFAllocatorDefault, kCFNumberIntType, &use);
CFDictionarySetValue(matcher, CFSTR(kIOHIDDeviceUsageKey), usen); CFDictionarySetValue(matcher, CFSTR(kIOHIDDeviceUsageKey), usen);
CFRelease(usen); CFRelease(usen);
@ -129,12 +142,14 @@ static void append_matching_dictionary(CFMutableArrayRef array, uint32_t page, u
void osx_pad_init(void) void osx_pad_init(void)
{ {
CFMutableArrayRef matcher;
if (g_hid_manager) if (g_hid_manager)
return; return;
g_hid_manager = IOHIDManagerCreate(kCFAllocatorDefault, kIOHIDOptionsTypeNone); g_hid_manager = IOHIDManagerCreate(kCFAllocatorDefault, kIOHIDOptionsTypeNone);
CFMutableArrayRef matcher = CFArrayCreateMutable(kCFAllocatorDefault, 0, &kCFTypeArrayCallBacks); matcher = CFArrayCreateMutable(kCFAllocatorDefault, 0, &kCFTypeArrayCallBacks);
append_matching_dictionary(matcher, kHIDPage_GenericDesktop, kHIDUsage_GD_Joystick); append_matching_dictionary(matcher, kHIDPage_GenericDesktop, kHIDUsage_GD_Joystick);
append_matching_dictionary(matcher, kHIDPage_GenericDesktop, kHIDUsage_GD_GamePad); append_matching_dictionary(matcher, kHIDPage_GenericDesktop, kHIDUsage_GD_GamePad);

9
input/apple_joypad.c
View File

@ -108,7 +108,7 @@ void apple_joypad_disconnect(uint32_t slot)
{ {
joypad_slot_t* s = (joypad_slot_t*)&slots[slot]; joypad_slot_t* s = (joypad_slot_t*)&slots[slot];
if (s->iface && s->data) if (s->iface && s->data && s->iface->disconnect)
s->iface->disconnect(s->data); s->iface->disconnect(s->data);
memset(s, 0, sizeof(joypad_slot_t)); memset(s, 0, sizeof(joypad_slot_t));
@ -121,7 +121,7 @@ void apple_joypad_packet(uint32_t slot, uint8_t* data, uint32_t length)
{ {
joypad_slot_t *s = (joypad_slot_t*)&slots[slot]; joypad_slot_t *s = (joypad_slot_t*)&slots[slot];
if (s->iface && s->data) if (s->iface && s->data && s->iface->packet_handler)
s->iface->packet_handler(s->data, data, length); s->iface->packet_handler(s->data, data, length);
} }
} }
@ -151,7 +151,7 @@ static void apple_joypad_destroy(void)
for (i = 0; i < MAX_PLAYERS; i ++) for (i = 0; i < MAX_PLAYERS; i ++)
{ {
if (slots[i].used && slots[i].iface) if (slots[i].used && slots[i].iface && slots[i].iface->set_rumble)
{ {
slots[i].iface->set_rumble(slots[i].data, RETRO_RUMBLE_STRONG, 0); slots[i].iface->set_rumble(slots[i].data, RETRO_RUMBLE_STRONG, 0);
slots[i].iface->set_rumble(slots[i].data, RETRO_RUMBLE_WEAK, 0); slots[i].iface->set_rumble(slots[i].data, RETRO_RUMBLE_WEAK, 0);
@ -200,7 +200,8 @@ static void apple_joypad_poll(void)
static bool apple_joypad_rumble(unsigned pad, enum retro_rumble_effect effect, uint16_t strength) static bool apple_joypad_rumble(unsigned pad, enum retro_rumble_effect effect, uint16_t strength)
{ {
if (pad < MAX_PLAYERS && slots[pad].used && slots[pad].iface) if (pad < MAX_PLAYERS && slots[pad].used && slots[pad].iface
&& slots[pad].iface->set_rumble)
{ {
slots[pad].iface->set_rumble(slots[pad].data, effect, strength); slots[pad].iface->set_rumble(slots[pad].data, effect, strength);
return true; return true;