mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-09 00:40:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

update coding style for PR

Browse Source
This commit is contained in:
revvv 2019-08-11 21:08:16 +02:00
parent 976e4672b4
commit 22669edfed
2 changed files with 15 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
input/connect/connect_retrode.c
View File

@ -97,19 +97,11 @@ static int16_t hidpad_retrode_get_axis(void *data, unsigned axis)
/* map Retrode values to a known gamepad (VID=0x0079, PID=0x0011) */
if (val == 0x9C)
{
/* axis=0 left, axis=1 up */
val = 0x00;
}
val = 0x00; /* axis=0 left, axis=1 up */
else if (val == 0x64)
{
/* axis=0 right, axis=1 down */
val = 0xFF;
}
val = 0xFF; /* axis=0 right, axis=1 down */
else
{
val = 0x7F; /* no button pressed */
}
val = (val << 8) - 0x8000;
@ -166,7 +158,7 @@ static void hidpad_retrode_packet_handler(void *data, uint8_t *packet, uint16_t
*/
device1234 = port_device[packet[1] - 1];
if (device1234 == NULL)
if (!device1234)
return;
memcpy(device1234->data, packet, size);

44
input/drivers_hid/wiiusb_hid.c
View File

@ -273,38 +273,22 @@ static int wiiusb_hid_removal_cb(int result, void *usrdata)
static bool isRetrodeGamepad(usb_devdesc devdesc)
{
if (devdesc.idVendor != VID_RETRODE || devdesc.idProduct != PID_RETRODE)
{
return false;
}
if (devdesc.configurations != NULL)
{
if (devdesc.configurations->interfaces != NULL)
{
if (devdesc.configurations->interfaces->endpoints != NULL)
{
if (devdesc.configurations)
if (devdesc.configurations->interfaces)
if (devdesc.configurations->interfaces->endpoints)
return devdesc.configurations->interfaces->bInterfaceSubClass == 0;
}
}
}
return false;
}
static bool isRetrodeMouse(usb_devdesc devdesc)
{
if (devdesc.idVendor != VID_RETRODE || devdesc.idProduct != PID_RETRODE)
{
return false;
}
if (devdesc.configurations != NULL)
{
if (devdesc.configurations->interfaces != NULL)
{
if (devdesc.configurations->interfaces->endpoints != NULL)
{
if (devdesc.configurations)
if (devdesc.configurations->interfaces)
if (devdesc.configurations->interfaces->endpoints)
return devdesc.configurations->interfaces->bInterfaceSubClass == 1;
}
}
}
return false;
}
@ -315,6 +299,8 @@ static int wiiusb_hid_add_adapter(void *data, usb_device_entry *dev)
wiiusb_hid_t *hid = (wiiusb_hid_t*)data;
struct wiiusb_adapter *adapter = (struct wiiusb_adapter*)
calloc(1, sizeof(struct wiiusb_adapter));
int i;
int32_t slot1;
if (!adapter)
return -1;
@ -390,20 +376,17 @@ static int wiiusb_hid_add_adapter(void *data, usb_device_entry *dev)
RARCH_LOG("Device 0x%p attached (VID/PID: %04x:%04x).\n",
adapter->device_id, desc.idVendor, desc.idProduct);
// Retrode support
if (isRetrodeGamepad(desc))
{
// Retrode port #1
/* Retrode port #1 */
RARCH_LOG("Interface Retrode1 gamepad slot: %d\n", adapter->slot);
wiiusb_hid_device_add_autodetect(adapter->slot, device_name, wiiusb_hid.ident, desc.idVendor, desc.idProduct);
// Retrode port #2, #3, #4
for (int i = 2; i <= 4; i++)
/* Retrode port #2, #3, #4 */
for (i = 2; i <= 4; i++)
{
int32_t slot1 = pad_connection_pad_init(hid->connections, "hid", desc.idVendor, desc.idProduct, adapter, &wiiusb_hid);
slot1 = pad_connection_pad_init(hid->connections, "hid", desc.idVendor, desc.idProduct, adapter, &wiiusb_hid);
if (slot1 == -1)
{
RARCH_LOG("No slot free for Retrode%d gamepad\n", i);
}
else
{
RARCH_LOG("Interface Retrode%d gamepad slot: %d\n", i, slot1);
@ -412,11 +395,8 @@ static int wiiusb_hid_add_adapter(void *data, usb_device_entry *dev)
}
}
else
{
//RARCH_LOG("Interface USB slot: %d\n", adapter->slot);
wiiusb_hid_device_add_autodetect(adapter->slot,
device_name, wiiusb_hid.ident, desc.idVendor, desc.idProduct);
}
USB_FreeDescriptors(&desc);
USB_DeviceRemovalNotifyAsync(adapter->handle, wiiusb_hid_removal_cb, adapter);