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 5d969d0fd26d0d7b122c30d0ea2d07103968b0f5..9fe2197a276dbf14e5caebc7ac03e44239bed4d8 100644 (file)
--- a/src/joystick.cpp
+++ b/src/joystick.cpp
@@ -8,12 +8,12 @@
 
 #include "joystick.h"
 
-#include <time.h>
 #include <SDL.h>
-#include "jaguar.h"
-#include "log.h"
+#include <time.h>
 #include "gpu.h"
 #include "gui.h"
+#include "jaguar.h"
+#include "log.h"
 #include "settings.h"
 #include "video.h"
 
@@ -72,7 +72,6 @@ void JoystickInit(void)
 
 void JoystickExec(void)
 {
-//     extern bool useJoystick;
        uint8 * keystate = SDL_GetKeyState(NULL);
 
        memset(joypad_0_buttons, 0, 21);
@@ -155,7 +154,7 @@ void JoystickExec(void)
        if (keystate[SDLK_q])
                start_logging = 1;
        if (keystate[SDLK_w])
-               gpu_reset_stats();
+               GPUResetStats();
 //     if (keystate[SDLK_u])           jaguar_long_write(0xf1c384,jaguar_long_read(0xf1c384)+1);
        if (keystate[SDLK_d])
                DumpMainMemory();
@@ -272,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;
 
@@ -283,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))
@@ -319,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])
@@ -341,6 +345,7 @@ uint8 JoystickReadByte(uint32 offset)
                        if (joypad_0_buttons[BUTTON_OPTION])
                                data ^= 0x02;
                }
+
                return data;
        }
 
@@ -359,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;