From 6d280e9fbb6be261d655fa68cc3b4809348d98a1 Mon Sep 17 00:00:00 2001 From: Twinaphex Date: Wed, 1 Aug 2012 03:00:12 +0200 Subject: [PATCH] (PS3) Clean up Cellframework2 leftovers from ps3_input.c --- ps3/ps3_input.c | 35 ------------------- ps3/ps3_input.h | 91 ------------------------------------------------- 2 files changed, 126 deletions(-) diff --git a/ps3/ps3_input.c b/ps3/ps3_input.c index 3fb5237a21..6a59b79d19 100644 --- a/ps3/ps3_input.c +++ b/ps3/ps3_input.c @@ -94,8 +94,6 @@ CellMouseData ps3_mouse_input_poll_device(uint32_t id) PS3 PAD ============================================================ */ -#define MAP(x) (x & 0xFF) - const struct platform_bind platform_keys[] = { { PS3_GAMEPAD_CIRCLE, "Circle button" }, { PS3_GAMEPAD_CROSS, "Cross button" }, @@ -139,39 +137,6 @@ static unsigned pads_connected; static unsigned mice_connected; #endif -uint64_t cell_pad_input_poll_device(uint32_t id) -{ - CellPadData pad_data; - static uint64_t ret[MAX_PADS]; - - // Get new pad data - cellPadGetData(id, &pad_data); - - if (pad_data.len != 0) - { - ret[id] = 0; - - // Build the return value. - ret[id] |= (uint64_t)MAP(pad_data.button[LOWER_BUTTONS]); - ret[id] |= (uint64_t)MAP(pad_data.button[HIGHER_BUTTONS]) << 8; - ret[id] |= (uint64_t)MAP(pad_data.button[RSTICK_X]) << 32; - ret[id] |= (uint64_t)MAP(pad_data.button[RSTICK_Y]) << 40; - ret[id] |= (uint64_t)MAP(pad_data.button[LSTICK_X]) << 16; - ret[id] |= (uint64_t)MAP(pad_data.button[LSTICK_Y]) << 24; - - ret[id] |= (uint64_t)(PRESSED_LEFT_LSTICK(ret[id])) << LSTICK_LEFT_SHIFT; - ret[id] |= (uint64_t)(PRESSED_RIGHT_LSTICK(ret[id])) << LSTICK_RIGHT_SHIFT; - ret[id] |= (uint64_t)(PRESSED_UP_LSTICK(ret[id])) << LSTICK_UP_SHIFT; - ret[id] |= (uint64_t)(PRESSED_DOWN_LSTICK(ret[id])) << LSTICK_DOWN_SHIFT; - - ret[id] |= (uint64_t)(PRESSED_LEFT_RSTICK(ret[id])) << RSTICK_LEFT_SHIFT; - ret[id] |= (uint64_t)(PRESSED_RIGHT_RSTICK(ret[id])) << RSTICK_RIGHT_SHIFT; - ret[id] |= (uint64_t)(PRESSED_UP_RSTICK(ret[id])) << RSTICK_UP_SHIFT; - ret[id] |= (uint64_t)(PRESSED_DOWN_RSTICK(ret[id])) << RSTICK_DOWN_SHIFT; - } - - return ret[id]; -} static void ps3_input_poll(void *data) { CellPadInfo2 pad_info; diff --git a/ps3/ps3_input.h b/ps3/ps3_input.h index 78604dea86..865b7d3eec 100644 --- a/ps3/ps3_input.h +++ b/ps3/ps3_input.h @@ -38,103 +38,12 @@ #define MAX_PADS 7 #endif -#define CTRL_SELECT_MASK 0x01 -#define CTRL_L3_MASK 0x2 -#define CTRL_R3_MASK 0x4 -#define CTRL_START_MASK 0x8 -#define CTRL_UP_MASK 0x10 -#define CTRL_RIGHT_MASK 0x20 -#define CTRL_DOWN_MASK 0x40 -#define CTRL_LEFT_MASK 0x80 - -#define CTRL_L2_MASK 0x100 -#define CTRL_R2_MASK 0x200 -#define CTRL_L1_MASK 0x400 -#define CTRL_R1_MASK 0x800 -#define CTRL_TRIANGLE_MASK 0x1000 -#define CTRL_CIRCLE_MASK 0x2000 -#define CTRL_CROSS_MASK 0x4000 -#define CTRL_SQUARE_MASK 0x8000 - -// Big numbers, harhar. -#define CTRL_LSTICK_LEFT_MASK 0x1000000000000LLU -#define CTRL_LSTICK_RIGHT_MASK 0x2000000000000LLU -#define CTRL_LSTICK_UP_MASK 0x4000000000000LLU -#define CTRL_LSTICK_DOWN_MASK 0x8000000000000LLU -#define CTRL_RSTICK_LEFT_MASK 0x10000000000000LLU -#define CTRL_RSTICK_RIGHT_MASK 0x20000000000000LLU -#define CTRL_RSTICK_UP_MASK 0x40000000000000LLU -#define CTRL_RSTICK_DOWN_MASK 0x80000000000000LLU - - -#define CTRL_SELECT(state) (CTRL_SELECT_MASK & state) -#define CTRL_L3(state) (CTRL_L3_MASK & state) -#define CTRL_R3(state) (CTRL_R3_MASK & state) -#define CTRL_START(state) (CTRL_START_MASK & state) -#define CTRL_UP(state) (CTRL_UP_MASK & state) -#define CTRL_RIGHT(state) (CTRL_RIGHT_MASK & state) -#define CTRL_DOWN(state) (CTRL_DOWN_MASK & state) -#define CTRL_LEFT(state) (CTRL_LEFT_MASK & state) - -#define CTRL_L2(state) (CTRL_L2_MASK & state) -#define CTRL_R2(state) (CTRL_R2_MASK & state) -#define CTRL_L1(state) (CTRL_L1_MASK & state) -#define CTRL_R1(state) (CTRL_R1_MASK & state) -#define CTRL_TRIANGLE(state) (CTRL_TRIANGLE_MASK & state) -#define CTRL_CIRCLE(state) (CTRL_CIRCLE_MASK & state) -#define CTRL_CROSS(state) (CTRL_CROSS_MASK & state) -#define CTRL_SQUARE(state) (CTRL_SQUARE_MASK & state) - -#define CTRL_LSTICK_LEFT(state) (CTRL_LSTICK_LEFT_MASK & state) -#define CTRL_LSTICK_RIGHT(state) (CTRL_LSTICK_RIGHT_MASK & state) -#define CTRL_LSTICK_UP(state) (CTRL_LSTICK_UP_MASK & state) -#define CTRL_LSTICK_DOWN(state) (CTRL_LSTICK_DOWN_MASK & state) -#define CTRL_RSTICK_LEFT(state) (CTRL_RSTICK_LEFT_MASK & state) -#define CTRL_RSTICK_RIGHT(state) (CTRL_RSTICK_RIGHT_MASK & state) -#define CTRL_RSTICK_UP(state) (CTRL_RSTICK_UP_MASK & state) -#define CTRL_RSTICK_DOWN(state) (CTRL_RSTICK_DOWN_MASK & state) - -#define CTRL_MASK(state, mask) (state & mask) - -#define CTRL_AXIS_LSTICK_X(state) ((uint8_t)(((0xFF0000LLU & state) >> 16) & 0xFF)) -#define CTRL_AXIS_LSTICK_Y(state) ((uint8_t)(((0xFF000000LLU & state) >> 24) & 0xFF)) -#define CTRL_AXIS_RSTICK_X(state) ((uint8_t)(((0xFF00000000LLU & state) >> 32) & 0xFF)) -#define CTRL_AXIS_RSTICK_Y(state) ((uint8_t)(((0xFF0000000000LLU & state) >> 40) & 0xFF)) - -#define LOWER_BUTTONS 2 -#define HIGHER_BUTTONS 3 -#define RSTICK_X 4 -#define RSTICK_Y 5 -#define LSTICK_X 6 -#define LSTICK_Y 7 - #define DEADZONE_LOW 55 #define DEADZONE_HIGH 210 -#define PRESSED_LEFT_LSTICK(state) (CTRL_AXIS_LSTICK_X(state) <= DEADZONE_LOW) -#define PRESSED_RIGHT_LSTICK(state) (CTRL_AXIS_LSTICK_X(state) >= DEADZONE_HIGH) -#define PRESSED_UP_LSTICK(state) (CTRL_AXIS_LSTICK_Y(state) <= DEADZONE_LOW) -#define PRESSED_DOWN_LSTICK(state) (CTRL_AXIS_LSTICK_Y(state) >= DEADZONE_HIGH) -#define PRESSED_LEFT_RSTICK(state) (CTRL_AXIS_RSTICK_X(state) <= DEADZONE_LOW) -#define PRESSED_RIGHT_RSTICK(state) (CTRL_AXIS_RSTICK_X(state) >= DEADZONE_HIGH) -#define PRESSED_UP_RSTICK(state) (CTRL_AXIS_RSTICK_Y(state) <= DEADZONE_LOW) -#define PRESSED_DOWN_RSTICK(state) (CTRL_AXIS_RSTICK_Y(state) >= DEADZONE_HIGH) - -#define LSTICK_LEFT_SHIFT 48 -#define LSTICK_RIGHT_SHIFT 49 -#define LSTICK_UP_SHIFT 50 -#define LSTICK_DOWN_SHIFT 51 - -#define RSTICK_LEFT_SHIFT 52 -#define RSTICK_RIGHT_SHIFT 53 -#define RSTICK_UP_SHIFT 54 -#define RSTICK_DOWN_SHIFT 55 - #define OSK_IS_RUNNING(object) object.is_running #define OUTPUT_TEXT_STRING(object) object.osk_text_buffer_char -uint64_t cell_pad_input_poll_device(uint32_t id); - #ifdef HAVE_OSKUTIL typedef struct