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

Revert "Update parport_joypad.c driver - mrob - confirm if things still"

Browse Source 
This reverts commit 04b6287d77065acc216f0f1067e9f9a26e6f9fb3.
This commit is contained in:
twinaphex 2014-10-17 05:58:28 +02:00
parent 04b6287d77
commit 72ca37f9d6
1 changed files with 6 additions and 16 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;
uint32_t buttons;
bool buttons[NUM_BUTTONS];
bool button_enable[NUM_BUTTONS];
char saved_data;
char saved_control;
@ -87,23 +87,13 @@ static void poll_pad(struct parport_joypad *pad)
for (i = 0; i < 8; i++)
{
if (!(data & UINT8_C(1 << i)) && pad->button_enable[i])
BIT32_SET(pad->buttons, i);
else
BIT32_CLEAR(pad->buttons, i);
pad->buttons[i] = !(data & UINT8_C(1 << i)) && pad->button_enable[i];
}
for (i = 3; i < 8; i++)
{
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[i + 5] = !(status & UINT8_C(1 << i)) && pad->button_enable[i + 5];
}
if (pad->buttons[12] && pad->button_enable[12])
BIT32_SET(pad->buttons, 12);
else
BIT32_CLEAR(pad->buttons, 12);
pad->buttons[12] = pad->buttons[12] ? false : true && pad->button_enable[12];
}
static bool parport_joypad_init_pad(const char *path, struct parport_joypad *pad)
@ -259,7 +249,7 @@ static bool parport_joypad_init(void)
for (j = 0; j < NUM_BUTTONS; j++)
{
if (!(BIT32_GET(pad->buttons, j)))
if (!pad->buttons[j])
{
pad->button_enable[j] = true;
found_enabled_button = true;
@ -325,7 +315,7 @@ static bool parport_joypad_button(unsigned port, uint16_t joykey)
{
const struct parport_joypad *pad = &g_pads[port];
return joykey < NUM_BUTTONS && BIT32_GET(pad->buttons, joykey);
return joykey < NUM_BUTTONS && pad->buttons[joykey];
}
static int16_t parport_joypad_axis(unsigned port, uint32_t joyaxis)