(Apple) Integrate apple_hid_pad code into apple_joypad
This commit is contained in:
twinaphex
parent
c22146fd0b
commit
62d1e311ad
|
|
@ -194,9 +194,6 @@ static char** waiting_argv;
|
||||||
_wantReload = false;
|
_wantReload = false;
|
||||||
|
|
||||||
apple_start_iteration();
|
apple_start_iteration();
|
||||||
|
|
||||||
extern void osx_pad_init();
|
|
||||||
osx_pad_init();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
- (BOOL)applicationShouldTerminateAfterLastWindowClosed:(NSApplication *)theApplication
|
- (BOOL)applicationShouldTerminateAfterLastWindowClosed:(NSApplication *)theApplication
|
||||||
|
|
|
||||||
|
|
@ -1,176 +0,0 @@
|
||||||
/* RetroArch - A frontend for libretro.
|
|
||||||
* Copyright (C) 2013-2014 - Jason Fetters
|
|
||||||
*
|
|
||||||
* RetroArch is free software: you can redistribute it and/or modify it under the terms
|
|
||||||
* of the GNU General Public License as published by the Free Software Found-
|
|
||||||
* ation, either version 3 of the License, or (at your option) any later version.
|
|
||||||
*
|
|
||||||
* RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
|
|
||||||
* without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
|
|
||||||
* PURPOSE. See the GNU General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU General Public License along with RetroArch.
|
|
||||||
* If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include <IOKit/hid/IOHIDManager.h>
|
|
||||||
#include "apple_input.h"
|
|
||||||
|
|
||||||
struct apple_pad_connection
|
|
||||||
{
|
|
||||||
uint32_t slot;
|
|
||||||
IOHIDDeviceRef device;
|
|
||||||
uint8_t data[2048];
|
|
||||||
};
|
|
||||||
|
|
||||||
static IOHIDManagerRef g_hid_manager;
|
|
||||||
|
|
||||||
void apple_pad_send_control(struct apple_pad_connection* connection, uint8_t* data, size_t size)
|
|
||||||
{
|
|
||||||
IOHIDDeviceSetReport(connection->device, kIOHIDReportTypeOutput, 0x01, data + 1, size - 1);
|
|
||||||
}
|
|
||||||
|
|
||||||
// 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)
|
|
||||||
{
|
|
||||||
IOHIDElementRef element;
|
|
||||||
uint32_t type, page, use;
|
|
||||||
struct apple_pad_connection* connection = (struct apple_pad_connection*)context;
|
|
||||||
|
|
||||||
element = IOHIDValueGetElement(value);
|
|
||||||
type = IOHIDElementGetType(element);
|
|
||||||
page = IOHIDElementGetUsagePage(element);
|
|
||||||
use = IOHIDElementGetUsage(element);
|
|
||||||
|
|
||||||
// Joystick handler: TODO: Can GamePad work the same?
|
|
||||||
if (type == kIOHIDElementTypeInput_Button && page == kHIDPage_Button)
|
|
||||||
{
|
|
||||||
CFIndex state = IOHIDValueGetIntegerValue(value);
|
|
||||||
|
|
||||||
if (state)
|
|
||||||
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)
|
|
||||||
{
|
|
||||||
static const uint32_t axis_use_ids[4] = { 48, 49, 50, 53 };
|
|
||||||
int i;
|
|
||||||
|
|
||||||
for (i = 0; i < 4; i ++)
|
|
||||||
{
|
|
||||||
if (use == axis_use_ids[i])
|
|
||||||
{
|
|
||||||
CFIndex min, max, state;
|
|
||||||
float val;
|
|
||||||
|
|
||||||
min = IOHIDElementGetPhysicalMin(element);
|
|
||||||
max = IOHIDElementGetPhysicalMax(element) - min;
|
|
||||||
state = IOHIDValueGetIntegerValue(value) - min;
|
|
||||||
|
|
||||||
val = (float)state / (float)max;
|
|
||||||
g_current_input_data.pad_axis[connection->slot][i] = ((val * 2.0f) - 1.0f) * 32767.0f;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
static void hid_device_removed(void* context, IOReturn result, void* sender)
|
|
||||||
{
|
|
||||||
struct apple_pad_connection* connection = (struct apple_pad_connection*)context;
|
|
||||||
|
|
||||||
if (connection && connection->slot < MAX_PLAYERS)
|
|
||||||
{
|
|
||||||
g_current_input_data.pad_buttons[connection->slot] = 0;
|
|
||||||
memset(g_current_input_data.pad_axis[connection->slot], 0, sizeof(g_current_input_data.pad_axis));
|
|
||||||
|
|
||||||
apple_joypad_disconnect(connection->slot);
|
|
||||||
free(connection);
|
|
||||||
}
|
|
||||||
|
|
||||||
IOHIDDeviceClose(sender, kIOHIDOptionsTypeNone);
|
|
||||||
}
|
|
||||||
|
|
||||||
static void hid_device_report(void* context, IOReturn result, void *sender, IOHIDReportType type, uint32_t reportID, uint8_t *report, CFIndex reportLength)
|
|
||||||
{
|
|
||||||
struct apple_pad_connection* connection = (struct apple_pad_connection*)context;
|
|
||||||
apple_joypad_packet(connection->slot, connection->data, reportLength + 1);
|
|
||||||
}
|
|
||||||
|
|
||||||
static void hid_manager_device_attached(void* context, IOReturn result, void* sender, IOHIDDeviceRef device)
|
|
||||||
{
|
|
||||||
char device_name[1024];
|
|
||||||
CFStringRef device_name_ref;
|
|
||||||
struct apple_pad_connection* connection = calloc(1, sizeof(struct apple_pad_connection));
|
|
||||||
|
|
||||||
connection->device = device;
|
|
||||||
connection->slot = MAX_PLAYERS;
|
|
||||||
|
|
||||||
IOHIDDeviceOpen(device, kIOHIDOptionsTypeNone);
|
|
||||||
IOHIDDeviceScheduleWithRunLoop(device, CFRunLoopGetCurrent(), kCFRunLoopCommonModes);
|
|
||||||
IOHIDDeviceRegisterRemovalCallback(device, hid_device_removed, connection);
|
|
||||||
|
|
||||||
device_name_ref = IOHIDDeviceGetProperty(device, CFSTR(kIOHIDProductKey));
|
|
||||||
CFStringGetCString(device_name_ref, device_name, sizeof(device_name), kCFStringEncodingUTF8);
|
|
||||||
|
|
||||||
connection->slot = apple_joypad_connect(device_name, connection);
|
|
||||||
|
|
||||||
if (apple_joypad_has_interface(connection->slot))
|
|
||||||
IOHIDDeviceRegisterInputReportCallback(device, connection->data + 1, sizeof(connection->data) - 1, hid_device_report, connection);
|
|
||||||
else
|
|
||||||
IOHIDDeviceRegisterInputValueCallback(device, hid_device_input_callback, connection);
|
|
||||||
}
|
|
||||||
|
|
||||||
static void append_matching_dictionary(CFMutableArrayRef array, uint32_t page, uint32_t use)
|
|
||||||
{
|
|
||||||
CFNumberRef pagen, usen;
|
|
||||||
CFMutableDictionaryRef matcher;
|
|
||||||
|
|
||||||
matcher = CFDictionaryCreateMutable(kCFAllocatorDefault, 0, &kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks);
|
|
||||||
|
|
||||||
pagen = CFNumberCreate(kCFAllocatorDefault, kCFNumberIntType, &page);
|
|
||||||
CFDictionarySetValue(matcher, CFSTR(kIOHIDDeviceUsagePageKey), pagen);
|
|
||||||
CFRelease(pagen);
|
|
||||||
|
|
||||||
usen = CFNumberCreate(kCFAllocatorDefault, kCFNumberIntType, &use);
|
|
||||||
CFDictionarySetValue(matcher, CFSTR(kIOHIDDeviceUsageKey), usen);
|
|
||||||
CFRelease(usen);
|
|
||||||
|
|
||||||
CFArrayAppendValue(array, matcher);
|
|
||||||
CFRelease(matcher);
|
|
||||||
}
|
|
||||||
|
|
||||||
void osx_pad_init(void)
|
|
||||||
{
|
|
||||||
CFMutableArrayRef matcher;
|
|
||||||
|
|
||||||
if (g_hid_manager)
|
|
||||||
return;
|
|
||||||
|
|
||||||
g_hid_manager = IOHIDManagerCreate(kCFAllocatorDefault, kIOHIDOptionsTypeNone);
|
|
||||||
|
|
||||||
matcher = CFArrayCreateMutable(kCFAllocatorDefault, 0, &kCFTypeArrayCallBacks);
|
|
||||||
append_matching_dictionary(matcher, kHIDPage_GenericDesktop, kHIDUsage_GD_Joystick);
|
|
||||||
append_matching_dictionary(matcher, kHIDPage_GenericDesktop, kHIDUsage_GD_GamePad);
|
|
||||||
|
|
||||||
IOHIDManagerSetDeviceMatchingMultiple(g_hid_manager, matcher);
|
|
||||||
CFRelease(matcher);
|
|
||||||
|
|
||||||
IOHIDManagerRegisterDeviceMatchingCallback(g_hid_manager, hid_manager_device_attached, 0);
|
|
||||||
IOHIDManagerScheduleWithRunLoop(g_hid_manager, CFRunLoopGetMain(), kCFRunLoopCommonModes);
|
|
||||||
|
|
||||||
IOHIDManagerOpen(g_hid_manager, kIOHIDOptionsTypeNone);
|
|
||||||
}
|
|
||||||
|
|
||||||
void osx_pad_quit(void)
|
|
||||||
{
|
|
||||||
if (g_hid_manager)
|
|
||||||
{
|
|
||||||
IOHIDManagerClose(g_hid_manager, kIOHIDOptionsTypeNone);
|
|
||||||
IOHIDManagerUnscheduleFromRunLoop(g_hid_manager, CFRunLoopGetCurrent(), kCFRunLoopCommonModes);
|
|
||||||
|
|
||||||
CFRelease(g_hid_manager);
|
|
||||||
}
|
|
||||||
|
|
||||||
g_hid_manager = 0;
|
|
||||||
}
|
|
||||||
|
|
@ -21,9 +21,10 @@
|
||||||
#include "../apple/iOS/bluetooth/btpad.c"
|
#include "../apple/iOS/bluetooth/btpad.c"
|
||||||
#include "../apple/iOS/bluetooth/btpad_queue.c"
|
#include "../apple/iOS/bluetooth/btpad_queue.c"
|
||||||
#elif defined(OSX)
|
#elif defined(OSX)
|
||||||
#include "apple_hid_pad.c"
|
#include <IOKit/hid/IOHIDManager.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#include "apple_input.h"
|
||||||
#include "../apple/common/hidpad/wiimote.c"
|
#include "../apple/common/hidpad/wiimote.c"
|
||||||
#include "../apple/common/hidpad/apple_ps3_pad.c"
|
#include "../apple/common/hidpad/apple_ps3_pad.c"
|
||||||
#include "../apple/common/hidpad/apple_wii_pad.c"
|
#include "../apple/common/hidpad/apple_wii_pad.c"
|
||||||
|
|
@ -39,6 +40,132 @@ typedef struct
|
||||||
|
|
||||||
static joypad_slot_t slots[MAX_PLAYERS];
|
static joypad_slot_t slots[MAX_PLAYERS];
|
||||||
|
|
||||||
|
#ifdef OSX
|
||||||
|
struct apple_pad_connection
|
||||||
|
{
|
||||||
|
uint32_t slot;
|
||||||
|
IOHIDDeviceRef device;
|
||||||
|
uint8_t data[2048];
|
||||||
|
};
|
||||||
|
|
||||||
|
static IOHIDManagerRef g_hid_manager;
|
||||||
|
|
||||||
|
void apple_pad_send_control(struct apple_pad_connection* connection, uint8_t* data, size_t size)
|
||||||
|
{
|
||||||
|
IOHIDDeviceSetReport(connection->device, kIOHIDReportTypeOutput, 0x01, data + 1, size - 1);
|
||||||
|
}
|
||||||
|
|
||||||
|
// 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)
|
||||||
|
{
|
||||||
|
IOHIDElementRef element;
|
||||||
|
uint32_t type, page, use;
|
||||||
|
struct apple_pad_connection* connection = (struct apple_pad_connection*)context;
|
||||||
|
|
||||||
|
element = IOHIDValueGetElement(value);
|
||||||
|
type = IOHIDElementGetType(element);
|
||||||
|
page = IOHIDElementGetUsagePage(element);
|
||||||
|
use = IOHIDElementGetUsage(element);
|
||||||
|
|
||||||
|
// Joystick handler: TODO: Can GamePad work the same?
|
||||||
|
if (type == kIOHIDElementTypeInput_Button && page == kHIDPage_Button)
|
||||||
|
{
|
||||||
|
CFIndex state = IOHIDValueGetIntegerValue(value);
|
||||||
|
|
||||||
|
if (state)
|
||||||
|
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)
|
||||||
|
{
|
||||||
|
static const uint32_t axis_use_ids[4] = { 48, 49, 50, 53 };
|
||||||
|
int i;
|
||||||
|
|
||||||
|
for (i = 0; i < 4; i ++)
|
||||||
|
{
|
||||||
|
if (use == axis_use_ids[i])
|
||||||
|
{
|
||||||
|
CFIndex min, max, state;
|
||||||
|
float val;
|
||||||
|
|
||||||
|
min = IOHIDElementGetPhysicalMin(element);
|
||||||
|
max = IOHIDElementGetPhysicalMax(element) - min;
|
||||||
|
state = IOHIDValueGetIntegerValue(value) - min;
|
||||||
|
|
||||||
|
val = (float)state / (float)max;
|
||||||
|
g_current_input_data.pad_axis[connection->slot][i] = ((val * 2.0f) - 1.0f) * 32767.0f;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
static void hid_device_removed(void* context, IOReturn result, void* sender)
|
||||||
|
{
|
||||||
|
struct apple_pad_connection* connection = (struct apple_pad_connection*)context;
|
||||||
|
|
||||||
|
if (connection && connection->slot < MAX_PLAYERS)
|
||||||
|
{
|
||||||
|
g_current_input_data.pad_buttons[connection->slot] = 0;
|
||||||
|
memset(g_current_input_data.pad_axis[connection->slot], 0, sizeof(g_current_input_data.pad_axis));
|
||||||
|
|
||||||
|
apple_joypad_disconnect(connection->slot);
|
||||||
|
free(connection);
|
||||||
|
}
|
||||||
|
|
||||||
|
IOHIDDeviceClose(sender, kIOHIDOptionsTypeNone);
|
||||||
|
}
|
||||||
|
|
||||||
|
static void hid_device_report(void* context, IOReturn result, void *sender, IOHIDReportType type, uint32_t reportID, uint8_t *report, CFIndex reportLength)
|
||||||
|
{
|
||||||
|
struct apple_pad_connection* connection = (struct apple_pad_connection*)context;
|
||||||
|
apple_joypad_packet(connection->slot, connection->data, reportLength + 1);
|
||||||
|
}
|
||||||
|
|
||||||
|
static void hid_manager_device_attached(void* context, IOReturn result, void* sender, IOHIDDeviceRef device)
|
||||||
|
{
|
||||||
|
char device_name[1024];
|
||||||
|
CFStringRef device_name_ref;
|
||||||
|
struct apple_pad_connection* connection = calloc(1, sizeof(struct apple_pad_connection));
|
||||||
|
|
||||||
|
connection->device = device;
|
||||||
|
connection->slot = MAX_PLAYERS;
|
||||||
|
|
||||||
|
IOHIDDeviceOpen(device, kIOHIDOptionsTypeNone);
|
||||||
|
IOHIDDeviceScheduleWithRunLoop(device, CFRunLoopGetCurrent(), kCFRunLoopCommonModes);
|
||||||
|
IOHIDDeviceRegisterRemovalCallback(device, hid_device_removed, connection);
|
||||||
|
|
||||||
|
device_name_ref = IOHIDDeviceGetProperty(device, CFSTR(kIOHIDProductKey));
|
||||||
|
CFStringGetCString(device_name_ref, device_name, sizeof(device_name), kCFStringEncodingUTF8);
|
||||||
|
|
||||||
|
connection->slot = apple_joypad_connect(device_name, connection);
|
||||||
|
|
||||||
|
if (apple_joypad_has_interface(connection->slot))
|
||||||
|
IOHIDDeviceRegisterInputReportCallback(device, connection->data + 1, sizeof(connection->data) - 1, hid_device_report, connection);
|
||||||
|
else
|
||||||
|
IOHIDDeviceRegisterInputValueCallback(device, hid_device_input_callback, connection);
|
||||||
|
}
|
||||||
|
|
||||||
|
static void append_matching_dictionary(CFMutableArrayRef array, uint32_t page, uint32_t use)
|
||||||
|
{
|
||||||
|
CFNumberRef pagen, usen;
|
||||||
|
CFMutableDictionaryRef matcher;
|
||||||
|
|
||||||
|
matcher = CFDictionaryCreateMutable(kCFAllocatorDefault, 0, &kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks);
|
||||||
|
|
||||||
|
pagen = CFNumberCreate(kCFAllocatorDefault, kCFNumberIntType, &page);
|
||||||
|
CFDictionarySetValue(matcher, CFSTR(kIOHIDDeviceUsagePageKey), pagen);
|
||||||
|
CFRelease(pagen);
|
||||||
|
|
||||||
|
usen = CFNumberCreate(kCFAllocatorDefault, kCFNumberIntType, &use);
|
||||||
|
CFDictionarySetValue(matcher, CFSTR(kIOHIDDeviceUsageKey), usen);
|
||||||
|
CFRelease(usen);
|
||||||
|
|
||||||
|
CFArrayAppendValue(array, matcher);
|
||||||
|
CFRelease(matcher);
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
static int32_t find_empty_slot(void)
|
static int32_t find_empty_slot(void)
|
||||||
{
|
{
|
||||||
unsigned i;
|
unsigned i;
|
||||||
|
|
@ -137,6 +264,27 @@ bool apple_joypad_has_interface(uint32_t slot)
|
||||||
// RetroArch joypad driver:
|
// RetroArch joypad driver:
|
||||||
static bool apple_joypad_init(void)
|
static bool apple_joypad_init(void)
|
||||||
{
|
{
|
||||||
|
#ifdef OSX
|
||||||
|
CFMutableArrayRef matcher;
|
||||||
|
|
||||||
|
if (g_hid_manager)
|
||||||
|
return true;
|
||||||
|
|
||||||
|
g_hid_manager = IOHIDManagerCreate(kCFAllocatorDefault, kIOHIDOptionsTypeNone);
|
||||||
|
|
||||||
|
matcher = CFArrayCreateMutable(kCFAllocatorDefault, 0, &kCFTypeArrayCallBacks);
|
||||||
|
append_matching_dictionary(matcher, kHIDPage_GenericDesktop, kHIDUsage_GD_Joystick);
|
||||||
|
append_matching_dictionary(matcher, kHIDPage_GenericDesktop, kHIDUsage_GD_GamePad);
|
||||||
|
|
||||||
|
IOHIDManagerSetDeviceMatchingMultiple(g_hid_manager, matcher);
|
||||||
|
CFRelease(matcher);
|
||||||
|
|
||||||
|
IOHIDManagerRegisterDeviceMatchingCallback(g_hid_manager, hid_manager_device_attached, 0);
|
||||||
|
IOHIDManagerScheduleWithRunLoop(g_hid_manager, CFRunLoopGetMain(), kCFRunLoopCommonModes);
|
||||||
|
|
||||||
|
IOHIDManagerOpen(g_hid_manager, kIOHIDOptionsTypeNone);
|
||||||
|
#endif
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -149,6 +297,17 @@ static void apple_joypad_destroy(void)
|
||||||
{
|
{
|
||||||
unsigned i;
|
unsigned i;
|
||||||
|
|
||||||
|
#ifdef OSX
|
||||||
|
if (g_hid_manager)
|
||||||
|
{
|
||||||
|
IOHIDManagerClose(g_hid_manager, kIOHIDOptionsTypeNone);
|
||||||
|
IOHIDManagerUnscheduleFromRunLoop(g_hid_manager, CFRunLoopGetCurrent(), kCFRunLoopCommonModes);
|
||||||
|
|
||||||
|
CFRelease(g_hid_manager);
|
||||||
|
}
|
||||||
|
g_hid_manager = NULL;
|
||||||
|
#endif
|
||||||
|
|
||||||
for (i = 0; i < MAX_PLAYERS; i ++)
|
for (i = 0; i < MAX_PLAYERS; i ++)
|
||||||
{
|
{
|
||||||
if (slots[i].used && slots[i].iface && slots[i].iface->set_rumble)
|
if (slots[i].used && slots[i].iface && slots[i].iface->set_rumble)
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue