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

(Android) Add JXD devices to autonconf

Browse Source
This commit is contained in:
twinaphex 2014-06-12 04:23:32 +02:00
parent 232ef7243a
commit 84fd553025
3 changed files with 86 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
input/android_input.c
View File

@ -466,7 +466,7 @@ static void handle_hotplug(void *data, unsigned *port, unsigned id,
else if (strstr(device_name, "OUYA Game Controller")) else if (strstr(device_name, "OUYA Game Controller"))
strlcpy(name_buf, "OUYA", sizeof(name_buf)); strlcpy(name_buf, "OUYA", sizeof(name_buf));
else if (strstr(device_name, "adc joystick")) else if (strstr(device_name, "adc joystick"))
device = DEVICE_JXD_S7300B; strlcpy(name_buf, "JXD S7300B", sizeof(name_buf));
else if (strstr(device_name, "idroid:con")) else if (strstr(device_name, "idroid:con"))
device = DEVICE_IDROID_CON; device = DEVICE_IDROID_CON;
else if (strstr(device_name, "NYKO PLAYPAD PRO")) else if (strstr(device_name, "NYKO PLAYPAD PRO"))
@ -494,9 +494,9 @@ static void handle_hotplug(void *data, unsigned *port, unsigned id,
else if (strstr(device_name, "joy_key")) else if (strstr(device_name, "joy_key"))
strlcpy(name_buf, "Archos Gamepad", sizeof(name_buf)); strlcpy(name_buf, "Archos Gamepad", sizeof(name_buf));
else if (strstr(device_name, "matrix_keyboard")) else if (strstr(device_name, "matrix_keyboard"))
device = DEVICE_JXD_S5110; strlcpy(name_buf, "JXD S5110B", sizeof(name_buf));
else if (strstr(device_name, "tincore_adc_joystick")) else if (strstr(device_name, "tincore_adc_joystick"))
device = DEVICE_JXD_S5110_SKELROM; strlcpy(name_buf, "JXD S5110B (Skelrom)", sizeof(name_buf));
else if (strstr(device_name, "keypad-zeus") || (strstr(device_name, "keypad-game-zeus"))) else if (strstr(device_name, "keypad-zeus") || (strstr(device_name, "keypad-game-zeus")))
strlcpy(name_buf, "Xperia Play", sizeof(name_buf)); strlcpy(name_buf, "Xperia Play", sizeof(name_buf));
else if (strstr(device_name, "Broadcom Bluetooth HID")) else if (strstr(device_name, "Broadcom Bluetooth HID"))
@ -504,7 +504,7 @@ static void handle_hotplug(void *data, unsigned *port, unsigned id,
else if (strstr(device_name, "USB Gamepad")) else if (strstr(device_name, "USB Gamepad"))
device = DEVICE_THRUST_PREDATOR; device = DEVICE_THRUST_PREDATOR;
else if (strstr(device_name, "ADC joystick")) else if (strstr(device_name, "ADC joystick"))
device = DEVICE_JXD_S7800B; strlcpy(name_buf, "JXD S7800B", sizeof(name_buf));
else if (strstr(device_name, "DragonRise")) else if (strstr(device_name, "DragonRise"))
device = DEVICE_DRAGONRISE; device = DEVICE_DRAGONRISE;
else if (strstr(device_name, "Thrustmaster T Mini")) else if (strstr(device_name, "Thrustmaster T Mini"))

62
input/android_input.c.rem
View File

@ -392,32 +392,6 @@ static void android_input_set_keybinds(void *data, unsigned device,
android->keycode_lut[AKEYCODE_ENTER] |= ((RETRO_DEVICE_ID_JOYPAD_START+1) << shift); android->keycode_lut[AKEYCODE_ENTER] |= ((RETRO_DEVICE_ID_JOYPAD_START+1) << shift);
android->keycode_lut[AKEYCODE_SPACE] |= ((RETRO_DEVICE_ID_JOYPAD_SELECT+1) << shift); android->keycode_lut[AKEYCODE_SPACE] |= ((RETRO_DEVICE_ID_JOYPAD_SELECT+1) << shift);
//android->keycode_lut[AKEYCODE_VOLUME_UP] |= ((RETRO_DEVICE_ID_JOYPAD_SELECT+1) << shift);
//android->keycode_lut[AKEYCODE_VOLUME_DOWN] |= ((RETRO_DEVICE_ID_JOYPAD_SELECT+1) << shift);
break;
case DEVICE_JXD_S7800B:
g_settings.input.device[port] = device;
strlcpy(g_settings.input.device_names[port], "JXD S7800B",
sizeof(g_settings.input.device_names[port]));
android->keycode_lut[AKEYCODE_DPAD_UP] |= ((RETRO_DEVICE_ID_JOYPAD_UP+1) << shift);
android->keycode_lut[AKEYCODE_DPAD_DOWN] |= ((RETRO_DEVICE_ID_JOYPAD_DOWN+1) << shift);
android->keycode_lut[AKEYCODE_DPAD_LEFT] |= ((RETRO_DEVICE_ID_JOYPAD_LEFT+1) << shift);
android->keycode_lut[AKEYCODE_DPAD_RIGHT] |= ((RETRO_DEVICE_ID_JOYPAD_RIGHT+1) << shift);
android->keycode_lut[AKEYCODE_BUTTON_A] |= ((RETRO_DEVICE_ID_JOYPAD_A+1) << shift);
android->keycode_lut[AKEYCODE_BUTTON_B] |= ((RETRO_DEVICE_ID_JOYPAD_B+1) << shift);
android->keycode_lut[AKEYCODE_BUTTON_Y] |= ((RETRO_DEVICE_ID_JOYPAD_Y+1) << shift);
android->keycode_lut[AKEYCODE_BUTTON_X] |= ((RETRO_DEVICE_ID_JOYPAD_X+1) << shift);
android->keycode_lut[AKEYCODE_BUTTON_L1] |= ((RETRO_DEVICE_ID_JOYPAD_L+1) << shift);
android->keycode_lut[AKEYCODE_BUTTON_R1] |= ((RETRO_DEVICE_ID_JOYPAD_R+1) << shift);
android->keycode_lut[AKEYCODE_BUTTON_L2] |= ((RETRO_DEVICE_ID_JOYPAD_L2+1) << shift);
android->keycode_lut[AKEYCODE_BUTTON_R2] |= ((RETRO_DEVICE_ID_JOYPAD_R2+1) << shift);
android->keycode_lut[AKEYCODE_BUTTON_START] |= ((RETRO_DEVICE_ID_JOYPAD_START+1) << shift);
android->keycode_lut[AKEYCODE_BUTTON_SELECT] |= ((RETRO_DEVICE_ID_JOYPAD_SELECT+1) << shift);
break; break;
case DEVICE_IDROID_CON: case DEVICE_IDROID_CON:
g_settings.input.device[port] = device; g_settings.input.device[port] = device;
@ -618,42 +592,6 @@ static void android_input_set_keybinds(void *data, unsigned device,
android->keycode_lut[AKEYCODE_BUTTON_L2] |= ((RETRO_DEVICE_ID_JOYPAD_SELECT+1) << shift); android->keycode_lut[AKEYCODE_BUTTON_L2] |= ((RETRO_DEVICE_ID_JOYPAD_SELECT+1) << shift);
android->keycode_lut[AKEYCODE_BUTTON_R2] |= ((RETRO_DEVICE_ID_JOYPAD_START+1) << shift); android->keycode_lut[AKEYCODE_BUTTON_R2] |= ((RETRO_DEVICE_ID_JOYPAD_START+1) << shift);
break; break;
case DEVICE_JXD_S5110:
g_settings.input.device[port] = device;
strlcpy(g_settings.input.device_names[port], "JXD S5110",
sizeof(g_settings.input.device_names[port]));
android->keycode_lut[AKEYCODE_DPAD_UP] |= ((RETRO_DEVICE_ID_JOYPAD_UP+1) << shift);
android->keycode_lut[AKEYCODE_DPAD_DOWN] |= ((RETRO_DEVICE_ID_JOYPAD_DOWN+1) << shift);
android->keycode_lut[AKEYCODE_DPAD_LEFT] |= ((RETRO_DEVICE_ID_JOYPAD_LEFT+1) << shift);
android->keycode_lut[AKEYCODE_DPAD_RIGHT] |= ((RETRO_DEVICE_ID_JOYPAD_RIGHT+1) << shift);
android->keycode_lut[AKEYCODE_BUTTON_A] |= ((RETRO_DEVICE_ID_JOYPAD_A+1) << shift);
android->keycode_lut[AKEYCODE_BUTTON_X] |= ((RETRO_DEVICE_ID_JOYPAD_X+1) << shift);
android->keycode_lut[AKEYCODE_SPACE] |= ((RETRO_DEVICE_ID_JOYPAD_SELECT+1) << shift);
android->keycode_lut[AKEYCODE_ENTER] |= ((RETRO_DEVICE_ID_JOYPAD_START+1) << shift);
android->keycode_lut[AKEYCODE_BUTTON_B] |= ((RETRO_DEVICE_ID_JOYPAD_B+1) << shift);
android->keycode_lut[AKEYCODE_BUTTON_Y] |= ((RETRO_DEVICE_ID_JOYPAD_Y+1) << shift);
android->keycode_lut[AKEYCODE_BUTTON_L1] |= ((RETRO_DEVICE_ID_JOYPAD_L+1) << shift);
android->keycode_lut[AKEYCODE_BUTTON_R1] |= ((RETRO_DEVICE_ID_JOYPAD_R+1) << shift);
break;
case DEVICE_JXD_S5110_SKELROM:
g_settings.input.device[port] = device;
strlcpy(g_settings.input.device_names[port], "JXD S5110 Skelrom",
sizeof(g_settings.input.device_names[port]));
android->keycode_lut[AKEYCODE_DPAD_UP] |= ((RETRO_DEVICE_ID_JOYPAD_UP+1) << shift);
android->keycode_lut[AKEYCODE_DPAD_DOWN] |= ((RETRO_DEVICE_ID_JOYPAD_DOWN+1) << shift);
android->keycode_lut[AKEYCODE_DPAD_LEFT] |= ((RETRO_DEVICE_ID_JOYPAD_LEFT+1) << shift);
android->keycode_lut[AKEYCODE_DPAD_RIGHT] |= ((RETRO_DEVICE_ID_JOYPAD_RIGHT+1) << shift);
android->keycode_lut[AKEYCODE_BUTTON_A] |= ((RETRO_DEVICE_ID_JOYPAD_A+1) << shift);
android->keycode_lut[AKEYCODE_BUTTON_X] |= ((RETRO_DEVICE_ID_JOYPAD_X+1) << shift);
android->keycode_lut[AKEYCODE_BUTTON_SELECT] |= ((RETRO_DEVICE_ID_JOYPAD_SELECT+1) << shift);
android->keycode_lut[AKEYCODE_BUTTON_START] |= ((RETRO_DEVICE_ID_JOYPAD_START+1) << shift);
android->keycode_lut[AKEYCODE_BUTTON_B] |= ((RETRO_DEVICE_ID_JOYPAD_B+1) << shift);
android->keycode_lut[AKEYCODE_BUTTON_Y] |= ((RETRO_DEVICE_ID_JOYPAD_Y+1) << shift);
android->keycode_lut[AKEYCODE_BUTTON_L1] |= ((RETRO_DEVICE_ID_JOYPAD_L+1) << shift);
android->keycode_lut[AKEYCODE_BUTTON_R1] |= ((RETRO_DEVICE_ID_JOYPAD_R+1) << shift);
break;
case DEVICE_HOLTEK_JC_U912F: case DEVICE_HOLTEK_JC_U912F:
g_settings.input.device[port] = device; g_settings.input.device[port] = device;
strlcpy(g_settings.input.device_names[port], "Elecom JC-U912F", strlcpy(g_settings.input.device_names[port], "Elecom JC-U912F",

82
input/autoconf/builtin_android.c
View File

@ -295,6 +295,72 @@ DECL_BTN(down, 20) \
DECL_BTN(left, 21) \ DECL_BTN(left, 21) \
DECL_BTN(right, 22) DECL_BTN(right, 22)
//TODO
// - Analog sticks (?)
#define JXD_S5110B_DEFAULT_BINDS \
DECL_BTN(a, 96) \
DECL_BTN(b, 97) \
DECL_BTN(x, 99) \
DECL_BTN(y, 100) \
DECL_BTN(start, 62) \
DECL_BTN(select, 66) \
DECL_BTN(up, 19) \
DECL_BTN(down, 20) \
DECL_BTN(left, 21) \
DECL_BTN(right, 22) \
DECL_BTN(l, 102) \
DECL_BTN(r, 103)
//TODO
// - Analog sticks (?)
#define JXD_S5110B_SKELROM_DEFAULT_BINDS \
DECL_BTN(a, 96) \
DECL_BTN(b, 97) \
DECL_BTN(x, 99) \
DECL_BTN(y, 100) \
DECL_BTN(start, 108) \
DECL_BTN(select, 109) \
DECL_BTN(up, 19) \
DECL_BTN(down, 20) \
DECL_BTN(left, 21) \
DECL_BTN(right, 22) \
DECL_BTN(l, 102) \
DECL_BTN(r, 103)
//TODO
// - Analog sticks (?)
#define JXD_S7300B_DEFAULT_BINDS \
DECL_BTN(a, 96) \
DECL_BTN(b, 97) \
DECL_BTN(x, 99) \
DECL_BTN(y, 100) \
DECL_BTN(start, 66) \
DECL_BTN(select, 62) \
DECL_BTN(up, 19) \
DECL_BTN(down, 20) \
DECL_BTN(left, 21) \
DECL_BTN(right, 22) \
DECL_BTN(l, 102) \
DECL_BTN(r, 103)
//TODO
// - Analog sticks
#define JXD_S7800B_DEFAULT_BINDS \
DECL_BTN(a, 96) \
DECL_BTN(b, 97) \
DECL_BTN(x, 99) \
DECL_BTN(y, 100) \
DECL_BTN(start, 108) \
DECL_BTN(select, 109) \
DECL_BTN(up, 19) \
DECL_BTN(down, 20) \
DECL_BTN(left, 21) \
DECL_BTN(right, 22) \
DECL_BTN(l, 102) \
DECL_BTN(r, 103) \
DECL_BTN(l2, 104) \
DECL_BTN(r2, 105)
#define RUMBLEPAD2_DEFAULT_BINDS \ #define RUMBLEPAD2_DEFAULT_BINDS \
DECL_BTN(a, 190) \ DECL_BTN(a, 190) \
DECL_BTN(b, 189) \ DECL_BTN(b, 189) \
@ -332,6 +398,22 @@ const char* const input_builtin_autoconfs[] =
"input_driver = \"android\" \n" "input_driver = \"android\" \n"
ZEUS_DEFAULT_BINDS, ZEUS_DEFAULT_BINDS,
"input_device = \"JXD S5110B\" \n"
"input_driver = \"android\" \n"
JXD_S5110B_DEFAULT_BINDS,
"input_device = \"JXD S7300B\" \n"
"input_driver = \"android\" \n"
JXD_S7300B_DEFAULT_BINDS,
"input_device = \"JXD S5110B (Skelrom)\" \n"
"input_driver = \"android\" \n"
JXD_S5110B_SKELROM_DEFAULT_BINDS,
"input_device = \"JXD S7800B\" \n"
"input_driver = \"android\" \n"
JXD_S7800B_DEFAULT_BINDS,
"input_device = \"Archos Gamepad\" \n" "input_device = \"Archos Gamepad\" \n"
"input_driver = \"android\" \n" "input_driver = \"android\" \n"
ARCHOS_GAMEPAD_DEFAULT_BINDS, ARCHOS_GAMEPAD_DEFAULT_BINDS,