X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fjoystick.cpp;h=208b58b2be51cb5ecbfca18f5206312c2455772e;hb=685bb45b7766e8a12cd0de8ee486b9a61183c425;hp=0a391b0bd00f979641e11a81764e05f306bc1e60;hpb=ea10984eaf09364d9f6e08114caa4bcfcaa72d9e;p=virtualjaguar

diff --git a/src/joystick.cpp b/src/joystick.cpp
index 0a391b0..208b58b 100644
--- 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
 // ---  ----------  -------------------------------------------------------------
@@ -18,36 +18,9 @@
 #include <SDL.h>
 #include <time.h>
 #include "gpu.h"
-//#include "gui.h"
 #include "jaguar.h"
 #include "log.h"
 #include "settings.h"
-#include "video.h"
-
-#if 0
-#define BUTTON_U		0
-#define BUTTON_D		1
-#define BUTTON_L		2
-#define BUTTON_R		3
-#define BUTTON_s		4
-#define BUTTON_7		5
-#define BUTTON_4		6
-#define BUTTON_1		7
-#define BUTTON_0		8
-#define BUTTON_8		9
-#define BUTTON_5		10
-#define BUTTON_2		11
-#define BUTTON_d		12
-#define BUTTON_9		13
-#define BUTTON_6		14
-#define BUTTON_3		15
-
-#define BUTTON_A		16
-#define BUTTON_B		17
-#define BUTTON_C		18
-#define BUTTON_OPTION	19
-#define BUTTON_PAUSE	20
-#endif
 
 // Global vars
 
@@ -57,6 +30,8 @@ uint8 joypad_1_buttons[21];
 
 bool keyBuffer[21];
 
+SDL_Joystick * joystick1;
+
 //extern bool finished;
 ////extern bool showGUI;
 bool GUIKeyHeld = false;
@@ -308,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)
@@ -335,6 +312,7 @@ void JoystickExec(void)
 
 	// Needed to ensure that the events queue is empty [nwagenaar]
     SDL_PumpEvents();
+#endif
 }
 
 void JoystickReset(void)
@@ -350,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;
@@ -363,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;
@@ -371,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;
@@ -399,9 +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?
+//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])
@@ -419,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;
 	}