From 61d5977054b4ddef34b3b9d60931f2857defd968 Mon Sep 17 00:00:00 2001 From: Twinaphex Date: Mon, 6 Aug 2012 22:00:35 +0200 Subject: [PATCH] (Wii) Change WII_ prefixes to GX_ --- wii/frontend/main.c | 58 +++--- wii/gx_input.c | 464 ++++++++++++++++++++++---------------------- wii/gx_input.h | 294 ++++++++++++++-------------- 3 files changed, 411 insertions(+), 405 deletions(-) diff --git a/wii/frontend/main.c b/wii/frontend/main.c index 35d21140e5..19588b01f7 100644 --- a/wii/frontend/main.c +++ b/wii/frontend/main.c @@ -50,15 +50,15 @@ char app_dir[PATH_MAX]; struct retro_system_info wii_core_info; static const struct retro_keybind _wii_nav_binds[] = { - { 0, 0, 0, WII_GC_UP | WII_GC_LSTICK_UP | WII_GC_RSTICK_UP | WII_CLASSIC_UP | WII_CLASSIC_LSTICK_UP | WII_CLASSIC_RSTICK_UP | WII_WIIMOTE_UP | WII_NUNCHUK_UP, 0 }, - { 0, 0, 0, WII_GC_DOWN | WII_GC_LSTICK_DOWN | WII_GC_RSTICK_DOWN | WII_CLASSIC_DOWN | WII_CLASSIC_LSTICK_DOWN | WII_CLASSIC_RSTICK_DOWN | WII_WIIMOTE_DOWN | WII_NUNCHUK_DOWN, 0 }, - { 0, 0, 0, WII_GC_LEFT | WII_GC_LSTICK_LEFT | WII_GC_RSTICK_LEFT | WII_CLASSIC_LEFT | WII_CLASSIC_LSTICK_LEFT | WII_CLASSIC_RSTICK_LEFT | WII_WIIMOTE_LEFT | WII_NUNCHUK_LEFT, 0 }, - { 0, 0, 0, WII_GC_RIGHT | WII_GC_LSTICK_RIGHT | WII_GC_RSTICK_RIGHT | WII_CLASSIC_RIGHT | WII_CLASSIC_LSTICK_RIGHT | WII_CLASSIC_RSTICK_RIGHT | WII_WIIMOTE_RIGHT | WII_NUNCHUK_RIGHT, 0 }, - { 0, 0, 0, WII_GC_A | WII_CLASSIC_A | WII_WIIMOTE_A | WII_WIIMOTE_2, 0 }, - { 0, 0, 0, WII_GC_B | WII_CLASSIC_B | WII_WIIMOTE_B | WII_WIIMOTE_1, 0 }, - { 0, 0, 0, WII_GC_START | WII_CLASSIC_PLUS | WII_WIIMOTE_PLUS, 0 }, - { 0, 0, 0, WII_GC_Z_TRIGGER | WII_CLASSIC_MINUS | WII_WIIMOTE_MINUS, 0 }, - { 0, 0, 0, WII_WIIMOTE_HOME | WII_CLASSIC_HOME, 0 }, + { 0, 0, 0, GX_GC_UP | GX_GC_LSTICK_UP | GX_GC_RSTICK_UP | GX_CLASSIC_UP | GX_CLASSIC_LSTICK_UP | GX_CLASSIC_RSTICK_UP | GX_WIIMOTE_UP | GX_NUNCHUK_UP, 0 }, + { 0, 0, 0, GX_GC_DOWN | GX_GC_LSTICK_DOWN | GX_GC_RSTICK_DOWN | GX_CLASSIC_DOWN | GX_CLASSIC_LSTICK_DOWN | GX_CLASSIC_RSTICK_DOWN | GX_WIIMOTE_DOWN | GX_NUNCHUK_DOWN, 0 }, + { 0, 0, 0, GX_GC_LEFT | GX_GC_LSTICK_LEFT | GX_GC_RSTICK_LEFT | GX_CLASSIC_LEFT | GX_CLASSIC_LSTICK_LEFT | GX_CLASSIC_RSTICK_LEFT | GX_WIIMOTE_LEFT | GX_NUNCHUK_LEFT, 0 }, + { 0, 0, 0, GX_GC_RIGHT | GX_GC_LSTICK_RIGHT | GX_GC_RSTICK_RIGHT | GX_CLASSIC_RIGHT | GX_CLASSIC_LSTICK_RIGHT | GX_CLASSIC_RSTICK_RIGHT | GX_WIIMOTE_RIGHT | GX_NUNCHUK_RIGHT, 0 }, + { 0, 0, 0, GX_GC_A | GX_CLASSIC_A | GX_WIIMOTE_A | GX_WIIMOTE_2, 0 }, + { 0, 0, 0, GX_GC_B | GX_CLASSIC_B | GX_WIIMOTE_B | GX_WIIMOTE_1, 0 }, + { 0, 0, 0, GX_GC_START | GX_CLASSIC_PLUS | GX_WIIMOTE_PLUS, 0 }, + { 0, 0, 0, GX_GC_Z_TRIGGER | GX_CLASSIC_MINUS | GX_WIIMOTE_MINUS, 0 }, + { 0, 0, 0, GX_WIIMOTE_HOME | GX_CLASSIC_HOME, 0 }, }; static const struct retro_keybind *wii_nav_binds[] = { @@ -67,16 +67,16 @@ static const struct retro_keybind *wii_nav_binds[] = { enum { - WII_DEVICE_NAV_UP = 0, - WII_DEVICE_NAV_DOWN, - WII_DEVICE_NAV_LEFT, - WII_DEVICE_NAV_RIGHT, - WII_DEVICE_NAV_A, - WII_DEVICE_NAV_B, - WII_DEVICE_NAV_START, - WII_DEVICE_NAV_SELECT, - WII_DEVICE_NAV_EXIT, - WII_DEVICE_NAV_LAST + GX_DEVICE_NAV_UP = 0, + GX_DEVICE_NAV_DOWN, + GX_DEVICE_NAV_LEFT, + GX_DEVICE_NAV_RIGHT, + GX_DEVICE_NAV_A, + GX_DEVICE_NAV_B, + GX_DEVICE_NAV_START, + GX_DEVICE_NAV_SELECT, + GX_DEVICE_NAV_EXIT, + GX_DEVICE_NAV_LAST }; static bool folder_cb(const char *directory, rgui_file_enum_cb_t file_cb, @@ -138,7 +138,7 @@ static bool get_rom_path(rgui_handle_t *rgui) input_wii.poll(NULL); - for (unsigned i = 0; i < WII_DEVICE_NAV_LAST; i++) + for (unsigned i = 0; i < GX_DEVICE_NAV_LAST; i++) { input_state |= input_wii.input_state(NULL, wii_nav_binds, 0, RETRO_DEVICE_JOYPAD, 0, i) ? (1 << i) : 0; @@ -150,7 +150,7 @@ static bool get_rom_path(rgui_handle_t *rgui) // don't run anything first frame, only capture held inputs for old_input_state if (!first) { - if (trigger_state & (1 << WII_DEVICE_NAV_EXIT)) + if (trigger_state & (1 << GX_DEVICE_NAV_EXIT)) { if (can_quit) return false; @@ -158,21 +158,21 @@ static bool get_rom_path(rgui_handle_t *rgui) else can_quit = true; - if (trigger_state & (1 << WII_DEVICE_NAV_B)) + if (trigger_state & (1 << GX_DEVICE_NAV_B)) action = RGUI_ACTION_CANCEL; - else if (trigger_state & (1 << WII_DEVICE_NAV_A)) + else if (trigger_state & (1 << GX_DEVICE_NAV_A)) action = RGUI_ACTION_OK; - else if (trigger_state & (1 << WII_DEVICE_NAV_UP)) + else if (trigger_state & (1 << GX_DEVICE_NAV_UP)) action = RGUI_ACTION_UP; - else if (trigger_state & (1 << WII_DEVICE_NAV_DOWN)) + else if (trigger_state & (1 << GX_DEVICE_NAV_DOWN)) action = RGUI_ACTION_DOWN; - else if (trigger_state & (1 << WII_DEVICE_NAV_LEFT)) + else if (trigger_state & (1 << GX_DEVICE_NAV_LEFT)) action = RGUI_ACTION_LEFT; - else if (trigger_state & (1 << WII_DEVICE_NAV_RIGHT)) + else if (trigger_state & (1 << GX_DEVICE_NAV_RIGHT)) action = RGUI_ACTION_RIGHT; - else if (trigger_state & (1 << WII_DEVICE_NAV_START)) + else if (trigger_state & (1 << GX_DEVICE_NAV_START)) action = RGUI_ACTION_START; - else if (trigger_state & (1 << WII_DEVICE_NAV_SELECT)) + else if (trigger_state & (1 << GX_DEVICE_NAV_SELECT)) action = RGUI_ACTION_SETTINGS; } else diff --git a/wii/gx_input.c b/wii/gx_input.c index 77d6560f7d..65bb1ab581 100644 --- a/wii/gx_input.c +++ b/wii/gx_input.c @@ -40,91 +40,91 @@ static uint64_t pad_state[MAX_PADS]; const struct platform_bind platform_keys[] = { - { WII_GC_A, "GC A button" }, - { WII_GC_B, "GC B button" }, - { WII_GC_X, "GC X button" }, - { WII_GC_Y, "GC Y button" }, - { WII_GC_UP, "GC D-Pad Up" }, - { WII_GC_DOWN, "GC D-Pad Down" }, - { WII_GC_LEFT, "GC D-Pad Left" }, - { WII_GC_RIGHT, "GC D-Pad Right" }, - { WII_GC_Z_TRIGGER, "GC Z Trigger" }, - { WII_GC_START, "GC Start button" }, - { WII_GC_L_TRIGGER, "GC Left Trigger" }, - { WII_GC_R_TRIGGER, "GC Right Trigger" }, - { WII_GC_LSTICK_LEFT, "GC Main Stick Left" }, - { WII_GC_LSTICK_RIGHT, "GC Main Stick Right" }, - { WII_GC_LSTICK_UP, "GC Main Stick Up" }, - { WII_GC_LSTICK_DOWN, "GC Main Stick Down" }, - { WII_GC_LSTICK_LEFT | WII_GC_LEFT, "GC Main Stick D-Pad Left" }, - { WII_GC_LSTICK_RIGHT | WII_GC_RIGHT, "GC Main Stick D-Pad Right" }, - { WII_GC_LSTICK_UP | WII_GC_UP, "GC Main Stick D-Pad Up" }, - { WII_GC_LSTICK_DOWN | WII_GC_DOWN, "GC Main Stick D-Pad Down" }, - { WII_GC_RSTICK_LEFT, "GC C-Stick Left" }, - { WII_GC_RSTICK_RIGHT, "GC C-Stick Right" }, - { WII_GC_RSTICK_UP, "GC C-Stick Up" }, - { WII_GC_RSTICK_DOWN, "GC C-Stick Down" }, - { WII_GC_RSTICK_LEFT | WII_GC_LEFT, "GC C-Stick D-Pad Left" }, - { WII_GC_RSTICK_RIGHT | WII_GC_RIGHT, "GC C-Stick D-Pad Right" }, - { WII_GC_RSTICK_UP | WII_GC_UP, "GC C-Stick D-Pad Up" }, - { WII_GC_RSTICK_DOWN | WII_GC_DOWN, "GC C-Stick D-Pad Down" }, + { GX_GC_A, "GC A button" }, + { GX_GC_B, "GC B button" }, + { GX_GC_X, "GC X button" }, + { GX_GC_Y, "GC Y button" }, + { GX_GC_UP, "GC D-Pad Up" }, + { GX_GC_DOWN, "GC D-Pad Down" }, + { GX_GC_LEFT, "GC D-Pad Left" }, + { GX_GC_RIGHT, "GC D-Pad Right" }, + { GX_GC_Z_TRIGGER, "GC Z Trigger" }, + { GX_GC_START, "GC Start button" }, + { GX_GC_L_TRIGGER, "GC Left Trigger" }, + { GX_GC_R_TRIGGER, "GC Right Trigger" }, + { GX_GC_LSTICK_LEFT, "GC Main Stick Left" }, + { GX_GC_LSTICK_RIGHT, "GC Main Stick Right" }, + { GX_GC_LSTICK_UP, "GC Main Stick Up" }, + { GX_GC_LSTICK_DOWN, "GC Main Stick Down" }, + { GX_GC_LSTICK_LEFT | GX_GC_LEFT, "GC Main Stick D-Pad Left" }, + { GX_GC_LSTICK_RIGHT | GX_GC_RIGHT, "GC Main Stick D-Pad Right" }, + { GX_GC_LSTICK_UP | GX_GC_UP, "GC Main Stick D-Pad Up" }, + { GX_GC_LSTICK_DOWN | GX_GC_DOWN, "GC Main Stick D-Pad Down" }, + { GX_GC_RSTICK_LEFT, "GC C-Stick Left" }, + { GX_GC_RSTICK_RIGHT, "GC C-Stick Right" }, + { GX_GC_RSTICK_UP, "GC C-Stick Up" }, + { GX_GC_RSTICK_DOWN, "GC C-Stick Down" }, + { GX_GC_RSTICK_LEFT | GX_GC_LEFT, "GC C-Stick D-Pad Left" }, + { GX_GC_RSTICK_RIGHT | GX_GC_RIGHT, "GC C-Stick D-Pad Right" }, + { GX_GC_RSTICK_UP | GX_GC_UP, "GC C-Stick D-Pad Up" }, + { GX_GC_RSTICK_DOWN | GX_GC_DOWN, "GC C-Stick D-Pad Down" }, #ifdef HW_RVL // CLASSIC CONTROLLER - { WII_CLASSIC_A, "Classic A button" }, - { WII_CLASSIC_B, "Classic B button" }, - { WII_CLASSIC_X, "Classic X button" }, - { WII_CLASSIC_Y, "Classic Y button" }, - { WII_CLASSIC_UP, "Classic D-Pad Up" }, - { WII_CLASSIC_DOWN, "Classic D-Pad Down" }, - { WII_CLASSIC_LEFT, "Classic D-Pad Left" }, - { WII_CLASSIC_RIGHT, "Classic D-Pad Right" }, - { WII_CLASSIC_PLUS, "Classic Plus button" }, - { WII_CLASSIC_MINUS, "Classic Minus button" }, - { WII_CLASSIC_HOME, "Classic Home button" }, - { WII_CLASSIC_L_TRIGGER, "Classic L Trigger" }, - { WII_CLASSIC_R_TRIGGER, "Classic R Trigger" }, - { WII_CLASSIC_ZL_TRIGGER, "Classic ZL Trigger" }, - { WII_CLASSIC_ZR_TRIGGER, "Classic ZR Trigger" }, - { WII_CLASSIC_LSTICK_LEFT, "Classic LStick Left" }, - { WII_CLASSIC_LSTICK_RIGHT, "Classic LStick Right" }, - { WII_CLASSIC_LSTICK_UP, "Classic LStick Up" }, - { WII_CLASSIC_LSTICK_DOWN, "Classic LStick Down" }, - { WII_CLASSIC_LSTICK_LEFT | WII_CLASSIC_LEFT, "Classic LStick D-Pad Left" }, - { WII_CLASSIC_LSTICK_RIGHT | WII_CLASSIC_RIGHT, "Classic LStick D-Pad Right" }, - { WII_CLASSIC_LSTICK_UP | WII_CLASSIC_UP, "Classic LStick D-Pad Up" }, - { WII_CLASSIC_LSTICK_DOWN | WII_CLASSIC_DOWN, "Classic LStick D-Pad Down" }, - { WII_CLASSIC_RSTICK_LEFT, "Classic RStick Left" }, - { WII_CLASSIC_RSTICK_RIGHT, "Classic RStick Right" }, - { WII_CLASSIC_RSTICK_UP, "Classic RStick Up" }, - { WII_CLASSIC_RSTICK_DOWN, "Classic RStick Down" }, - { WII_CLASSIC_RSTICK_LEFT | WII_CLASSIC_LEFT, "Classic RStick D-Pad Left" }, - { WII_CLASSIC_RSTICK_RIGHT | WII_CLASSIC_RIGHT, "Classic RStick D-Pad Right" }, - { WII_CLASSIC_RSTICK_UP | WII_CLASSIC_UP, "Classic RStick D-Pad Up" }, - { WII_CLASSIC_RSTICK_DOWN | WII_CLASSIC_DOWN, "Classic RStick D-Pad Down" }, + { GX_CLASSIC_A, "Classic A button" }, + { GX_CLASSIC_B, "Classic B button" }, + { GX_CLASSIC_X, "Classic X button" }, + { GX_CLASSIC_Y, "Classic Y button" }, + { GX_CLASSIC_UP, "Classic D-Pad Up" }, + { GX_CLASSIC_DOWN, "Classic D-Pad Down" }, + { GX_CLASSIC_LEFT, "Classic D-Pad Left" }, + { GX_CLASSIC_RIGHT, "Classic D-Pad Right" }, + { GX_CLASSIC_PLUS, "Classic Plus button" }, + { GX_CLASSIC_MINUS, "Classic Minus button" }, + { GX_CLASSIC_HOME, "Classic Home button" }, + { GX_CLASSIC_L_TRIGGER, "Classic L Trigger" }, + { GX_CLASSIC_R_TRIGGER, "Classic R Trigger" }, + { GX_CLASSIC_ZL_TRIGGER, "Classic ZL Trigger" }, + { GX_CLASSIC_ZR_TRIGGER, "Classic ZR Trigger" }, + { GX_CLASSIC_LSTICK_LEFT, "Classic LStick Left" }, + { GX_CLASSIC_LSTICK_RIGHT, "Classic LStick Right" }, + { GX_CLASSIC_LSTICK_UP, "Classic LStick Up" }, + { GX_CLASSIC_LSTICK_DOWN, "Classic LStick Down" }, + { GX_CLASSIC_LSTICK_LEFT | GX_CLASSIC_LEFT, "Classic LStick D-Pad Left" }, + { GX_CLASSIC_LSTICK_RIGHT | GX_CLASSIC_RIGHT, "Classic LStick D-Pad Right" }, + { GX_CLASSIC_LSTICK_UP | GX_CLASSIC_UP, "Classic LStick D-Pad Up" }, + { GX_CLASSIC_LSTICK_DOWN | GX_CLASSIC_DOWN, "Classic LStick D-Pad Down" }, + { GX_CLASSIC_RSTICK_LEFT, "Classic RStick Left" }, + { GX_CLASSIC_RSTICK_RIGHT, "Classic RStick Right" }, + { GX_CLASSIC_RSTICK_UP, "Classic RStick Up" }, + { GX_CLASSIC_RSTICK_DOWN, "Classic RStick Down" }, + { GX_CLASSIC_RSTICK_LEFT | GX_CLASSIC_LEFT, "Classic RStick D-Pad Left" }, + { GX_CLASSIC_RSTICK_RIGHT | GX_CLASSIC_RIGHT, "Classic RStick D-Pad Right" }, + { GX_CLASSIC_RSTICK_UP | GX_CLASSIC_UP, "Classic RStick D-Pad Up" }, + { GX_CLASSIC_RSTICK_DOWN | GX_CLASSIC_DOWN, "Classic RStick D-Pad Down" }, // WIIMOTE (PLUS OPTIONAL NUNCHUK) - { WII_WIIMOTE_A, "Wiimote A button" }, - { WII_WIIMOTE_B, "Wiimote B button" }, - { WII_WIIMOTE_1, "Wiimote 1 button" }, - { WII_WIIMOTE_2, "Wiimote 2 button" }, - { WII_WIIMOTE_UP, "Wiimote D-Pad Up" }, - { WII_WIIMOTE_DOWN, "Wiimote D-Pad Down" }, - { WII_WIIMOTE_LEFT, "Wiimote D-Pad Left" }, - { WII_WIIMOTE_RIGHT, "Wiimote D-Pad Right" }, - { WII_WIIMOTE_PLUS, "Wiimote Plus button" }, - { WII_WIIMOTE_MINUS, "Wiimote Minus button" }, - { WII_WIIMOTE_HOME, "Wiimote Home button" }, - { WII_NUNCHUK_Z, "Nunchuk Z button" }, - { WII_NUNCHUK_C, "Nunchuk C button" }, - { WII_NUNCHUK_LEFT, "Nunchuk Stick Left" }, - { WII_NUNCHUK_RIGHT, "Nunchuk Stick Right" }, - { WII_NUNCHUK_UP, "Nunchuk Stick Up" }, - { WII_NUNCHUK_DOWN, "Nunchuk Stick Down" }, - { WII_NUNCHUK_LEFT | WII_WIIMOTE_LEFT, "Nunchuk Stick D-Pad Left" }, - { WII_NUNCHUK_RIGHT | WII_WIIMOTE_RIGHT, "Nunchuk Stick D-Pad Right" }, - { WII_NUNCHUK_UP | WII_WIIMOTE_UP, "Nunchuk Stick D-Pad Up" }, - { WII_NUNCHUK_DOWN | WII_WIIMOTE_DOWN, "Nunchuk Stick D-Pad Down" }, + { GX_WIIMOTE_A, "Wiimote A button" }, + { GX_WIIMOTE_B, "Wiimote B button" }, + { GX_WIIMOTE_1, "Wiimote 1 button" }, + { GX_WIIMOTE_2, "Wiimote 2 button" }, + { GX_WIIMOTE_UP, "Wiimote D-Pad Up" }, + { GX_WIIMOTE_DOWN, "Wiimote D-Pad Down" }, + { GX_WIIMOTE_LEFT, "Wiimote D-Pad Left" }, + { GX_WIIMOTE_RIGHT, "Wiimote D-Pad Right" }, + { GX_WIIMOTE_PLUS, "Wiimote Plus button" }, + { GX_WIIMOTE_MINUS, "Wiimote Minus button" }, + { GX_WIIMOTE_HOME, "Wiimote Home button" }, + { GX_NUNCHUK_Z, "Nunchuk Z button" }, + { GX_NUNCHUK_C, "Nunchuk C button" }, + { GX_NUNCHUK_LEFT, "Nunchuk Stick Left" }, + { GX_NUNCHUK_RIGHT, "Nunchuk Stick Right" }, + { GX_NUNCHUK_UP, "Nunchuk Stick Up" }, + { GX_NUNCHUK_DOWN, "Nunchuk Stick Down" }, + { GX_NUNCHUK_LEFT | GX_WIIMOTE_LEFT, "Nunchuk Stick D-Pad Left" }, + { GX_NUNCHUK_RIGHT | GX_WIIMOTE_RIGHT, "Nunchuk Stick D-Pad Right" }, + { GX_NUNCHUK_UP | GX_WIIMOTE_UP, "Nunchuk Stick D-Pad Up" }, + { GX_NUNCHUK_DOWN | GX_WIIMOTE_DOWN, "Nunchuk Stick D-Pad Down" }, #endif }; @@ -158,72 +158,74 @@ static void wii_input_set_analog_dpad_mapping(unsigned device, unsigned map_dpad { switch (device) { - case WII_DEVICE_WIIMOTE: - g_settings.input.binds[controller_id][RETRO_DEVICE_ID_JOYPAD_UP].joykey = platform_keys[WII_DEVICE_WIIMOTE_ID_JOYPAD_UP].joykey; - g_settings.input.binds[controller_id][RETRO_DEVICE_ID_JOYPAD_DOWN].joykey = platform_keys[WII_DEVICE_WIIMOTE_ID_JOYPAD_DOWN].joykey; - g_settings.input.binds[controller_id][RETRO_DEVICE_ID_JOYPAD_LEFT].joykey = platform_keys[WII_DEVICE_WIIMOTE_ID_JOYPAD_LEFT].joykey; - g_settings.input.binds[controller_id][RETRO_DEVICE_ID_JOYPAD_RIGHT].joykey = platform_keys[WII_DEVICE_WIIMOTE_ID_JOYPAD_RIGHT].joykey; +#ifdef HW_RVL + case GX_DEVICE_WIIMOTE: + g_settings.input.binds[controller_id][RETRO_DEVICE_ID_JOYPAD_UP].joykey = platform_keys[GX_DEVICE_WIIMOTE_ID_JOYPAD_UP].joykey; + g_settings.input.binds[controller_id][RETRO_DEVICE_ID_JOYPAD_DOWN].joykey = platform_keys[GX_DEVICE_WIIMOTE_ID_JOYPAD_DOWN].joykey; + g_settings.input.binds[controller_id][RETRO_DEVICE_ID_JOYPAD_LEFT].joykey = platform_keys[GX_DEVICE_WIIMOTE_ID_JOYPAD_LEFT].joykey; + g_settings.input.binds[controller_id][RETRO_DEVICE_ID_JOYPAD_RIGHT].joykey = platform_keys[GX_DEVICE_WIIMOTE_ID_JOYPAD_RIGHT].joykey; break; - case WII_DEVICE_NUNCHUK: + case GX_DEVICE_NUNCHUK: if (map_dpad_enum == DPAD_EMULATION_NONE) { - g_settings.input.binds[controller_id][RETRO_DEVICE_ID_JOYPAD_UP].joykey = platform_keys[WII_DEVICE_WIIMOTE_ID_JOYPAD_UP].joykey; - g_settings.input.binds[controller_id][RETRO_DEVICE_ID_JOYPAD_DOWN].joykey = platform_keys[WII_DEVICE_WIIMOTE_ID_JOYPAD_DOWN].joykey; - g_settings.input.binds[controller_id][RETRO_DEVICE_ID_JOYPAD_LEFT].joykey = platform_keys[WII_DEVICE_WIIMOTE_ID_JOYPAD_LEFT].joykey; - g_settings.input.binds[controller_id][RETRO_DEVICE_ID_JOYPAD_RIGHT].joykey = platform_keys[WII_DEVICE_WIIMOTE_ID_JOYPAD_RIGHT].joykey; + g_settings.input.binds[controller_id][RETRO_DEVICE_ID_JOYPAD_UP].joykey = platform_keys[GX_DEVICE_WIIMOTE_ID_JOYPAD_UP].joykey; + g_settings.input.binds[controller_id][RETRO_DEVICE_ID_JOYPAD_DOWN].joykey = platform_keys[GX_DEVICE_WIIMOTE_ID_JOYPAD_DOWN].joykey; + g_settings.input.binds[controller_id][RETRO_DEVICE_ID_JOYPAD_LEFT].joykey = platform_keys[GX_DEVICE_WIIMOTE_ID_JOYPAD_LEFT].joykey; + g_settings.input.binds[controller_id][RETRO_DEVICE_ID_JOYPAD_RIGHT].joykey = platform_keys[GX_DEVICE_WIIMOTE_ID_JOYPAD_RIGHT].joykey; } else { - g_settings.input.binds[controller_id][RETRO_DEVICE_ID_JOYPAD_UP].joykey = platform_keys[WII_DEVICE_WIIMOTE_ID_LSTICK_UP_DPAD].joykey; - g_settings.input.binds[controller_id][RETRO_DEVICE_ID_JOYPAD_DOWN].joykey = platform_keys[WII_DEVICE_WIIMOTE_ID_LSTICK_DOWN_DPAD].joykey; - g_settings.input.binds[controller_id][RETRO_DEVICE_ID_JOYPAD_LEFT].joykey = platform_keys[WII_DEVICE_WIIMOTE_ID_LSTICK_LEFT_DPAD].joykey; - g_settings.input.binds[controller_id][RETRO_DEVICE_ID_JOYPAD_RIGHT].joykey = platform_keys[WII_DEVICE_WIIMOTE_ID_LSTICK_RIGHT_DPAD].joykey; + g_settings.input.binds[controller_id][RETRO_DEVICE_ID_JOYPAD_UP].joykey = platform_keys[GX_DEVICE_WIIMOTE_ID_LSTICK_UP_DPAD].joykey; + g_settings.input.binds[controller_id][RETRO_DEVICE_ID_JOYPAD_DOWN].joykey = platform_keys[GX_DEVICE_WIIMOTE_ID_LSTICK_DOWN_DPAD].joykey; + g_settings.input.binds[controller_id][RETRO_DEVICE_ID_JOYPAD_LEFT].joykey = platform_keys[GX_DEVICE_WIIMOTE_ID_LSTICK_LEFT_DPAD].joykey; + g_settings.input.binds[controller_id][RETRO_DEVICE_ID_JOYPAD_RIGHT].joykey = platform_keys[GX_DEVICE_WIIMOTE_ID_LSTICK_RIGHT_DPAD].joykey; } break; - case WII_DEVICE_CLASSIC: + case GX_DEVICE_CLASSIC: if (map_dpad_enum == DPAD_EMULATION_NONE) { - g_settings.input.binds[controller_id][RETRO_DEVICE_ID_JOYPAD_UP].joykey = platform_keys[WII_DEVICE_CLASSIC_ID_JOYPAD_UP].joykey; - g_settings.input.binds[controller_id][RETRO_DEVICE_ID_JOYPAD_DOWN].joykey = platform_keys[WII_DEVICE_CLASSIC_ID_JOYPAD_DOWN].joykey; - g_settings.input.binds[controller_id][RETRO_DEVICE_ID_JOYPAD_LEFT].joykey = platform_keys[WII_DEVICE_CLASSIC_ID_JOYPAD_LEFT].joykey; - g_settings.input.binds[controller_id][RETRO_DEVICE_ID_JOYPAD_RIGHT].joykey = platform_keys[WII_DEVICE_CLASSIC_ID_JOYPAD_RIGHT].joykey; + g_settings.input.binds[controller_id][RETRO_DEVICE_ID_JOYPAD_UP].joykey = platform_keys[GX_DEVICE_CLASSIC_ID_JOYPAD_UP].joykey; + g_settings.input.binds[controller_id][RETRO_DEVICE_ID_JOYPAD_DOWN].joykey = platform_keys[GX_DEVICE_CLASSIC_ID_JOYPAD_DOWN].joykey; + g_settings.input.binds[controller_id][RETRO_DEVICE_ID_JOYPAD_LEFT].joykey = platform_keys[GX_DEVICE_CLASSIC_ID_JOYPAD_LEFT].joykey; + g_settings.input.binds[controller_id][RETRO_DEVICE_ID_JOYPAD_RIGHT].joykey = platform_keys[GX_DEVICE_CLASSIC_ID_JOYPAD_RIGHT].joykey; } else if (map_dpad_enum == DPAD_EMULATION_LSTICK) { - g_settings.input.binds[controller_id][RETRO_DEVICE_ID_JOYPAD_UP].joykey = platform_keys[WII_DEVICE_CLASSIC_ID_LSTICK_UP_DPAD].joykey; - g_settings.input.binds[controller_id][RETRO_DEVICE_ID_JOYPAD_DOWN].joykey = platform_keys[WII_DEVICE_CLASSIC_ID_LSTICK_DOWN_DPAD].joykey; - g_settings.input.binds[controller_id][RETRO_DEVICE_ID_JOYPAD_LEFT].joykey = platform_keys[WII_DEVICE_CLASSIC_ID_LSTICK_LEFT_DPAD].joykey; - g_settings.input.binds[controller_id][RETRO_DEVICE_ID_JOYPAD_RIGHT].joykey = platform_keys[WII_DEVICE_CLASSIC_ID_LSTICK_RIGHT_DPAD].joykey; + g_settings.input.binds[controller_id][RETRO_DEVICE_ID_JOYPAD_UP].joykey = platform_keys[GX_DEVICE_CLASSIC_ID_LSTICK_UP_DPAD].joykey; + g_settings.input.binds[controller_id][RETRO_DEVICE_ID_JOYPAD_DOWN].joykey = platform_keys[GX_DEVICE_CLASSIC_ID_LSTICK_DOWN_DPAD].joykey; + g_settings.input.binds[controller_id][RETRO_DEVICE_ID_JOYPAD_LEFT].joykey = platform_keys[GX_DEVICE_CLASSIC_ID_LSTICK_LEFT_DPAD].joykey; + g_settings.input.binds[controller_id][RETRO_DEVICE_ID_JOYPAD_RIGHT].joykey = platform_keys[GX_DEVICE_CLASSIC_ID_LSTICK_RIGHT_DPAD].joykey; } else if (map_dpad_enum == DPAD_EMULATION_RSTICK) { - g_settings.input.binds[controller_id][RETRO_DEVICE_ID_JOYPAD_UP].joykey = platform_keys[WII_DEVICE_CLASSIC_ID_RSTICK_UP_DPAD].joykey; - g_settings.input.binds[controller_id][RETRO_DEVICE_ID_JOYPAD_DOWN].joykey = platform_keys[WII_DEVICE_CLASSIC_ID_RSTICK_DOWN_DPAD].joykey; - g_settings.input.binds[controller_id][RETRO_DEVICE_ID_JOYPAD_LEFT].joykey = platform_keys[WII_DEVICE_CLASSIC_ID_RSTICK_LEFT_DPAD].joykey; - g_settings.input.binds[controller_id][RETRO_DEVICE_ID_JOYPAD_RIGHT].joykey = platform_keys[WII_DEVICE_CLASSIC_ID_RSTICK_RIGHT_DPAD].joykey; + g_settings.input.binds[controller_id][RETRO_DEVICE_ID_JOYPAD_UP].joykey = platform_keys[GX_DEVICE_CLASSIC_ID_RSTICK_UP_DPAD].joykey; + g_settings.input.binds[controller_id][RETRO_DEVICE_ID_JOYPAD_DOWN].joykey = platform_keys[GX_DEVICE_CLASSIC_ID_RSTICK_DOWN_DPAD].joykey; + g_settings.input.binds[controller_id][RETRO_DEVICE_ID_JOYPAD_LEFT].joykey = platform_keys[GX_DEVICE_CLASSIC_ID_RSTICK_LEFT_DPAD].joykey; + g_settings.input.binds[controller_id][RETRO_DEVICE_ID_JOYPAD_RIGHT].joykey = platform_keys[GX_DEVICE_CLASSIC_ID_RSTICK_RIGHT_DPAD].joykey; } break; - case WII_DEVICE_GAMECUBE: +#endif + case GX_DEVICE_GAMECUBE: if (map_dpad_enum == DPAD_EMULATION_NONE) { - g_settings.input.binds[controller_id][RETRO_DEVICE_ID_JOYPAD_UP].joykey = platform_keys[WII_DEVICE_GC_ID_JOYPAD_UP].joykey; - g_settings.input.binds[controller_id][RETRO_DEVICE_ID_JOYPAD_DOWN].joykey = platform_keys[WII_DEVICE_GC_ID_JOYPAD_DOWN].joykey; - g_settings.input.binds[controller_id][RETRO_DEVICE_ID_JOYPAD_LEFT].joykey = platform_keys[WII_DEVICE_GC_ID_JOYPAD_LEFT].joykey; - g_settings.input.binds[controller_id][RETRO_DEVICE_ID_JOYPAD_RIGHT].joykey = platform_keys[WII_DEVICE_GC_ID_JOYPAD_RIGHT].joykey; + g_settings.input.binds[controller_id][RETRO_DEVICE_ID_JOYPAD_UP].joykey = platform_keys[GX_DEVICE_GC_ID_JOYPAD_UP].joykey; + g_settings.input.binds[controller_id][RETRO_DEVICE_ID_JOYPAD_DOWN].joykey = platform_keys[GX_DEVICE_GC_ID_JOYPAD_DOWN].joykey; + g_settings.input.binds[controller_id][RETRO_DEVICE_ID_JOYPAD_LEFT].joykey = platform_keys[GX_DEVICE_GC_ID_JOYPAD_LEFT].joykey; + g_settings.input.binds[controller_id][RETRO_DEVICE_ID_JOYPAD_RIGHT].joykey = platform_keys[GX_DEVICE_GC_ID_JOYPAD_RIGHT].joykey; } else if (map_dpad_enum == DPAD_EMULATION_LSTICK) { - g_settings.input.binds[controller_id][RETRO_DEVICE_ID_JOYPAD_UP].joykey = platform_keys[WII_DEVICE_GC_ID_LSTICK_UP_DPAD].joykey; - g_settings.input.binds[controller_id][RETRO_DEVICE_ID_JOYPAD_DOWN].joykey = platform_keys[WII_DEVICE_GC_ID_LSTICK_DOWN_DPAD].joykey; - g_settings.input.binds[controller_id][RETRO_DEVICE_ID_JOYPAD_LEFT].joykey = platform_keys[WII_DEVICE_GC_ID_LSTICK_LEFT_DPAD].joykey; - g_settings.input.binds[controller_id][RETRO_DEVICE_ID_JOYPAD_RIGHT].joykey = platform_keys[WII_DEVICE_GC_ID_LSTICK_RIGHT_DPAD].joykey; + g_settings.input.binds[controller_id][RETRO_DEVICE_ID_JOYPAD_UP].joykey = platform_keys[GX_DEVICE_GC_ID_LSTICK_UP_DPAD].joykey; + g_settings.input.binds[controller_id][RETRO_DEVICE_ID_JOYPAD_DOWN].joykey = platform_keys[GX_DEVICE_GC_ID_LSTICK_DOWN_DPAD].joykey; + g_settings.input.binds[controller_id][RETRO_DEVICE_ID_JOYPAD_LEFT].joykey = platform_keys[GX_DEVICE_GC_ID_LSTICK_LEFT_DPAD].joykey; + g_settings.input.binds[controller_id][RETRO_DEVICE_ID_JOYPAD_RIGHT].joykey = platform_keys[GX_DEVICE_GC_ID_LSTICK_RIGHT_DPAD].joykey; } else if (map_dpad_enum == DPAD_EMULATION_RSTICK) { - g_settings.input.binds[controller_id][RETRO_DEVICE_ID_JOYPAD_UP].joykey = platform_keys[WII_DEVICE_GC_ID_RSTICK_UP_DPAD].joykey; - g_settings.input.binds[controller_id][RETRO_DEVICE_ID_JOYPAD_DOWN].joykey = platform_keys[WII_DEVICE_GC_ID_RSTICK_DOWN_DPAD].joykey; - g_settings.input.binds[controller_id][RETRO_DEVICE_ID_JOYPAD_LEFT].joykey = platform_keys[WII_DEVICE_GC_ID_RSTICK_LEFT_DPAD].joykey; - g_settings.input.binds[controller_id][RETRO_DEVICE_ID_JOYPAD_RIGHT].joykey = platform_keys[WII_DEVICE_GC_ID_RSTICK_RIGHT_DPAD].joykey; + g_settings.input.binds[controller_id][RETRO_DEVICE_ID_JOYPAD_UP].joykey = platform_keys[GX_DEVICE_GC_ID_RSTICK_UP_DPAD].joykey; + g_settings.input.binds[controller_id][RETRO_DEVICE_ID_JOYPAD_DOWN].joykey = platform_keys[GX_DEVICE_GC_ID_RSTICK_DOWN_DPAD].joykey; + g_settings.input.binds[controller_id][RETRO_DEVICE_ID_JOYPAD_LEFT].joykey = platform_keys[GX_DEVICE_GC_ID_RSTICK_LEFT_DPAD].joykey; + g_settings.input.binds[controller_id][RETRO_DEVICE_ID_JOYPAD_RIGHT].joykey = platform_keys[GX_DEVICE_GC_ID_RSTICK_RIGHT_DPAD].joykey; } break; default: @@ -268,29 +270,29 @@ static void wii_input_poll(void *data) { uint16_t down = PAD_ButtonsHeld(port); - state |= (down & PAD_BUTTON_A) ? WII_GC_A : 0; - state |= (down & PAD_BUTTON_B) ? WII_GC_B : 0; - state |= (down & PAD_BUTTON_X) ? WII_GC_X : 0; - state |= (down & PAD_BUTTON_Y) ? WII_GC_Y : 0; - state |= (down & PAD_BUTTON_UP) ? WII_GC_UP : 0; - state |= (down & PAD_BUTTON_DOWN) ? WII_GC_DOWN : 0; - state |= (down & PAD_BUTTON_LEFT) ? WII_GC_LEFT : 0; - state |= (down & PAD_BUTTON_RIGHT) ? WII_GC_RIGHT : 0; - state |= (down & PAD_BUTTON_START) ? WII_GC_START : 0; - state |= (down & PAD_TRIGGER_Z) ? WII_GC_Z_TRIGGER : 0; - state |= (PAD_TriggerL(port) > 127) ? WII_GC_L_TRIGGER : 0; - state |= (PAD_TriggerR(port) > 127) ? WII_GC_R_TRIGGER : 0; + state |= (down & PAD_BUTTON_A) ? GX_GC_A : 0; + state |= (down & PAD_BUTTON_B) ? GX_GC_B : 0; + state |= (down & PAD_BUTTON_X) ? GX_GC_X : 0; + state |= (down & PAD_BUTTON_Y) ? GX_GC_Y : 0; + state |= (down & PAD_BUTTON_UP) ? GX_GC_UP : 0; + state |= (down & PAD_BUTTON_DOWN) ? GX_GC_DOWN : 0; + state |= (down & PAD_BUTTON_LEFT) ? GX_GC_LEFT : 0; + state |= (down & PAD_BUTTON_RIGHT) ? GX_GC_RIGHT : 0; + state |= (down & PAD_BUTTON_START) ? GX_GC_START : 0; + state |= (down & PAD_TRIGGER_Z) ? GX_GC_Z_TRIGGER : 0; + state |= (PAD_TriggerL(port) > 127) ? GX_GC_L_TRIGGER : 0; + state |= (PAD_TriggerR(port) > 127) ? GX_GC_R_TRIGGER : 0; s8 x = PAD_StickX(port); s8 y = PAD_StickY(port); if (abs(x) > JOYSTICK_THRESHOLD) { - state |= x > 0 ? WII_GC_LSTICK_RIGHT : WII_GC_LSTICK_LEFT; + state |= x > 0 ? GX_GC_LSTICK_RIGHT : GX_GC_LSTICK_LEFT; } if (abs(y) > JOYSTICK_THRESHOLD) { - state |= y > 0 ? WII_GC_LSTICK_UP : WII_GC_LSTICK_DOWN; + state |= y > 0 ? GX_GC_LSTICK_UP : GX_GC_LSTICK_DOWN; } x = PAD_SubStickX(port); @@ -298,11 +300,11 @@ static void wii_input_poll(void *data) if (abs(x) > JOYSTICK_THRESHOLD) { - state |= x > 0 ? WII_GC_RSTICK_RIGHT : WII_GC_RSTICK_LEFT; + state |= x > 0 ? GX_GC_RSTICK_RIGHT : GX_GC_RSTICK_LEFT; } if (abs(y) > JOYSTICK_THRESHOLD) { - state |= y > 0 ? WII_GC_RSTICK_UP : WII_GC_RSTICK_DOWN; + state |= y > 0 ? GX_GC_RSTICK_UP : GX_GC_RSTICK_DOWN; } } @@ -310,13 +312,13 @@ static void wii_input_poll(void *data) { uint32_t down = WPAD_ButtonsHeld(port); - state |= (down & WPAD_BUTTON_A) ? WII_WIIMOTE_A : 0; - state |= (down & WPAD_BUTTON_B) ? WII_WIIMOTE_B : 0; - state |= (down & WPAD_BUTTON_1) ? WII_WIIMOTE_1 : 0; - state |= (down & WPAD_BUTTON_2) ? WII_WIIMOTE_2 : 0; - state |= (down & WPAD_BUTTON_PLUS) ? WII_WIIMOTE_PLUS : 0; - state |= (down & WPAD_BUTTON_MINUS) ? WII_WIIMOTE_MINUS : 0; - state |= (down & WPAD_BUTTON_HOME) ? WII_WIIMOTE_HOME : 0; + state |= (down & WPAD_BUTTON_A) ? GX_WIIMOTE_A : 0; + state |= (down & WPAD_BUTTON_B) ? GX_WIIMOTE_B : 0; + state |= (down & WPAD_BUTTON_1) ? GX_WIIMOTE_1 : 0; + state |= (down & WPAD_BUTTON_2) ? GX_WIIMOTE_2 : 0; + state |= (down & WPAD_BUTTON_PLUS) ? GX_WIIMOTE_PLUS : 0; + state |= (down & WPAD_BUTTON_MINUS) ? GX_WIIMOTE_MINUS : 0; + state |= (down & WPAD_BUTTON_HOME) ? GX_WIIMOTE_HOME : 0; expansion_t exp; WPAD_Expansion(port, &exp); @@ -325,55 +327,55 @@ static void wii_input_poll(void *data) case WPAD_EXP_NUNCHUK: { // wiimote is held upright with nunchuk, do not change d-pad orientation - state |= (down & WPAD_BUTTON_UP) ? WII_WIIMOTE_UP : 0; - state |= (down & WPAD_BUTTON_DOWN) ? WII_WIIMOTE_DOWN : 0; - state |= (down & WPAD_BUTTON_LEFT) ? WII_WIIMOTE_LEFT : 0; - state |= (down & WPAD_BUTTON_RIGHT) ? WII_WIIMOTE_RIGHT : 0; + state |= (down & WPAD_BUTTON_UP) ? GX_WIIMOTE_UP : 0; + state |= (down & WPAD_BUTTON_DOWN) ? GX_WIIMOTE_DOWN : 0; + state |= (down & WPAD_BUTTON_LEFT) ? GX_WIIMOTE_LEFT : 0; + state |= (down & WPAD_BUTTON_RIGHT) ? GX_WIIMOTE_RIGHT : 0; - state |= (down & WPAD_NUNCHUK_BUTTON_Z) ? WII_NUNCHUK_Z : 0; - state |= (down & WPAD_NUNCHUK_BUTTON_C) ? WII_NUNCHUK_C : 0; + state |= (down & WPAD_NUNCHUK_BUTTON_Z) ? GX_NUNCHUK_Z : 0; + state |= (down & WPAD_NUNCHUK_BUTTON_C) ? GX_NUNCHUK_C : 0; s8 x = wii_stick_x(exp.nunchuk.js); s8 y = wii_stick_y(exp.nunchuk.js); if (abs(x) > JOYSTICK_THRESHOLD) { - state |= x > 0 ? WII_NUNCHUK_RIGHT : WII_NUNCHUK_LEFT; + state |= x > 0 ? GX_NUNCHUK_RIGHT : GX_NUNCHUK_LEFT; } if (abs(y) > JOYSTICK_THRESHOLD) { - state |= y > 0 ? WII_NUNCHUK_UP : WII_NUNCHUK_DOWN; + state |= y > 0 ? GX_NUNCHUK_UP : GX_NUNCHUK_DOWN; } break; } case WPAD_EXP_CLASSIC: { - state |= (down & WPAD_CLASSIC_BUTTON_A) ? WII_CLASSIC_A : 0; - state |= (down & WPAD_CLASSIC_BUTTON_B) ? WII_CLASSIC_B : 0; - state |= (down & WPAD_CLASSIC_BUTTON_X) ? WII_CLASSIC_X : 0; - state |= (down & WPAD_CLASSIC_BUTTON_Y) ? WII_CLASSIC_Y : 0; - state |= (down & WPAD_CLASSIC_BUTTON_UP) ? WII_CLASSIC_UP : 0; - state |= (down & WPAD_CLASSIC_BUTTON_DOWN) ? WII_CLASSIC_DOWN : 0; - state |= (down & WPAD_CLASSIC_BUTTON_LEFT) ? WII_CLASSIC_LEFT : 0; - state |= (down & WPAD_CLASSIC_BUTTON_RIGHT) ? WII_CLASSIC_RIGHT : 0; - state |= (down & WPAD_CLASSIC_BUTTON_PLUS) ? WII_CLASSIC_PLUS : 0; - state |= (down & WPAD_CLASSIC_BUTTON_MINUS) ? WII_CLASSIC_MINUS : 0; - state |= (down & WPAD_CLASSIC_BUTTON_HOME) ? WII_CLASSIC_HOME : 0; - state |= (down & WPAD_CLASSIC_BUTTON_FULL_L) ? WII_CLASSIC_L_TRIGGER : 0; - state |= (down & WPAD_CLASSIC_BUTTON_FULL_R) ? WII_CLASSIC_R_TRIGGER : 0; - state |= (down & WPAD_CLASSIC_BUTTON_ZL) ? WII_CLASSIC_ZL_TRIGGER : 0; - state |= (down & WPAD_CLASSIC_BUTTON_ZR) ? WII_CLASSIC_ZR_TRIGGER : 0; + state |= (down & WPAD_CLASSIC_BUTTON_A) ? GX_CLASSIC_A : 0; + state |= (down & WPAD_CLASSIC_BUTTON_B) ? GX_CLASSIC_B : 0; + state |= (down & WPAD_CLASSIC_BUTTON_X) ? GX_CLASSIC_X : 0; + state |= (down & WPAD_CLASSIC_BUTTON_Y) ? GX_CLASSIC_Y : 0; + state |= (down & WPAD_CLASSIC_BUTTON_UP) ? GX_CLASSIC_UP : 0; + state |= (down & WPAD_CLASSIC_BUTTON_DOWN) ? GX_CLASSIC_DOWN : 0; + state |= (down & WPAD_CLASSIC_BUTTON_LEFT) ? GX_CLASSIC_LEFT : 0; + state |= (down & WPAD_CLASSIC_BUTTON_RIGHT) ? GX_CLASSIC_RIGHT : 0; + state |= (down & WPAD_CLASSIC_BUTTON_PLUS) ? GX_CLASSIC_PLUS : 0; + state |= (down & WPAD_CLASSIC_BUTTON_MINUS) ? GX_CLASSIC_MINUS : 0; + state |= (down & WPAD_CLASSIC_BUTTON_HOME) ? GX_CLASSIC_HOME : 0; + state |= (down & WPAD_CLASSIC_BUTTON_FULL_L) ? GX_CLASSIC_L_TRIGGER : 0; + state |= (down & WPAD_CLASSIC_BUTTON_FULL_R) ? GX_CLASSIC_R_TRIGGER : 0; + state |= (down & WPAD_CLASSIC_BUTTON_ZL) ? GX_CLASSIC_ZL_TRIGGER : 0; + state |= (down & WPAD_CLASSIC_BUTTON_ZR) ? GX_CLASSIC_ZR_TRIGGER : 0; s8 x = wii_stick_x(exp.classic.ljs); s8 y = wii_stick_y(exp.classic.ljs); if (abs(x) > JOYSTICK_THRESHOLD) { - state |= x > 0 ? WII_CLASSIC_LSTICK_RIGHT : WII_CLASSIC_LSTICK_LEFT; + state |= x > 0 ? GX_CLASSIC_LSTICK_RIGHT : GX_CLASSIC_LSTICK_LEFT; } if (abs(y) > JOYSTICK_THRESHOLD) { - state |= y > 0 ? WII_CLASSIC_LSTICK_UP : WII_CLASSIC_LSTICK_DOWN; + state |= y > 0 ? GX_CLASSIC_LSTICK_UP : GX_CLASSIC_LSTICK_DOWN; } x = wii_stick_x(exp.classic.rjs); @@ -381,28 +383,28 @@ static void wii_input_poll(void *data) if (abs(x) > JOYSTICK_THRESHOLD) { - state |= x > 0 ? WII_CLASSIC_RSTICK_RIGHT : WII_CLASSIC_RSTICK_LEFT; + state |= x > 0 ? GX_CLASSIC_RSTICK_RIGHT : GX_CLASSIC_RSTICK_LEFT; } if (abs(y) > JOYSTICK_THRESHOLD) { - state |= y > 0 ? WII_CLASSIC_RSTICK_UP : WII_CLASSIC_RSTICK_DOWN; + state |= y > 0 ? GX_CLASSIC_RSTICK_UP : GX_CLASSIC_RSTICK_DOWN; } // do not return, fall through for wiimote d-pad } default: // rotated d-pad - state |= (down & WPAD_BUTTON_UP) ? WII_WIIMOTE_LEFT : 0; - state |= (down & WPAD_BUTTON_DOWN) ? WII_WIIMOTE_RIGHT : 0; - state |= (down & WPAD_BUTTON_LEFT) ? WII_WIIMOTE_DOWN : 0; - state |= (down & WPAD_BUTTON_RIGHT) ? WII_WIIMOTE_UP : 0; + state |= (down & WPAD_BUTTON_UP) ? GX_WIIMOTE_LEFT : 0; + state |= (down & WPAD_BUTTON_DOWN) ? GX_WIIMOTE_RIGHT : 0; + state |= (down & WPAD_BUTTON_LEFT) ? GX_WIIMOTE_DOWN : 0; + state |= (down & WPAD_BUTTON_RIGHT) ? GX_WIIMOTE_UP : 0; break; } } #endif - if ((state & (WII_GC_START | WII_GC_Z_TRIGGER | WII_GC_L_TRIGGER | WII_GC_R_TRIGGER)) == (WII_GC_START | WII_GC_Z_TRIGGER | WII_GC_L_TRIGGER | WII_GC_R_TRIGGER)) + if ((state & (GX_GC_START | GX_GC_Z_TRIGGER | GX_GC_L_TRIGGER | GX_GC_R_TRIGGER)) == (GX_GC_START | GX_GC_Z_TRIGGER | GX_GC_L_TRIGGER | GX_GC_R_TRIGGER)) { - state |= WII_WIIMOTE_HOME; + state |= GX_WIIMOTE_HOME; } pad_state[port] = state; @@ -410,7 +412,7 @@ static void wii_input_poll(void *data) if (g_quit) { - pad_state[0] |= WII_WIIMOTE_HOME; + pad_state[0] |= GX_WIIMOTE_HOME; g_quit = false; } } @@ -421,7 +423,7 @@ static bool wii_key_pressed(void *data, int key) switch (key) { case RARCH_QUIT_KEY: - return pad_state[0] & (WII_CLASSIC_HOME | WII_WIIMOTE_HOME) ? true : false; + return pad_state[0] & (GX_CLASSIC_HOME | GX_WIIMOTE_HOME) ? true : false; default: return false; } @@ -433,17 +435,18 @@ static void wii_set_default_keybind_lut(unsigned device, unsigned port) switch (device) { - case WII_DEVICE_WIIMOTE: - rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_B] = platform_keys[WII_DEVICE_WIIMOTE_ID_JOYPAD_B].joykey; - rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_Y] = platform_keys[WII_DEVICE_WIIMOTE_ID_JOYPAD_A].joykey; - rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_SELECT] = platform_keys[WII_DEVICE_WIIMOTE_ID_JOYPAD_MINUS].joykey; - rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_START] = platform_keys[WII_DEVICE_WIIMOTE_ID_JOYPAD_PLUS].joykey; - rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_UP] = platform_keys[WII_DEVICE_WIIMOTE_ID_JOYPAD_UP].joykey; - rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_DOWN] = platform_keys[WII_DEVICE_WIIMOTE_ID_JOYPAD_DOWN].joykey; - rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_LEFT] = platform_keys[WII_DEVICE_WIIMOTE_ID_JOYPAD_LEFT].joykey; - rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_RIGHT] = platform_keys[WII_DEVICE_WIIMOTE_ID_JOYPAD_RIGHT].joykey; - rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_A] = platform_keys[WII_DEVICE_WIIMOTE_ID_JOYPAD_1].joykey; - rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_X] = platform_keys[WII_DEVICE_WIIMOTE_ID_JOYPAD_2].joykey; +#ifdef HW_RVL + case GX_DEVICE_WIIMOTE: + rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_B] = platform_keys[GX_DEVICE_WIIMOTE_ID_JOYPAD_B].joykey; + rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_Y] = platform_keys[GX_DEVICE_WIIMOTE_ID_JOYPAD_A].joykey; + rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_SELECT] = platform_keys[GX_DEVICE_WIIMOTE_ID_JOYPAD_MINUS].joykey; + rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_START] = platform_keys[GX_DEVICE_WIIMOTE_ID_JOYPAD_PLUS].joykey; + rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_UP] = platform_keys[GX_DEVICE_WIIMOTE_ID_JOYPAD_UP].joykey; + rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_DOWN] = platform_keys[GX_DEVICE_WIIMOTE_ID_JOYPAD_DOWN].joykey; + rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_LEFT] = platform_keys[GX_DEVICE_WIIMOTE_ID_JOYPAD_LEFT].joykey; + rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_RIGHT] = platform_keys[GX_DEVICE_WIIMOTE_ID_JOYPAD_RIGHT].joykey; + rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_A] = platform_keys[GX_DEVICE_WIIMOTE_ID_JOYPAD_1].joykey; + rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_X] = platform_keys[GX_DEVICE_WIIMOTE_ID_JOYPAD_2].joykey; rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_L] = 0; rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_R] = 0; rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_L2] = 0; @@ -451,55 +454,56 @@ static void wii_set_default_keybind_lut(unsigned device, unsigned port) rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_L3] = 0; rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_R3] = 0; break; - case WII_DEVICE_NUNCHUK: - rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_B] = platform_keys[WII_DEVICE_WIIMOTE_ID_JOYPAD_B].joykey; - rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_Y] = platform_keys[WII_DEVICE_WIIMOTE_ID_JOYPAD_2].joykey; - rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_SELECT] = platform_keys[WII_DEVICE_WIIMOTE_ID_JOYPAD_MINUS].joykey; - rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_START] = platform_keys[WII_DEVICE_WIIMOTE_ID_JOYPAD_PLUS].joykey; - rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_UP] = platform_keys[WII_DEVICE_WIIMOTE_ID_JOYPAD_UP].joykey; - rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_DOWN] = platform_keys[WII_DEVICE_WIIMOTE_ID_JOYPAD_DOWN].joykey; - rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_LEFT] = platform_keys[WII_DEVICE_WIIMOTE_ID_JOYPAD_LEFT].joykey; - rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_RIGHT] = platform_keys[WII_DEVICE_WIIMOTE_ID_JOYPAD_RIGHT].joykey; - rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_A] = platform_keys[WII_DEVICE_WIIMOTE_ID_JOYPAD_A].joykey; - rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_X] = platform_keys[WII_DEVICE_WIIMOTE_ID_JOYPAD_1].joykey; - rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_L] = platform_keys[WII_DEVICE_WIIMOTE_ID_JOYPAD_Z].joykey; - rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_R] = platform_keys[WII_DEVICE_WIIMOTE_ID_JOYPAD_C].joykey;; + case GX_DEVICE_NUNCHUK: + rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_B] = platform_keys[GX_DEVICE_WIIMOTE_ID_JOYPAD_B].joykey; + rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_Y] = platform_keys[GX_DEVICE_WIIMOTE_ID_JOYPAD_2].joykey; + rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_SELECT] = platform_keys[GX_DEVICE_WIIMOTE_ID_JOYPAD_MINUS].joykey; + rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_START] = platform_keys[GX_DEVICE_WIIMOTE_ID_JOYPAD_PLUS].joykey; + rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_UP] = platform_keys[GX_DEVICE_WIIMOTE_ID_JOYPAD_UP].joykey; + rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_DOWN] = platform_keys[GX_DEVICE_WIIMOTE_ID_JOYPAD_DOWN].joykey; + rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_LEFT] = platform_keys[GX_DEVICE_WIIMOTE_ID_JOYPAD_LEFT].joykey; + rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_RIGHT] = platform_keys[GX_DEVICE_WIIMOTE_ID_JOYPAD_RIGHT].joykey; + rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_A] = platform_keys[GX_DEVICE_WIIMOTE_ID_JOYPAD_A].joykey; + rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_X] = platform_keys[GX_DEVICE_WIIMOTE_ID_JOYPAD_1].joykey; + rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_L] = platform_keys[GX_DEVICE_WIIMOTE_ID_JOYPAD_Z].joykey; + rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_R] = platform_keys[GX_DEVICE_WIIMOTE_ID_JOYPAD_C].joykey;; rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_L2] = 0; rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_R2] = 0; rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_L3] = 0; rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_R3] = 0; break; - case WII_DEVICE_CLASSIC: - rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_B] = platform_keys[WII_DEVICE_CLASSIC_ID_JOYPAD_B].joykey; - rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_Y] = platform_keys[WII_DEVICE_CLASSIC_ID_JOYPAD_Y].joykey; - rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_SELECT] = platform_keys[WII_DEVICE_CLASSIC_ID_JOYPAD_MINUS].joykey; - rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_START] = platform_keys[WII_DEVICE_CLASSIC_ID_JOYPAD_PLUS].joykey; - rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_UP] = platform_keys[WII_DEVICE_CLASSIC_ID_JOYPAD_UP].joykey; - rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_DOWN] = platform_keys[WII_DEVICE_CLASSIC_ID_JOYPAD_DOWN].joykey; - rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_LEFT] = platform_keys[WII_DEVICE_CLASSIC_ID_JOYPAD_LEFT].joykey; - rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_RIGHT] = platform_keys[WII_DEVICE_CLASSIC_ID_JOYPAD_RIGHT].joykey; - rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_A] = platform_keys[WII_DEVICE_CLASSIC_ID_JOYPAD_A].joykey; - rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_X] = platform_keys[WII_DEVICE_CLASSIC_ID_JOYPAD_X].joykey; - rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_L] = platform_keys[WII_DEVICE_CLASSIC_ID_JOYPAD_L_TRIGGER].joykey; - rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_R] = platform_keys[WII_DEVICE_CLASSIC_ID_JOYPAD_R_TRIGGER].joykey; - rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_L2] = platform_keys[WII_DEVICE_CLASSIC_ID_JOYPAD_ZL_TRIGGER].joykey; - rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_R2] = platform_keys[WII_DEVICE_CLASSIC_ID_JOYPAD_ZR_TRIGGER].joykey; + case GX_DEVICE_CLASSIC: + rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_B] = platform_keys[GX_DEVICE_CLASSIC_ID_JOYPAD_B].joykey; + rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_Y] = platform_keys[GX_DEVICE_CLASSIC_ID_JOYPAD_Y].joykey; + rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_SELECT] = platform_keys[GX_DEVICE_CLASSIC_ID_JOYPAD_MINUS].joykey; + rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_START] = platform_keys[GX_DEVICE_CLASSIC_ID_JOYPAD_PLUS].joykey; + rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_UP] = platform_keys[GX_DEVICE_CLASSIC_ID_JOYPAD_UP].joykey; + rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_DOWN] = platform_keys[GX_DEVICE_CLASSIC_ID_JOYPAD_DOWN].joykey; + rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_LEFT] = platform_keys[GX_DEVICE_CLASSIC_ID_JOYPAD_LEFT].joykey; + rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_RIGHT] = platform_keys[GX_DEVICE_CLASSIC_ID_JOYPAD_RIGHT].joykey; + rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_A] = platform_keys[GX_DEVICE_CLASSIC_ID_JOYPAD_A].joykey; + rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_X] = platform_keys[GX_DEVICE_CLASSIC_ID_JOYPAD_X].joykey; + rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_L] = platform_keys[GX_DEVICE_CLASSIC_ID_JOYPAD_L_TRIGGER].joykey; + rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_R] = platform_keys[GX_DEVICE_CLASSIC_ID_JOYPAD_R_TRIGGER].joykey; + rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_L2] = platform_keys[GX_DEVICE_CLASSIC_ID_JOYPAD_ZL_TRIGGER].joykey; + rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_R2] = platform_keys[GX_DEVICE_CLASSIC_ID_JOYPAD_ZR_TRIGGER].joykey; rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_L3] = 0; rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_R3] = 0; break; - case WII_DEVICE_GAMECUBE: - rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_B] = platform_keys[WII_DEVICE_GC_ID_JOYPAD_B].joykey; - rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_Y] = platform_keys[WII_DEVICE_GC_ID_JOYPAD_Y].joykey; - rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_SELECT] = platform_keys[WII_DEVICE_GC_ID_JOYPAD_Z_TRIGGER].joykey; - rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_START] = platform_keys[WII_DEVICE_GC_ID_JOYPAD_START].joykey; - rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_UP] = platform_keys[WII_DEVICE_GC_ID_JOYPAD_UP].joykey; - rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_DOWN] = platform_keys[WII_DEVICE_GC_ID_JOYPAD_DOWN].joykey; - rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_LEFT] = platform_keys[WII_DEVICE_GC_ID_JOYPAD_LEFT].joykey; - rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_RIGHT] = platform_keys[WII_DEVICE_GC_ID_JOYPAD_RIGHT].joykey; - rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_A] = platform_keys[WII_DEVICE_GC_ID_JOYPAD_A].joykey; - rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_X] = platform_keys[WII_DEVICE_GC_ID_JOYPAD_X].joykey; - rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_L] = platform_keys[WII_DEVICE_GC_ID_JOYPAD_L_TRIGGER].joykey; - rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_R] = platform_keys[WII_DEVICE_GC_ID_JOYPAD_R_TRIGGER].joykey; +#endif + case GX_DEVICE_GAMECUBE: + rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_B] = platform_keys[GX_DEVICE_GC_ID_JOYPAD_B].joykey; + rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_Y] = platform_keys[GX_DEVICE_GC_ID_JOYPAD_Y].joykey; + rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_SELECT] = platform_keys[GX_DEVICE_GC_ID_JOYPAD_Z_TRIGGER].joykey; + rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_START] = platform_keys[GX_DEVICE_GC_ID_JOYPAD_START].joykey; + rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_UP] = platform_keys[GX_DEVICE_GC_ID_JOYPAD_UP].joykey; + rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_DOWN] = platform_keys[GX_DEVICE_GC_ID_JOYPAD_DOWN].joykey; + rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_LEFT] = platform_keys[GX_DEVICE_GC_ID_JOYPAD_LEFT].joykey; + rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_RIGHT] = platform_keys[GX_DEVICE_GC_ID_JOYPAD_RIGHT].joykey; + rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_A] = platform_keys[GX_DEVICE_GC_ID_JOYPAD_A].joykey; + rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_X] = platform_keys[GX_DEVICE_GC_ID_JOYPAD_X].joykey; + rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_L] = platform_keys[GX_DEVICE_GC_ID_JOYPAD_L_TRIGGER].joykey; + rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_R] = platform_keys[GX_DEVICE_GC_ID_JOYPAD_R_TRIGGER].joykey; rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_L2] = 0; rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_R2] = 0; rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_L3] = 0; diff --git a/wii/gx_input.h b/wii/gx_input.h index 9296bbd91c..86f9e24d7d 100644 --- a/wii/gx_input.h +++ b/wii/gx_input.h @@ -15,160 +15,162 @@ * If not, see . */ -#ifndef _WII_INPUT_H -#define _WII_INPUT_H +#ifndef _GX_INPUT_H +#define _GX_INPUT_H enum { - WII_GC_A = 1ULL << 0, - WII_GC_B = 1ULL << 1, - WII_GC_X = 1ULL << 2, - WII_GC_Y = 1ULL << 3, - WII_GC_START = 1ULL << 4, - WII_GC_Z_TRIGGER = 1ULL << 5, - WII_GC_L_TRIGGER = 1ULL << 6, - WII_GC_R_TRIGGER = 1ULL << 7, - WII_GC_UP = 1ULL << 8, - WII_GC_DOWN = 1ULL << 9, - WII_GC_LEFT = 1ULL << 10, - WII_GC_RIGHT = 1ULL << 11, - WII_GC_LSTICK_UP = 1ULL << 12, - WII_GC_LSTICK_DOWN = 1ULL << 13, - WII_GC_LSTICK_LEFT = 1ULL << 14, - WII_GC_LSTICK_RIGHT = 1ULL << 15, - WII_GC_RSTICK_UP = 1ULL << 16, - WII_GC_RSTICK_DOWN = 1ULL << 17, - WII_GC_RSTICK_LEFT = 1ULL << 18, - WII_GC_RSTICK_RIGHT = 1ULL << 19, - WII_CLASSIC_A = 1ULL << 20, - WII_CLASSIC_B = 1ULL << 21, - WII_CLASSIC_X = 1ULL << 22, - WII_CLASSIC_Y = 1ULL << 23, - WII_CLASSIC_PLUS = 1ULL << 24, - WII_CLASSIC_MINUS = 1ULL << 25, - WII_CLASSIC_HOME = 1ULL << 26, - WII_CLASSIC_L_TRIGGER = 1ULL << 27, - WII_CLASSIC_R_TRIGGER = 1ULL << 28, - WII_CLASSIC_ZL_TRIGGER = 1ULL << 29, - WII_CLASSIC_ZR_TRIGGER = 1ULL << 30, - WII_CLASSIC_UP = 1ULL << 31, - WII_CLASSIC_DOWN = 1ULL << 32, - WII_CLASSIC_LEFT = 1ULL << 33, - WII_CLASSIC_RIGHT = 1ULL << 34, - WII_CLASSIC_LSTICK_UP = 1ULL << 35, - WII_CLASSIC_LSTICK_DOWN = 1ULL << 36, - WII_CLASSIC_LSTICK_LEFT = 1ULL << 37, - WII_CLASSIC_LSTICK_RIGHT = 1ULL << 38, - WII_CLASSIC_RSTICK_UP = 1ULL << 39, - WII_CLASSIC_RSTICK_DOWN = 1ULL << 40, - WII_CLASSIC_RSTICK_LEFT = 1ULL << 41, - WII_CLASSIC_RSTICK_RIGHT = 1ULL << 42, - WII_WIIMOTE_A = 1ULL << 43, - WII_WIIMOTE_B = 1ULL << 44, - WII_WIIMOTE_1 = 1ULL << 45, - WII_WIIMOTE_2 = 1ULL << 46, - WII_WIIMOTE_PLUS = 1ULL << 47, - WII_WIIMOTE_MINUS = 1ULL << 48, - WII_WIIMOTE_HOME = 1ULL << 49, - WII_WIIMOTE_UP = 1ULL << 50, - WII_WIIMOTE_DOWN = 1ULL << 51, - WII_WIIMOTE_LEFT = 1ULL << 52, - WII_WIIMOTE_RIGHT = 1ULL << 53, - WII_NUNCHUK_Z = 1ULL << 54, - WII_NUNCHUK_C = 1ULL << 55, - WII_NUNCHUK_UP = 1ULL << 56, - WII_NUNCHUK_DOWN = 1ULL << 57, - WII_NUNCHUK_LEFT = 1ULL << 58, - WII_NUNCHUK_RIGHT = 1ULL << 59, + GX_GC_A = 1ULL << 0, + GX_GC_B = 1ULL << 1, + GX_GC_X = 1ULL << 2, + GX_GC_Y = 1ULL << 3, + GX_GC_START = 1ULL << 4, + GX_GC_Z_TRIGGER = 1ULL << 5, + GX_GC_L_TRIGGER = 1ULL << 6, + GX_GC_R_TRIGGER = 1ULL << 7, + GX_GC_UP = 1ULL << 8, + GX_GC_DOWN = 1ULL << 9, + GX_GC_LEFT = 1ULL << 10, + GX_GC_RIGHT = 1ULL << 11, + GX_GC_LSTICK_UP = 1ULL << 12, + GX_GC_LSTICK_DOWN = 1ULL << 13, + GX_GC_LSTICK_LEFT = 1ULL << 14, + GX_GC_LSTICK_RIGHT = 1ULL << 15, + GX_GC_RSTICK_UP = 1ULL << 16, + GX_GC_RSTICK_DOWN = 1ULL << 17, + GX_GC_RSTICK_LEFT = 1ULL << 18, + GX_GC_RSTICK_RIGHT = 1ULL << 19, +#ifdef HW_RVL + GX_CLASSIC_A = 1ULL << 20, + GX_CLASSIC_B = 1ULL << 21, + GX_CLASSIC_X = 1ULL << 22, + GX_CLASSIC_Y = 1ULL << 23, + GX_CLASSIC_PLUS = 1ULL << 24, + GX_CLASSIC_MINUS = 1ULL << 25, + GX_CLASSIC_HOME = 1ULL << 26, + GX_CLASSIC_L_TRIGGER = 1ULL << 27, + GX_CLASSIC_R_TRIGGER = 1ULL << 28, + GX_CLASSIC_ZL_TRIGGER = 1ULL << 29, + GX_CLASSIC_ZR_TRIGGER = 1ULL << 30, + GX_CLASSIC_UP = 1ULL << 31, + GX_CLASSIC_DOWN = 1ULL << 32, + GX_CLASSIC_LEFT = 1ULL << 33, + GX_CLASSIC_RIGHT = 1ULL << 34, + GX_CLASSIC_LSTICK_UP = 1ULL << 35, + GX_CLASSIC_LSTICK_DOWN = 1ULL << 36, + GX_CLASSIC_LSTICK_LEFT = 1ULL << 37, + GX_CLASSIC_LSTICK_RIGHT = 1ULL << 38, + GX_CLASSIC_RSTICK_UP = 1ULL << 39, + GX_CLASSIC_RSTICK_DOWN = 1ULL << 40, + GX_CLASSIC_RSTICK_LEFT = 1ULL << 41, + GX_CLASSIC_RSTICK_RIGHT = 1ULL << 42, + GX_WIIMOTE_A = 1ULL << 43, + GX_WIIMOTE_B = 1ULL << 44, + GX_WIIMOTE_1 = 1ULL << 45, + GX_WIIMOTE_2 = 1ULL << 46, + GX_WIIMOTE_PLUS = 1ULL << 47, + GX_WIIMOTE_MINUS = 1ULL << 48, + GX_WIIMOTE_HOME = 1ULL << 49, + GX_WIIMOTE_UP = 1ULL << 50, + GX_WIIMOTE_DOWN = 1ULL << 51, + GX_WIIMOTE_LEFT = 1ULL << 52, + GX_WIIMOTE_RIGHT = 1ULL << 53, + GX_NUNCHUK_Z = 1ULL << 54, + GX_NUNCHUK_C = 1ULL << 55, + GX_NUNCHUK_UP = 1ULL << 56, + GX_NUNCHUK_DOWN = 1ULL << 57, + GX_NUNCHUK_LEFT = 1ULL << 58, + GX_NUNCHUK_RIGHT = 1ULL << 59, +#endif }; enum wii_device_id { - WII_DEVICE_GC_ID_JOYPAD_A = 0, - WII_DEVICE_GC_ID_JOYPAD_B, - WII_DEVICE_GC_ID_JOYPAD_X, - WII_DEVICE_GC_ID_JOYPAD_Y, - WII_DEVICE_GC_ID_JOYPAD_UP, - WII_DEVICE_GC_ID_JOYPAD_DOWN, - WII_DEVICE_GC_ID_JOYPAD_LEFT, - WII_DEVICE_GC_ID_JOYPAD_RIGHT, - WII_DEVICE_GC_ID_JOYPAD_Z_TRIGGER, - WII_DEVICE_GC_ID_JOYPAD_START, - WII_DEVICE_GC_ID_JOYPAD_L_TRIGGER, - WII_DEVICE_GC_ID_JOYPAD_R_TRIGGER, - WII_DEVICE_GC_ID_LSTICK_LEFT, - WII_DEVICE_GC_ID_LSTICK_RIGHT, - WII_DEVICE_GC_ID_LSTICK_UP, - WII_DEVICE_GC_ID_LSTICK_DOWN, - WII_DEVICE_GC_ID_LSTICK_LEFT_DPAD, - WII_DEVICE_GC_ID_LSTICK_RIGHT_DPAD, - WII_DEVICE_GC_ID_LSTICK_UP_DPAD, - WII_DEVICE_GC_ID_LSTICK_DOWN_DPAD, - WII_DEVICE_GC_ID_RSTICK_LEFT, - WII_DEVICE_GC_ID_RSTICK_RIGHT, - WII_DEVICE_GC_ID_RSTICK_UP, - WII_DEVICE_GC_ID_RSTICK_DOWN, - WII_DEVICE_GC_ID_RSTICK_LEFT_DPAD, - WII_DEVICE_GC_ID_RSTICK_RIGHT_DPAD, - WII_DEVICE_GC_ID_RSTICK_UP_DPAD, - WII_DEVICE_GC_ID_RSTICK_DOWN_DPAD, + GX_DEVICE_GC_ID_JOYPAD_A = 0, + GX_DEVICE_GC_ID_JOYPAD_B, + GX_DEVICE_GC_ID_JOYPAD_X, + GX_DEVICE_GC_ID_JOYPAD_Y, + GX_DEVICE_GC_ID_JOYPAD_UP, + GX_DEVICE_GC_ID_JOYPAD_DOWN, + GX_DEVICE_GC_ID_JOYPAD_LEFT, + GX_DEVICE_GC_ID_JOYPAD_RIGHT, + GX_DEVICE_GC_ID_JOYPAD_Z_TRIGGER, + GX_DEVICE_GC_ID_JOYPAD_START, + GX_DEVICE_GC_ID_JOYPAD_L_TRIGGER, + GX_DEVICE_GC_ID_JOYPAD_R_TRIGGER, + GX_DEVICE_GC_ID_LSTICK_LEFT, + GX_DEVICE_GC_ID_LSTICK_RIGHT, + GX_DEVICE_GC_ID_LSTICK_UP, + GX_DEVICE_GC_ID_LSTICK_DOWN, + GX_DEVICE_GC_ID_LSTICK_LEFT_DPAD, + GX_DEVICE_GC_ID_LSTICK_RIGHT_DPAD, + GX_DEVICE_GC_ID_LSTICK_UP_DPAD, + GX_DEVICE_GC_ID_LSTICK_DOWN_DPAD, + GX_DEVICE_GC_ID_RSTICK_LEFT, + GX_DEVICE_GC_ID_RSTICK_RIGHT, + GX_DEVICE_GC_ID_RSTICK_UP, + GX_DEVICE_GC_ID_RSTICK_DOWN, + GX_DEVICE_GC_ID_RSTICK_LEFT_DPAD, + GX_DEVICE_GC_ID_RSTICK_RIGHT_DPAD, + GX_DEVICE_GC_ID_RSTICK_UP_DPAD, + GX_DEVICE_GC_ID_RSTICK_DOWN_DPAD, #ifdef HW_RVL // CLASSIC CONTROLLER - WII_DEVICE_CLASSIC_ID_JOYPAD_A, - WII_DEVICE_CLASSIC_ID_JOYPAD_B, - WII_DEVICE_CLASSIC_ID_JOYPAD_X, - WII_DEVICE_CLASSIC_ID_JOYPAD_Y, - WII_DEVICE_CLASSIC_ID_JOYPAD_UP, - WII_DEVICE_CLASSIC_ID_JOYPAD_DOWN, - WII_DEVICE_CLASSIC_ID_JOYPAD_LEFT, - WII_DEVICE_CLASSIC_ID_JOYPAD_RIGHT, - WII_DEVICE_CLASSIC_ID_JOYPAD_PLUS, - WII_DEVICE_CLASSIC_ID_JOYPAD_MINUS, - WII_DEVICE_CLASSIC_ID_JOYPAD_HOME, - WII_DEVICE_CLASSIC_ID_JOYPAD_L_TRIGGER, - WII_DEVICE_CLASSIC_ID_JOYPAD_R_TRIGGER, - WII_DEVICE_CLASSIC_ID_JOYPAD_ZL_TRIGGER, - WII_DEVICE_CLASSIC_ID_JOYPAD_ZR_TRIGGER, - WII_DEVICE_CLASSIC_ID_LSTICK_LEFT, - WII_DEVICE_CLASSIC_ID_LSTICK_RIGHT, - WII_DEVICE_CLASSIC_ID_LSTICK_UP, - WII_DEVICE_CLASSIC_ID_LSTICK_DOWN, - WII_DEVICE_CLASSIC_ID_LSTICK_LEFT_DPAD, - WII_DEVICE_CLASSIC_ID_LSTICK_RIGHT_DPAD, - WII_DEVICE_CLASSIC_ID_LSTICK_UP_DPAD, - WII_DEVICE_CLASSIC_ID_LSTICK_DOWN_DPAD, - WII_DEVICE_CLASSIC_ID_RSTICK_LEFT, - WII_DEVICE_CLASSIC_ID_RSTICK_RIGHT, - WII_DEVICE_CLASSIC_ID_RSTICK_UP, - WII_DEVICE_CLASSIC_ID_RSTICK_DOWN, - WII_DEVICE_CLASSIC_ID_RSTICK_LEFT_DPAD, - WII_DEVICE_CLASSIC_ID_RSTICK_RIGHT_DPAD, - WII_DEVICE_CLASSIC_ID_RSTICK_UP_DPAD, - WII_DEVICE_CLASSIC_ID_RSTICK_DOWN_DPAD, + GX_DEVICE_CLASSIC_ID_JOYPAD_A, + GX_DEVICE_CLASSIC_ID_JOYPAD_B, + GX_DEVICE_CLASSIC_ID_JOYPAD_X, + GX_DEVICE_CLASSIC_ID_JOYPAD_Y, + GX_DEVICE_CLASSIC_ID_JOYPAD_UP, + GX_DEVICE_CLASSIC_ID_JOYPAD_DOWN, + GX_DEVICE_CLASSIC_ID_JOYPAD_LEFT, + GX_DEVICE_CLASSIC_ID_JOYPAD_RIGHT, + GX_DEVICE_CLASSIC_ID_JOYPAD_PLUS, + GX_DEVICE_CLASSIC_ID_JOYPAD_MINUS, + GX_DEVICE_CLASSIC_ID_JOYPAD_HOME, + GX_DEVICE_CLASSIC_ID_JOYPAD_L_TRIGGER, + GX_DEVICE_CLASSIC_ID_JOYPAD_R_TRIGGER, + GX_DEVICE_CLASSIC_ID_JOYPAD_ZL_TRIGGER, + GX_DEVICE_CLASSIC_ID_JOYPAD_ZR_TRIGGER, + GX_DEVICE_CLASSIC_ID_LSTICK_LEFT, + GX_DEVICE_CLASSIC_ID_LSTICK_RIGHT, + GX_DEVICE_CLASSIC_ID_LSTICK_UP, + GX_DEVICE_CLASSIC_ID_LSTICK_DOWN, + GX_DEVICE_CLASSIC_ID_LSTICK_LEFT_DPAD, + GX_DEVICE_CLASSIC_ID_LSTICK_RIGHT_DPAD, + GX_DEVICE_CLASSIC_ID_LSTICK_UP_DPAD, + GX_DEVICE_CLASSIC_ID_LSTICK_DOWN_DPAD, + GX_DEVICE_CLASSIC_ID_RSTICK_LEFT, + GX_DEVICE_CLASSIC_ID_RSTICK_RIGHT, + GX_DEVICE_CLASSIC_ID_RSTICK_UP, + GX_DEVICE_CLASSIC_ID_RSTICK_DOWN, + GX_DEVICE_CLASSIC_ID_RSTICK_LEFT_DPAD, + GX_DEVICE_CLASSIC_ID_RSTICK_RIGHT_DPAD, + GX_DEVICE_CLASSIC_ID_RSTICK_UP_DPAD, + GX_DEVICE_CLASSIC_ID_RSTICK_DOWN_DPAD, // WIIMOTE (PLUS OPTIONAL NUNCHUK) - WII_DEVICE_WIIMOTE_ID_JOYPAD_A, - WII_DEVICE_WIIMOTE_ID_JOYPAD_B, - WII_DEVICE_WIIMOTE_ID_JOYPAD_1, - WII_DEVICE_WIIMOTE_ID_JOYPAD_2, - WII_DEVICE_WIIMOTE_ID_JOYPAD_UP, - WII_DEVICE_WIIMOTE_ID_JOYPAD_DOWN, - WII_DEVICE_WIIMOTE_ID_JOYPAD_LEFT, - WII_DEVICE_WIIMOTE_ID_JOYPAD_RIGHT, - WII_DEVICE_WIIMOTE_ID_JOYPAD_PLUS, - WII_DEVICE_WIIMOTE_ID_JOYPAD_MINUS, - WII_DEVICE_WIIMOTE_ID_JOYPAD_HOME, - WII_DEVICE_WIIMOTE_ID_JOYPAD_Z, - WII_DEVICE_WIIMOTE_ID_JOYPAD_C, - WII_DEVICE_WIIMOTE_ID_LSTICK_LEFT, - WII_DEVICE_WIIMOTE_ID_LSTICK_RIGHT, - WII_DEVICE_WIIMOTE_ID_LSTICK_UP, - WII_DEVICE_WIIMOTE_ID_LSTICK_DOWN, - WII_DEVICE_WIIMOTE_ID_LSTICK_LEFT_DPAD, - WII_DEVICE_WIIMOTE_ID_LSTICK_RIGHT_DPAD, - WII_DEVICE_WIIMOTE_ID_LSTICK_UP_DPAD, - WII_DEVICE_WIIMOTE_ID_LSTICK_DOWN_DPAD, + GX_DEVICE_WIIMOTE_ID_JOYPAD_A, + GX_DEVICE_WIIMOTE_ID_JOYPAD_B, + GX_DEVICE_WIIMOTE_ID_JOYPAD_1, + GX_DEVICE_WIIMOTE_ID_JOYPAD_2, + GX_DEVICE_WIIMOTE_ID_JOYPAD_UP, + GX_DEVICE_WIIMOTE_ID_JOYPAD_DOWN, + GX_DEVICE_WIIMOTE_ID_JOYPAD_LEFT, + GX_DEVICE_WIIMOTE_ID_JOYPAD_RIGHT, + GX_DEVICE_WIIMOTE_ID_JOYPAD_PLUS, + GX_DEVICE_WIIMOTE_ID_JOYPAD_MINUS, + GX_DEVICE_WIIMOTE_ID_JOYPAD_HOME, + GX_DEVICE_WIIMOTE_ID_JOYPAD_Z, + GX_DEVICE_WIIMOTE_ID_JOYPAD_C, + GX_DEVICE_WIIMOTE_ID_LSTICK_LEFT, + GX_DEVICE_WIIMOTE_ID_LSTICK_RIGHT, + GX_DEVICE_WIIMOTE_ID_LSTICK_UP, + GX_DEVICE_WIIMOTE_ID_LSTICK_DOWN, + GX_DEVICE_WIIMOTE_ID_LSTICK_LEFT_DPAD, + GX_DEVICE_WIIMOTE_ID_LSTICK_RIGHT_DPAD, + GX_DEVICE_WIIMOTE_ID_LSTICK_UP_DPAD, + GX_DEVICE_WIIMOTE_ID_LSTICK_DOWN_DPAD, #endif RARCH_LAST_PLATFORM_KEY @@ -176,10 +178,10 @@ enum wii_device_id enum { - WII_DEVICE_GAMECUBE = 0, - WII_DEVICE_WIIMOTE, - WII_DEVICE_NUNCHUK, - WII_DEVICE_CLASSIC, + GX_DEVICE_GAMECUBE = 0, + GX_DEVICE_WIIMOTE, + GX_DEVICE_NUNCHUK, + GX_DEVICE_CLASSIC, RARCH_DEVICE_LAST };