Attempting to add sanity to memory access: Added mmu.cpp/h

[virtualjaguar] / src / joystick.cpp

diff --git a/src/joystick.cpp b/src/joystick.cpp
index aa81c0ff3ebc107412ba38e365a80dd6735bd759..9fe2197a276dbf14e5caebc7ac03e44239bed4d8 100644 (file)
--- a/src/joystick.cpp
+++ b/src/joystick.cpp
@@ -271,7 +271,7 @@ void JoystickDone(void)
 
 uint8 JoystickReadByte(uint32 offset)
 {
-#warning No bounds checking done in JoystickReadByte!
+#warning "No bounds checking done in JoystickReadByte!"
 //     extern bool hardwareTypeNTSC;
        offset &= 0x03;
 
@@ -282,6 +282,10 @@ uint8 JoystickReadByte(uint32 offset)
                int pad1Index = (joystick_ram[1] >> 4) & 0x0F;
 
 // 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!
+
                if (!(pad0Index & 0x01))
                        pad0Index = 0;
                else if (!(pad0Index & 0x02))
@@ -318,6 +322,7 @@ uint8 JoystickReadByte(uint32 offset)
                int pad0Index = joystick_ram[1] & 0x0F;
 //unused               int pad1Index = (joystick_ram[1] >> 4) & 0x0F;
 
+//WTF is this shit?
                if (!(pad0Index & 0x01))
                {
                        if (joypad_0_buttons[BUTTON_PAUSE])
@@ -340,6 +345,7 @@ uint8 JoystickReadByte(uint32 offset)
                        if (joypad_0_buttons[BUTTON_OPTION])
                                data ^= 0x02;
                }
+
                return data;
        }
 
@@ -358,7 +364,7 @@ void JoystickWriteByte(uint32 offset, uint8 data)
 
 void JoystickWriteWord(uint32 offset, uint16 data)
 {
-#warning No bounds checking done for JoystickWriteWord!
+#warning "No bounds checking done for JoystickWriteWord!"
        offset &= 0x03;
        joystick_ram[offset + 0] = (data >> 8) & 0xFF;
        joystick_ram[offset + 1] = data & 0xFF;