From 1c2ac16456b632ea1bc5169abbb9f4259e63fe1d Mon Sep 17 00:00:00 2001 From: zeromus Date: Tue, 6 Jan 2015 01:57:24 +0000 Subject: [PATCH] psx - remove unneeded input axis/button metadata --- psx/octoshock/psx/input/dualanalog.cpp | 67 -------------------------- psx/octoshock/psx/input/dualanalog.h | 2 - psx/octoshock/psx/input/dualshock.cpp | 37 -------------- psx/octoshock/psx/input/dualshock.h | 1 - psx/octoshock/psx/input/gamepad.cpp | 45 ----------------- psx/octoshock/psx/input/gamepad.h | 2 - 6 files changed, 154 deletions(-) diff --git a/psx/octoshock/psx/input/dualanalog.cpp b/psx/octoshock/psx/input/dualanalog.cpp index 1c127e9a48..ed04f1c91a 100644 --- a/psx/octoshock/psx/input/dualanalog.cpp +++ b/psx/octoshock/psx/input/dualanalog.cpp @@ -221,72 +221,5 @@ InputDevice *Device_DualAnalog_Create(bool joystick_mode) } -InputDeviceInputInfoStruct Device_DualAnalog_IDII[24] = -{ - { "select", "SELECT", 4, IDIT_BUTTON, NULL }, - { "l3", "Left Stick, Button(L3)", 18, IDIT_BUTTON, NULL }, - { "r3", "Right stick, Button(R3)", 23, IDIT_BUTTON, NULL }, - { "start", "START", 5, IDIT_BUTTON, NULL }, - { "up", "D-Pad UP ↑", 0, IDIT_BUTTON, "down" }, - { "right", "D-Pad RIGHT →", 3, IDIT_BUTTON, "left" }, - { "down", "D-Pad DOWN ↓", 1, IDIT_BUTTON, "up" }, - { "left", "D-Pad LEFT ←", 2, IDIT_BUTTON, "right" }, - - { "l2", "L2 (rear left shoulder)", 11, IDIT_BUTTON, NULL }, - { "r2", "R2 (rear right shoulder)", 13, IDIT_BUTTON, NULL }, - { "l1", "L1 (front left shoulder)", 10, IDIT_BUTTON, NULL }, - { "r1", "R1 (front right shoulder)", 12, IDIT_BUTTON, NULL }, - - { "triangle", "△ (upper)", 6, IDIT_BUTTON_CAN_RAPID, NULL }, - { "circle", "○ (right)", 9, IDIT_BUTTON_CAN_RAPID, NULL }, - { "cross", "x (lower)", 7, IDIT_BUTTON_CAN_RAPID, NULL }, - { "square", "□ (left)", 8, IDIT_BUTTON_CAN_RAPID, NULL }, - - { "rstick_right", "Right Stick RIGHT →", 22, IDIT_BUTTON_ANALOG, NULL, { NULL, NULL, NULL }, IDIT_BUTTON_ANALOG_FLAG_SQLR }, - { "rstick_left", "Right Stick LEFT ←", 21, IDIT_BUTTON_ANALOG, NULL, { NULL, NULL, NULL }, IDIT_BUTTON_ANALOG_FLAG_SQLR }, - { "rstick_down", "Right Stick DOWN ↓", 20, IDIT_BUTTON_ANALOG, NULL, { NULL, NULL, NULL }, IDIT_BUTTON_ANALOG_FLAG_SQLR }, - { "rstick_up", "Right Stick UP ↑", 19, IDIT_BUTTON_ANALOG, NULL, { NULL, NULL, NULL }, IDIT_BUTTON_ANALOG_FLAG_SQLR }, - - { "lstick_right", "Left Stick RIGHT →", 17, IDIT_BUTTON_ANALOG, NULL, { NULL, NULL, NULL }, IDIT_BUTTON_ANALOG_FLAG_SQLR }, - { "lstick_left", "Left Stick LEFT ←", 16, IDIT_BUTTON_ANALOG, NULL, { NULL, NULL, NULL }, IDIT_BUTTON_ANALOG_FLAG_SQLR }, - { "lstick_down", "Left Stick DOWN ↓", 15, IDIT_BUTTON_ANALOG, NULL, { NULL, NULL, NULL }, IDIT_BUTTON_ANALOG_FLAG_SQLR }, - { "lstick_up", "Left Stick UP ↑", 14, IDIT_BUTTON_ANALOG, NULL, { NULL, NULL, NULL }, IDIT_BUTTON_ANALOG_FLAG_SQLR }, - -}; - -// Not sure if all these buttons are named correctly! -InputDeviceInputInfoStruct Device_AnalogJoy_IDII[24] = -{ - { "select", "SELECT", 8, IDIT_BUTTON, NULL }, - { NULL, "empty", 0, IDIT_BUTTON }, - { NULL, "empty", 0, IDIT_BUTTON }, - { "start", "START", 9, IDIT_BUTTON, NULL }, - { "up", "Thumbstick UP ↑", 14, IDIT_BUTTON, "down" }, - { "right", "Thumbstick RIGHT →", 17, IDIT_BUTTON, "left" }, - { "down", "Thumbstick DOWN ↓", 15, IDIT_BUTTON, "up" }, - { "left", "Thumbstick LEFT ←", 16, IDIT_BUTTON, "right" }, - - { "l2", "Left stick, Trigger", 2, IDIT_BUTTON, NULL }, - { "r2", "Left stick, Pinky", 3, IDIT_BUTTON, NULL }, - { "l1", "Left stick, L-thumb", 0, IDIT_BUTTON, NULL }, - { "r1", "Left stick, R-thumb", 1, IDIT_BUTTON, NULL }, - - { "triangle", "Right stick, Pinky", 13, IDIT_BUTTON, NULL }, - { "circle", "Right stick, R-thumb", 11, IDIT_BUTTON, NULL }, - { "cross", "Right stick, L-thumb", 10, IDIT_BUTTON, NULL }, - { "square", "Right stick, Trigger", 12, IDIT_BUTTON, NULL }, - - { "rstick_right", "Right Stick, RIGHT →", 21, IDIT_BUTTON_ANALOG, NULL, { NULL, NULL, NULL }, IDIT_BUTTON_ANALOG_FLAG_SQLR }, - { "rstick_left", "Right Stick, LEFT ←", 20, IDIT_BUTTON_ANALOG, NULL, { NULL, NULL, NULL }, IDIT_BUTTON_ANALOG_FLAG_SQLR }, - { "rstick_down", "Right Stick, BACK ↓", 19, IDIT_BUTTON_ANALOG, NULL, { NULL, NULL, NULL }, IDIT_BUTTON_ANALOG_FLAG_SQLR }, - { "rstick_up", "Right Stick, FORE ↑", 18, IDIT_BUTTON_ANALOG, NULL, { NULL, NULL, NULL }, IDIT_BUTTON_ANALOG_FLAG_SQLR }, - - { "lstick_right", "Left Stick, RIGHT →", 7, IDIT_BUTTON_ANALOG, NULL, { NULL, NULL, NULL }, IDIT_BUTTON_ANALOG_FLAG_SQLR }, - { "lstick_left", "Left Stick, LEFT ←", 6, IDIT_BUTTON_ANALOG, NULL, { NULL, NULL, NULL }, IDIT_BUTTON_ANALOG_FLAG_SQLR }, - { "lstick_down", "Left Stick, BACK ↓", 5, IDIT_BUTTON_ANALOG, NULL, { NULL, NULL, NULL }, IDIT_BUTTON_ANALOG_FLAG_SQLR }, - { "lstick_up", "Left Stick, FORE ↑", 4, IDIT_BUTTON_ANALOG, NULL, { NULL, NULL, NULL }, IDIT_BUTTON_ANALOG_FLAG_SQLR }, - -}; - } diff --git a/psx/octoshock/psx/input/dualanalog.h b/psx/octoshock/psx/input/dualanalog.h index 71bd6e7d62..e4e2ef6862 100644 --- a/psx/octoshock/psx/input/dualanalog.h +++ b/psx/octoshock/psx/input/dualanalog.h @@ -5,7 +5,5 @@ namespace MDFN_IEN_PSX { InputDevice *Device_DualAnalog_Create(bool joystick_mode); -extern InputDeviceInputInfoStruct Device_DualAnalog_IDII[24]; -extern InputDeviceInputInfoStruct Device_AnalogJoy_IDII[24]; } #endif diff --git a/psx/octoshock/psx/input/dualshock.cpp b/psx/octoshock/psx/input/dualshock.cpp index 5156482a2d..5d28867896 100644 --- a/psx/octoshock/psx/input/dualshock.cpp +++ b/psx/octoshock/psx/input/dualshock.cpp @@ -1044,41 +1044,4 @@ InputDevice *Device_DualShock_Create() return new InputDevice_DualShock(); } - -InputDeviceInputInfoStruct Device_DualShock_IDII[26] = -{ - { "select", "SELECT", 4, IDIT_BUTTON, NULL }, - { "l3", "Left Stick, Button(L3)", 18, IDIT_BUTTON, NULL }, - { "r3", "Right stick, Button(R3)", 23, IDIT_BUTTON, NULL }, - { "start", "START", 5, IDIT_BUTTON, NULL }, - { "up", "D-Pad UP ↑", 0, IDIT_BUTTON, "down" }, - { "right", "D-Pad RIGHT →", 3, IDIT_BUTTON, "left" }, - { "down", "D-Pad DOWN ↓", 1, IDIT_BUTTON, "up" }, - { "left", "D-Pad LEFT ←", 2, IDIT_BUTTON, "right" }, - - { "l2", "L2 (rear left shoulder)", 11, IDIT_BUTTON, NULL }, - { "r2", "R2 (rear right shoulder)", 13, IDIT_BUTTON, NULL }, - { "l1", "L1 (front left shoulder)", 10, IDIT_BUTTON, NULL }, - { "r1", "R1 (front right shoulder)", 12, IDIT_BUTTON, NULL }, - - { "triangle", "△ (upper)", 6, IDIT_BUTTON_CAN_RAPID, NULL }, - { "circle", "○ (right)", 9, IDIT_BUTTON_CAN_RAPID, NULL }, - { "cross", "x (lower)", 7, IDIT_BUTTON_CAN_RAPID, NULL }, - { "square", "□ (left)", 8, IDIT_BUTTON_CAN_RAPID, NULL }, - - { "analog", "Analog(mode toggle)", 24, IDIT_BUTTON, NULL }, - - { "rstick_right", "Right Stick RIGHT →", 22, IDIT_BUTTON_ANALOG, NULL, { NULL, NULL, NULL }, IDIT_BUTTON_ANALOG_FLAG_SQLR }, - { "rstick_left", "Right Stick LEFT ←", 21, IDIT_BUTTON_ANALOG, NULL, { NULL, NULL, NULL }, IDIT_BUTTON_ANALOG_FLAG_SQLR }, - { "rstick_down", "Right Stick DOWN ↓", 20, IDIT_BUTTON_ANALOG, NULL, { NULL, NULL, NULL }, IDIT_BUTTON_ANALOG_FLAG_SQLR }, - { "rstick_up", "Right Stick UP ↑", 19, IDIT_BUTTON_ANALOG, NULL, { NULL, NULL, NULL }, IDIT_BUTTON_ANALOG_FLAG_SQLR }, - - { "lstick_right", "Left Stick RIGHT →", 17, IDIT_BUTTON_ANALOG, NULL, { NULL, NULL, NULL }, IDIT_BUTTON_ANALOG_FLAG_SQLR }, - { "lstick_left", "Left Stick LEFT ←", 16, IDIT_BUTTON_ANALOG, NULL, { NULL, NULL, NULL }, IDIT_BUTTON_ANALOG_FLAG_SQLR }, - { "lstick_down", "Left Stick DOWN ↓", 15, IDIT_BUTTON_ANALOG, NULL, { NULL, NULL, NULL }, IDIT_BUTTON_ANALOG_FLAG_SQLR }, - { "lstick_up", "Left Stick UP ↑", 14, IDIT_BUTTON_ANALOG, NULL, { NULL, NULL, NULL }, IDIT_BUTTON_ANALOG_FLAG_SQLR }, - - { "rumble", "RUMBLE MONSTER RUMBA", 100, IDIT_RUMBLE }, -}; - } diff --git a/psx/octoshock/psx/input/dualshock.h b/psx/octoshock/psx/input/dualshock.h index e7c6813b38..36e7f3d796 100644 --- a/psx/octoshock/psx/input/dualshock.h +++ b/psx/octoshock/psx/input/dualshock.h @@ -6,6 +6,5 @@ namespace MDFN_IEN_PSX { InputDevice *Device_DualShock_Create(); -extern InputDeviceInputInfoStruct Device_DualShock_IDII[26]; } #endif diff --git a/psx/octoshock/psx/input/gamepad.cpp b/psx/octoshock/psx/input/gamepad.cpp index 1b190809da..808dedf0c8 100644 --- a/psx/octoshock/psx/input/gamepad.cpp +++ b/psx/octoshock/psx/input/gamepad.cpp @@ -192,50 +192,5 @@ InputDevice *Device_Gamepad_Create(void) } -InputDeviceInputInfoStruct Device_Gamepad_IDII[16] = -{ - { "select", "SELECT", 4, IDIT_BUTTON, NULL }, - { NULL, "empty", 0, IDIT_BUTTON }, - { NULL, "empty", 0, IDIT_BUTTON }, - { "start", "START", 5, IDIT_BUTTON, NULL }, - { "up", "UP ↑", 0, IDIT_BUTTON, "down" }, - { "right", "RIGHT →", 3, IDIT_BUTTON, "left" }, - { "down", "DOWN ↓", 1, IDIT_BUTTON, "up" }, - { "left", "LEFT ←", 2, IDIT_BUTTON, "right" }, - - { "l2", "L2 (rear left shoulder)", 11, IDIT_BUTTON, NULL }, - { "r2", "R2 (rear right shoulder)", 13, IDIT_BUTTON, NULL }, - { "l1", "L1 (front left shoulder)", 10, IDIT_BUTTON, NULL }, - { "r1", "R1 (front right shoulder)", 12, IDIT_BUTTON, NULL }, - - { "triangle", "△ (upper)", 6, IDIT_BUTTON_CAN_RAPID, NULL }, - { "circle", "○ (right)", 9, IDIT_BUTTON_CAN_RAPID, NULL }, - { "cross", "x (lower)", 7, IDIT_BUTTON_CAN_RAPID, NULL }, - { "square", "□ (left)", 8, IDIT_BUTTON_CAN_RAPID, NULL }, -}; - -InputDeviceInputInfoStruct Device_Dancepad_IDII[16] = -{ - { "select", "SELECT", 0, IDIT_BUTTON, NULL }, - { NULL, "empty", 0, IDIT_BUTTON }, - { NULL, "empty", 0, IDIT_BUTTON }, - { "start", "START", 1, IDIT_BUTTON, NULL }, - - { "up", "UP ↑", 3, IDIT_BUTTON, NULL }, - { "right", "RIGHT →", 6, IDIT_BUTTON, NULL }, - { "down", "DOWN ↓", 8, IDIT_BUTTON, NULL }, - { "left", "LEFT ←", 5, IDIT_BUTTON, NULL }, - - { NULL, "empty", 0, IDIT_BUTTON, NULL }, - { NULL, "empty", 0, IDIT_BUTTON, NULL }, - { NULL, "empty", 0, IDIT_BUTTON, NULL }, - { NULL, "empty", 0, IDIT_BUTTON, NULL }, - - { "triangle", "△ (lower left)", 7, IDIT_BUTTON, NULL }, - { "circle", "○ (upper right)", 4, IDIT_BUTTON, NULL }, - { "cross", "x (upper left)", 2, IDIT_BUTTON, NULL }, - { "square", "□ (lower right)", 9, IDIT_BUTTON, NULL }, -}; - } diff --git a/psx/octoshock/psx/input/gamepad.h b/psx/octoshock/psx/input/gamepad.h index 5c652b1551..96c716e3b3 100644 --- a/psx/octoshock/psx/input/gamepad.h +++ b/psx/octoshock/psx/input/gamepad.h @@ -5,8 +5,6 @@ namespace MDFN_IEN_PSX { InputDevice *Device_Gamepad_Create(void); -extern InputDeviceInputInfoStruct Device_Gamepad_IDII[16]; -extern InputDeviceInputInfoStruct Device_Dancepad_IDII[16]; } #endif