Pico fixes

git-svn-id: file:///home/notaz/opt/svn/PicoDrive/platform@446 be3aeb3a-fb24-0410-a615-afba39da0efa

diff --git a/gp2x/emu.c b/gp2x/emu.c
index e3f1148..f580f84 100644 (file)
--- a/gp2x/emu.c
+++ b/gp2x/emu.c
@@ -53,7 +53,9 @@ char noticeMsg[64];                   // notice msg to draw
 unsigned char *PicoDraw2FB = NULL;  // temporary buffer for alt renderer\r
 int reset_timing = 0;\r
 \r
-static int pico_pen_x = 0, pico_pen_y = 0, pico_inp_mode = 0;\r
+#define PICO_PEN_ADJUST_X 4\r
+#define PICO_PEN_ADJUST_Y 2\r
+static int pico_pen_x = 320/2, pico_pen_y = 240/2, pico_inp_mode = 0;\r
 \r
 static void emu_msg_cb(const char *msg);\r
 static void emu_msg_tray_open(void);\r
@@ -199,7 +201,7 @@ void osd_text(int x, int y, const char *text)
        }\r
 }\r
 \r
-static void cd_leds(void)\r
+static void draw_cd_leds(void)\r
 {\r
 //     static\r
        int old_reg;\r
@@ -227,6 +229,25 @@ static void cd_leds(void)
        }\r
 }\r
 \r
+static void draw_pico_ptr(void)\r
+{\r
+       unsigned short *p = (unsigned short *)gp2x_screen;\r
+\r
+       // only if pen enabled and for 16bit modes\r
+       if (pico_inp_mode == 0 || (PicoOpt&0x10) || !(currentConfig.EmuOpt&0x80)) return;\r
+\r
+       if (!(Pico.video.reg[12]&1) && !(PicoOpt&POPT_DIS_32C_BORDER))\r
+               p += 32;\r
+\r
+       p += 320 * (pico_pen_y + PICO_PEN_ADJUST_Y);\r
+       p += pico_pen_x + PICO_PEN_ADJUST_X;\r
+       p[0]   ^= 0xffff;\r
+       p[319] ^= 0xffff;\r
+       p[320] ^= 0xffff;\r
+       p[321] ^= 0xffff;\r
+       p[640] ^= 0xffff;\r
+}\r
+\r
 static int EmuScanBegin16(unsigned int num)\r
 {\r
        if (!(Pico.video.reg[1]&8)) num += 8;\r
@@ -301,7 +322,9 @@ static void blit(const char *fps, const char *notice)
                        osd_text(osd_fps_x, h, fps);\r
        }\r
        if ((emu_opt & 0x400) && (PicoAHW & PAHW_MCD))\r
-               cd_leds();\r
+               draw_cd_leds();\r
+       if (PicoAHW & PAHW_PICO)\r
+               draw_pico_ptr();\r
 \r
        //gp2x_video_wait_vsync();\r
        gp2x_video_flip();\r
@@ -404,9 +427,11 @@ static void RunEventsPico(unsigned int events, unsigned int gp2x_keys)
                pico_inp_mode++;\r
                if (pico_inp_mode > 2) pico_inp_mode = 0;\r
                switch (pico_inp_mode) {\r
-                       case 0: strcpy(noticeMsg, "Input: Joytick         "); break;\r
-                       case 1: strcpy(noticeMsg, "Input: Pen on Storyware"); break;\r
                        case 2: strcpy(noticeMsg, "Input: Pen on Pad      "); break;\r
+                       case 1: strcpy(noticeMsg, "Input: Pen on Storyware"); break;\r
+                       case 0: strcpy(noticeMsg, "Input: Joytick         ");\r
+                               PicoPicohw.pen_pos[0] = PicoPicohw.pen_pos[1] = 0x8000;\r
+                               break;\r
                }\r
                gettimeofday(&noticeMsgTime, 0);\r
        }\r
@@ -424,11 +449,18 @@ static void RunEventsPico(unsigned int events, unsigned int gp2x_keys)
        }\r
        if (pico_inp_mode != 0) {\r
                PicoPad[0] &= ~0x0f; // release UDLR\r
-               if (gp2x_keys & GP2X_UP)   { pico_pen_y--; if (pico_pen_y <   0) pico_pen_y =   0; }\r
-               if (gp2x_keys & GP2X_DOWN) { pico_pen_y++; if (pico_pen_y > 251) pico_pen_y = 251; }\r
-               if (gp2x_keys & GP2X_LEFT) { pico_pen_x--; if (pico_pen_x <   0) pico_pen_x =   0; }\r
-               if (gp2x_keys & GP2X_RIGHT){ pico_pen_x++; if (pico_pen_x > 353) pico_pen_x = 353; }\r
-               PicoPicohw.pen_pos[0] = 0x03c + pico_pen_x;\r
+               if (gp2x_keys & GP2X_UP)   { pico_pen_y--; if (pico_pen_y < 0) pico_pen_y = 0; }\r
+               if (gp2x_keys & GP2X_DOWN) { pico_pen_y++; if (pico_pen_y > 239-PICO_PEN_ADJUST_Y) pico_pen_y = 239-PICO_PEN_ADJUST_Y; }\r
+               if (gp2x_keys & GP2X_LEFT) { pico_pen_x--; if (pico_pen_x < 0) pico_pen_x = 0; }\r
+               if (gp2x_keys & GP2X_RIGHT) {\r
+                       int lim = (Pico.video.reg[12]&1) ? 319 : 255;\r
+                       pico_pen_x++;\r
+                       if (pico_pen_x > lim-PICO_PEN_ADJUST_X)\r
+                               pico_pen_x = lim-PICO_PEN_ADJUST_X;\r
+               }\r
+               PicoPicohw.pen_pos[0] = pico_pen_x;\r
+               if (!(Pico.video.reg[12]&1)) PicoPicohw.pen_pos[0] += pico_pen_x/4;\r
+               PicoPicohw.pen_pos[0] += 0x3c;\r
                PicoPicohw.pen_pos[1] = pico_inp_mode == 1 ? (0x2f8 + pico_pen_y) : (0x1fc + pico_pen_y);\r
        }\r
 }\r
@@ -554,7 +586,6 @@ static void RunEvents(unsigned int which)
        }\r
 }\r
 \r
-\r
 static void updateKeys(void)\r
 {\r
        unsigned int keys, keys2, allActions[2] = { 0, 0 }, events;\r