core, add internal pad and mouse data to io save state

diff --git a/pico/memory.c b/pico/memory.c
index cfdd48c..e1a892a 100644 (file)
--- a/pico/memory.c
+++ b/pico/memory.c
@@ -618,9 +618,13 @@ int io_ports_pack(void *buf, size_t size)
   for (i = 0; i < ARRAY_SIZE(Pico.m.padDelay); i++)\r
     save_u8_(buf, &b, Pico.m.padDelay[i]);\r
   for (i = 0; i < ARRAY_SIZE(padTHLatency); i++) {\r
-    save_u32(buf, &b, padTHLatency[i]);\r
-    save_u32(buf, &b, padTLLatency[i]);\r
+    save_s32(buf, &b, padTHLatency[i]);\r
+    save_s32(buf, &b, padTLLatency[i]);\r
   }\r
+  for (i = 0; i < 4; i++)\r
+    save_u16(buf, &b, PicoIn.padInt[i]);\r
+  for (i = 0; i < 4; i++)\r
+    save_s32(buf, &b, PicoIn.mouseInt[i]);\r
   assert(b <= size);\r
   return b;\r
 }\r
@@ -634,9 +638,13 @@ void io_ports_unpack(const void *buf, size_t size)
   for (i = 0; i < ARRAY_SIZE(Pico.m.padDelay); i++)\r
     Pico.m.padDelay[i] = load_u8_(buf, &b);\r
   for (i = 0; i < ARRAY_SIZE(padTHLatency); i++) {\r
-    padTHLatency[i] = load_u32(buf, &b);\r
-    padTLLatency[i] = load_u32(buf, &b);\r
+    padTHLatency[i] = load_s32(buf, &b);\r
+    padTLLatency[i] = load_s32(buf, &b);\r
   }\r
+  for (i = 0; i < 4; i++)\r
+    PicoIn.padInt[i] = load_u16(buf, &b);\r
+  for (i = 0; i < 4; i++)\r
+    PicoIn.mouseInt[i] = load_s32(buf, &b);\r
   assert(b <= size);\r
 }\r
 \r

diff --git a/pico/pico.h b/pico/pico.h
index e9fc54f..b7acabf 100644 (file)
--- a/pico/pico.h
+++ b/pico/pico.h
@@ -109,9 +109,18 @@ typedef struct PicoInterface
 {\r
        unsigned int opt; // POPT_* bitfield\r
 \r
-       unsigned short pad[4];     // Joypads, format is MXYZ SACB RLDU\r
-       unsigned short padInt[4];  // internal copy\r
-       unsigned short AHW;        // active addon hardware: PAHW_* bitfield\r
+       unsigned short pad[4];         // Joypads, format is MXYZ SACB RLDU\r
+       unsigned short padInt[4];      // internal copy\r
+       unsigned short AHW;            // active addon hardware: PAHW_* bitfield\r
+\r
+       unsigned short kbd;            // SC-3000 or Pico Keyboard\r
+       int mouse[4];                  // x,y mouse coordinates\r
+       int mouseInt[4];               // internal copy\r
+\r
+       unsigned short quirks;         // game-specific quirks: PQUIRK_*\r
+       unsigned short overclockM68k;  // overclock the emulated 68k, in %\r
+\r
+       unsigned short filter;         // softscale filter type\r
 \r
        unsigned short skipFrame;      // skip rendering frame, but still do sound (if enabled) and emulation stuff\r
        unsigned short regionOverride; // override the region detection 0: auto, 1: Japan NTSC, 2: Japan PAL, 4: US, 8: Europe\r
@@ -120,11 +129,6 @@ typedef struct PicoInterface
        unsigned int mapper;           // mapper selection for SMS, 0 = auto\r
        unsigned int tmsPalette;       // palette used by SMS in TMS graphic modes\r
 \r
-       unsigned short quirks;         // game-specific quirks: PQUIRK_*\r
-       unsigned short overclockM68k;  // overclock the emulated 68k, in %\r
-\r
-       unsigned short filter;         // softscale filter type\r
-\r
        int sndRate;                   // rate in Hz\r
        int sndFilterAlpha;            // Low pass sound filter alpha (Q16)\r
        short *sndOut;                 // PCM output buffer\r
@@ -134,10 +138,6 @@ typedef struct PicoInterface
 \r
        void (*mcdTrayOpen)(void);\r
        void (*mcdTrayClose)(void);\r
-\r
-       int mouse[4];                  // x,y mouse coordinates\r
-       int mouseInt[4];               // internal copy\r
-       unsigned int kbd;              // SC-3000 or Pico Keyboard\r
 } PicoInterface;\r
 \r
 extern PicoInterface PicoIn;\r

diff --git a/pico/state.h b/pico/state.h
index 4f49590..5a6d5fc 100644 (file)
--- a/pico/state.h
+++ b/pico/state.h
@@ -46,6 +46,14 @@ static inline void save_u32(u8 *buf, size_t *b, u32 u)
        buf[(*b)++] = u >> 24;
 }
 
+static inline void save_s32(u8 *buf, size_t *b, s32 s)
+{
+       buf[(*b)++] = s;
+       buf[(*b)++] = s >> 8;
+       buf[(*b)++] = s >> 16;
+       buf[(*b)++] = s >> 24;
+}
+
 static inline u8 load_u8_(const u8 *buf, size_t *b)
 {
        return buf[(*b)++];
@@ -76,3 +84,10 @@ static inline u32 load_u32(const u8 *buf, size_t *b)
        (*b) += 4;
        return r;
 }
+
+static inline s32 load_s32(const u8 *buf, size_t *b)
+{
+       s32 r = (buf[*b + 3] << 24) | (buf[*b + 2] << 16) | (buf[*b + 1] << 8) | buf[*b];
+       (*b) += 4;
+       return r;
+}