mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-23 11:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Properly init ps3 joypad driver.

Browse Source
This commit is contained in:
Themaister 2014-06-09 16:03:26 +02:00
parent b842ba5565
commit accc24ac8a
3 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
input/input_common.c
View File

@ -47,6 +47,9 @@
static const rarch_joypad_driver_t *joypad_drivers[] = { static const rarch_joypad_driver_t *joypad_drivers[] = {
#ifndef IS_RETROLAUNCH #ifndef IS_RETROLAUNCH
#ifdef __CELLOS_LV2__
&ps3_joypad,
#endif
#ifdef HAVE_WINXINPUT #ifdef HAVE_WINXINPUT
&winxinput_joypad, &winxinput_joypad,
#endif #endif

2
input/input_common.h
View File

@ -105,7 +105,7 @@ extern const rarch_joypad_driver_t linuxraw_joypad;
extern const rarch_joypad_driver_t udev_joypad; extern const rarch_joypad_driver_t udev_joypad;
extern const rarch_joypad_driver_t winxinput_joypad; // Named as such to avoid confusion with xb1/360 port code extern const rarch_joypad_driver_t winxinput_joypad; // Named as such to avoid confusion with xb1/360 port code
extern const rarch_joypad_driver_t sdl_joypad; extern const rarch_joypad_driver_t sdl_joypad;
extern const rarch_joypad_driver_t ps3_joypad;
struct rarch_key_map struct rarch_key_map
{ {

16
input/ps3_input.c
View File

@ -69,8 +69,6 @@ const struct platform_bind platform_keys[] = {
{ (1ULL << RARCH_TURBO_ENABLE), "Turbo button (unmapped)" }, { (1ULL << RARCH_TURBO_ENABLE), "Turbo button (unmapped)" },
}; };
extern const rarch_joypad_driver_t ps3_joypad;
typedef struct ps3_input typedef struct ps3_input
{ {
uint64_t pad_state[MAX_PADS]; uint64_t pad_state[MAX_PADS];
@ -80,6 +78,7 @@ typedef struct ps3_input
unsigned mice_connected; unsigned mice_connected;
#endif #endif
sensor_t accelerometer_state[MAX_PADS]; sensor_t accelerometer_state[MAX_PADS];
const rarch_joypad_driver_t *joypad;
} ps3_input_t; } ps3_input_t;
static inline int16_t convert_u8_to_s16(uint8_t val) static inline int16_t convert_u8_to_s16(uint8_t val)
@ -241,9 +240,9 @@ static int16_t ps3_input_state(void *data, const struct retro_keybind **binds,
switch (device) switch (device)
{ {
case RETRO_DEVICE_JOYPAD: case RETRO_DEVICE_JOYPAD:
return input_joypad_pressed(&ps3_joypad, port, binds[port], id); return input_joypad_pressed(ps3->joypad, port, binds[port], id);
case RETRO_DEVICE_ANALOG: case RETRO_DEVICE_ANALOG:
return input_joypad_analog(&ps3_joypad, port, index, id, binds[port]); return input_joypad_analog(ps3->joypad, port, index, id, binds[port]);
#if 0 #if 0
case RETRO_DEVICE_SENSOR_ACCELEROMETER: case RETRO_DEVICE_SENSOR_ACCELEROMETER:
switch (id) switch (id)
@ -282,6 +281,9 @@ static void ps3_input_free_input(void *data)
if (!ps3) if (!ps3)
return; return;
if (ps3->joypad)
ps3->joypad->destroy();
cellPadEnd(); cellPadEnd();
#ifdef HAVE_MOUSE #ifdef HAVE_MOUSE
cellMouseEnd(); cellMouseEnd();
@ -301,12 +303,13 @@ static void* ps3_input_init(void)
cellMouseInit(MAX_MICE); cellMouseInit(MAX_MICE);
#endif #endif
ps3->joypad = input_joypad_init_driver(g_settings.input.joypad_driver);
return ps3; return ps3;
} }
static bool ps3_input_key_pressed(void *data, int key) static bool ps3_input_key_pressed(void *data, int key)
{ {
return (g_extern.lifecycle_state & (1ULL << key)) || input_joypad_pressed(&ps3_joypad, 0, g_settings.input.binds[0], key); return (g_extern.lifecycle_state & (1ULL << key)) || input_joypad_pressed(ps3->joypad, 0, g_settings.input.binds[0], key);
} }
static uint64_t ps3_input_get_capabilities(void *data) static uint64_t ps3_input_get_capabilities(void *data)
@ -370,7 +373,8 @@ static bool ps3_input_set_rumble(void *data, unsigned port, enum retro_rumble_ef
static const rarch_joypad_driver_t *ps3_input_get_joypad_driver(void *data) static const rarch_joypad_driver_t *ps3_input_get_joypad_driver(void *data)
{ {
return &ps3_joypad; ps3_input_t *ps3 = (ps3_input_t*)data;
return ps3->joypad;
} }
static unsigned ps3_input_devices_size(void *data) static unsigned ps3_input_devices_size(void *data)