From 8592e64b88827e3475bcb24de3c6713880afd333 Mon Sep 17 00:00:00 2001 From: Patrice Mandin Date: Wed, 5 Nov 2008 20:08:17 +0000 Subject: [PATCH] Aranym now has Joypad emulation. Also mask bits for joypad state, for bits only used for buttons, to avoid generating events when dummy bits are set --- src/joystick/mint/SDL_sysjoystick.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/joystick/mint/SDL_sysjoystick.c b/src/joystick/mint/SDL_sysjoystick.c index 364e568b3..b931fc0f0 100644 --- a/src/joystick/mint/SDL_sysjoystick.c +++ b/src/joystick/mint/SDL_sysjoystick.c @@ -219,8 +219,9 @@ int SDL_SYS_JoystickInit(void) TEST_JOY_ENABLED(envr, "ikbd-joy1", IKBD_JOY1); } } - /* Joypads ports only on STE and Falcon */ - if ((cookie_mch == MCH_STE<<16) || (cookie_mch == MCH_F30<<16)) { + /* Joypads ports on STE, Falcon and maybe others */ + if ((cookie_mch == MCH_STE<<16) || (cookie_mch == MCH_F30<<16) || + (cookie_mch == MCH_ARANYM<<16)) { TEST_JOY_ENABLED(envr, "porta-pad", PORTA_PAD0); if (!atarijoysticks[PORTA_PAD0].enabled) { TEST_JOY_ENABLED(envr, "porta-joy0", PORTA_JOY0); @@ -437,7 +438,7 @@ void SDL_SYS_JoystickUpdate(SDL_Joystick *joystick) numjoypad = 7; break; } - curstate=jp_joypads[numjoypad]; + curstate=jp_joypads[numjoypad] & 0xabffff; if (curstate!=prevstate) { hatstate = SDL_HAT_CENTERED; if (curstate & (1<