Fix to M68K core vs. DSP thread sync problem.

[virtualjaguar] / src / joystick.cpp

diff --git a/src/joystick.cpp b/src/joystick.cpp
index fd8977fb8f2cd77303efab92941807ef33a73e2c..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)
@@ -325,6 +328,9 @@ void JoystickDone(void)
 
 uint8 JoystickReadByte(uint32 offset)
 {
+// For now, until we can fix the 2nd controller... :-P
+//memset(joypad_1_buttons, 0, 21);
+
 #warning "No bounds checking done in JoystickReadByte!"
 //     extern bool hardwareTypeNTSC;
        offset &= 0x03;
@@ -338,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;
@@ -346,17 +355,17 @@ uint8 JoystickReadByte(uint32 offset)
                        pad0Index = 1;
                else if (!(pad0Index & 0x04))
                        pad0Index = 2;
-               else
+               else if (!(pad0Index & 0x08))
                        pad0Index = 3;
 
                if (!(pad1Index & 0x01))
-                       pad1Index = 0;
+                       pad1Index = 3;
                else if (!(pad1Index & 0x02))
-                       pad1Index = 1;
-               else if (!(pad1Index & 0x04))
                        pad1Index = 2;
-               else
-                       pad1Index = 3;
+               else if (!(pad1Index & 0x04))
+                       pad1Index = 1;
+               else if (!(pad1Index & 0x08))
+                       pad1Index = 0;
 
                if (joypad_0_buttons[(pad0Index << 2) + 0])     data |= 0x01;
                if (joypad_0_buttons[(pad0Index << 2) + 1]) data |= 0x02;
@@ -374,10 +383,11 @@ uint8 JoystickReadByte(uint32 offset)
                // Hardware ID returns NTSC/PAL identification bit here
                uint8 data = 0x2F | (vjs.hardwareTypeNTSC ? 0x10 : 0x00);
                int pad0Index = joystick_ram[1] & 0x0F;
-//unused               int pad1Index = (joystick_ram[1] >> 4) & 0x0F;
+               int pad1Index = (joystick_ram[1] >> 4) & 0x0F;
 
-//WTF is this shit?
-#warning "!!! What is this? !!!"
+//This is more stuff to add to the button reading, as the preceeding only
+//yields 16 buttons...
+#warning "!!! This reports TeamTap incorrectly when PAUSE pressed on controller #1 or #2 !!!"
                if (!(pad0Index & 0x01))
                {
                        if (joypad_0_buttons[BUTTON_PAUSE])
@@ -395,12 +405,35 @@ uint8 JoystickReadByte(uint32 offset)
                        if (joypad_0_buttons[BUTTON_C])
                                data ^= 0x02;
                }
-               else
+               else if (!(pad0Index & 0x08))
                {
                        if (joypad_0_buttons[BUTTON_OPTION])
                                data ^= 0x02;
                }
 
+               if (!(pad1Index & 0x08))
+               {
+                       if (joypad_1_buttons[BUTTON_PAUSE])
+                               data ^= 0x04;
+                       if (joypad_1_buttons[BUTTON_A])
+                               data ^= 0x08;
+               }
+               else if (!(pad1Index & 0x04))
+               {
+                       if (joypad_1_buttons[BUTTON_B])
+                               data ^= 0x08;
+               }
+               else if (!(pad1Index & 0x02))
+               {
+                       if (joypad_1_buttons[BUTTON_C])
+                               data ^= 0x08;
+               }
+               else if (!(pad1Index & 0x01))
+               {
+                       if (joypad_1_buttons[BUTTON_OPTION])
+                               data ^= 0x08;
+               }
+
                return data;
        }