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

Simplify joypad_connection.c

This commit is contained in:
LibretroAdmin 2022-09-04 02:02:51 +02:00
parent 835bbc6f68
commit dfff8e127a
2 changed files with 94 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

152
input/connect/joypad_connection.c
View File

@ -25,22 +25,72 @@
#include "joypad_connection.h" #include "joypad_connection.h"
/* We init the HID/VID to 0 because we need to do static joypad_connection_entry_t pad_map[] = {
endian magic that we can't do during the declaration */ { "Nintendo RVL-CNT-01",
joypad_connection_entry_t pad_map[] = { VID_NINTENDO,
{ "Nintendo RVL-CNT-01", 0, 0, &pad_connection_wii }, PID_NINTENDO_PRO,
{ "Nintendo RVL-CNT-01-UC", 0, 0, &pad_connection_wiiupro }, &pad_connection_wii
{ "Wireless Controller", 0, 0, &pad_connection_ps4 }, },
{ "PLAYSTATION(R)3 Controller", 0, 0, &pad_connection_ps3 }, { "Nintendo RVL-CNT-01-UC",
{ "PLAYSTATION(R)3 Controller", 0, 0, &pad_connection_ps3 }, VID_NINTENDO,
{ "Generic SNES USB Controller", 0, 0, &pad_connection_snesusb }, PID_NINTENDO_PRO,
{ "Generic NES USB Controller", 0, 0, &pad_connection_nesusb }, &pad_connection_wiiupro
{ "Wii U GC Controller Adapter", 0, 0, &pad_connection_wiiugca }, },
{ "PS2/PSX Controller Adapter", 0, 0, &pad_connection_ps2adapter }, { "Wireless Controller",
{ "PSX to PS3 Controller Adapter", 0, 0, &pad_connection_psxadapter }, VID_SONY,
{ "Mayflash DolphinBar", 0, 0, &pad_connection_wii }, PID_SONY_DS4,
{ "Retrode", 0, 0, &pad_connection_retrode }, &pad_connection_ps4
{ "HORI mini wired PS4", 0, 0, &pad_connection_ps4_hori_mini }, },
{ "PLAYSTATION(R)3 Controller",
VID_SONY,
PID_SONY_DS3,
&pad_connection_ps3
},
{ "PLAYSTATION(R)3 Controller",
VID_PS3_CLONE,
PID_DS3_CLONE,
&pad_connection_ps3
},
{ "Generic SNES USB Controller",
VID_SNES_CLONE,
PID_SNES_CLONE,
&pad_connection_snesusb
},
{ "Generic NES USB Controller",
VID_MICRONTEK,
PID_MICRONTEK_NES,
&pad_connection_nesusb
},
{ "Wii U GC Controller Adapter",
VID_NINTENDO,
PID_NINTENDO_GCA,
&pad_connection_wiiugca
},
{ "PS2/PSX Controller Adapter",
VID_PCS,
PID_PCS_PS2PSX,
&pad_connection_ps2adapter
},
{ "PSX to PS3 Controller Adapter",
VID_PCS,
PID_PCS_PSX2PS3,
&pad_connection_psxadapter
},
{ "Mayflash DolphinBar",
1406,
774,
&pad_connection_wii
},
{ "Retrode",
VID_RETRODE,
PID_RETRODE,
&pad_connection_retrode
},
{ "HORI mini wired PS4",
VID_HORI_1,
PID_HORI_MINI_WIRED_PS4,
&pad_connection_ps4_hori_mini
},
{ 0, 0} { 0, 0}
}; };
@ -54,9 +104,9 @@ static bool joypad_is_end_of_list(joypad_connection_t *pad)
int pad_connection_find_vacant_pad(joypad_connection_t *joyconn) int pad_connection_find_vacant_pad(joypad_connection_t *joyconn)
{ {
int i;
if (joyconn) if (joyconn)
{ {
int i;
for (i = 0; !joypad_is_end_of_list(&joyconn[i]); i++) for (i = 0; !joypad_is_end_of_list(&joyconn[i]); i++)
{ {
if (!joyconn[i].connected) if (!joyconn[i].connected)
@ -105,46 +155,12 @@ joypad_connection_t *pad_connection_init(unsigned pads)
return joyconn; return joyconn;
} }
static void init_pad_map(void)
{
pad_map[0].vid = VID_NINTENDO;
pad_map[0].pid = PID_NINTENDO_PRO;
pad_map[1].vid = VID_NINTENDO;
pad_map[1].pid = PID_NINTENDO_PRO;
pad_map[2].vid = VID_SONY;
pad_map[2].pid = PID_SONY_DS4;
pad_map[3].vid = VID_SONY;
pad_map[3].pid = PID_SONY_DS3;
pad_map[4].vid = VID_PS3_CLONE;
pad_map[4].pid = PID_DS3_CLONE;
pad_map[5].vid = VID_SNES_CLONE;
pad_map[5].pid = PID_SNES_CLONE;
pad_map[6].vid = VID_MICRONTEK;
pad_map[6].pid = PID_MICRONTEK_NES;
pad_map[7].vid = VID_NINTENDO;
pad_map[7].pid = PID_NINTENDO_GCA;
pad_map[8].vid = VID_PCS;
pad_map[8].pid = PID_PCS_PS2PSX;
pad_map[9].vid = VID_PCS;
pad_map[9].pid = PID_PCS_PSX2PS3;
pad_map[10].vid = 1406;
pad_map[10].pid = 774;
pad_map[11].vid = VID_RETRODE;
pad_map[11].pid = PID_RETRODE;
pad_map[12].vid = VID_HORI_1;
pad_map[12].pid = PID_HORI_MINI_WIRED_PS4;
}
joypad_connection_entry_t *find_connection_entry(uint16_t vid, uint16_t pid, const char *name) joypad_connection_entry_t *find_connection_entry(uint16_t vid, uint16_t pid, const char *name)
{ {
unsigned i; unsigned i;
const bool has_name = !string_is_empty(name); const bool has_name = !string_is_empty(name);
size_t name_len = strlen(name); size_t name_len = strlen(name);
if (pad_map[0].vid == 0)
init_pad_map();
for (i = 0; pad_map[i].name != NULL; i++) for (i = 0; pad_map[i].name != NULL; i++)
{ {
char *name_match = NULL; char *name_match = NULL;
@ -192,10 +208,6 @@ static int joypad_to_slot(joypad_connection_t *haystack,
return -1; return -1;
} }
void release_joypad(joypad_connection_t *joypad) {
}
void legacy_pad_connection_pad_deregister(joypad_connection_t *pad_list, pad_connection_interface_t *iface, void *pad_data) void legacy_pad_connection_pad_deregister(joypad_connection_t *pad_list, pad_connection_interface_t *iface, void *pad_data)
{ {
int i; int i;
@ -265,8 +277,7 @@ void pad_connection_pad_refresh(joypad_connection_t *joyconn,
break; break;
/* The joypad is connected but has not been bound */ /* The joypad is connected but has not been bound */
case PAD_CONNECT_READY: case PAD_CONNECT_READY:
slot = pad_connection_find_vacant_pad(joyconn); if ((slot = pad_connection_find_vacant_pad(joyconn)) >= 0)
if (slot >= 0)
{ {
joypad = &joyconn[slot]; joypad = &joyconn[slot];
joypad->connection = iface->pad_init(device_data, joypad->connection = iface->pad_init(device_data,
@ -294,16 +305,17 @@ void pad_connection_pad_register(joypad_connection_t *joyconn,
input_device_driver_t *input_driver, int slot) input_device_driver_t *input_driver, int slot)
{ {
int i; int i;
int max_pad; int max_pad = 1;
if ( (iface->multi_pad) if (iface->multi_pad)
&& (iface->max_pad <= 1 || !iface->status || !iface->pad_init)) {
if (iface->max_pad <= 1 || !iface->status || !iface->pad_init)
{ {
RARCH_ERR("pad_connection_pad_register: multi-pad driver has incomplete implementation\n"); RARCH_ERR("pad_connection_pad_register: multi-pad driver has incomplete implementation\n");
return; return;
} }
max_pad = iface->max_pad;
max_pad = iface->multi_pad ? iface->max_pad : 1; }
for (i = 0; i < max_pad; i++) for (i = 0; i < max_pad; i++)
{ {
@ -352,9 +364,7 @@ int32_t pad_connection_pad_init_entry(joypad_connection_t *joyconn,
if (entry) if (entry)
{ {
conn->iface = entry->iface; conn->iface = entry->iface;
conn->data = data;
conn->connection = conn->iface->init(data, pad, driver); conn->connection = conn->iface->init(data, pad, driver);
conn->connected = true;
} }
else else
{ {
@ -362,9 +372,9 @@ int32_t pad_connection_pad_init_entry(joypad_connection_t *joyconn,
* Set up one without an interface */ * Set up one without an interface */
RARCH_DBG("Pad was not matched. Setting up without an interface.\n"); RARCH_DBG("Pad was not matched. Setting up without an interface.\n");
conn->iface = NULL; conn->iface = NULL;
}
conn->data = data; conn->data = data;
conn->connected = true; conn->connected = true;
}
return pad; return pad;
} }
@ -373,13 +383,7 @@ int32_t pad_connection_pad_init(joypad_connection_t *joyconn,
const char *name, uint16_t vid, uint16_t pid, const char *name, uint16_t vid, uint16_t pid,
void *data, hid_driver_t *driver) void *data, hid_driver_t *driver)
{ {
joypad_connection_entry_t *entry = NULL; joypad_connection_entry_t *entry = find_connection_entry(vid, pid, name);
if (pad_map[0].vid == 0)
init_pad_map();
entry = find_connection_entry(vid, pid, name);
return pad_connection_pad_init_entry(joyconn, entry, data, driver); return pad_connection_pad_init_entry(joyconn, entry, data, driver);
} }
@ -454,9 +458,7 @@ void pad_connection_destroy(joypad_connection_t *joyconn)
bool pad_connection_rumble(joypad_connection_t *joyconn, bool pad_connection_rumble(joypad_connection_t *joyconn,
unsigned pad, enum retro_rumble_effect effect, uint16_t strength) unsigned pad, enum retro_rumble_effect effect, uint16_t strength)
{ {
if (!joyconn->connected) if (!joyconn->connected || !joyconn->iface || !joyconn->iface->set_rumble)
return false;
if (!joyconn->iface || !joyconn->iface->set_rumble)
return false; return false;
joyconn->iface->set_rumble(joyconn->connection, effect, strength); joyconn->iface->set_rumble(joyconn->connection, effect, strength);

8
input/connect/joypad_connection.h
View File

@ -25,11 +25,11 @@
#include <retro_endianness.h> #include <retro_endianness.h>
#include "../input_driver.h" #include "../input_driver.h"
/* Wii have PID/VID already swapped by USB_GetDescriptors from libogc */ /* Gekko (NGC/Wii) has PID/VID already swapped by USB_GetDescriptors from libogc, so skip bigendian byteswap */
#ifdef GEKKO #if defined(MSB_FIRST) && !defined(GEKKO)
#define SWAP_IF_BIG(val) (val) #define SWAP_IF_BIG(val) ((((val) & 0x00ff) << 8) | (((val) & 0xff00) >> 8))
#else #else
#define SWAP_IF_BIG(val) swap_if_big16(val) #define SWAP_IF_BIG(val) (val)
#endif #endif
#define VID_NONE 0x0000 #define VID_NONE 0x0000