revive pandora and win32 builds, rm gp2x dep for linux, lots of refactoring
[libpicofe.git] / gp2x / emu.c
index f27b285..b1b314e 100644 (file)
@@ -5,10 +5,6 @@
 \r
 #include <stdio.h>\r
 #include <stdlib.h>\r
-#include <sys/time.h>\r
-#include <sys/stat.h>\r
-#include <sys/types.h>\r
-#include <stdarg.h>\r
 \r
 #include "plat_gp2x.h"\r
 #include "soc.h"\r
 \r
 extern int crashed_940;\r
 \r
-static short __attribute__((aligned(4))) sndBuffer[2*44100/50];\r
-static struct timeval noticeMsgTime = { 0, 0 };        // when started showing\r
-static int osd_fps_x;\r
-static int gp2x_old_gamma = 100;\r
-static char noticeMsg[40];\r
-unsigned char *PicoDraw2FB = NULL;  // temporary buffer for alt renderer\r
-int reset_timing = 0;\r
+static short __attribute__((aligned(4))) sndBuffer[2*(44100+100)/50];\r
+static unsigned char PicoDraw2FB_[(8+320) * (8+240+8)];\r
+unsigned char *PicoDraw2FB = PicoDraw2FB_;\r
+static int osd_fps_x, osd_y;\r
 \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;\r
-\r
-static void emu_msg_tray_open(void);\r
-\r
-\r
-void plat_status_msg(const char *format, ...)\r
-{\r
-       va_list vl;\r
-\r
-       va_start(vl, format);\r
-       vsnprintf(noticeMsg, sizeof(noticeMsg), format, vl);\r
-       va_end(vl);\r
-\r
-       gettimeofday(&noticeMsgTime, 0);\r
-}\r
-\r
-int emu_getMainDir(char *dst, int len)\r
-{\r
-       extern char **g_argv;\r
-       int j;\r
-\r
-       strncpy(dst, g_argv[0], len);\r
-       len -= 32; // reserve\r
-       if (len < 0) len = 0;\r
-       dst[len] = 0;\r
-       for (j = strlen(dst); j > 0; j--)\r
-               if (dst[j] == '/') { dst[j+1] = 0; break; }\r
-\r
-       return j + 1;\r
-}\r
-\r
-void emu_Init(void)\r
-{\r
-       // make temp buffer for alt renderer\r
-       PicoDraw2FB = malloc((8+320)*(8+240+8));\r
-       if (!PicoDraw2FB)\r
-       {\r
-               printf("PicoDraw2FB == 0\n");\r
-       }\r
-\r
-       // make dirs for saves, cfgs, etc.\r
-       mkdir("mds", 0777);\r
-       mkdir("srm", 0777);\r
-       mkdir("brm", 0777);\r
-       mkdir("cfg", 0777);\r
-\r
-       PicoInit();\r
-       PicoMessage = plat_status_msg_busy_next;\r
-       PicoMCDopenTray = emu_msg_tray_open;\r
-       PicoMCDcloseTray = menu_loop_tray;\r
-}\r
+extern void *gp2x_screens[4];\r
 \r
 \r
 static void scaling_update(void)\r
@@ -116,123 +57,159 @@ static void scaling_update(void)
 }\r
 \r
 \r
-void emu_Deinit(void)\r
+void pemu_prep_defconfig(void)\r
 {\r
-       // save SRAM\r
-       if((currentConfig.EmuOpt & 1) && SRam.changed) {\r
-               emu_SaveLoadGame(0, 1);\r
-               SRam.changed = 0;\r
-       }\r
-\r
-       if (!(currentConfig.EmuOpt & EOPT_NO_AUTOSVCFG))\r
-               emu_writelrom();\r
-\r
-       free(PicoDraw2FB);\r
+       gp2x_soc_t soc;\r
 \r
-       PicoExit();\r
+       defaultConfig.CPUclock = default_cpu_clock;\r
 \r
-       // restore gamma\r
-       if (gp2x_old_gamma != 100)\r
-               set_lcd_gamma(100, 0);\r
+       soc = soc_detect();\r
+       if (soc == SOCID_MMSP2)\r
+               defaultConfig.s_PicoOpt |= POPT_EXT_FM;\r
+       else if (soc == SOCID_POLLUX)\r
+               defaultConfig.EmuOpt |= EOPT_WIZ_TEAR_FIX|EOPT_SHOW_RTC;\r
 }\r
 \r
-void emu_prepareDefaultConfig(void)\r
+void pemu_validate_config(void)\r
 {\r
        gp2x_soc_t soc;\r
 \r
-       memset(&defaultConfig, 0, sizeof(defaultConfig));\r
-       defaultConfig.EmuOpt    = 0x9d | EOPT_RAM_TIMINGS | 0x600; // | <- confirm_save, cd_leds\r
-       defaultConfig.s_PicoOpt = 0x0f | POPT_EN_MCD_PCM|POPT_EN_MCD_CDDA|POPT_EN_SVP_DRC|POPT_ACC_SPRITES;\r
-       defaultConfig.s_PsndRate = 44100;\r
-       defaultConfig.s_PicoRegion = 0; // auto\r
-       defaultConfig.s_PicoAutoRgnOrder = 0x184; // US, EU, JP\r
-       defaultConfig.s_PicoCDBuffers = 0;\r
-       defaultConfig.Frameskip = -1; // auto\r
-       defaultConfig.CPUclock = default_cpu_clock;\r
-       defaultConfig.volume = 50;\r
-       defaultConfig.gamma = 100;\r
-       defaultConfig.scaling = 0;\r
-       defaultConfig.turbo_rate = 15;\r
-\r
        soc = soc_detect();\r
-       if (soc == SOCID_MMSP2)\r
-               defaultConfig.s_PicoOpt |= POPT_EXT_FM;\r
+       if (soc != SOCID_MMSP2)\r
+               PicoOpt &= ~POPT_EXT_FM;\r
+       if (soc != SOCID_POLLUX)\r
+               currentConfig.EmuOpt &= ~EOPT_WIZ_TEAR_FIX;\r
+\r
+       if (currentConfig.gamma < 10 || currentConfig.gamma > 300)\r
+               currentConfig.gamma = 100;\r
+\r
+       if (currentConfig.CPUclock < 10 || currentConfig.CPUclock > 1024)\r
+               currentConfig.CPUclock = default_cpu_clock;\r
 }\r
 \r
-static void osd_text(int x, int y, const char *text)\r
+static void (*osd_text)(int x, int y, const char *text);\r
+\r
+static void osd_text8(int x, int y, const char *text)\r
 {\r
        int len = strlen(text)*8;\r
        int *p, i, h, offs;\r
 \r
-       if ((PicoOpt&0x10)||!(currentConfig.EmuOpt&0x80)) {\r
-               len = (len+3) >> 2;\r
-               for (h = 0; h < 8; h++) {\r
-                       offs = (x + g_screen_width * (y+h)) & ~3;\r
-                       p = (int *) ((char *)g_screen_ptr + offs);\r
-                       for (i = len; i; i--, p++)\r
-                               *p = 0xe0e0e0e0;\r
-               }\r
-               emu_textOut8(x, y, text);\r
-       } else {\r
-               len = (len+1) >> 1;\r
-               for (h = 0; h < 8; h++) {\r
-                       offs = (x + g_screen_width * (y+h)) & ~1;\r
-                       p = (int *) ((short *)g_screen_ptr + offs);\r
-                       for (i = len; i; i--, p++)\r
-                               *p = (*p >> 2) & 0x39e7;\r
-               }\r
-               emu_textOut16(x, y, text);\r
+       len = (len+3) >> 2;\r
+       for (h = 0; h < 8; h++) {\r
+               offs = (x + g_screen_width * (y+h)) & ~3;\r
+               p = (int *) ((char *)g_screen_ptr + offs);\r
+               for (i = len; i; i--, p++)\r
+                       *p = 0xe0e0e0e0;\r
        }\r
+       emu_text_out8(x, y, text);\r
+}\r
+\r
+static void osd_text16(int x, int y, const char *text)\r
+{\r
+       int len = strlen(text)*8;\r
+       int *p, i, h, offs;\r
+\r
+       len = (len+1) >> 1;\r
+       for (h = 0; h < 8; h++) {\r
+               offs = (x + g_screen_width * (y+h)) & ~1;\r
+               p = (int *) ((short *)g_screen_ptr + offs);\r
+               for (i = len; i; i--, p++)\r
+                       *p = (*p >> 2) & 0x39e7;\r
+       }\r
+       emu_text_out16(x, y, text);\r
+}\r
+\r
+static void osd_text8_rot(int x, int y, const char *text)\r
+{\r
+       int len = strlen(text) * 8;\r
+       char *p = (char *)g_screen_ptr + 240*(320-x) + y;\r
+\r
+       while (len--) {\r
+               memset(p, 0xe0, 8);\r
+               p -= 240;\r
+       }\r
+\r
+       emu_text_out8_rot(x, y, text);\r
+}\r
+\r
+static void osd_text16_rot(int x, int y, const char *text)\r
+{\r
+       int len = strlen(text) * 8;\r
+       short *p = (short *)g_screen_ptr + 240*(320-x) + y;\r
+\r
+       while (len--) {\r
+               memset(p, 0, 8*2);\r
+               p -= 240;\r
+       }\r
+\r
+       emu_text_out16_rot(x, y, text);\r
 }\r
 \r
 static void draw_cd_leds(void)\r
 {\r
-       int old_reg;\r
-       old_reg = Pico_mcd->s68k_regs[0];\r
+       int led_reg, pitch, scr_offs, led_offs;\r
+       led_reg = Pico_mcd->s68k_regs[0];\r
+\r
+       if (currentConfig.EmuOpt & EOPT_WIZ_TEAR_FIX) {\r
+               pitch = 240;\r
+               led_offs = -pitch * 6;\r
+               scr_offs = pitch * (320 - 4);\r
+       } else {\r
+               pitch = 320;\r
+               led_offs = 4;\r
+               scr_offs = pitch * 2 + 4;\r
+       }\r
 \r
        if ((PicoOpt & POPT_ALT_RENDERER) || !(currentConfig.EmuOpt & EOPT_16BPP)) {\r
+       #define p(x) px[(x) >> 2]\r
                // 8-bit modes\r
-               unsigned int col_g = (old_reg & 2) ? 0xc0c0c0c0 : 0xe0e0e0e0;\r
-               unsigned int col_r = (old_reg & 1) ? 0xd0d0d0d0 : 0xe0e0e0e0;\r
-               *(unsigned int *)((char *)g_screen_ptr + 320*2+ 4) =\r
-               *(unsigned int *)((char *)g_screen_ptr + 320*3+ 4) =\r
-               *(unsigned int *)((char *)g_screen_ptr + 320*4+ 4) = col_g;\r
-               *(unsigned int *)((char *)g_screen_ptr + 320*2+12) =\r
-               *(unsigned int *)((char *)g_screen_ptr + 320*3+12) =\r
-               *(unsigned int *)((char *)g_screen_ptr + 320*4+12) = col_r;\r
+               unsigned int *px = (unsigned int *)((char *)g_screen_ptr + scr_offs);\r
+               unsigned int col_g = (led_reg & 2) ? 0xc0c0c0c0 : 0xe0e0e0e0;\r
+               unsigned int col_r = (led_reg & 1) ? 0xd0d0d0d0 : 0xe0e0e0e0;\r
+               p(pitch*0) = p(pitch*1) = p(pitch*2) = col_g;\r
+               p(pitch*0 + led_offs) = p(pitch*1 + led_offs) = p(pitch*2 + led_offs) = col_r;\r
+       #undef p\r
        } else {\r
+       #define p(x) px[(x)*2 >> 2] = px[((x)*2 >> 2) + 1]\r
                // 16-bit modes\r
-               unsigned int *p = (unsigned int *)((short *)g_screen_ptr + 320*2+4);\r
-               unsigned int col_g = (old_reg & 2) ? 0x06000600 : 0;\r
-               unsigned int col_r = (old_reg & 1) ? 0xc000c000 : 0;\r
-               *p++ = col_g; *p++ = col_g; p+=2; *p++ = col_r; *p++ = col_r; p += 320/2 - 12/2;\r
-               *p++ = col_g; *p++ = col_g; p+=2; *p++ = col_r; *p++ = col_r; p += 320/2 - 12/2;\r
-               *p++ = col_g; *p++ = col_g; p+=2; *p++ = col_r; *p++ = col_r;\r
+               unsigned int *px = (unsigned int *)((short *)g_screen_ptr + scr_offs);\r
+               unsigned int col_g = (led_reg & 2) ? 0x06000600 : 0;\r
+               unsigned int col_r = (led_reg & 1) ? 0xc000c000 : 0;\r
+               p(pitch*0) = p(pitch*1) = p(pitch*2) = col_g;\r
+               p(pitch*0 + led_offs) = p(pitch*1 + led_offs) = p(pitch*2 + led_offs) = col_r;\r
+       #undef p\r
        }\r
 }\r
 \r
 static void draw_pico_ptr(void)\r
 {\r
        unsigned short *p = (unsigned short *)g_screen_ptr;\r
+       int x, y, pitch = 320;\r
 \r
        // only if pen enabled and for 16bit modes\r
-       if (pico_inp_mode == 0 || (PicoOpt&0x10) || !(currentConfig.EmuOpt&0x80)) return;\r
+       if (pico_inp_mode == 0 || (PicoOpt & POPT_ALT_RENDERER) || !(currentConfig.EmuOpt & EOPT_16BPP))\r
+               return;\r
+\r
+       x = pico_pen_x + PICO_PEN_ADJUST_X;\r
+       y = pico_pen_y + PICO_PEN_ADJUST_Y;\r
+       if (!(Pico.video.reg[12]&1) && !(PicoOpt & POPT_DIS_32C_BORDER))\r
+               x += 32;\r
 \r
-       if (!(Pico.video.reg[12]&1) && !(PicoOpt&POPT_DIS_32C_BORDER))\r
-               p += 32;\r
+       if (currentConfig.EmuOpt & EOPT_WIZ_TEAR_FIX) {\r
+               pitch = 240;\r
+               p += (319 - x) * pitch + y;\r
+       } else\r
+               p += x + y * pitch;\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
+       p[0]       ^= 0xffff;\r
+       p[pitch-1] ^= 0xffff;\r
+       p[pitch]   ^= 0xffff;\r
+       p[pitch+1] ^= 0xffff;\r
+       p[pitch*2] ^= 0xffff;\r
 }\r
 \r
 static int EmuScanBegin16(unsigned int num)\r
 {\r
-       if (!(Pico.video.reg[1]&8)) num += 8;\r
        DrawLineDest = (unsigned short *) g_screen_ptr + g_screen_width * num;\r
 \r
        return 0;\r
@@ -240,114 +217,202 @@ static int EmuScanBegin16(unsigned int num)
 \r
 static int EmuScanBegin8(unsigned int num)\r
 {\r
-       if (!(Pico.video.reg[1]&8)) num += 8;\r
        DrawLineDest = (unsigned char *)  g_screen_ptr + g_screen_width * num;\r
 \r
        return 0;\r
 }\r
 \r
-int localPal[0x100];\r
-static void (*vidCpyM2)(void *dest, void *src) = NULL;\r
+/* rot thing for Wiz */\r
+static unsigned char __attribute__((aligned(4))) rot_buff[320*4*2];\r
+\r
+static int EmuScanBegin16_rot(unsigned int num)\r
+{\r
+       DrawLineDest = rot_buff + (num & 3) * 320 * 2;\r
+       return 0;\r
+}\r
 \r
-static void blit(const char *fps, const char *notice)\r
+static int EmuScanEnd16_rot(unsigned int num)\r
+{\r
+       if ((num & 3) != 3)\r
+               return 0;\r
+       rotated_blit16(g_screen_ptr, rot_buff, num + 1,\r
+               !(Pico.video.reg[12] & 1) && !(PicoOpt & POPT_EN_SOFTSCALE));\r
+       return 0;\r
+}\r
+\r
+static int EmuScanBegin8_rot(unsigned int num)\r
+{\r
+       DrawLineDest = rot_buff + (num & 3) * 320;\r
+       return 0;\r
+}\r
+\r
+static int EmuScanEnd8_rot(unsigned int num)\r
+{\r
+       if ((num & 3) != 3)\r
+               return 0;\r
+       rotated_blit8(g_screen_ptr, rot_buff, num + 1,\r
+               !(Pico.video.reg[12] & 1));\r
+       return 0;\r
+}\r
+\r
+static int localPal[0x100];\r
+static void (*vidcpyM2)(void *dest, void *src, int m32col, int with_32c_border);\r
+static int (*make_local_pal)(int fast_mode);\r
+\r
+static int make_local_pal_md(int fast_mode)\r
+{\r
+       int pallen = 0xc0;\r
+\r
+       bgr444_to_rgb32(localPal, Pico.cram);\r
+       if (fast_mode)\r
+               return 0x40;\r
+\r
+       if (Pico.video.reg[0xC] & 8) { // shadow/hilight mode\r
+               bgr444_to_rgb32_sh(localPal, Pico.cram);\r
+               localPal[0xc0] = 0x0000c000;\r
+               localPal[0xd0] = 0x00c00000;\r
+               localPal[0xe0] = 0x00000000; // reserved pixels for OSD\r
+               localPal[0xf0] = 0x00ffffff;\r
+               pallen = 0x100;\r
+       }\r
+       else if (rendstatus & PDRAW_SONIC_MODE) { // mid-frame palette changes\r
+               bgr444_to_rgb32(localPal+0x40, HighPal);\r
+               bgr444_to_rgb32(localPal+0x80, HighPal+0x40);\r
+       }\r
+       else\r
+               memcpy32(localPal+0x80, localPal, 0x40); // for spr prio mess\r
+\r
+       return pallen;\r
+}\r
+\r
+static int make_local_pal_sms(int fast_mode)\r
+{\r
+       unsigned short *spal = Pico.cram;\r
+       unsigned int *dpal = (void *)localPal;\r
+       unsigned int i, t;\r
+\r
+       for (i = 0x40; i > 0; i--) {\r
+               t = *spal++;\r
+               t = ((t & 0x0003) << 22) | ((t & 0x000c) << 12) | ((t & 0x0030) << 2);\r
+               t |= t >> 2;\r
+               t |= t >> 4;\r
+               *dpal++ = t;\r
+       }\r
+\r
+       return 0x40;\r
+}\r
+\r
+void pemu_update_display(const char *fps, const char *notice)\r
 {\r
        int emu_opt = currentConfig.EmuOpt;\r
+       int ret;\r
 \r
        if (PicoOpt & POPT_ALT_RENDERER)\r
        {\r
                // 8bit fast renderer\r
                if (Pico.m.dirtyPal) {\r
                        Pico.m.dirtyPal = 0;\r
-                       vidConvCpyRGB32(localPal, Pico.cram, 0x40);\r
+                       ret = make_local_pal(1);\r
                        // feed new palette to our device\r
-                       gp2x_video_setpalette(localPal, 0x40);\r
+                       gp2x_video_setpalette(localPal, ret);\r
                }\r
                // a hack for VR\r
-               if (PicoRead16Hook == PicoSVPRead16)\r
+               if (PicoAHW & PAHW_SVP)\r
                        memset32((int *)(PicoDraw2FB+328*8+328*223), 0xe0e0e0e0, 328);\r
                // do actual copy\r
-               vidCpyM2((unsigned char *)g_screen_ptr+320*8, PicoDraw2FB+328*8);\r
+               vidcpyM2(g_screen_ptr, PicoDraw2FB+328*8,\r
+                       !(Pico.video.reg[12] & 1), !(PicoOpt & POPT_DIS_32C_BORDER));\r
        }\r
        else if (!(emu_opt & EOPT_16BPP))\r
        {\r
                // 8bit accurate renderer\r
                if (Pico.m.dirtyPal)\r
                {\r
-                       int pallen = 0xc0;\r
                        Pico.m.dirtyPal = 0;\r
-                       if (Pico.video.reg[0xC]&8) // shadow/hilight mode\r
-                       {\r
-                               vidConvCpyRGB32(localPal, Pico.cram, 0x40);\r
-                               vidConvCpyRGB32sh(localPal+0x40, Pico.cram, 0x40);\r
-                               vidConvCpyRGB32hi(localPal+0x80, Pico.cram, 0x40);\r
-                               memcpy32(localPal+0xc0, localPal+0x40, 0x40);\r
-                               pallen = 0x100;\r
-                       }\r
-                       else if (rendstatus & PDRAW_SONIC_MODE) { // mid-frame palette changes\r
-                               vidConvCpyRGB32(localPal, Pico.cram, 0x40);\r
-                               vidConvCpyRGB32(localPal+0x40, HighPal, 0x40);\r
-                               vidConvCpyRGB32(localPal+0x80, HighPal+0x40, 0x40);\r
-                       }\r
-                       else {\r
-                               vidConvCpyRGB32(localPal, Pico.cram, 0x40);\r
-                               memcpy32(localPal+0x80, localPal, 0x40); // for spr prio mess\r
-                       }\r
-                       if (pallen > 0xc0) {\r
-                               localPal[0xc0] = 0x0000c000;\r
-                               localPal[0xd0] = 0x00c00000;\r
-                               localPal[0xe0] = 0x00000000; // reserved pixels for OSD\r
-                               localPal[0xf0] = 0x00ffffff;\r
-                       }\r
-                       gp2x_video_setpalette(localPal, pallen);\r
+                       ret = make_local_pal(0);\r
+                       gp2x_video_setpalette(localPal, ret);\r
                }\r
        }\r
 \r
-       if (notice || (emu_opt & 2)) {\r
-               int h = 232;\r
-               if (currentConfig.scaling == EOPT_SCALE_HW_HV && !(Pico.video.reg[1]&8))\r
-                       h -= 8;\r
+       if (notice || (emu_opt & EOPT_SHOW_FPS)) {\r
                if (notice)\r
-                       osd_text(4, h, notice);\r
+                       osd_text(4, osd_y, notice);\r
                if (emu_opt & 2)\r
-                       osd_text(osd_fps_x, h, fps);\r
+                       osd_text(osd_fps_x, osd_y, fps);\r
        }\r
-       if ((emu_opt & 0x400) && (PicoAHW & PAHW_MCD))\r
+       if ((PicoAHW & PAHW_MCD) && (emu_opt & EOPT_EN_CD_LEDS))\r
                draw_cd_leds();\r
        if (PicoAHW & PAHW_PICO)\r
                draw_pico_ptr();\r
 \r
        gp2x_video_flip();\r
+}\r
 \r
-       if (!(PicoOpt & POPT_ALT_RENDERER)) {\r
-               if (!(Pico.video.reg[1]&8)) {\r
-                       if (currentConfig.EmuOpt & EOPT_16BPP)\r
-                               DrawLineDest = (unsigned short *) g_screen_ptr + 320*8;\r
-                       else\r
-                               DrawLineDest = (unsigned char  *) g_screen_ptr + 320*8;\r
-               } else {\r
-                       DrawLineDest = g_screen_ptr;\r
-               }\r
+/* XXX */\r
+#ifdef __GP2X__\r
+unsigned int plat_get_ticks_ms(void)\r
+{\r
+       return gp2x_get_ticks_ms();\r
+}\r
+\r
+unsigned int plat_get_ticks_us(void)\r
+{\r
+       return gp2x_get_ticks_us();\r
+}\r
+#endif\r
+\r
+void plat_wait_till_us(unsigned int us_to)\r
+{\r
+       unsigned int now;\r
+\r
+       spend_cycles(1024);\r
+       now = plat_get_ticks_us();\r
+\r
+       while ((signed int)(us_to - now) > 512)\r
+       {\r
+               spend_cycles(1024);\r
+               now = plat_get_ticks_us();\r
        }\r
 }\r
 \r
-// clears whole screen or just the notice area (in all buffers)\r
-static void clearArea(int full)\r
+void plat_video_wait_vsync(void)\r
 {\r
-       if ((PicoOpt&0x10)||!(currentConfig.EmuOpt&0x80)) {\r
-               // 8-bit renderers\r
-               if (full) gp2x_memset_all_buffers(0, 0xe0, 320*240);\r
-               else      gp2x_memset_all_buffers(320*232, 0xe0, 320*8);\r
-       } else {\r
-               // 16bit accurate renderer\r
-               if (full) gp2x_memset_all_buffers(0, 0, 320*240*2);\r
-               else      gp2x_memset_all_buffers(320*232*2, 0, 320*8*2);\r
+       gp2x_video_wait_vsync();\r
+}\r
+\r
+void plat_status_msg_clear(void)\r
+{\r
+       int is_8bit = (PicoOpt & POPT_ALT_RENDERER) || !(currentConfig.EmuOpt & EOPT_16BPP);\r
+       if (currentConfig.EmuOpt & EOPT_WIZ_TEAR_FIX) {\r
+               /* ugh.. */\r
+               int i, u, *p;\r
+               if (is_8bit) {\r
+                       for (i = 0; i < 4; i++) {\r
+                               p = (int *)gp2x_screens[i] + (240-8) / 4;\r
+                               for (u = 320; u > 0; u--, p += 240/4)\r
+                                       p[0] = p[1] = 0xe0e0e0e0;\r
+                       }\r
+               } else {\r
+                       for (i = 0; i < 4; i++) {\r
+                               p = (int *)gp2x_screens[i] + (240-8)*2 / 4;\r
+                               for (u = 320; u > 0; u--, p += 240*2/4)\r
+                                       p[0] = p[1] = p[2] = p[3] = 0;\r
+                       }\r
+               }\r
+               return;\r
        }\r
+\r
+       if (is_8bit)\r
+               gp2x_memset_all_buffers(320*232, 0xe0, 320*8);\r
+       else\r
+               gp2x_memset_all_buffers(320*232*2, 0, 320*8*2);\r
 }\r
 \r
 void plat_status_msg_busy_next(const char *msg)\r
 {\r
-       clearArea(0);\r
-       blit("", msg);\r
+       plat_status_msg_clear();\r
+       pemu_update_display("", msg);\r
+       emu_status_msg("");\r
 \r
        /* assumption: msg_busy_next gets called only when\r
         * something slow is about to happen */\r
@@ -362,17 +427,46 @@ void plat_status_msg_busy_first(const char *msg)
 \r
 static void vidResetMode(void)\r
 {\r
+       PicoScanEnd = NULL;\r
+\r
        if (PicoOpt & POPT_ALT_RENDERER) {\r
-               gp2x_video_changemode(8);\r
-       } else if (currentConfig.EmuOpt & EOPT_16BPP) {\r
-               gp2x_video_changemode(16);\r
+               if (currentConfig.EmuOpt & EOPT_WIZ_TEAR_FIX) {\r
+                       gp2x_video_changemode(-8);\r
+                       vidcpyM2 = vidcpy_m2_rot;\r
+                       osd_text = osd_text8_rot;\r
+               } else {\r
+                       gp2x_video_changemode(8);\r
+                       vidcpyM2 = vidcpy_m2;\r
+                       osd_text = osd_text8;\r
+               }\r
+       }\r
+       else if (currentConfig.EmuOpt & EOPT_16BPP) {\r
                PicoDrawSetColorFormat(1);\r
-               PicoScanBegin = EmuScanBegin16;\r
-       } else {\r
-               gp2x_video_changemode(8);\r
+               if (currentConfig.EmuOpt & EOPT_WIZ_TEAR_FIX) {\r
+                       gp2x_video_changemode(-16);\r
+                       PicoScanBegin = EmuScanBegin16_rot;\r
+                       PicoScanEnd = EmuScanEnd16_rot;\r
+                       osd_text = osd_text16_rot;\r
+               } else {\r
+                       gp2x_video_changemode(16);\r
+                       PicoScanBegin = EmuScanBegin16;\r
+                       osd_text = osd_text16;\r
+               }\r
+       }\r
+       else {\r
                PicoDrawSetColorFormat(2);\r
-               PicoScanBegin = EmuScanBegin8;\r
+               if (currentConfig.EmuOpt & EOPT_WIZ_TEAR_FIX) {\r
+                       gp2x_video_changemode(-8);\r
+                       PicoScanBegin = EmuScanBegin8_rot;\r
+                       PicoScanEnd = EmuScanEnd8_rot;\r
+                       osd_text = osd_text8_rot;\r
+               } else {\r
+                       gp2x_video_changemode(8);\r
+                       PicoScanBegin = EmuScanBegin8;\r
+                       osd_text = osd_text8;\r
+               }\r
        }\r
+\r
        if ((PicoOpt & POPT_ALT_RENDERER) || !(currentConfig.EmuOpt & EOPT_16BPP)) {\r
                // setup pal for 8-bit modes\r
                localPal[0xc0] = 0x0000c000; // MCD LEDs\r
@@ -384,47 +478,59 @@ static void vidResetMode(void)
                gp2x_video_flip();\r
        }\r
        Pico.m.dirtyPal = 1;\r
+\r
        // reset scaling\r
        if (currentConfig.scaling == EOPT_SCALE_HW_HV && !(Pico.video.reg[1]&8))\r
             gp2x_video_RGB_setscaling(8, (PicoOpt&0x100)&&!(Pico.video.reg[12]&1) ? 256 : 320, 224);\r
        else gp2x_video_RGB_setscaling(0, (PicoOpt&0x100)&&!(Pico.video.reg[12]&1) ? 256 : 320, 240);\r
+\r
+       // palette converters for 8bit modes\r
+       make_local_pal = (PicoAHW & PAHW_SMS) ? make_local_pal_sms : make_local_pal_md;\r
 }\r
 \r
-void plat_video_toggle_renderer(void)\r
+void plat_video_toggle_renderer(int is_next, int force_16bpp, int is_menu)\r
 {\r
-       if (PicoOpt & POPT_ALT_RENDERER) {\r
+       if (force_16bpp) {\r
                PicoOpt &= ~POPT_ALT_RENDERER;\r
                currentConfig.EmuOpt |= EOPT_16BPP;\r
-       } else if (!(currentConfig.EmuOpt & EOPT_16BPP))\r
-               PicoOpt |= POPT_ALT_RENDERER;\r
-       else\r
+       }\r
+       /* alt, 16bpp, 8bpp */\r
+       else if (PicoOpt & POPT_ALT_RENDERER) {\r
+               PicoOpt &= ~POPT_ALT_RENDERER;\r
+               if (is_next)\r
+                       currentConfig.EmuOpt |= EOPT_16BPP;\r
+       } else if (!(currentConfig.EmuOpt & EOPT_16BPP)) {\r
+               if (is_next)\r
+                       PicoOpt |= POPT_ALT_RENDERER;\r
+               else\r
+                       currentConfig.EmuOpt |= EOPT_16BPP;\r
+       } else {\r
                currentConfig.EmuOpt &= ~EOPT_16BPP;\r
+               if (!is_next)\r
+                       PicoOpt |= POPT_ALT_RENDERER;\r
+       }\r
+\r
+       if (is_menu)\r
+               return;\r
 \r
        vidResetMode();\r
+       rendstatus_old = -1;\r
 \r
        if (PicoOpt & POPT_ALT_RENDERER) {\r
-               plat_status_msg(" 8bit fast renderer");\r
+               emu_status_msg(" 8bit fast renderer");\r
        } else if (currentConfig.EmuOpt & EOPT_16BPP) {\r
-               plat_status_msg("16bit accurate renderer");\r
+               emu_status_msg("16bit accurate renderer");\r
        } else {\r
-               plat_status_msg(" 8bit accurate renderer");\r
+               emu_status_msg(" 8bit accurate renderer");\r
        }\r
 }\r
 \r
-static void emu_msg_tray_open(void)\r
-{\r
-       plat_status_msg("CD tray opened");\r
-}\r
-\r
+#if 0 // TODO\r
 static void RunEventsPico(unsigned int events)\r
 {\r
        int ret, px, py, lim_x;\r
        static int pdown_frames = 0;\r
 \r
-       emu_RunEventsPico(events);\r
-\r
-       if (pico_inp_mode == 0) return;\r
-\r
        // for F200\r
        ret = gp2x_touchpad_read(&px, &py);\r
        if (ret >= 0)\r
@@ -449,24 +555,8 @@ static void RunEventsPico(unsigned int events)
                //if (ret == 0)\r
                //      PicoPicohw.pen_pos[0] = PicoPicohw.pen_pos[1] = 0x8000;\r
        }\r
-\r
-       if (PicoPad[0] & 1) pico_pen_y--;\r
-       if (PicoPad[0] & 2) pico_pen_y++;\r
-       if (PicoPad[0] & 4) pico_pen_x--;\r
-       if (PicoPad[0] & 8) pico_pen_x++;\r
-       PicoPad[0] &= ~0x0f; // release UDLR\r
-\r
-       lim_x = (Pico.video.reg[12]&1) ? 319 : 255;\r
-       if (pico_pen_y < 8) pico_pen_y = 8;\r
-       if (pico_pen_y > 224-PICO_PEN_ADJUST_Y) pico_pen_y = 224-PICO_PEN_ADJUST_Y;\r
-       if (pico_pen_x < 0) pico_pen_x = 0;\r
-       if (pico_pen_x > lim_x-PICO_PEN_ADJUST_X) pico_pen_x = lim_x-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
+#endif\r
 \r
 void plat_update_volume(int has_changed, int is_up)\r
 {\r
@@ -493,11 +583,11 @@ void plat_update_volume(int has_changed, int is_up)
                        sndout_oss_setvol(vol, vol);\r
                        currentConfig.volume = vol;\r
                }\r
-               plat_status_msg("VOL: %02i", vol);\r
+               emu_status_msg("VOL: %02i", vol);\r
                prev_frame = Pico.m.frame_count;\r
        }\r
 \r
-       if (need_low_volume)\r
+       if (!need_low_volume)\r
                return;\r
 \r
        /* set the right mixer func */\r
@@ -509,116 +599,142 @@ void plat_update_volume(int has_changed, int is_up)
        }\r
 }\r
 \r
-\r
 static void updateSound(int len)\r
 {\r
-       if (PicoOpt&8) len<<=1;\r
+       len <<= 1;\r
+       if (PicoOpt & POPT_EN_STEREO)\r
+               len <<= 1;\r
+\r
+       if ((currentConfig.EmuOpt & EOPT_NO_FRMLIMIT) && !sndout_oss_can_write(len))\r
+               return;\r
 \r
        /* avoid writing audio when lagging behind to prevent audio lag */\r
        if (PicoSkipFrame != 2)\r
-               sndout_oss_write(PsndOut, len<<1);\r
+               sndout_oss_write(PsndOut, len);\r
 }\r
 \r
-void emu_startSound(void)\r
+void pemu_sound_start(void)\r
 {\r
        static int PsndRate_old = 0, PicoOpt_old = 0, pal_old = 0;\r
-       int target_fps = Pico.m.pal ? 50 : 60;\r
 \r
        PsndOut = NULL;\r
 \r
        // prepare sound stuff\r
-       if (currentConfig.EmuOpt & 4)\r
+       if (currentConfig.EmuOpt & EOPT_EN_SOUND)\r
        {\r
-               int snd_excess_add;\r
-               if (PsndRate != PsndRate_old || (PicoOpt&0x20b) != (PicoOpt_old&0x20b) || Pico.m.pal != pal_old ||\r
-                               ((PicoOpt&0x200) && crashed_940)) {\r
+               int is_stereo = (PicoOpt & POPT_EN_STEREO) ? 1 : 0;\r
+               int target_fps = Pico.m.pal ? 50 : 60;\r
+               int frame_samples, snd_excess_add;\r
+               int snd_rate_oss = PsndRate;\r
+               gp2x_soc_t soc;\r
+\r
+               soc = soc_detect();\r
+               if (soc == SOCID_POLLUX) {\r
+                       /* POLLUX pain: DPLL1 / mclk_div / bitclk_div / 4 */\r
+                       switch (PsndRate) {\r
+                       case 44100: PsndRate = 44171; break; // 44170.673077\r
+                       case 22050: PsndRate = 22086; break; // 22085.336538\r
+                       case 11025: PsndRate = 11043; break; // 11042.668269\r
+                       default: break;\r
+                       }\r
+               }\r
+\r
+               #define SOUND_RERATE_FLAGS (POPT_EN_FM|POPT_EN_PSG|POPT_EN_STEREO|POPT_EXT_FM|POPT_EN_MCD_CDDA)\r
+               if (PsndRate != PsndRate_old || Pico.m.pal != pal_old || ((PicoOpt & POPT_EXT_FM) && crashed_940) ||\r
+                               ((PicoOpt ^ PicoOpt_old) & SOUND_RERATE_FLAGS)) {\r
                        PsndRerate(Pico.m.frame_count ? 1 : 0);\r
                }\r
-               snd_excess_add = ((PsndRate - PsndLen*target_fps)<<16) / target_fps;\r
-               printf("starting audio: %i len: %i (ex: %04x) stereo: %i, pal: %i\n",\r
-                       PsndRate, PsndLen, snd_excess_add, (PicoOpt&8)>>3, Pico.m.pal);\r
-               sndout_oss_start(PsndRate, 16, (PicoOpt&8)>>3);\r
-               sndout_oss_setvol(currentConfig.volume, currentConfig.volume);\r
-               PicoWriteSound = updateSound;\r
-               plat_update_volume(0, 0);\r
+\r
                memset(sndBuffer, 0, sizeof(sndBuffer));\r
                PsndOut = sndBuffer;\r
+               PicoWriteSound = updateSound;\r
                PsndRate_old = PsndRate;\r
                PicoOpt_old  = PicoOpt;\r
                pal_old = Pico.m.pal;\r
+               plat_update_volume(0, 0);\r
+\r
+               frame_samples = PsndLen;\r
+               snd_excess_add = ((PsndRate - PsndLen * target_fps)<<16) / target_fps;\r
+               if (snd_excess_add != 0)\r
+                       frame_samples++;\r
+               if (soc == SOCID_POLLUX)\r
+                       frame_samples *= 2;     /* force larger buffer */\r
+\r
+               printf("starting audio: %i len: %i (ex: %04x) stereo: %i, pal: %i\n",\r
+                       PsndRate, PsndLen, snd_excess_add, is_stereo, Pico.m.pal);\r
+               sndout_oss_setvol(currentConfig.volume, currentConfig.volume);\r
+               sndout_oss_start(snd_rate_oss, frame_samples, is_stereo);\r
+\r
+               /* Wiz's sound hardware needs more prebuffer */\r
+               if (soc == SOCID_POLLUX)\r
+                       updateSound(frame_samples);\r
        }\r
 }\r
 \r
-void emu_endSound(void)\r
+void pemu_sound_stop(void)\r
 {\r
+       /* get back from Wiz pain */\r
+       switch (PsndRate) {\r
+               case 44171: PsndRate = 44100; break;\r
+               case 22086: PsndRate = 22050; break;\r
+               case 11043: PsndRate = 11025; break;\r
+               default: break;\r
+       }\r
 }\r
 \r
-/* wait until we can write more sound */\r
-void emu_waitSound(void)\r
+void pemu_sound_wait(void)\r
 {\r
        // don't need to do anything, writes will block by themselves\r
 }\r
 \r
 \r
-static void SkipFrame(int do_audio)\r
-{\r
-       PicoSkipFrame=do_audio ? 1 : 2;\r
-       PicoFrame();\r
-       PicoSkipFrame=0;\r
-}\r
-\r
-\r
-void emu_forcedFrame(int opts)\r
+void pemu_forced_frame(int opts)\r
 {\r
        int po_old = PicoOpt;\r
        int eo_old = currentConfig.EmuOpt;\r
 \r
-       PicoOpt &= ~0x10;\r
-       PicoOpt |= opts|POPT_ACC_SPRITES; // acc_sprites\r
-       currentConfig.EmuOpt |= 0x80;\r
+       PicoOpt &= ~POPT_ALT_RENDERER;\r
+       PicoOpt |= opts|POPT_ACC_SPRITES;\r
+       currentConfig.EmuOpt |= EOPT_16BPP;\r
 \r
-       //vidResetMode();\r
        PicoDrawSetColorFormat(1);\r
        PicoScanBegin = EmuScanBegin16;\r
+       PicoScanEnd = NULL;\r
        Pico.m.dirtyPal = 1;\r
        PicoFrameDrawOnly();\r
 \r
-/*\r
-       if (!(Pico.video.reg[12]&1)) {\r
-               vidCpyM2 = vidCpyM2_32col;\r
-               clearArea(1);\r
-       } else  vidCpyM2 = vidCpyM2_40col;\r
-\r
-       vidCpyM2((unsigned char *)g_screen_ptr+320*8, PicoDraw2FB+328*8);\r
-       vidConvCpyRGB32(localPal, Pico.cram, 0x40);\r
-       gp2x_video_setpalette(localPal, 0x40);\r
-*/\r
        PicoOpt = po_old;\r
        currentConfig.EmuOpt = eo_old;\r
 }\r
 \r
-void emu_platformDebugCat(char *str)\r
+void plat_debug_cat(char *str)\r
 {\r
-       // nothing\r
 }\r
 \r
-static void simpleWait(int thissec, int lim_time)\r
+void emu_video_mode_change(int start_line, int line_count, int is_32cols)\r
 {\r
-       struct timeval tval;\r
+       int scalex = 320;\r
+       osd_fps_x = OSD_FPS_X;\r
+       osd_y = 232;\r
+       if (is_32cols && (PicoOpt & POPT_DIS_32C_BORDER)) {\r
+               scalex = 256;\r
+               osd_fps_x = OSD_FPS_X - 64;\r
+       }\r
 \r
-       spend_cycles(1024);\r
-       gettimeofday(&tval, 0);\r
-       if (thissec != tval.tv_sec) tval.tv_usec+=1000000;\r
+       /* want vertical scaling and game is not in 240 line mode */\r
+       if (currentConfig.scaling == EOPT_SCALE_HW_HV) {\r
+               gp2x_video_RGB_setscaling(start_line, scalex, line_count);\r
+               osd_y = start_line + line_count - 8;\r
+       } else\r
+               gp2x_video_RGB_setscaling(0, scalex, 240);\r
 \r
-       while (tval.tv_usec < lim_time)\r
-       {\r
-               spend_cycles(1024);\r
-               gettimeofday(&tval, 0);\r
-               if (thissec != tval.tv_sec) tval.tv_usec+=1000000;\r
-       }\r
+       // clear whole screen in all buffers\r
+       if ((PicoOpt & POPT_ALT_RENDERER) || !(currentConfig.EmuOpt & EOPT_16BPP))\r
+               gp2x_memset_all_buffers(0, 0xe0, 320*240);\r
+       else\r
+               gp2x_memset_all_buffers(0, 0, 320*240*2);\r
 }\r
 \r
-\r
 #if 0\r
 static void tga_dump(void)\r
 {\r
@@ -667,18 +783,13 @@ static void tga_dump(void)
 }\r
 #endif\r
 \r
-\r
-void emu_Loop(void)\r
+void pemu_loop_prep(void)\r
 {\r
-       static int gp2x_old_clock = -1, EmuOpt_old = 0;\r
-       char fpsbuff[24]; // fps count c string\r
-       struct timeval tval; // timing\r
-       int pframes_done, pframes_shown, pthissec; // "period" frames, used for sync\r
-       int  frames_done,  frames_shown,  thissec; // actual frames\r
-       int oldmodes = 0, target_fps, target_frametime, lim_time, vsync_offset, i;\r
-       char *notice = 0;\r
+       static int gp2x_old_clock = -1, EmuOpt_old = 0, pal_old = 0;\r
+       static int gp2x_old_gamma = 100;\r
+       gp2x_soc_t soc;\r
 \r
-       printf("entered emu_Loop()\n");\r
+       soc = soc_detect();\r
 \r
        if ((EmuOpt_old ^ currentConfig.EmuOpt) & EOPT_RAM_TIMINGS) {\r
                if (currentConfig.EmuOpt & EOPT_RAM_TIMINGS)\r
@@ -696,16 +807,16 @@ void emu_Loop(void)
                printf(" done\n");\r
        }\r
 \r
-       if (gp2x_old_gamma != currentConfig.gamma || (EmuOpt_old&0x1000) != (currentConfig.EmuOpt&0x1000)) {\r
-               set_lcd_gamma(currentConfig.gamma, !!(currentConfig.EmuOpt&0x1000));\r
+       if (gp2x_old_gamma != currentConfig.gamma || ((EmuOpt_old ^ currentConfig.EmuOpt) & EOPT_A_SN_GAMMA)) {\r
+               set_lcd_gamma(currentConfig.gamma, !!(currentConfig.EmuOpt & EOPT_A_SN_GAMMA));\r
                gp2x_old_gamma = currentConfig.gamma;\r
                printf("updated gamma to %i, A_SN's curve: %i\n", currentConfig.gamma, !!(currentConfig.EmuOpt&0x1000));\r
        }\r
 \r
-       if ((EmuOpt_old ^ currentConfig.EmuOpt) & EOPT_PSYNC) {\r
-               if (currentConfig.EmuOpt & EOPT_PSYNC)\r
+       if (((EmuOpt_old ^ currentConfig.EmuOpt) & EOPT_VSYNC) || Pico.m.pal != pal_old) {\r
+               if ((currentConfig.EmuOpt & EOPT_VSYNC) || soc == SOCID_POLLUX)\r
                        set_lcd_custom_rate(Pico.m.pal);\r
-               else\r
+               else if (EmuOpt_old & EOPT_VSYNC)\r
                        unset_lcd_custom_rate();\r
        }\r
 \r
@@ -713,221 +824,36 @@ void emu_Loop(void)
                gp2x_make_fb_bufferable(currentConfig.EmuOpt & EOPT_MMUHACK);\r
 \r
        EmuOpt_old = currentConfig.EmuOpt;\r
-       fpsbuff[0] = 0;\r
+       pal_old = Pico.m.pal;\r
 \r
        // make sure we are in correct mode\r
        vidResetMode();\r
        scaling_update();\r
-       Pico.m.dirtyPal = 1;\r
-       oldmodes = ((Pico.video.reg[12]&1)<<2) ^ 0xc;\r
-\r
-       // pal/ntsc might have changed, reset related stuff\r
-       target_fps = Pico.m.pal ? 50 : 60;\r
-       target_frametime = 1000000/target_fps;\r
-       reset_timing = 1;\r
-\r
-       emu_startSound();\r
-\r
-       // prepare CD buffer\r
-       if (PicoAHW & PAHW_MCD) PicoCDBufferInit();\r
-\r
-       // calc vsync offset to sync timing code with vsync\r
-       if (currentConfig.EmuOpt&0x2000) {\r
-               gettimeofday(&tval, 0);\r
-               gp2x_video_wait_vsync();\r
-               gettimeofday(&tval, 0);\r
-               vsync_offset = tval.tv_usec;\r
-               while (vsync_offset >= target_frametime)\r
-                       vsync_offset -= target_frametime;\r
-               if (!vsync_offset) vsync_offset++;\r
-               printf("vsync_offset: %i\n", vsync_offset);\r
-       } else\r
-               vsync_offset = 0;\r
-\r
-       frames_done = frames_shown = thissec =\r
-       pframes_done = pframes_shown = pthissec = 0;\r
-\r
-       // loop\r
-       while (engineState == PGS_Running)\r
-       {\r
-               int modes;\r
-\r
-               gettimeofday(&tval, 0);\r
-               if (reset_timing) {\r
-                       reset_timing = 0;\r
-                       pthissec = tval.tv_sec;\r
-                       pframes_shown = pframes_done = tval.tv_usec/target_frametime;\r
-               }\r
-\r
-               // show notice message?\r
-               if (noticeMsgTime.tv_sec)\r
-               {\r
-                       static int noticeMsgSum;\r
-                       if((tval.tv_sec*1000000+tval.tv_usec) - (noticeMsgTime.tv_sec*1000000+noticeMsgTime.tv_usec) > 2000000) { // > 2.0 sec\r
-                               noticeMsgTime.tv_sec = noticeMsgTime.tv_usec = 0;\r
-                               clearArea(0);\r
-                               notice = 0;\r
-                       } else {\r
-                               int sum = noticeMsg[0]+noticeMsg[1]+noticeMsg[2];\r
-                               if (sum != noticeMsgSum) { clearArea(0); noticeMsgSum = sum; }\r
-                               notice = noticeMsg;\r
-                       }\r
-               }\r
-\r
-               // check for mode changes\r
-               modes = ((Pico.video.reg[12]&1)<<2)|(Pico.video.reg[1]&8);\r
-               if (modes != oldmodes)\r
-               {\r
-                       int scalex = 320;\r
-                       osd_fps_x = OSD_FPS_X;\r
-                       if (modes & 4) {\r
-                               vidCpyM2 = vidCpyM2_40col;\r
-                       } else {\r
-                               if (PicoOpt & 0x100) {\r
-                                       vidCpyM2 = vidCpyM2_32col_nobord;\r
-                                       scalex = 256;\r
-                                       osd_fps_x = OSD_FPS_X - 64;\r
-                               } else {\r
-                                       vidCpyM2 = vidCpyM2_32col;\r
-                               }\r
-                       }\r
-                       /* want vertical scaling and game is not in 240 line mode */\r
-                       if (currentConfig.scaling == EOPT_SCALE_HW_HV && !(modes&8))\r
-                            gp2x_video_RGB_setscaling(8, scalex, 224);\r
-                       else gp2x_video_RGB_setscaling(0, scalex, 240);\r
-                       oldmodes = modes;\r
-                       clearArea(1);\r
-               }\r
-\r
-               // second changed?\r
-               if (thissec != tval.tv_sec)\r
-               {\r
-#ifdef BENCHMARK\r
-                       static int bench = 0, bench_fps = 0, bench_fps_s = 0, bfp = 0, bf[4];\r
-                       if (++bench == 10) {\r
-                               bench = 0;\r
-                               bench_fps_s = bench_fps;\r
-                               bf[bfp++ & 3] = bench_fps;\r
-                               bench_fps = 0;\r
-                       }\r
-                       bench_fps += frames_shown;\r
-                       sprintf(fpsbuff, "%02i/%02i/%02i", frames_shown, bench_fps_s, (bf[0]+bf[1]+bf[2]+bf[3])>>2);\r
-#else\r
-                       if (currentConfig.EmuOpt & 2) {\r
-                               sprintf(fpsbuff, "%02i/%02i", frames_shown, frames_done);\r
-                               if (fpsbuff[5] == 0) { fpsbuff[5] = fpsbuff[6] = ' '; fpsbuff[7] = 0; }\r
-                       }\r
-#endif\r
-                       frames_shown = frames_done = 0;\r
-                       thissec = tval.tv_sec;\r
-               }\r
-#ifdef PFRAMES\r
-               sprintf(fpsbuff, "%i", Pico.m.frame_count);\r
-#endif\r
-\r
-               if (pthissec != tval.tv_sec)\r
-               {\r
-                       if (PsndOut == 0 && currentConfig.Frameskip >= 0) {\r
-                               pframes_done = pframes_shown = 0;\r
-                       } else {\r
-                               // it is quite common for this implementation to leave 1 fame unfinished\r
-                               // when second changes, but we don't want buffer to starve.\r
-                               if (PsndOut && pframes_done < target_fps && pframes_done > target_fps-5) {\r
-                                       emu_update_input();\r
-                                       SkipFrame(1); pframes_done++;\r
-                               }\r
-\r
-                               pframes_done  -= target_fps; if (pframes_done  < 0) pframes_done  = 0;\r
-                               pframes_shown -= target_fps; if (pframes_shown < 0) pframes_shown = 0;\r
-                               if (pframes_shown > pframes_done) pframes_shown = pframes_done;\r
-                       }\r
-                       pthissec = tval.tv_sec;\r
-               }\r
-\r
-               lim_time = (pframes_done+1) * target_frametime + vsync_offset;\r
-               if (currentConfig.Frameskip >= 0) // frameskip enabled\r
-               {\r
-                       for(i = 0; i < currentConfig.Frameskip; i++) {\r
-                               emu_update_input();\r
-                               SkipFrame(1); pframes_done++; frames_done++;\r
-                               if (PsndOut && !reset_timing) { // do framelimitting if sound is enabled\r
-                                       gettimeofday(&tval, 0);\r
-                                       if (pthissec != tval.tv_sec) tval.tv_usec+=1000000;\r
-                                       if (tval.tv_usec < lim_time) { // we are too fast\r
-                                               simpleWait(pthissec, lim_time);\r
-                                       }\r
-                               }\r
-                               lim_time += target_frametime;\r
-                       }\r
-               }\r
-               else if (tval.tv_usec > lim_time) // auto frameskip\r
-               {\r
-                       // no time left for this frame - skip\r
-                       if (tval.tv_usec - lim_time >= 300000) {\r
-                               /* something caused a slowdown for us (disk access? cache flush?)\r
-                                * try to recover by resetting timing... */\r
-                               reset_timing = 1;\r
-                               continue;\r
-                       }\r
-                       emu_update_input();\r
-                       SkipFrame(tval.tv_usec < lim_time+target_frametime*2); pframes_done++; frames_done++;\r
-                       continue;\r
-               }\r
 \r
-               emu_update_input();\r
-               PicoFrame();\r
-\r
-               // check time\r
-               gettimeofday(&tval, 0);\r
-               if (pthissec != tval.tv_sec) tval.tv_usec+=1000000;\r
-\r
-               if (currentConfig.Frameskip < 0 && tval.tv_usec - lim_time >= 300000) // slowdown detection\r
-                       reset_timing = 1;\r
-               else if (PsndOut != NULL || currentConfig.Frameskip < 0)\r
-               {\r
-                       // sleep or vsync if we are still too fast\r
-                       // usleep sleeps for ~20ms minimum, so it is not a solution here\r
-                       if (!reset_timing && tval.tv_usec < lim_time)\r
-                       {\r
-                               // we are too fast\r
-                               if (vsync_offset) {\r
-                                       if (lim_time - tval.tv_usec > target_frametime/2)\r
-                                               simpleWait(pthissec, lim_time - target_frametime/4);\r
-                                       gp2x_video_wait_vsync();\r
-                               } else {\r
-                                       simpleWait(pthissec, lim_time);\r
-                               }\r
-                       }\r
-               }\r
-\r
-               blit(fpsbuff, notice);\r
-\r
-               pframes_done++; pframes_shown++;\r
-                frames_done++;  frames_shown++;\r
-       }\r
-\r
-       emu_changeFastForward(0);\r
+       pemu_sound_start();\r
+}\r
 \r
-       if (PicoAHW & PAHW_MCD)\r
-               PicoCDBufferFree();\r
+void pemu_loop_end(void)\r
+{\r
+       int po_old = PicoOpt;\r
+       int eo_old = currentConfig.EmuOpt;\r
 \r
-       // save SRAM\r
-       if ((currentConfig.EmuOpt & EOPT_USE_SRAM) && SRam.changed) {\r
-               plat_status_msg_busy_first("Writing SRAM/BRAM...");\r
-               emu_SaveLoadGame(0, 1);\r
-               SRam.changed = 0;\r
-       }\r
+       pemu_sound_stop();\r
+       memset32(g_screen_ptr, 0, 320*240*2/4);\r
 \r
-       // if in 8bit mode, generate 16bit image for menu background\r
-       if ((PicoOpt & POPT_ALT_RENDERER) || !(currentConfig.EmuOpt & EOPT_16BPP))\r
-               emu_forcedFrame(POPT_EN_SOFTSCALE);\r
-}\r
+       /* do one more frame for menu bg */\r
+       PicoOpt &= ~POPT_ALT_RENDERER;\r
+       PicoOpt |= POPT_EN_SOFTSCALE|POPT_ACC_SPRITES;\r
+       currentConfig.EmuOpt |= EOPT_16BPP;\r
 \r
+       PicoScanBegin = EmuScanBegin16;\r
+       PicoScanEnd = NULL;\r
+       PicoDrawSetColorFormat(1);\r
+       Pico.m.dirtyPal = 1;\r
+       PicoFrame();\r
 \r
-void emu_ResetGame(void)\r
-{\r
-       PicoReset();\r
-       reset_timing = 1;\r
+       PicoOpt = po_old;\r
+       currentConfig.EmuOpt = eo_old;\r
 }\r
 \r
 const char *plat_get_credits(void)\r