core+platform, add basic mouse support

diff --git a/pico/memory.c b/pico/memory.c
index 5c3600c..0a65f16 100644 (file)
--- a/pico/memory.c
+++ b/pico/memory.c
@@ -340,7 +340,7 @@ static u32 read_pad_6btn(int i, u32 out_bits)
     value = (pad & 0xc0) >> 2;                   // ?0SA 0000\r
     goto out;\r
   }\r
-  else if(phase == 3) {\r
+  else if (phase == 3) {\r
     if (out_bits & 0x40)\r
       value = (pad & 0x30) | ((pad >> 8) & 0xf); // ?1CB MXYZ\r
     else\r
@@ -403,6 +403,58 @@ static u32 read_pad_4way(int i, u32 out_bits)
   return value;\r
 }\r
 \r
+static u32 read_pad_mouse(int i, u32 out_bits)\r
+{\r
+  int phase = Pico.m.padTHPhase[i];\r
+  u32 value;\r
+\r
+  int x = PicoIn.mouseInt[0] - PicoIn.mouseInt[2];\r
+  int y = PicoIn.mouseInt[3] - PicoIn.mouseInt[1];\r
+\r
+  switch (phase) {\r
+  case 0:\r
+    value = 0x00;\r
+    break;\r
+  case 1:\r
+    value = 0x0b;\r
+    break;\r
+  case 2:\r
+    value = 0x0f;\r
+    // store last read values for x,y difference calculation\r
+    PicoIn.mouseInt[2] = PicoIn.mouseInt[0];\r
+    PicoIn.mouseInt[3] = PicoIn.mouseInt[1];\r
+    break;\r
+  case 3:\r
+    value = 0x0f;\r
+    // latch current mouse position during readout\r
+    PicoIn.mouseInt[0] = PicoIn.mouse[0];\r
+    PicoIn.mouseInt[1] = PicoIn.mouse[1];\r
+    break;\r
+  case 4: // xxxx OOSS, OO = y,x overflow, SS = y,x sign bits\r
+    value = (x<0) | ((y<0)<<1) | ((x<-255||x>255)<<2) | ((y<-255||y>255)<<3);\r
+    break;\r
+  case 5:\r
+    value = (PicoIn.padInt[i] & 0xf0) >> 4;      // SMRL, mapped from SACB\r
+    break;\r
+  case 6: // high nibble of x\r
+    value = (x>>4) & 0xf;\r
+    break;\r
+  case 7: // low nibble of x\r
+    value = x & 0xf;\r
+    break;\r
+  case 8: // high nibble of y\r
+    value = (y>>4) & 0xf;\r
+    break;\r
+  case 9: // low nibble of y\r
+  default: // also sent on all later phases\r
+    value = y & 0xf;\r
+    break;\r
+  }\r
+\r
+  value |= (out_bits & 0x40) | ((out_bits & 0x20)>>1);\r
+  return value;\r
+}\r
+\r
 static u32 read_nothing(int i, u32 out_bits)\r
 {\r
   return 0xff;\r
@@ -417,6 +469,7 @@ static port_read_func *port_readers[3] = {
 };\r
 \r
 static int padTHLatency[3]; // TODO this should be in the save file structures\r
+static int padTLLatency[3]; // TODO this should be in the save file structures\r
 \r
 static NOINLINE u32 port_read(int i)\r
 {\r
@@ -439,6 +492,13 @@ static NOINLINE u32 port_read(int i)
 \r
   in = port_readers[i](i, out);\r
 \r
+  // Sega mouse uses the TL/TR lines for req/ack. For buggy drivers, make sure\r
+  // there's some delay before ack is sent by taking over the new TL line level\r
+  if (CYCLES_GE(SekCyclesDone(), padTLLatency[i]))\r
+    padTLLatency[i] = SekCyclesDone();\r
+  else\r
+    in ^= 0x10; // TL\r
+\r
   return (in & ~ctrl_reg) | (data_reg & ctrl_reg);\r
 }\r
 \r
@@ -475,6 +535,10 @@ void PicoSetInputDevice(int port, enum input_device device)
     func = read_pad_4way;\r
     break;\r
 \r
+  case PICO_INPUT_MOUSE:\r
+    func = read_pad_mouse;\r
+    break;\r
+\r
   default:\r
     func = read_nothing;\r
     break;\r
@@ -501,7 +565,7 @@ NOINLINE void io_ports_write(u32 a, u32 d)
 {\r
   a = (a>>1) & 0xf;\r
 \r
-  // 6 button gamepad: if TH went from 0 to 1, gamepad changes state\r
+  // for some controllers, changing TH/TR changes controller state\r
   if (1 <= a && a <= 2)\r
   {\r
     Pico.m.padDelay[a - 1] = 0;\r
@@ -515,6 +579,18 @@ NOINLINE void io_ports_write(u32 a, u32 d)
         Pico.m.padTHPhase[0] = 0;\r
       if (a == 1 && !(PicoMem.ioports[a] & 0x40) && (d & 0x40))\r
         Pico.m.padTHPhase[0]++;\r
+    } else if (port_readers[a - 1] == read_pad_mouse) {\r
+      if ((d^PicoMem.ioports[a]) & 0x20) {\r
+        if (Pico.m.padTHPhase[a - 1]) { // in readout?\r
+          padTLLatency[a - 1] = SekCyclesDone() + 100;\r
+          Pico.m.padTHPhase[a - 1]++;\r
+        } else // in ID cycle\r
+          padTLLatency[a - 1] = SekCyclesDone() + 25; // Cannon Fodder\r
+      }\r
+      if ((d^PicoMem.ioports[a]) & 0x40) {\r
+        // 1->0 transition starts the readout protocol\r
+        Pico.m.padTHPhase[a - 1] = !(d & 0x40);\r
+      }\r
     } else if (!(PicoMem.ioports[a] & 0x40) && (d & 0x40))\r
       Pico.m.padTHPhase[a - 1]++;\r
   }\r

diff --git a/pico/pico.h b/pico/pico.h
index 8e6de01..16cc685 100644 (file)
--- a/pico/pico.h
+++ b/pico/pico.h
@@ -134,7 +134,9 @@ typedef struct PicoInterface
        void (*mcdTrayOpen)(void);\r
        void (*mcdTrayClose)(void);\r
 \r
-       unsigned int kbd;   // PS/2 peripherals, e.g. Pico Keyboard\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
@@ -360,6 +362,7 @@ enum input_device {
   PICO_INPUT_NOTHING,\r
   PICO_INPUT_PAD_3BTN,\r
   PICO_INPUT_PAD_6BTN,\r
+  PICO_INPUT_MOUSE,\r
   PICO_INPUT_PAD_TEAM,\r
   PICO_INPUT_PAD_4WAY,\r
 };\r

diff --git a/platform/common/emu.c b/platform/common/emu.c
index 799aa31..86b5429 100644 (file)
--- a/platform/common/emu.c
+++ b/platform/common/emu.c
@@ -1334,7 +1334,7 @@ void emu_update_input(void)
        int actions_kbd[IN_BIND_LAST] = { 0, };\r
        int pl_actions[4];\r
        int count_kbd = 0;\r
-       int events, i;\r
+       int events, i = 0;\r
 \r
        in_update(actions);\r
 \r
@@ -1345,6 +1345,23 @@ void emu_update_input(void)
 \r
        events = actions[IN_BINDTYPE_EMU] & PEV_MASK;\r
 \r
+       // update mouse coordinates if there is an emulated mouse\r
+       in_update_analog(0, 0, &PicoIn.mouse[0]);\r
+       in_update_analog(0, 1, &PicoIn.mouse[1]);\r
+       // scale mouse coordinates according to window scale\r
+       PicoIn.mouse[0] = PicoIn.mouse[0] * g_screen_width  / (2*1024);\r
+       PicoIn.mouse[1] = PicoIn.mouse[1] * g_screen_height / (2*1024);\r
+\r
+       in_update_analog(0, -1, &i);\r
+       int buttons = 0;\r
+       if (i & 1) buttons |= 1<<GBTN_B;\r
+       if (i & 4) buttons |= 1<<GBTN_C;\r
+       if (i & 2) buttons |= 1<<GBTN_START;\r
+       if (currentConfig.input_dev0 == PICO_INPUT_MOUSE)\r
+               pl_actions[0] |= buttons;\r
+       if (currentConfig.input_dev1 == PICO_INPUT_MOUSE)\r
+               pl_actions[1] |= buttons;\r
+\r
        if (kbd_mode) {\r
                int mask = (PicoIn.AHW & PAHW_PICO ? 0xf : 0x0);\r
                if (currentConfig.keyboard == 2)\r

diff --git a/platform/common/menu_pico.c b/platform/common/menu_pico.c
index 6c1905e..e6ee9a5 100644 (file)
--- a/platform/common/menu_pico.c
+++ b/platform/common/menu_pico.c
@@ -541,8 +541,8 @@ int key_config_kbd_loop(int id, int keys)
 }
 
 
-const char *indev0_names[] = { "none", "3 button pad", "6 button pad", "Team player", "4 way play", NULL };
-const char *indev1_names[] = { "none", "3 button pad", "6 button pad", NULL };
+const char *indev0_names[] = { "none", "3 button pad", "6 button pad", "Mouse", "Team player", "4 way play", NULL };
+const char *indev1_names[] = { "none", "3 button pad", "6 button pad", "Mouse", NULL };
 
 static char h_play12[55];
 static char h_kbd[55];

diff --git a/platform/common/plat_sdl.c b/platform/common/plat_sdl.c
index a2f8d01..b3cd239 100644 (file)
--- a/platform/common/plat_sdl.c
+++ b/platform/common/plat_sdl.c
@@ -543,6 +543,13 @@ void plat_init(void)
        in_sdl_init(&in_sdl_platform_data, plat_sdl_event_handler);
        in_probe();
 
+       // create an artificial resize event to initialize mouse scaling
+       SDL_Event ev;
+       ev.resize.type = SDL_VIDEORESIZE;
+       ev.resize.w = g_menuscreen_w;
+       ev.resize.h = g_menuscreen_h;
+       SDL_PeepEvents(&ev, 1, SDL_ADDEVENT, SDL_ALLEVENTS);
+
        bgr_to_uyvy_init();
        linux_menu_init();
 }

diff --git a/platform/libpicofe b/platform/libpicofe
index 023d7e8..7bd23aa 160000 (submodule)
--- a/platform/libpicofe
+++ b/platform/libpicofe
@@ -1 +1 @@
-Subproject commit 023d7e890f1c4386ff3bc095efd96eb65fafe389
+Subproject commit 7bd23aaf69e6caf8f6d8933bd9b2f4db3210eb51