libretro/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch.git synced 2024-11-24 16:39:43 +00:00
Code Issues Actions 23 Packages Projects Releases Wiki Activity

Fixed version of 72ca37f9d6

Browse Source
This commit is contained in:
Mike Robinson 2014-10-17 06:41:43 +01:00
parent dfe8c291b8
commit 00f6a17804
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
input/parport_joypad.c
View File

@ -33,7 +33,7 @@
struct parport_joypad
{
int fd;
bool buttons[NUM_BUTTONS];
uint32_t buttons;
bool button_enable[NUM_BUTTONS];
char saved_data;
char saved_control;
@ -87,13 +87,23 @@ static void poll_pad(struct parport_joypad *pad)
for (i = 0; i < 8; i++)
{
pad->buttons[i] = !(data & UINT8_C(1 << i)) && pad->button_enable[i];
if (!(data & UINT8_C(1 << i)) && pad->button_enable[i])
BIT32_SET(pad->buttons, i);
else
BIT32_CLEAR(pad->buttons, i);
}
for (i = 3; i < 8; i++)
{
pad->buttons[i + 5] = !(status & UINT8_C(1 << i)) && pad->button_enable[i + 5];
if (!(status & UINT8_C(1 << i)) && pad->button_enable[i + 5])
BIT32_SET(pad->buttons, i + 5);
else
BIT32_CLEAR(pad->buttons, i + 5);
}
pad->buttons[12] = pad->buttons[12] ? false : true && pad->button_enable[12];
if (BIT32_GET(pad->buttons, 12) && pad->button_enable[12])
BIT32_CLEAR(pad->buttons, 12);
else
BIT32_SET(pad->buttons, 12);
}
static bool parport_joypad_init_pad(const char *path, struct parport_joypad *pad)
@ -249,7 +259,7 @@ static bool parport_joypad_init(void)
for (j = 0; j < NUM_BUTTONS; j++)
{
if (!pad->buttons[j])
if (!(BIT32_GET(pad->buttons, j)))
{
pad->button_enable[j] = true;
found_enabled_button = true;
@ -315,7 +325,7 @@ static bool parport_joypad_button(unsigned port, uint16_t joykey)
{
const struct parport_joypad *pad = &g_pads[port];
return joykey < NUM_BUTTONS && pad->buttons[joykey];
return joykey < NUM_BUTTONS && BIT32_GET(pad->buttons, joykey);
}
static int16_t parport_joypad_axis(unsigned port, uint32_t joyaxis)