From 47f95020f0e9e2ff2ce24d7c3d6beecdb091822a Mon Sep 17 00:00:00 2001 From: Themaister Date: Mon, 5 Mar 2012 17:55:16 +0100 Subject: [PATCH] Style nits. --- input/input_luts.c | 183 ++++++++++++++++++++------------------------- input/input_luts.h | 85 +++++++++++---------- 2 files changed, 124 insertions(+), 144 deletions(-) diff --git a/input/input_luts.c b/input/input_luts.c index ed1821f824..41b5c1c8e3 100644 --- a/input/input_luts.c +++ b/input/input_luts.c @@ -18,112 +18,93 @@ #include "input_luts.h" -uint64_t default_keybind_lut[SSNES_FIRST_META_KEY] = -{ - SNES_DEVICE_ID_JOYPAD_B, - SNES_DEVICE_ID_JOYPAD_Y, - SNES_DEVICE_ID_JOYPAD_SELECT, - SNES_DEVICE_ID_JOYPAD_START, - SNES_DEVICE_ID_JOYPAD_UP, - SNES_DEVICE_ID_JOYPAD_DOWN, - SNES_DEVICE_ID_JOYPAD_LEFT, - SNES_DEVICE_ID_JOYPAD_RIGHT, - SNES_DEVICE_ID_JOYPAD_A, - SNES_DEVICE_ID_JOYPAD_X, - SNES_DEVICE_ID_JOYPAD_L, - SNES_DEVICE_ID_JOYPAD_R +uint64_t default_keybind_lut[SSNES_FIRST_META_KEY]; + +const char *default_libsnes_keybind_name_lut[SSNES_FIRST_META_KEY] = { + "Button B", // SNES_DEVICE_ID_JOYPAD_B + "Button Y", // SNES_DEVICE_ID_JOYPAD_Y + "Select button", // SNES_DEVICE_ID_JOYPAD_SELECT + "Start button", // SNES_DEVICE_ID_JOYPAD_START + "D-Pad Up", // SNES_DEVICE_ID_JOYPAD_UP + "D-Pad Down", // SNES_DEVICE_ID_JOYPAD_DOWN + "D-Pad Left", // SNES_DEVICE_ID_JOYPAD_LEFT + "D-Pad Right", // SNES_DEVICE_ID_JOYPAD_RIGHT + "Button A", // SNES_DEVICE_ID_JOYPAD_A + "Button X", // SNES_DEVICE_ID_JOYPAD_X + "L Button", // SNES_DEVICE_ID_JOYPAD_L + "R Button", // SNES_DEVICE_ID_JOYPAD_R }; -const char * default_libsnes_keybind_name_lut[SSNES_FIRST_META_KEY] = -{ - "Button B", //SNES_DEVICE_ID_JOYPAD_B - "Button Y", //SNES_DEVICE_ID_JOYPAD_Y - "Select button", //SNES_DEVICE_ID_JOYPAD_SELECT - "Start button", //SNES_DEVICE_ID_JOYPAD_START - "D-Pad Up", //SNES_DEVICE_ID_JOYPAD_UP - "D-Pad Down", //SNES_DEVICE_ID_JOYPAD_DOWN - "D-Pad Left", //SNES_DEVICE_ID_JOYPAD_LEFT - "D-Pad Right", //SNES_DEVICE_ID_JOYPAD_RIGHT - "Button A", //SNES_DEVICE_ID_JOYPAD_A - "Button X", //SNES_DEVICE_ID_JOYPAD_X - "L Button", //SNES_DEVICE_ID_JOYPAD_L - "R Button" //SNES_DEVICE_ID_JOYPAD_R -}; - -#ifdef SSNES_CONSOLE #if defined(__CELLOS_LV2__) -uint64_t platform_keybind_lut[SSNES_LAST_PLATFORM_KEY+1] = -{ - CTRL_CIRCLE_MASK, - CTRL_CROSS_MASK, - CTRL_TRIANGLE_MASK, - CTRL_SQUARE_MASK, - CTRL_UP_MASK, - CTRL_DOWN_MASK, - CTRL_LEFT_MASK, - CTRL_RIGHT_MASK, - CTRL_SELECT_MASK, - CTRL_START_MASK, - CTRL_L1_MASK, - CTRL_L2_MASK, - CTRL_L3_MASK, - CTRL_R1_MASK, - CTRL_R2_MASK, - CTRL_R3_MASK, - CTRL_LSTICK_LEFT_MASK, - CTRL_LSTICK_RIGHT_MASK, - CTRL_LSTICK_UP_MASK, - CTRL_LSTICK_DOWN_MASK, - CTRL_LEFT_MASK | CTRL_LSTICK_LEFT_MASK, - CTRL_RIGHT_MASK | CTRL_LSTICK_RIGHT_MASK, - CTRL_UP_MASK | CTRL_LSTICK_UP_MASK, - CTRL_DOWN_MASK | CTRL_LSTICK_DOWN_MASK, - CTRL_RSTICK_LEFT_MASK, - CTRL_RSTICK_RIGHT_MASK, - CTRL_RSTICK_UP_MASK, - CTRL_RSTICK_DOWN_MASK, - CTRL_LEFT_MASK | CTRL_RSTICK_LEFT_MASK, - CTRL_RIGHT_MASK | CTRL_RSTICK_RIGHT_MASK, - CTRL_UP_MASK | CTRL_RSTICK_UP_MASK, - CTRL_DOWN_MASK | CTRL_RSTICK_DOWN_MASK, +uint64_t platform_keybind_lut[SSNES_LAST_PLATFORM_KEY] = { + CTRL_CIRCLE_MASK, + CTRL_CROSS_MASK, + CTRL_TRIANGLE_MASK, + CTRL_SQUARE_MASK, + CTRL_UP_MASK, + CTRL_DOWN_MASK, + CTRL_LEFT_MASK, + CTRL_RIGHT_MASK, + CTRL_SELECT_MASK, + CTRL_START_MASK, + CTRL_L1_MASK, + CTRL_L2_MASK, + CTRL_L3_MASK, + CTRL_R1_MASK, + CTRL_R2_MASK, + CTRL_R3_MASK, + CTRL_LSTICK_LEFT_MASK, + CTRL_LSTICK_RIGHT_MASK, + CTRL_LSTICK_UP_MASK, + CTRL_LSTICK_DOWN_MASK, + CTRL_LEFT_MASK | CTRL_LSTICK_LEFT_MASK, + CTRL_RIGHT_MASK | CTRL_LSTICK_RIGHT_MASK, + CTRL_UP_MASK | CTRL_LSTICK_UP_MASK, + CTRL_DOWN_MASK | CTRL_LSTICK_DOWN_MASK, + CTRL_RSTICK_LEFT_MASK, + CTRL_RSTICK_RIGHT_MASK, + CTRL_RSTICK_UP_MASK, + CTRL_RSTICK_DOWN_MASK, + CTRL_LEFT_MASK | CTRL_RSTICK_LEFT_MASK, + CTRL_RIGHT_MASK | CTRL_RSTICK_RIGHT_MASK, + CTRL_UP_MASK | CTRL_RSTICK_UP_MASK, + CTRL_DOWN_MASK | CTRL_RSTICK_DOWN_MASK, }; -char platform_keybind_name_lut[SSNES_LAST_PLATFORM_KEY+1][256] = -{ - "Circle button", - "Cross button", - "Triangle button", - "Square button", - "D-Pad Up", - "D-Pad Down", - "D-Pad Left", - "D-Pad Right", - "Select button", - "Start button", - "L1 button", - "L2 button", - "L3 button", - "R1 button", - "R2 button", - "R3 button", - "LStick Left", - "LStick Right", - "LStick Up", - "LStick Down", - "LStick D-Pad Left", - "LStick D-Pad Right", - "LStick D-Pad Up", - "LStick D-Pad Down", - "RStick Left", - "RStick Right", - "RStick Up", - "RStick Down", - "RStick D-Pad Left", - "RStick D-Pad Right", - "RStick D-Pad Up", - "RStick D-Pad Down" +char platform_keybind_name_lut[SSNES_LAST_PLATFORM_KEY][256] = { + "Circle button", + "Cross button", + "Triangle button", + "Square button", + "D-Pad Up", + "D-Pad Down", + "D-Pad Left", + "D-Pad Right", + "Select button", + "Start button", + "L1 button", + "L2 button", + "L3 button", + "R1 button", + "R2 button", + "R3 button", + "LStick Left", + "LStick Right", + "LStick Up", + "LStick Down", + "LStick D-Pad Left", + "LStick D-Pad Right", + "LStick D-Pad Up", + "LStick D-Pad Down", + "RStick Left", + "RStick Right", + "RStick Up", + "RStick Down", + "RStick D-Pad Left", + "RStick D-Pad Right", + "RStick D-Pad Up", + "RStick D-Pad Down", }; #elif defined(_XBOX) +#endif -#endif -#endif diff --git a/input/input_luts.h b/input/input_luts.h index 3455333aab..39df9ab83c 100644 --- a/input/input_luts.h +++ b/input/input_luts.h @@ -16,62 +16,61 @@ * If not, see . */ -#ifndef _SSNES_INPUT_LUTS_H -#define _SSNES_INPUT_LUTS_H +#ifndef __SSNES_INPUT_LUTS_H +#define __SSNES_INPUT_LUTS_H #include "../driver.h" #include "../libsnes.hpp" +#include -#ifdef SSNES_CONSOLE #if defined(__CELLOS_LV2__) #include "../ps3/cellframework2/input/pad_input.h" -enum +enum ps3_device_id { - PS3_DEVICE_ID_JOYPAD_CIRCLE, - PS3_DEVICE_ID_JOYPAD_CROSS, - PS3_DEVICE_ID_JOYPAD_TRIANGLE, - PS3_DEVICE_ID_JOYPAD_SQUARE, - PS3_DEVICE_ID_JOYPAD_UP, - PS3_DEVICE_ID_JOYPAD_DOWN, - PS3_DEVICE_ID_JOYPAD_LEFT, - PS3_DEVICE_ID_JOYPAD_RIGHT, - PS3_DEVICE_ID_JOYPAD_SELECT, - PS3_DEVICE_ID_JOYPAD_START, - PS3_DEVICE_ID_JOYPAD_L1, - PS3_DEVICE_ID_JOYPAD_L2, - PS3_DEVICE_ID_JOYPAD_L3, - PS3_DEVICE_ID_JOYPAD_R1, - PS3_DEVICE_ID_JOYPAD_R2, - PS3_DEVICE_ID_JOYPAD_R3, - PS3_DEVICE_ID_LSTICK_LEFT, - PS3_DEVICE_ID_LSTICK_RIGHT, - PS3_DEVICE_ID_LSTICK_UP, - PS3_DEVICE_ID_LSTICK_DOWN, - PS3_DEVICE_ID_LSTICK_LEFT_DPAD, - PS3_DEVICE_ID_LSTICK_RIGHT_DPAD, - PS3_DEVICE_ID_LSTICK_UP_DPAD, - PS3_DEVICE_ID_LSTICK_DOWN_DPAD, - PS3_DEVICE_ID_RSTICK_LEFT, - PS3_DEVICE_ID_RSTICK_RIGHT, - PS3_DEVICE_ID_RSTICK_UP, - PS3_DEVICE_ID_RSTICK_DOWN, - PS3_DEVICE_ID_RSTICK_LEFT_DPAD, - PS3_DEVICE_ID_RSTICK_RIGHT_DPAD, - PS3_DEVICE_ID_RSTICK_UP_DPAD, - PS3_DEVICE_ID_RSTICK_DOWN_DPAD -}; + PS3_DEVICE_ID_JOYPAD_CIRCLE = 0, + PS3_DEVICE_ID_JOYPAD_CROSS, + PS3_DEVICE_ID_JOYPAD_TRIANGLE, + PS3_DEVICE_ID_JOYPAD_SQUARE, + PS3_DEVICE_ID_JOYPAD_UP, + PS3_DEVICE_ID_JOYPAD_DOWN, + PS3_DEVICE_ID_JOYPAD_LEFT, + PS3_DEVICE_ID_JOYPAD_RIGHT, + PS3_DEVICE_ID_JOYPAD_SELECT, + PS3_DEVICE_ID_JOYPAD_START, + PS3_DEVICE_ID_JOYPAD_L1, + PS3_DEVICE_ID_JOYPAD_L2, + PS3_DEVICE_ID_JOYPAD_L3, + PS3_DEVICE_ID_JOYPAD_R1, + PS3_DEVICE_ID_JOYPAD_R2, + PS3_DEVICE_ID_JOYPAD_R3, + PS3_DEVICE_ID_LSTICK_LEFT, + PS3_DEVICE_ID_LSTICK_RIGHT, + PS3_DEVICE_ID_LSTICK_UP, + PS3_DEVICE_ID_LSTICK_DOWN, + PS3_DEVICE_ID_LSTICK_LEFT_DPAD, + PS3_DEVICE_ID_LSTICK_RIGHT_DPAD, + PS3_DEVICE_ID_LSTICK_UP_DPAD, + PS3_DEVICE_ID_LSTICK_DOWN_DPAD, + PS3_DEVICE_ID_RSTICK_LEFT, + PS3_DEVICE_ID_RSTICK_RIGHT, + PS3_DEVICE_ID_RSTICK_UP, + PS3_DEVICE_ID_RSTICK_DOWN, + PS3_DEVICE_ID_RSTICK_LEFT_DPAD, + PS3_DEVICE_ID_RSTICK_RIGHT_DPAD, + PS3_DEVICE_ID_RSTICK_UP_DPAD, + PS3_DEVICE_ID_RSTICK_DOWN_DPAD, -#define SSNES_LAST_PLATFORM_KEY (PS3_DEVICE_ID_RSTICK_DOWN_DPAD+1) + SSNES_LAST_PLATFORM_KEY +}; #elif defined(_XBOX) #endif -uint64_t platform_keybind_lut[SSNES_LAST_PLATFORM_KEY+1]; -char platform_keybind_name_lut[SSNES_LAST_PLATFORM_KEY+1][256]; -#endif - +extern uint64_t platform_keybind_lut[SSNES_LAST_PLATFORM_KEY]; +char platform_keybind_name_lut[SSNES_LAST_PLATFORM_KEY][256]; extern uint64_t default_keybind_lut[SSNES_FIRST_META_KEY]; -extern const char * default_libsnes_keybind_name_lut[SSNES_FIRST_META_KEY]; +extern const char *default_libsnes_keybind_name_lut[SSNES_FIRST_META_KEY]; #endif +