Fix to M68K core vs. DSP thread sync problem.

[virtualjaguar] / src / joystick.cpp

diff --git a/src/joystick.cpp b/src/joystick.cpp
index 146c15d9e29c547ca5a77efecd58fad27abfb4d9..208b58b2be51cb5ecbfca18f5206312c2455772e 100644 (file)
--- a/src/joystick.cpp
+++ b/src/joystick.cpp
@@ -3,10 +3,10 @@
 //
 // by cal2
 // GCC/SDL port by Niels Wagenaar (Linux/WIN32) and Caz (BeOS)
-// Cleanups/fixes by James L. Hammons
+// Cleanups/fixes by James Hammons
 // (C) 2010 Underground Software
 //
-// JLH = James L. Hammons <jlhamm@acm.org>
+// JLH = James Hammons <jlhamm@acm.org>
 //
 // Who  When        What
 // ---  ----------  -------------------------------------------------------------
@@ -283,6 +283,8 @@ void JoystickExec(void)
                joypad_0_buttons[BUTTON_D] = 0;
 #endif
 
+// This is handled by the GUI layer, as it should
+#if 0
        // Joystick support [nwagenaar]
 
     if (vjs.useJoystick)
@@ -310,6 +312,7 @@ void JoystickExec(void)
 
        // Needed to ensure that the events queue is empty [nwagenaar]
     SDL_PumpEvents();
+#endif
 }
 
 void JoystickReset(void)
@@ -341,7 +344,10 @@ uint8 JoystickReadByte(uint32 offset)
 // This is bad--we're assuming that a bit is set in the last case. Might not be so!
 // NOTE: values $7, B, D, & E are only legal ones for pad 0, (rows 3 to 0, in both cases)
 //              $E, D, B, & 7 are only legal ones for pad 1
-//       So the following code is WRONG!
+//       So the following code is WRONG! (now fixed! ;-)
+// Also: we should explicitly check for those bit patterns, as other patterns
+// are legal and yield other controllers... !!! FIX !!!
+#warning "!!! Need to explicitly check for the proper bit combinations! !!!"
 
                if (!(pad0Index & 0x01))
                        pad0Index = 0;