mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-29 04:20:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Try to fix Apple iOS build - error: initializer element is not a compile-time constant

Browse Source
This commit is contained in:
twinaphex 2018-01-01 15:27:52 +01:00
parent 8908d9983b
commit b57f0d95c2
1 changed files with 37 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
input/connect/joypad_connection.c
View File

@ -95,7 +95,7 @@ int32_t pad_connection_pad_init(joypad_connection_t *joyconn,
void *data, hid_driver_t *driver) void *data, hid_driver_t *driver)
{ {
static const struct static struct
{ {
const char* name; const char* name;
uint16_t vid; uint16_t vid;
@ -103,17 +103,17 @@ int32_t pad_connection_pad_init(joypad_connection_t *joyconn,
pad_connection_interface_t *iface; pad_connection_interface_t *iface;
} pad_map[] = } pad_map[] =
{ {
{ "Nintendo RVL-CNT-01", VID_NINTENDO, PID_NINTENDO_PRO, &pad_connection_wii }, { "Nintendo RVL-CNT-01", 0, 0, &pad_connection_wii },
{ "Nintendo RVL-CNT-01-UC", VID_NINTENDO, PID_NINTENDO_PRO, &pad_connection_wiiupro }, { "Nintendo RVL-CNT-01-UC", 0, 0, &pad_connection_wiiupro },
{ "Wireless Controller", VID_SONY, PID_SONY_DS4, &pad_connection_ps4 }, { "Wireless Controller", 0, 0, &pad_connection_ps4 },
{ "PLAYSTATION(R)3 Controller", VID_SONY, PID_SONY_DS3, &pad_connection_ps3 }, { "PLAYSTATION(R)3 Controller", 0, 0, &pad_connection_ps3 },
{ "PLAYSTATION(R)3 Controller", VID_PS3_CLONE, PID_DS3_CLONE, &pad_connection_ps3 }, { "PLAYSTATION(R)3 Controller", 0, 0, &pad_connection_ps3 },
{ "Generic SNES USB Controller", VID_SNES_CLONE, PID_SNES_CLONE, &pad_connection_snesusb }, { "Generic SNES USB Controller", 0, 0, &pad_connection_snesusb },
{ "Generic NES USB Controller", VID_MICRONTEK, PID_MICRONTEK_NES, &pad_connection_nesusb }, { "Generic NES USB Controller", 0, 0, &pad_connection_nesusb },
{ "Wii U GC Controller Adapter", VID_NINTENDO, PID_NINTENDO_GCA, &pad_connection_wiiugca }, { "Wii U GC Controller Adapter", 0, 0, &pad_connection_wiiugca },
{ "PS2/PSX Controller Adapter", VID_PCS, PID_PCS_PS2PSX, &pad_connection_ps2adapter }, { "PS2/PSX Controller Adapter", 0, 0, &pad_connection_ps2adapter },
{ "PSX to PS3 Controller Adapter", VID_PCS, PID_PCS_PSX2PS3, &pad_connection_psxadapter }, { "PSX to PS3 Controller Adapter", 0, 0, &pad_connection_psxadapter },
{ "Mayflash DolphinBar", 1406, 774, &pad_connection_wii }, { "Mayflash DolphinBar", 0, 0, &pad_connection_wii },
{ 0, 0} { 0, 0}
}; };
joypad_connection_t *s = NULL; joypad_connection_t *s = NULL;
@ -124,6 +124,29 @@ int32_t pad_connection_pad_init(joypad_connection_t *joyconn,
s = &joyconn[pad]; s = &joyconn[pad];
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;
if (s) if (s)
{ {
unsigned i; unsigned i;
@ -157,12 +180,12 @@ int32_t pad_connection_pad_init(joypad_connection_t *joyconn,
#endif #endif
break; break;
} }
#if 0
else else
{ {
#if 0
RARCH_LOG("%s not found \n", pad_map[i].name); RARCH_LOG("%s not found \n", pad_map[i].name);
#endif
} }
#endif
} }
/* We failed to find a matching pad, /* We failed to find a matching pad,