From 7a67348b3c69650a16197840b6ea3f0f13b21d0f Mon Sep 17 00:00:00 2001 From: twinaphex Date: Sat, 15 Dec 2012 18:00:30 +0100 Subject: [PATCH] Change 1 << for bitmasks to 1ULL << --- 360/frontend-xdk/menu.cpp | 32 ++++----- android/native/jni/input_android.c | 110 ++++++++++++++--------------- gx/frontend/main.c | 24 +++---- ps3/sdk_defines.h | 18 ++--- psp/psp_input.h | 40 +++++------ 5 files changed, 112 insertions(+), 112 deletions(-) diff --git a/360/frontend-xdk/menu.cpp b/360/frontend-xdk/menu.cpp index f693f0ab11..a377843683 100644 --- a/360/frontend-xdk/menu.cpp +++ b/360/frontend-xdk/menu.cpp @@ -104,21 +104,21 @@ static void browser_update(filebrowser_t * b, uint64_t input, const char *extens bool ret = true; filebrowser_action_t action = FILEBROWSER_ACTION_NOOP; - if (input & (1 << RMENU_DEVICE_NAV_DOWN)) + if (input & (1ULL << RMENU_DEVICE_NAV_DOWN)) action = FILEBROWSER_ACTION_DOWN; - else if (input & (1 << RMENU_DEVICE_NAV_UP)) + else if (input & (1ULL << RMENU_DEVICE_NAV_UP)) action = FILEBROWSER_ACTION_UP; - else if (input & (1 << RMENU_DEVICE_NAV_RIGHT)) + else if (input & (1ULL << RMENU_DEVICE_NAV_RIGHT)) action = FILEBROWSER_ACTION_RIGHT; - else if (input & (1 << RMENU_DEVICE_NAV_LEFT)) + else if (input & (1ULL << RMENU_DEVICE_NAV_LEFT)) action = FILEBROWSER_ACTION_LEFT; - else if (input & (1 << RMENU_DEVICE_NAV_R2)) + else if (input & (1ULL << RMENU_DEVICE_NAV_R2)) action = FILEBROWSER_ACTION_SCROLL_DOWN; - else if (input & (1 << RMENU_DEVICE_NAV_L2)) + else if (input & (1ULL << RMENU_DEVICE_NAV_L2)) action = FILEBROWSER_ACTION_SCROLL_UP; - else if (input & (1 << RMENU_DEVICE_NAV_A)) + else if (input & (1ULL << RMENU_DEVICE_NAV_A)) action = FILEBROWSER_ACTION_CANCEL; - else if (input & (1 << RMENU_DEVICE_NAV_START)) + else if (input & (1ULL << RMENU_DEVICE_NAV_START)) { action = FILEBROWSER_ACTION_RESET; filebrowser_set_root(b, default_paths.filesystem_root_dir); @@ -161,7 +161,7 @@ HRESULT CRetroArchFileBrowser::OnInit(XUIMessageInit * pInitData, BOOL& bHandled filebrowser_set_root_and_ext(&browser, rarch_console_get_rom_ext(), g_extern.console.main_wrap.paths.default_rom_startup_dir); - uint64_t action = (1 << RMENU_DEVICE_NAV_B); + uint64_t action = (1ULL << RMENU_DEVICE_NAV_B); filebrowser_fetch_directory_entries(&browser, action, &m_romlist, &m_rompathtitle); return 0; @@ -183,7 +183,7 @@ HRESULT CRetroArchFileBrowser::OnNotifyPress( HXUIOBJ hObjPressed, BOOL& bHandle else if(browser.current_dir.list->elems[index].attr.b) { snprintf(path, sizeof(path), "%s\\%s", filebrowser_get_current_dir(&browser), str_buffer); - uint64_t action = (1 << RMENU_DEVICE_NAV_B); + uint64_t action = (1ULL << RMENU_DEVICE_NAV_B); filebrowser_set_root_and_ext(&browser, rarch_console_get_rom_ext(), path); filebrowser_fetch_directory_entries(&browser, action, &m_romlist, &m_rompathtitle); } @@ -191,14 +191,14 @@ HRESULT CRetroArchFileBrowser::OnNotifyPress( HXUIOBJ hObjPressed, BOOL& bHandle else if (hObjPressed == m_dir_game) { filebrowser_set_root_and_ext(&browser, rarch_console_get_rom_ext(), g_extern.console.main_wrap.paths.default_rom_startup_dir); - uint64_t action = (1 << RMENU_DEVICE_NAV_B); + uint64_t action = (1ULL << RMENU_DEVICE_NAV_B); filebrowser_fetch_directory_entries(&browser, action, &m_romlist, &m_rompathtitle); } #ifdef HAVE_HDD_CACHE_PARTITION else if (hObjPressed == m_dir_cache) { filebrowser_set_root_and_ext(&browser, rarch_console_get_rom_ext(), "cache:"); - uint64_t action = (1 << RMENU_DEVICE_NAV_B); + uint64_t action = (1ULL << RMENU_DEVICE_NAV_B); filebrowser_fetch_directory_entries(&browser, action, &m_romlist, &m_rompathtitle); if (g_extern.console.rmenu.state.msg_info.enable) @@ -853,7 +853,7 @@ HRESULT CRetroArchShaderBrowser::OnInit(XUIMessageInit * pInitData, BOOL& bHandl GetChildById(L"XuiTxtRomPath", &m_shaderpathtitle); filebrowser_set_root_and_ext(&tmp_browser, "cg|CG", "game:\\media\\shaders"); - uint64_t action = (1 << RMENU_DEVICE_NAV_B); + uint64_t action = (1ULL << RMENU_DEVICE_NAV_B); filebrowser_fetch_directory_entries(&tmp_browser, action, &m_shaderlist, &m_shaderpathtitle); return 0; @@ -889,7 +889,7 @@ HRESULT CRetroArchShaderBrowser::OnNotifyPress( HXUIOBJ hObjPressed, BOOL& bHand convert_wchar_to_char(str_buffer, (const wchar_t *)m_shaderlist.GetText(index), sizeof(str_buffer)); snprintf(path, sizeof(path), "%s\\%s", filebrowser_get_current_dir(&tmp_browser), str_buffer); filebrowser_set_root_and_ext(&tmp_browser, "cg|CG", path); - uint64_t action = (1 << RMENU_DEVICE_NAV_B); + uint64_t action = (1ULL << RMENU_DEVICE_NAV_B); filebrowser_fetch_directory_entries(&tmp_browser, action, &m_shaderlist, &m_shaderpathtitle); } } @@ -906,7 +906,7 @@ HRESULT CRetroArchCoreBrowser::OnInit(XUIMessageInit * pInitData, BOOL& bHandled GetChildById(L"XuiTxtRomPath", &m_rompathtitle); filebrowser_set_root_and_ext(&tmp_browser, "xex|XEX", "game:"); - uint64_t action = (1 << RMENU_DEVICE_NAV_B); + uint64_t action = (1ULL << RMENU_DEVICE_NAV_B); filebrowser_fetch_directory_entries(&tmp_browser, action, &m_romlist, &m_rompathtitle); return 0; @@ -929,7 +929,7 @@ HRESULT CRetroArchCoreBrowser::OnNotifyPress( HXUIOBJ hObjPressed, BOOL& bHandle { snprintf(path, sizeof(path), "%s\\%s", filebrowser_get_current_dir(&tmp_browser), str_buffer); filebrowser_set_root_and_ext(&tmp_browser, "xex|XEX", path); - uint64_t action = (1 << RMENU_DEVICE_NAV_B); + uint64_t action = (1ULL << RMENU_DEVICE_NAV_B); filebrowser_fetch_directory_entries(&tmp_browser, action, &m_romlist, &m_rompathtitle); } } diff --git a/android/native/jni/input_android.c b/android/native/jni/input_android.c index 7c781d22a7..7848cc8ad3 100644 --- a/android/native/jni/input_android.c +++ b/android/native/jni/input_android.c @@ -87,18 +87,18 @@ static void setup_keycode_lut(void) * builtinKeyboard=false */ - keycode_lut[AKEYCODE_BUTTON_2] = (1 << RETRO_DEVICE_ID_JOYPAD_B); - keycode_lut[AKEYCODE_BUTTON_1] = (1 << RETRO_DEVICE_ID_JOYPAD_Y); - keycode_lut[AKEYCODE_BUTTON_9] = (1 << RETRO_DEVICE_ID_JOYPAD_SELECT); - keycode_lut[AKEYCODE_BUTTON_10] = (1 << RETRO_DEVICE_ID_JOYPAD_START); - keycode_lut[AKEYCODE_BUTTON_3] = (1 << RETRO_DEVICE_ID_JOYPAD_A); - keycode_lut[AKEYCODE_BUTTON_4] = (1 << RETRO_DEVICE_ID_JOYPAD_X); - keycode_lut[AKEYCODE_BUTTON_5] = (1 << RETRO_DEVICE_ID_JOYPAD_L); - keycode_lut[AKEYCODE_BUTTON_6] = (1 << RETRO_DEVICE_ID_JOYPAD_R); - keycode_lut[AKEYCODE_BUTTON_7] = (1 << RETRO_DEVICE_ID_JOYPAD_L2); - keycode_lut[AKEYCODE_BUTTON_8] = (1 << RETRO_DEVICE_ID_JOYPAD_R2); - keycode_lut[AKEYCODE_BUTTON_11] = (1 << RETRO_DEVICE_ID_JOYPAD_L3); - keycode_lut[AKEYCODE_BUTTON_12] = (1 << RETRO_DEVICE_ID_JOYPAD_R3); + keycode_lut[AKEYCODE_BUTTON_2] = (1ULL << RETRO_DEVICE_ID_JOYPAD_B); + keycode_lut[AKEYCODE_BUTTON_1] = (1ULL << RETRO_DEVICE_ID_JOYPAD_Y); + keycode_lut[AKEYCODE_BUTTON_9] = (1ULL << RETRO_DEVICE_ID_JOYPAD_SELECT); + keycode_lut[AKEYCODE_BUTTON_10] = (1ULL << RETRO_DEVICE_ID_JOYPAD_START); + keycode_lut[AKEYCODE_BUTTON_3] = (1ULL << RETRO_DEVICE_ID_JOYPAD_A); + keycode_lut[AKEYCODE_BUTTON_4] = (1ULL << RETRO_DEVICE_ID_JOYPAD_X); + keycode_lut[AKEYCODE_BUTTON_5] = (1ULL << RETRO_DEVICE_ID_JOYPAD_L); + keycode_lut[AKEYCODE_BUTTON_6] = (1ULL << RETRO_DEVICE_ID_JOYPAD_R); + keycode_lut[AKEYCODE_BUTTON_7] = (1ULL << RETRO_DEVICE_ID_JOYPAD_L2); + keycode_lut[AKEYCODE_BUTTON_8] = (1ULL << RETRO_DEVICE_ID_JOYPAD_R2); + keycode_lut[AKEYCODE_BUTTON_11] = (1ULL << RETRO_DEVICE_ID_JOYPAD_L3); + keycode_lut[AKEYCODE_BUTTON_12] = (1ULL << RETRO_DEVICE_ID_JOYPAD_R3); /* Control scheme 2 * Tested with: SNES Pad USB converter @@ -112,14 +112,14 @@ static void setup_keycode_lut(void) * builtinKeyboard=false */ - keycode_lut[AKEYCODE_BUTTON_C] = (1 << RETRO_DEVICE_ID_JOYPAD_B); - keycode_lut[AKEYCODE_BUTTON_X] = (1 << RETRO_DEVICE_ID_JOYPAD_Y); - keycode_lut[AKEYCODE_BUTTON_L2] = (1 << RETRO_DEVICE_ID_JOYPAD_SELECT); - keycode_lut[AKEYCODE_BUTTON_R2] = (1 << RETRO_DEVICE_ID_JOYPAD_START); - keycode_lut[AKEYCODE_BUTTON_B] = (1 << RETRO_DEVICE_ID_JOYPAD_A); - keycode_lut[AKEYCODE_BUTTON_A] = (1 << RETRO_DEVICE_ID_JOYPAD_X); - keycode_lut[AKEYCODE_BUTTON_L1] = (1 << RETRO_DEVICE_ID_JOYPAD_L); - keycode_lut[AKEYCODE_BUTTON_R1] = (1 << RETRO_DEVICE_ID_JOYPAD_R); + keycode_lut[AKEYCODE_BUTTON_C] = (1ULL << RETRO_DEVICE_ID_JOYPAD_B); + keycode_lut[AKEYCODE_BUTTON_X] = (1ULL << RETRO_DEVICE_ID_JOYPAD_Y); + keycode_lut[AKEYCODE_BUTTON_L2] = (1ULL << RETRO_DEVICE_ID_JOYPAD_SELECT); + keycode_lut[AKEYCODE_BUTTON_R2] = (1ULL << RETRO_DEVICE_ID_JOYPAD_START); + keycode_lut[AKEYCODE_BUTTON_B] = (1ULL << RETRO_DEVICE_ID_JOYPAD_A); + keycode_lut[AKEYCODE_BUTTON_A] = (1ULL << RETRO_DEVICE_ID_JOYPAD_X); + keycode_lut[AKEYCODE_BUTTON_L1] = (1ULL << RETRO_DEVICE_ID_JOYPAD_L); + keycode_lut[AKEYCODE_BUTTON_R1] = (1ULL << RETRO_DEVICE_ID_JOYPAD_R); /* Control scheme 3 * fd=196 @@ -202,18 +202,18 @@ static void setup_keycode_lut(void) * TODO: Map L2/R2/L3/R3 * */ - keycode_lut[AKEYCODE_Z] = (1 << RETRO_DEVICE_ID_JOYPAD_B); - keycode_lut[AKEYCODE_A] = (1 << RETRO_DEVICE_ID_JOYPAD_Y); - keycode_lut[AKEYCODE_SHIFT_RIGHT] = (1 << RETRO_DEVICE_ID_JOYPAD_SELECT); - keycode_lut[AKEYCODE_ENTER] = (1 << RETRO_DEVICE_ID_JOYPAD_START); - keycode_lut[AKEYCODE_DPAD_UP] = (1 << RETRO_DEVICE_ID_JOYPAD_UP); - keycode_lut[AKEYCODE_DPAD_DOWN] = (1 << RETRO_DEVICE_ID_JOYPAD_DOWN); - keycode_lut[AKEYCODE_DPAD_LEFT] = (1 << RETRO_DEVICE_ID_JOYPAD_LEFT); - keycode_lut[AKEYCODE_DPAD_RIGHT] = (1 << RETRO_DEVICE_ID_JOYPAD_RIGHT); - keycode_lut[AKEYCODE_X] = (1 << RETRO_DEVICE_ID_JOYPAD_A); - keycode_lut[AKEYCODE_S] = (1 << RETRO_DEVICE_ID_JOYPAD_X); - keycode_lut[AKEYCODE_Q] = (1 << RETRO_DEVICE_ID_JOYPAD_L); - keycode_lut[AKEYCODE_W] = (1 << RETRO_DEVICE_ID_JOYPAD_R); + keycode_lut[AKEYCODE_Z] = (1ULL << RETRO_DEVICE_ID_JOYPAD_B); + keycode_lut[AKEYCODE_A] = (1ULL << RETRO_DEVICE_ID_JOYPAD_Y); + keycode_lut[AKEYCODE_SHIFT_RIGHT] = (1ULL << RETRO_DEVICE_ID_JOYPAD_SELECT); + keycode_lut[AKEYCODE_ENTER] = (1ULL << RETRO_DEVICE_ID_JOYPAD_START); + keycode_lut[AKEYCODE_DPAD_UP] = (1ULL << RETRO_DEVICE_ID_JOYPAD_UP); + keycode_lut[AKEYCODE_DPAD_DOWN] = (1ULL << RETRO_DEVICE_ID_JOYPAD_DOWN); + keycode_lut[AKEYCODE_DPAD_LEFT] = (1ULL << RETRO_DEVICE_ID_JOYPAD_LEFT); + keycode_lut[AKEYCODE_DPAD_RIGHT] = (1ULL << RETRO_DEVICE_ID_JOYPAD_RIGHT); + keycode_lut[AKEYCODE_X] = (1ULL << RETRO_DEVICE_ID_JOYPAD_A); + keycode_lut[AKEYCODE_S] = (1ULL << RETRO_DEVICE_ID_JOYPAD_X); + keycode_lut[AKEYCODE_Q] = (1ULL << RETRO_DEVICE_ID_JOYPAD_L); + keycode_lut[AKEYCODE_W] = (1ULL << RETRO_DEVICE_ID_JOYPAD_R); /* Misc control scheme */ keycode_lut[AKEYCODE_BACK] = (1ULL << RARCH_QUIT_KEY); @@ -244,22 +244,22 @@ static void *android_input_init(void) for(int player = 0; player < 4; player++) { - g_settings.input.binds[player][RETRO_DEVICE_ID_JOYPAD_B].joykey = (1 << RETRO_DEVICE_ID_JOYPAD_B); - g_settings.input.binds[player][RETRO_DEVICE_ID_JOYPAD_Y].joykey = (1 << RETRO_DEVICE_ID_JOYPAD_Y); - g_settings.input.binds[player][RETRO_DEVICE_ID_JOYPAD_SELECT].joykey = (1 << RETRO_DEVICE_ID_JOYPAD_SELECT); - g_settings.input.binds[player][RETRO_DEVICE_ID_JOYPAD_START].joykey = (1 << RETRO_DEVICE_ID_JOYPAD_START); - g_settings.input.binds[player][RETRO_DEVICE_ID_JOYPAD_UP].joykey = (1 << RETRO_DEVICE_ID_JOYPAD_UP); - g_settings.input.binds[player][RETRO_DEVICE_ID_JOYPAD_DOWN].joykey = (1 << RETRO_DEVICE_ID_JOYPAD_DOWN); - g_settings.input.binds[player][RETRO_DEVICE_ID_JOYPAD_LEFT].joykey = (1 << RETRO_DEVICE_ID_JOYPAD_LEFT); - g_settings.input.binds[player][RETRO_DEVICE_ID_JOYPAD_RIGHT].joykey = (1 << RETRO_DEVICE_ID_JOYPAD_RIGHT); - g_settings.input.binds[player][RETRO_DEVICE_ID_JOYPAD_A].joykey = (1 << RETRO_DEVICE_ID_JOYPAD_A); - g_settings.input.binds[player][RETRO_DEVICE_ID_JOYPAD_X].joykey = (1 << RETRO_DEVICE_ID_JOYPAD_X); - g_settings.input.binds[player][RETRO_DEVICE_ID_JOYPAD_L].joykey = (1 << RETRO_DEVICE_ID_JOYPAD_L); - g_settings.input.binds[player][RETRO_DEVICE_ID_JOYPAD_R].joykey = (1 << RETRO_DEVICE_ID_JOYPAD_R); - g_settings.input.binds[player][RETRO_DEVICE_ID_JOYPAD_L2].joykey = (1 << RETRO_DEVICE_ID_JOYPAD_L2); - g_settings.input.binds[player][RETRO_DEVICE_ID_JOYPAD_R2].joykey = (1 << RETRO_DEVICE_ID_JOYPAD_R2); - g_settings.input.binds[player][RETRO_DEVICE_ID_JOYPAD_L3].joykey = (1 << RETRO_DEVICE_ID_JOYPAD_L3); - g_settings.input.binds[player][RETRO_DEVICE_ID_JOYPAD_R3].joykey = (1 << RETRO_DEVICE_ID_JOYPAD_R3); + g_settings.input.binds[player][RETRO_DEVICE_ID_JOYPAD_B].joykey = (1ULL << RETRO_DEVICE_ID_JOYPAD_B); + g_settings.input.binds[player][RETRO_DEVICE_ID_JOYPAD_Y].joykey = (1ULL << RETRO_DEVICE_ID_JOYPAD_Y); + g_settings.input.binds[player][RETRO_DEVICE_ID_JOYPAD_SELECT].joykey = (1ULL << RETRO_DEVICE_ID_JOYPAD_SELECT); + g_settings.input.binds[player][RETRO_DEVICE_ID_JOYPAD_START].joykey = (1ULL << RETRO_DEVICE_ID_JOYPAD_START); + g_settings.input.binds[player][RETRO_DEVICE_ID_JOYPAD_UP].joykey = (1ULL << RETRO_DEVICE_ID_JOYPAD_UP); + g_settings.input.binds[player][RETRO_DEVICE_ID_JOYPAD_DOWN].joykey = (1ULL << RETRO_DEVICE_ID_JOYPAD_DOWN); + g_settings.input.binds[player][RETRO_DEVICE_ID_JOYPAD_LEFT].joykey = (1ULL << RETRO_DEVICE_ID_JOYPAD_LEFT); + g_settings.input.binds[player][RETRO_DEVICE_ID_JOYPAD_RIGHT].joykey = (1ULL << RETRO_DEVICE_ID_JOYPAD_RIGHT); + g_settings.input.binds[player][RETRO_DEVICE_ID_JOYPAD_A].joykey = (1ULL << RETRO_DEVICE_ID_JOYPAD_A); + g_settings.input.binds[player][RETRO_DEVICE_ID_JOYPAD_X].joykey = (1ULL << RETRO_DEVICE_ID_JOYPAD_X); + g_settings.input.binds[player][RETRO_DEVICE_ID_JOYPAD_L].joykey = (1ULL << RETRO_DEVICE_ID_JOYPAD_L); + g_settings.input.binds[player][RETRO_DEVICE_ID_JOYPAD_R].joykey = (1ULL << RETRO_DEVICE_ID_JOYPAD_R); + g_settings.input.binds[player][RETRO_DEVICE_ID_JOYPAD_L2].joykey = (1ULL << RETRO_DEVICE_ID_JOYPAD_L2); + g_settings.input.binds[player][RETRO_DEVICE_ID_JOYPAD_R2].joykey = (1ULL << RETRO_DEVICE_ID_JOYPAD_R2); + g_settings.input.binds[player][RETRO_DEVICE_ID_JOYPAD_L3].joykey = (1ULL << RETRO_DEVICE_ID_JOYPAD_L3); + g_settings.input.binds[player][RETRO_DEVICE_ID_JOYPAD_R3].joykey = (1ULL << RETRO_DEVICE_ID_JOYPAD_R3); } for(int i = 0; i < MAX_DEVICE_IDS; i++) @@ -303,12 +303,12 @@ static void android_input_poll(void *data) #ifdef RARCH_INPUT_DEBUG RARCH_LOG("AINPUT_EVENT_TYPE_MOTION, pad: %d, x: %f, y: %f.\n", i, x, y); #endif - state[i] &= ~((1 << RETRO_DEVICE_ID_JOYPAD_LEFT) | (1 << RETRO_DEVICE_ID_JOYPAD_RIGHT) | - (1 << RETRO_DEVICE_ID_JOYPAD_UP) | (1 << RETRO_DEVICE_ID_JOYPAD_DOWN)); - state[i] |= PRESSED_LEFT(x, y) ? (1 << RETRO_DEVICE_ID_JOYPAD_LEFT) : 0; - state[i] |= PRESSED_RIGHT(x, y) ? (1 << RETRO_DEVICE_ID_JOYPAD_RIGHT) : 0; - state[i] |= PRESSED_UP(x, y) ? (1 << RETRO_DEVICE_ID_JOYPAD_UP) : 0; - state[i] |= PRESSED_DOWN(x, y) ? (1 << RETRO_DEVICE_ID_JOYPAD_DOWN) : 0; + state[i] &= ~((1ULL << RETRO_DEVICE_ID_JOYPAD_LEFT) | (1ULL << RETRO_DEVICE_ID_JOYPAD_RIGHT) | + (1ULL << RETRO_DEVICE_ID_JOYPAD_UP) | (1ULL << RETRO_DEVICE_ID_JOYPAD_DOWN)); + state[i] |= PRESSED_LEFT(x, y) ? (1ULL << RETRO_DEVICE_ID_JOYPAD_LEFT) : 0; + state[i] |= PRESSED_RIGHT(x, y) ? (1ULL << RETRO_DEVICE_ID_JOYPAD_RIGHT) : 0; + state[i] |= PRESSED_UP(x, y) ? (1ULL << RETRO_DEVICE_ID_JOYPAD_UP) : 0; + state[i] |= PRESSED_DOWN(x, y) ? (1ULL << RETRO_DEVICE_ID_JOYPAD_DOWN) : 0; } else { @@ -317,7 +317,7 @@ static void android_input_poll(void *data) #ifdef RARCH_INPUT_DEBUG RARCH_LOG("Keycode RetroPad %d : %d.\n", i, keycode); #endif - if(input_state < (1 << RARCH_FIRST_META_KEY)) + if(input_state < (1ULL << RARCH_FIRST_META_KEY)) { int action = AKeyEvent_getAction(event); diff --git a/gx/frontend/main.c b/gx/frontend/main.c index fe9cec471d..f49571a2d6 100644 --- a/gx/frontend/main.c +++ b/gx/frontend/main.c @@ -295,11 +295,11 @@ static bool rmenu_iterate(void) for (unsigned i = 0; i < GX_DEVICE_NAV_LAST; i++) { input_state |= input_gx.input_state(NULL, gx_nav_binds, 0, - RETRO_DEVICE_JOYPAD, 0, i) ? (1 << i) : 0; + RETRO_DEVICE_JOYPAD, 0, i) ? (1ULL << i) : 0; } uint16_t trigger_state = input_state & ~old_input_state; - bool do_held = (input_state & ((1 << GX_DEVICE_NAV_UP) | (1 << GX_DEVICE_NAV_DOWN) | (1 << GX_DEVICE_NAV_LEFT) | (1 << GX_DEVICE_NAV_RIGHT))) && !(input_state & ((1 << GX_DEVICE_NAV_MENU) | (1 << GX_DEVICE_NAV_QUIT))); + bool do_held = (input_state & ((1ULL << GX_DEVICE_NAV_UP) | (1ULL << GX_DEVICE_NAV_DOWN) | (1ULL << GX_DEVICE_NAV_LEFT) | (1ULL << GX_DEVICE_NAV_RIGHT))) && !(input_state & ((1ULL << GX_DEVICE_NAV_MENU) | (1ULL << GX_DEVICE_NAV_QUIT))); if(do_held) { @@ -328,21 +328,21 @@ static bool rmenu_iterate(void) // don't run anything first frame, only capture held inputs for old_input_state if (!first) { - if (trigger_state & (1 << GX_DEVICE_NAV_UP)) + if (trigger_state & (1ULL << GX_DEVICE_NAV_UP)) action = RGUI_ACTION_UP; - else if (trigger_state & (1 << GX_DEVICE_NAV_DOWN)) + else if (trigger_state & (1ULL << GX_DEVICE_NAV_DOWN)) action = RGUI_ACTION_DOWN; - else if (trigger_state & (1 << GX_DEVICE_NAV_LEFT)) + else if (trigger_state & (1ULL << GX_DEVICE_NAV_LEFT)) action = RGUI_ACTION_LEFT; - else if (trigger_state & (1 << GX_DEVICE_NAV_RIGHT)) + else if (trigger_state & (1ULL << GX_DEVICE_NAV_RIGHT)) action = RGUI_ACTION_RIGHT; - else if (trigger_state & (1 << GX_DEVICE_NAV_B)) + else if (trigger_state & (1ULL << GX_DEVICE_NAV_B)) action = RGUI_ACTION_CANCEL; - else if (trigger_state & (1 << GX_DEVICE_NAV_A)) + else if (trigger_state & (1ULL << GX_DEVICE_NAV_A)) action = RGUI_ACTION_OK; - else if (trigger_state & (1 << GX_DEVICE_NAV_START)) + else if (trigger_state & (1ULL << GX_DEVICE_NAV_START)) action = RGUI_ACTION_START; - else if (trigger_state & (1 << GX_DEVICE_NAV_SELECT)) + else if (trigger_state & (1ULL << GX_DEVICE_NAV_SELECT)) action = RGUI_ACTION_SETTINGS; } else @@ -356,8 +356,8 @@ static bool rmenu_iterate(void) old_input_state = input_state; - bool goto_menu_key_pressed = (trigger_state & (1 << GX_DEVICE_NAV_MENU)); - bool quit_key_pressed = (trigger_state & (1 << GX_DEVICE_NAV_QUIT)); + bool goto_menu_key_pressed = (trigger_state & (1ULL << GX_DEVICE_NAV_MENU)); + bool quit_key_pressed = (trigger_state & (1ULL << GX_DEVICE_NAV_QUIT)); if(IS_TIMER_EXPIRED(0)) { diff --git a/ps3/sdk_defines.h b/ps3/sdk_defines.h index e02e70fa14..4c5580cd5b 100644 --- a/ps3/sdk_defines.h +++ b/ps3/sdk_defines.h @@ -124,14 +124,14 @@ extern int audioAddData(uint32_t portNum, float *data, uint32_t frames, float vo #define cellMouseGetInfo ioMouseGetInfo /* PSL1GHT does not define these in its header */ -#define CELL_MOUSE_BUTTON_1 (1 << 0) /* Button 1 */ -#define CELL_MOUSE_BUTTON_2 (1 << 1) /* Button 2 */ -#define CELL_MOUSE_BUTTON_3 (1 << 2) /* Button 3 */ -#define CELL_MOUSE_BUTTON_4 (1 << 3) /* Button 4 */ -#define CELL_MOUSE_BUTTON_5 (1 << 4) /* Button 5 */ -#define CELL_MOUSE_BUTTON_6 (1 << 5) /* Button 6 */ -#define CELL_MOUSE_BUTTON_7 (1 << 6) /* Button 7 */ -#define CELL_MOUSE_BUTTON_8 (1 << 7) /* Button 8 */ +#define CELL_MOUSE_BUTTON_1 (1ULL << 0) /* Button 1 */ +#define CELL_MOUSE_BUTTON_2 (1ULL << 1) /* Button 2 */ +#define CELL_MOUSE_BUTTON_3 (1ULL << 2) /* Button 3 */ +#define CELL_MOUSE_BUTTON_4 (1ULL << 3) /* Button 4 */ +#define CELL_MOUSE_BUTTON_5 (1ULL << 4) /* Button 5 */ +#define CELL_MOUSE_BUTTON_6 (1ULL << 5) /* Button 6 */ +#define CELL_MOUSE_BUTTON_7 (1ULL << 6) /* Button 7 */ +#define CELL_MOUSE_BUTTON_8 (1ULL << 7) /* Button 8 */ #else #include @@ -611,7 +611,7 @@ extern int audioAddData(uint32_t portNum, float *data, uint32_t frames, float vo #define cellGameContentPermit sysGameContentPermit #define cellGameBootCheck sysGameBootCheck -#define CELL_GAME_ATTRIBUTE_APP_HOME (1 <<1) /* boot from / app_home/PS3_GAME */ +#define CELL_GAME_ATTRIBUTE_APP_HOME (1ULL <<1) /* boot from / app_home/PS3_GAME */ #define CELL_GAME_DIRNAME_SIZE 32 #define CELL_GAME_GAMETYPE_SYS 0 diff --git a/psp/psp_input.h b/psp/psp_input.h index 8dec51d2e9..8c8254744d 100644 --- a/psp/psp_input.h +++ b/psp/psp_input.h @@ -18,27 +18,27 @@ #define _PSP_INPUT_H_ enum { - PSP_GAMEPAD_CROSS = 1 << 0, - PSP_GAMEPAD_SQUARE = 1 << 1, - PSP_GAMEPAD_SELECT = 1 << 2, - PSP_GAMEPAD_START = 1 << 3, - PSP_GAMEPAD_DPAD_UP = 1 << 4, - PSP_GAMEPAD_DPAD_DOWN = 1 << 5, - PSP_GAMEPAD_DPAD_LEFT = 1 << 6, - PSP_GAMEPAD_DPAD_RIGHT = 1 << 7, - PSP_GAMEPAD_CIRCLE = 1 << 8, - PSP_GAMEPAD_TRIANGLE = 1 << 9, - PSP_GAMEPAD_L = 1 << 10, - PSP_GAMEPAD_R = 1 << 11, - PSP_GAMEPAD_LSTICK_LEFT_MASK = 1 << 16, - PSP_GAMEPAD_LSTICK_RIGHT_MASK = 1 << 17, - PSP_GAMEPAD_LSTICK_UP_MASK = 1 << 18, - PSP_GAMEPAD_LSTICK_DOWN_MASK = 1 << 19, + PSP_GAMEPAD_CROSS = 1ULL << 0, + PSP_GAMEPAD_SQUARE = 1ULL << 1, + PSP_GAMEPAD_SELECT = 1ULL << 2, + PSP_GAMEPAD_START = 1ULL << 3, + PSP_GAMEPAD_DPAD_UP = 1ULL << 4, + PSP_GAMEPAD_DPAD_DOWN = 1ULL << 5, + PSP_GAMEPAD_DPAD_LEFT = 1ULL << 6, + PSP_GAMEPAD_DPAD_RIGHT = 1ULL << 7, + PSP_GAMEPAD_CIRCLE = 1ULL << 8, + PSP_GAMEPAD_TRIANGLE = 1ULL << 9, + PSP_GAMEPAD_L = 1ULL << 10, + PSP_GAMEPAD_R = 1ULL << 11, + PSP_GAMEPAD_LSTICK_LEFT_MASK = 1ULL << 16, + PSP_GAMEPAD_LSTICK_RIGHT_MASK = 1ULL << 17, + PSP_GAMEPAD_LSTICK_UP_MASK = 1ULL << 18, + PSP_GAMEPAD_LSTICK_DOWN_MASK = 1ULL << 19, #ifdef SN_TARGET_PSP2 - PSP_GAMEPAD_RSTICK_LEFT_MASK = 1 << 20, - PSP_GAMEPAD_RSTICK_RIGHT_MASK = 1 << 21, - PSP_GAMEPAD_RSTICK_UP_MASK = 1 << 22, - PSP_GAMEPAD_RSTICK_DOWN_MASK = 1 << 23, + PSP_GAMEPAD_RSTICK_LEFT_MASK = 1ULL << 20, + PSP_GAMEPAD_RSTICK_RIGHT_MASK = 1ULL << 21, + PSP_GAMEPAD_RSTICK_UP_MASK = 1ULL << 22, + PSP_GAMEPAD_RSTICK_DOWN_MASK = 1ULL << 23, #endif };