Fixed updated joystick handling, first major stab at gamepad profiles.

[virtualjaguar] / src / jerry.cpp

diff --git a/src/jerry.cpp b/src/jerry.cpp
index 9ff7ac6af141faeb92409025c5193051aa9ec8ee..e0255c49d394b071e5e290711a282d37a274996a 100644 (file)
--- a/src/jerry.cpp
+++ b/src/jerry.cpp
@@ -435,7 +435,18 @@ WriteLog("JERRY: Unhandled timer read (BYTE) at %08X...\n", offset);
 //     else if (offset >= 0xF17C00 && offset <= 0xF17C01)
 //             return anajoy_byte_read(offset);
        else if (offset >= 0xF14000 && offset <= 0xF14003)
-               return JoystickReadByte(offset) | EepromReadByte(offset);
+//             return JoystickReadByte(offset) | EepromReadByte(offset);
+       {
+               uint16_t value = JoystickReadWord(offset & 0xFE);
+
+               if (offset & 0x01)
+                       value &= 0xFF;
+               else
+                       value >>= 8;
+
+               // This is wrong, should only have the lowest bit from $F14001
+               return value | EepromReadByte(offset);
+       }
        else if (offset >= 0xF14000 && offset <= 0xF1A0FF)
                return EepromReadByte(offset);
 
@@ -568,7 +579,10 @@ WriteLog("JERRY: Unhandled timer write (BYTE) at %08X...\n", offset);
        }*/
        else if ((offset >= 0xF14000) && (offset <= 0xF14003))
        {
-               JoystickWriteByte(offset, data);
+WriteLog("JERRYWriteByte: Unhandled byte write to JOYSTICK by %s.\n", whoName[who]);
+//             JoystickWriteByte(offset, data);
+               JoystickWriteWord(offset & 0xFE, (uint16_t)data);
+// This is wrong, EEPROM is never written here
                EepromWriteByte(offset, data);
                return;
        }