supporting caanoo, line doublers, refactoring

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

diff --git a/common/emu.h b/common/emu.h
index 90803a6..27864be 100644 (file)
--- a/common/emu.h
+++ b/common/emu.h
@@ -43,9 +43,8 @@ extern int g_screen_height;
 
 enum {
        EOPT_SCALE_NONE = 0,
-       EOPT_SCALE_SW_H,
-       EOPT_SCALE_HW_H,
-       EOPT_SCALE_HW_HV,
+       EOPT_SCALE_SW,
+       EOPT_SCALE_HW,
 };
 
 enum {
@@ -67,7 +66,8 @@ typedef struct _currentConfig_t {
        int CPUclock;
        int volume;
        int gamma;
-       int scaling;  // gp2x: 0=center, 1=hscale, 2=hvscale, 3=hsoftscale; psp: bilinear filtering
+       int scaling;  // gp2x: EOPT_SCALE_*; psp: bilinear filtering
+       int vscaling;
        int rotation; // for UIQ
        float scale; // psp: screen scale
        float hscale32, hscale40; // psp: horizontal scale

diff --git a/common/menu.c b/common/menu.c
index 35ab449..4ee5c19 100644 (file)
--- a/common/menu.c
+++ b/common/menu.c
@@ -1606,7 +1606,7 @@ static int menu_loop_32x_options(menu_id id, int keys)
 {\r
        static int sel = 0;\r
 \r
-       me_enable(e_menu_32x_options, MA_32XOPT_RENDERER, renderer_names32x != NULL);\r
+       me_enable(e_menu_32x_options, MA_32XOPT_RENDERER, renderer_names32x[0] != NULL);\r
        me_loop(e_menu_32x_options, &sel, NULL);\r
 \r
        return 0;\r
@@ -1834,7 +1834,7 @@ static menu_entry e_menu_options[] =
        mee_onoff     ("Enable sound",             MA_OPT_ENABLE_SOUND,  currentConfig.EmuOpt, EOPT_EN_SOUND),\r
        mee_cust      ("Sound Quality",            MA_OPT_SOUND_QUALITY, mh_opt_misc, mgn_opt_sound),\r
        mee_enum_h    ("Confirm savestate",        MA_OPT_CONFIRM_STATES,currentConfig.confirm_save, men_confirm_save, h_confirm_save),\r
-       mee_range     (cpu_clk_name,               MA_OPT_CPU_CLOCKS,    currentConfig.CPUclock, 20, 900),\r
+       mee_range     ("",                         MA_OPT_CPU_CLOCKS,    currentConfig.CPUclock, 20, 900),\r
        mee_handler   ("[Display options]",        menu_loop_gfx_options),\r
        mee_handler   ("[Sega/Mega CD options]",   menu_loop_cd_options),\r
 #ifndef NO_32X\r
@@ -1851,7 +1851,10 @@ static menu_entry e_menu_options[] =
 static int menu_loop_options(menu_id id, int keys)\r
 {\r
        static int sel = 0;\r
+       int i;\r
 \r
+       i = me_id2offset(e_menu_options, MA_OPT_CPU_CLOCKS);\r
+       e_menu_options[i].enabled = e_menu_options[i].name ? 1 : 0;\r
        me_enable(e_menu_options, MA_OPT_SAVECFG_GAME, rom_loaded);\r
        me_enable(e_menu_options, MA_OPT_LOADCFG, config_slot != config_slot_current);\r
 \r
@@ -2191,28 +2194,6 @@ void me_update_msg(const char *msg)
 \r
 // ------------ util ------------\r
 \r
-/* GP2X/wiz for now, probably extend later */\r
-void menu_plat_setup(int is_wiz)\r
-{\r
-       int i;\r
-\r
-       if (!is_wiz) {\r
-               me_enable(e_menu_gfx_options, MA_OPT_TEARING_FIX, 0);\r
-               i = me_id2offset(e_menu_gfx_options, MA_OPT_TEARING_FIX);\r
-               e_menu_gfx_options[i].need_to_save = 0;\r
-               return;\r
-       }\r
-\r
-       me_enable(e_menu_adv_options, MA_OPT_ARM940_SOUND, 0);\r
-       me_enable(e_menu_gfx_options, MA_OPT2_GAMMA, 0);\r
-       me_enable(e_menu_gfx_options, MA_OPT2_A_SN_GAMMA, 0);\r
-\r
-       i = me_id2offset(e_menu_gfx_options, MA_OPT_SCALING);\r
-       e_menu_gfx_options[i].max = 1;  /* only off and sw */\r
-       i = me_id2offset(e_menu_gfx_options, MA_OPT_ARM940_SOUND);\r
-       e_menu_gfx_options[i].need_to_save = 0;\r
-}\r
-\r
 /* hidden options for config engine only */\r
 static menu_entry e_menu_hidden[] =\r
 {\r

diff --git a/common/menu.h b/common/menu.h
index 64a70a7..fd80753 100644 (file)
--- a/common/menu.h
+++ b/common/menu.h
@@ -27,6 +27,7 @@ typedef enum
        MA_MAIN_EXIT,
        MA_OPT_RENDERER,
        MA_OPT_SCALING,
+       MA_OPT_VSCALING,
        MA_OPT_ACC_SPRITES,
        MA_OPT_SHOW_FPS,
        MA_OPT_FRAMESKIP,
@@ -195,7 +196,6 @@ extern int g_menuscreen_h;
 #endif
 
 void menu_init(void);
-void menu_plat_setup(int is_wiz);
 void text_out16(int x, int y, const char *texto, ...);
 void me_update_msg(const char *msg);
 

diff --git a/common/plat.h b/common/plat.h
index bc48e83..eadc2a8 100644 (file)
--- a/common/plat.h
+++ b/common/plat.h
@@ -3,7 +3,6 @@ extern "C" {
 #endif
 
 /* stuff to be implemented by platform code */
-extern char cpu_clk_name[];
 extern const char *renderer_names[];
 extern const char *renderer_names32x[];
 

diff --git a/gp2x/emu.c b/gp2x/emu.c
index b019c3b..7520076 100644 (file)
--- a/gp2x/emu.c
+++ b/gp2x/emu.c
@@ -43,28 +43,15 @@ extern int crashed_940;
 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
+static int osd_fps_x, osd_y, doing_bg_frame;\r
 const char *renderer_names[] = { "16bit accurate", " 8bit accurate", " 8bit fast", NULL };\r
 const char *renderer_names32x[] = { "accurate", "faster", "fastest", NULL };\r
 enum renderer_types { RT_16BIT, RT_8BIT_ACC, RT_8BIT_FAST, RT_COUNT };\r
 \r
-extern void *gp2x_screens[4];\r
-\r
+static int (*emu_scan_begin)(unsigned int num) = NULL;\r
+static int (*emu_scan_end)(unsigned int num) = NULL;\r
 \r
-static void scaling_update(void)\r
-{\r
-       PicoOpt &= ~(POPT_DIS_32C_BORDER|POPT_EN_SOFTSCALE);\r
-       switch (currentConfig.scaling) {\r
-               default:break;\r
-               case EOPT_SCALE_HW_H:\r
-               case EOPT_SCALE_HW_HV:\r
-                       PicoOpt |= POPT_DIS_32C_BORDER;\r
-                       break;\r
-               case EOPT_SCALE_SW_H:\r
-                       PicoOpt |= POPT_EN_SOFTSCALE;\r
-                       break;\r
-       }\r
-}\r
+extern void *gp2x_screens[4];\r
 \r
 \r
 void pemu_prep_defconfig(void)\r
@@ -83,12 +70,9 @@ void pemu_prep_defconfig(void)
 \r
 void pemu_validate_config(void)\r
 {\r
-       gp2x_soc_t soc;\r
-\r
-       soc = soc_detect();\r
-       if (soc != SOCID_MMSP2)\r
+       if (gp2x_dev_id != GP2X_DEV_GP2X)\r
                PicoOpt &= ~POPT_EXT_FM;\r
-       if (soc != SOCID_POLLUX)\r
+       if (gp2x_dev_id != GP2X_DEV_WIZ)\r
                currentConfig.EmuOpt &= ~EOPT_WIZ_TEAR_FIX;\r
 \r
        if (currentConfig.gamma < 10 || currentConfig.gamma > 300)\r
@@ -114,6 +98,11 @@ static void change_renderer(int diff)
        else\r
                r = &currentConfig.renderer;\r
        *r += diff;\r
+\r
+       // 8bpp fast is not there (yet?)\r
+       if ((PicoAHW & PAHW_SMS) && *r == RT_8BIT_FAST)\r
+               (*r)++;\r
+\r
        if      (*r >= RT_COUNT)\r
                *r = 0;\r
        else if (*r < 0)\r
@@ -277,6 +266,46 @@ static int EmuScanEnd8_rot(unsigned int num)
        return 0;\r
 }\r
 \r
+/* line doublers */\r
+static unsigned int ld_counter;\r
+static int ld_left, ld_lines;\r
+\r
+static int EmuScanBegin16_ld(unsigned int num)\r
+{\r
+       if ((signed int)(ld_counter - num) > 100)\r
+               ld_counter = 0;\r
+\r
+       if (emu_scan_begin)\r
+               return emu_scan_begin(ld_counter);\r
+       else\r
+               DrawLineDest = (char *)g_screen_ptr + 320 * ld_counter * gp2x_current_bpp / 8;\r
+\r
+       return 0;\r
+}\r
+\r
+static int EmuScanEnd16_ld(unsigned int num)\r
+{\r
+       void *oldline = DrawLineDest;\r
+\r
+       if (emu_scan_end)\r
+               emu_scan_end(ld_counter);\r
+\r
+       ld_counter++;\r
+       ld_left--;\r
+       if (ld_left <= 0) {\r
+               ld_left = ld_lines;\r
+\r
+               EmuScanBegin16_ld(num);\r
+               memcpy32(DrawLineDest, oldline, 320 * gp2x_current_bpp / 8 / 4);\r
+               if (emu_scan_end)\r
+                       emu_scan_end(ld_counter);\r
+\r
+               ld_counter++;\r
+       }\r
+\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
@@ -358,12 +387,10 @@ void pemu_finalize_frame(const char *fps, const char *notice)
                }\r
        }\r
 \r
-       if (notice || (emu_opt & EOPT_SHOW_FPS)) {\r
-               if (notice)\r
-                       osd_text(4, osd_y, notice);\r
-               if (emu_opt & 2)\r
-                       osd_text(osd_fps_x, osd_y, fps);\r
-       }\r
+       if (notice)\r
+               osd_text(4, osd_y, notice);\r
+       if (emu_opt & EOPT_SHOW_FPS)\r
+               osd_text(osd_fps_x, osd_y, fps);\r
        if ((PicoAHW & PAHW_MCD) && (emu_opt & EOPT_EN_CD_LEDS))\r
                draw_cd_leds();\r
        if (PicoAHW & PAHW_PICO)\r
@@ -458,77 +485,73 @@ void plat_status_msg_busy_first(const char *msg)
        plat_status_msg_busy_next(msg);\r
 }\r
 \r
-static void vidResetMode(void)\r
+static void vid_reset_mode(void)\r
 {\r
        int gp2x_mode = 16;\r
        int renderer = get_renderer();\r
 \r
-       PicoScanBegin = NULL;\r
-       PicoScanEnd = NULL;\r
+       PicoOpt &= ~POPT_ALT_RENDERER;\r
+       emu_scan_begin = NULL;\r
+       emu_scan_end = NULL;\r
 \r
        switch (renderer) {\r
        case RT_16BIT:\r
-               PicoOpt &= ~POPT_ALT_RENDERER;\r
                PicoDrawSetOutFormat(PDF_RGB555, 0);\r
                PicoDrawSetOutBuf(g_screen_ptr, g_screen_width * 2);\r
-               if (currentConfig.EmuOpt & EOPT_WIZ_TEAR_FIX) {\r
-                       PicoScanBegin = EmuScanBegin16_rot;\r
-                       PicoScanEnd = EmuScanEnd16_rot;\r
-               }\r
                break;\r
        case RT_8BIT_ACC:\r
-               PicoOpt &= ~POPT_ALT_RENDERER;\r
                PicoDrawSetOutFormat(PDF_8BIT, 0);\r
                PicoDrawSetOutBuf(g_screen_ptr, g_screen_width);\r
-               if (currentConfig.EmuOpt & EOPT_WIZ_TEAR_FIX) {\r
-                       PicoScanBegin = EmuScanBegin8_rot;\r
-                       PicoScanEnd = EmuScanEnd8_rot;\r
-               }\r
                gp2x_mode = 8;\r
                break;\r
        case RT_8BIT_FAST:\r
-               PicoOpt |=  POPT_ALT_RENDERER;\r
+               PicoOpt |= POPT_ALT_RENDERER;\r
                PicoDrawSetOutFormat(PDF_NONE, 0);\r
-               if (currentConfig.EmuOpt & EOPT_WIZ_TEAR_FIX)\r
-                       vidcpyM2 = vidcpy_m2_rot;\r
-               else\r
-                       vidcpyM2 = vidcpy_m2;\r
+               vidcpyM2 = vidcpy_m2;\r
                gp2x_mode = 8;\r
                break;\r
+       default:\r
+               printf("bad renderer\n");\r
+               break;\r
        }\r
 \r
-       if (is_16bit_mode())\r
-               osd_text = (currentConfig.EmuOpt & EOPT_WIZ_TEAR_FIX) ? osd_text16_rot : osd_text16;\r
-       else\r
-               osd_text = (currentConfig.EmuOpt & EOPT_WIZ_TEAR_FIX) ? osd_text8_rot : osd_text8;\r
-\r
        if (PicoAHW & PAHW_32X) {\r
-               // rules change in 32X world\r
-               if (renderer != RT_16BIT) {\r
-                       PicoDrawSetOutFormat(PDF_NONE, 0);\r
-                       PicoScanBegin = NULL;\r
-                       PicoScanEnd = NULL;\r
-               }\r
-               PicoScan32xBegin = NULL;\r
-               PicoScan32xEnd = NULL;\r
-               if (currentConfig.EmuOpt & EOPT_WIZ_TEAR_FIX) {\r
-                       PicoScan32xBegin = EmuScanBegin16_rot;\r
-                       PicoScan32xEnd = EmuScanEnd16_rot;\r
-               }\r
                // Wiz 16bit is an exception, uses line rendering due to rotation mess\r
                if (renderer == RT_16BIT && (currentConfig.EmuOpt & EOPT_WIZ_TEAR_FIX)) {\r
                        PicoDrawSetOutFormat(PDF_RGB555, 1);\r
                        PicoDraw32xSetFrameMode(0, 0);\r
                }\r
                else {\r
+                       PicoDrawSetOutFormat(PDF_NONE, 0);\r
                        PicoDraw32xSetFrameMode(1, (renderer == RT_16BIT) ? 1 : 0);\r
                }\r
                PicoDrawSetOutBuf(g_screen_ptr, g_screen_width * 2);\r
-               gp2x_mode = 16;\r
        }\r
 \r
+       if (currentConfig.EmuOpt & EOPT_WIZ_TEAR_FIX) {\r
+               if ((PicoAHW & PAHW_32X) || renderer == RT_16BIT) {\r
+                       emu_scan_begin = EmuScanBegin16_rot;\r
+                       emu_scan_end = EmuScanEnd16_rot;\r
+               }\r
+               else if (renderer == RT_8BIT_ACC) {\r
+                       emu_scan_begin = EmuScanBegin8_rot;\r
+                       emu_scan_end = EmuScanEnd8_rot;\r
+               }\r
+               else if (renderer == RT_8BIT_FAST)\r
+                       vidcpyM2 = vidcpy_m2_rot;\r
+       }\r
+\r
+       PicoDrawSetCallbacks(emu_scan_begin, emu_scan_end);\r
+\r
+       if (is_16bit_mode())\r
+               osd_text = (currentConfig.EmuOpt & EOPT_WIZ_TEAR_FIX) ? osd_text16_rot : osd_text16;\r
+       else\r
+               osd_text = (currentConfig.EmuOpt & EOPT_WIZ_TEAR_FIX) ? osd_text8_rot : osd_text8;\r
+\r
        if (currentConfig.EmuOpt & EOPT_WIZ_TEAR_FIX)\r
                gp2x_mode = -gp2x_mode;\r
+\r
+       gp2x_video_wait_vsync();\r
        gp2x_video_changemode(gp2x_mode);\r
 \r
        if (!is_16bit_mode()) {\r
@@ -539,19 +562,60 @@ static void vidResetMode(void)
                localPal[0xf0] = 0x00ffffff;\r
                gp2x_video_setpalette(localPal, 0x100);\r
                gp2x_memset_all_buffers(0, 0xe0, 320*240);\r
-               gp2x_video_flip();\r
        }\r
+       else\r
+               gp2x_memset_all_buffers(0, 0, 320*240*2);\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
+       PicoOpt &= ~POPT_EN_SOFTSCALE;\r
+       if (currentConfig.scaling == EOPT_SCALE_SW)\r
+               PicoOpt |= POPT_EN_SOFTSCALE;\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 emu_video_mode_change(int start_line, int line_count, int is_32cols)\r
+{\r
+       int scalex = 320, scaley = 240;\r
+       int ln_offs = 0;\r
+\r
+       if (doing_bg_frame)\r
+               return;\r
+\r
+       osd_fps_x = OSD_FPS_X;\r
+       osd_y = 232;\r
+\r
+       /* set up hwscaling here */\r
+       PicoOpt &= ~POPT_DIS_32C_BORDER;\r
+       if (is_32cols && currentConfig.scaling == EOPT_SCALE_HW) {\r
+               scalex = 256;\r
+               PicoOpt |= POPT_DIS_32C_BORDER;\r
+               osd_fps_x = OSD_FPS_X - 64;\r
+       }\r
+\r
+       if (currentConfig.vscaling == EOPT_SCALE_HW) {\r
+               ln_offs = start_line;\r
+               scaley = line_count;\r
+               osd_y = start_line + line_count - 8;\r
+       }\r
+\r
+       gp2x_video_RGB_setscaling(ln_offs, scalex, scaley);\r
+\r
+       /* line doubling */\r
+       if (currentConfig.vscaling == EOPT_SCALE_SW && line_count < 240) {\r
+               ld_lines = ld_left = line_count / (240 - line_count);\r
+               PicoDrawSetCallbacks(EmuScanBegin16_ld, EmuScanEnd16_ld);\r
+       }\r
+\r
+       // clear whole screen in all buffers\r
+       if (!is_16bit_mode())\r
+               gp2x_memset_all_buffers(0, 0xe0, 320*240);\r
+       else\r
+               gp2x_memset_all_buffers(0, 0, 320*240*2);\r
+}\r
+\r
 void plat_video_toggle_renderer(int change, int is_menu_call)\r
 {\r
        change_renderer(change);\r
@@ -559,7 +623,7 @@ void plat_video_toggle_renderer(int change, int is_menu_call)
        if (is_menu_call)\r
                return;\r
 \r
-       vidResetMode();\r
+       vid_reset_mode();\r
        rendstatus_old = -1;\r
 \r
        if (PicoAHW & PAHW_32X)\r
@@ -730,22 +794,29 @@ void pemu_sound_wait(void)
        // don't need to do anything, writes will block by themselves\r
 }\r
 \r
-\r
 void pemu_forced_frame(int opts, int no_scale)\r
 {\r
        int po_old = PicoOpt;\r
 \r
+       doing_bg_frame = 1;\r
        PicoOpt &= ~POPT_ALT_RENDERER;\r
        PicoOpt |= opts|POPT_ACC_SPRITES;\r
 \r
+       memset32(g_screen_ptr, 0, g_screen_width * g_screen_height * 2 / 4);\r
+\r
        PicoDrawSetOutFormat(PDF_RGB555, 1);\r
        PicoDrawSetOutBuf(g_screen_ptr, g_screen_width * 2);\r
        PicoDraw32xSetFrameMode(0, 0);\r
-       PicoScanBegin = NULL;\r
-       PicoScanEnd = NULL;\r
+       PicoDrawSetCallbacks(NULL, NULL);\r
        Pico.m.dirtyPal = 1;\r
-       PicoFrameDrawOnly();\r
 \r
+       if (no_scale == -9)\r
+               // yes I'm lazy, see pemu_forced_frame call below\r
+               PicoFrame();\r
+       else\r
+               PicoFrameDrawOnly();\r
+\r
+       doing_bg_frame = 0;\r
        PicoOpt = po_old;\r
 }\r
 \r
@@ -753,30 +824,6 @@ void plat_debug_cat(char *str)
 {\r
 }\r
 \r
-void emu_video_mode_change(int start_line, int line_count, int is_32cols)\r
-{\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
-       /* 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
-       // clear whole screen in all buffers\r
-       if (!is_16bit_mode())\r
-               gp2x_memset_all_buffers(0, 0xe0, 320*240);\r
-       else\r
-               gp2x_memset_all_buffers(0, 0, 320*240*2);\r
-}\r
-\r
 #if 0\r
 static void tga_dump(void)\r
 {\r
@@ -842,7 +889,7 @@ void pemu_loop_prep(void)
 \r
        if (gp2x_old_clock < 0)\r
                gp2x_old_clock = default_cpu_clock;\r
-       if (gp2x_old_clock != currentConfig.CPUclock) {\r
+       if (gp2x_old_clock != currentConfig.CPUclock && gp2x_set_cpuclk != NULL) {\r
                printf("changing clock to %i...", currentConfig.CPUclock); fflush(stdout);\r
                gp2x_set_cpuclk(currentConfig.CPUclock);\r
                gp2x_old_clock = currentConfig.CPUclock;\r
@@ -869,8 +916,8 @@ void pemu_loop_prep(void)
        pal_old = Pico.m.pal;\r
 \r
        // make sure we are in correct mode\r
-       vidResetMode();\r
-       scaling_update();\r
+       change_renderer(0);\r
+       vid_reset_mode();\r
 \r
        // dirty buffers better go now than during gameplay\r
        sync();\r
@@ -881,26 +928,11 @@ void pemu_loop_prep(void)
 \r
 void pemu_loop_end(void)\r
 {\r
-       int po_old = PicoOpt;\r
-       int eo_old = currentConfig.EmuOpt;\r
-\r
        pemu_sound_stop();\r
-       memset32(g_screen_ptr, 0, 320*240*2/4);\r
 \r
        /* do one more frame for menu bg */\r
-       PicoOpt &= ~POPT_ALT_RENDERER;\r
-       PicoOpt |= POPT_EN_SOFTSCALE|POPT_ACC_SPRITES;\r
-\r
-       PicoDrawSetOutFormat(PDF_RGB555, 1);\r
-       PicoDrawSetOutBuf(g_screen_ptr, g_screen_width * 2);\r
-       PicoDraw32xSetFrameMode(0, 0);\r
-       PicoScanBegin = NULL;\r
-       PicoScanEnd = NULL;\r
-       Pico.m.dirtyPal = 1;\r
-       PicoFrame();\r
-\r
-       PicoOpt = po_old;\r
-       currentConfig.EmuOpt = eo_old;\r
+       pemu_forced_frame(POPT_EN_SOFTSCALE, -9);\r
+       g_menubg_src_ptr = g_screen_ptr;\r
 }\r
 \r
 const char *plat_get_credits(void)\r

diff --git a/gp2x/in_gp2x.c b/gp2x/in_gp2x.c
index eb97a7e..9894669 100644 (file)
--- a/gp2x/in_gp2x.c
+++ b/gp2x/in_gp2x.c
@@ -8,7 +8,7 @@
 
 #include "../common/input.h"
 #include "in_gp2x.h"
-#include "soc.h"
+#include "plat_gp2x.h"
 
 #define IN_PREFIX "gp2x:"
 #define IN_GP2X_NBUTTONS 32
@@ -92,15 +92,12 @@ static int in_gp2x_get_fake_bits(void)
 
 static void in_gp2x_probe(void)
 {
-       gp2x_soc_t soc;
-
-       soc = soc_detect();
-       switch (soc)
+       switch (gp2x_dev_id)
        {
-       case SOCID_MMSP2:
+       case GP2X_DEV_GP2X:
                in_gp2x_get_bits = in_gp2x_get_mmsp2_bits;
                break;
-       case SOCID_POLLUX:
+       case GP2X_DEV_WIZ:
                gpiodev = open("/dev/GPIO", O_RDONLY);
                if (gpiodev < 0) {
                        perror("in_gp2x: couldn't open /dev/GPIO");
@@ -320,10 +317,8 @@ static int in_gp2x_clean_binds(void *drv_data, int *binds, int *def_binds)
 void in_gp2x_init(void *vdrv)
 {
        in_drv_t *drv = vdrv;
-       gp2x_soc_t soc;
 
-       soc = soc_detect();
-       if (soc == SOCID_POLLUX)
+       if (gp2x_dev_id == GP2X_DEV_WIZ)
                in_gp2x_keys[BTN_START] = "MENU";
        
        in_gp2x_combo_keys = in_gp2x_combo_acts = 0;

diff --git a/gp2x/menu.c b/gp2x/menu.c
index 9dbabe4..9e53b25 100644 (file)
--- a/gp2x/menu.c
+++ b/gp2x/menu.c
@@ -1,5 +1,6 @@
 #include <time.h>
 #include "soc.h"
+#include "plat_gp2x.h"
 
 static void menu_main_plat_draw(void)
 {
@@ -60,10 +61,11 @@ static const char *mgn_aopt_gamma(menu_id id, int *offs)
 }
 
 
-const char *men_scaling_opts[] = { "OFF", "sw horizontal", "hw horizontal", "hw horiz. + vert", NULL };
+const char *men_scaling_opts[] = { "OFF", "software", "hardware", NULL };
 
 #define MENU_OPTIONS_GFX \
-       mee_enum      ("Scaling",                  MA_OPT_SCALING,        currentConfig.scaling, men_scaling_opts), \
+       mee_enum      ("Horizontal scaling",       MA_OPT_SCALING,        currentConfig.scaling, men_scaling_opts), \
+       mee_enum      ("Vertical scaling",         MA_OPT_VSCALING,       currentConfig.vscaling, men_scaling_opts), \
        mee_onoff     ("Tearing Fix",              MA_OPT_TEARING_FIX,    currentConfig.EmuOpt, EOPT_WIZ_TEAR_FIX), \
        mee_range_cust("Gamma correction",         MA_OPT2_GAMMA,         currentConfig.gamma, 1, 300, mgn_aopt_gamma), \
        mee_onoff     ("A_SN's gamma curve",       MA_OPT2_A_SN_GAMMA,    currentConfig.EmuOpt, EOPT_A_SN_GAMMA), \
@@ -76,3 +78,47 @@ const char *men_scaling_opts[] = { "OFF", "sw horizontal", "hw horizontal", "hw
        mee_onoff     ("SVP dynarec",              MA_OPT2_SVP_DYNAREC,   PicoOpt, POPT_EN_SVP_DRC), \
        mee_onoff     ("Status line in main menu", MA_OPT2_STATUS_LINE,   currentConfig.EmuOpt, EOPT_SHOW_RTC),
 
+
+static menu_entry e_menu_adv_options[];
+static menu_entry e_menu_gfx_options[];
+static menu_entry e_menu_options[];
+
+void gp2x_menu_init(void)
+{
+       static menu_entry *cpu_clk_ent;
+       int i;
+
+       i = me_id2offset(e_menu_options, MA_OPT_CPU_CLOCKS);
+       cpu_clk_ent = &e_menu_options[i];
+
+       /* disable by default.. */
+       me_enable(e_menu_adv_options, MA_OPT_ARM940_SOUND, 0);
+       me_enable(e_menu_gfx_options, MA_OPT_TEARING_FIX, 0);
+       me_enable(e_menu_gfx_options, MA_OPT2_GAMMA, 0);
+       me_enable(e_menu_gfx_options, MA_OPT2_A_SN_GAMMA, 0);
+
+       switch (gp2x_dev_id) {
+       case GP2X_DEV_GP2X:
+               me_enable(e_menu_adv_options, MA_OPT_ARM940_SOUND, 1);
+               me_enable(e_menu_gfx_options, MA_OPT2_GAMMA, 1);
+               me_enable(e_menu_gfx_options, MA_OPT2_A_SN_GAMMA, 1);
+               cpu_clk_ent->name = "GP2X CPU clocks";
+               break;
+       case GP2X_DEV_WIZ:
+               me_enable(e_menu_gfx_options, MA_OPT_TEARING_FIX, 1);
+               cpu_clk_ent->name = "Wiz/Caanoo CPU clock";
+               break;
+       case GP2X_DEV_CAANOO:
+               cpu_clk_ent->name = "Wiz/Caanoo CPU clock";
+               break;
+       default:
+               break;
+       }
+
+       if (gp2x_set_cpuclk == NULL)
+               cpu_clk_ent->name = "";
+
+       if (gp2x_dev_id != GP2X_DEV_GP2X)
+               men_scaling_opts[2] = NULL; /* leave only off and sw */
+}
+

diff --git a/gp2x/plat.c b/gp2x/plat.c
index f0be14e..6fce7bc 100644 (file)
--- a/gp2x/plat.c
+++ b/gp2x/plat.c
@@ -16,14 +16,15 @@
 
 /* GP2X local */
 int default_cpu_clock;
+int gp2x_dev_id;
+int gp2x_current_bpp;
 void *gp2x_screens[4];
 
 void gp2x_video_changemode(int bpp)
 {
        gp2x_video_changemode_ll(bpp);
 
-       gp2x_memset_all_buffers(0, 0, 320*240*2);
-       gp2x_video_flip();
+       gp2x_current_bpp = bpp < 0 ? -bpp : bpp;
 }
 
 static void gp2x_memcpy_buffers(int buffers, void *data, int offset, int len)
@@ -65,17 +66,17 @@ void gp2x_make_fb_bufferable(int yes)
 }
 
 /* common */
-char cpu_clk_name[16] = "GP2X CPU clocks";
-
 void plat_video_menu_enter(int is_rom_loaded)
 {
-       /* try to switch nicely avoiding tearing on Wiz */
-       gp2x_video_wait_vsync();
-       memset(gp2x_screens[0], 0, 320*240*2);
-       memset(gp2x_screens[1], 0, 320*240*2);
-       gp2x_video_flip2();
-       gp2x_video_wait_vsync();
-       gp2x_video_wait_vsync();
+       if (gp2x_current_bpp != 16 || gp2x_dev_id == GP2X_DEV_WIZ) {
+               /* try to switch nicely avoiding glitches */
+               gp2x_video_wait_vsync();
+               memset(gp2x_screens[0], 0, 320*240*2);
+               memset(gp2x_screens[1], 0, 320*240*2);
+               gp2x_video_flip2(); // might flip to fb2/3
+               gp2x_video_flip2(); // ..so we do it again
+               // gp2x_video_wait_vsync();
+       }
 
        // switch to 16bpp
        gp2x_video_changemode_ll(16);
@@ -98,21 +99,34 @@ void plat_video_menu_end(void)
 void plat_early_init(void)
 {
        gp2x_soc_t soc;
+       FILE *f;
 
        soc = soc_detect();
        switch (soc)
        {
        case SOCID_MMSP2:
                default_cpu_clock = 200;
+               gp2x_dev_id = GP2X_DEV_GP2X;
                break;
        case SOCID_POLLUX:
-               strcpy(cpu_clk_name, "Wiz CPU clock");
                default_cpu_clock = 533;
+               f = fopen("/dev/accel", "rb");
+               if (f) {
+                       printf("detected Caanoo\n");
+                       gp2x_dev_id = GP2X_DEV_CAANOO;
+                       fclose(f);
+               }
+               else {
+                       printf("detected Wiz\n");
+                       gp2x_dev_id = GP2X_DEV_WIZ;
+               }
                break;
        default:
                printf("could not recognize SoC, running in dummy mode.\n");
                break;
        }
+
+       gp2x_menu_init();
 }
 
 void plat_init(void)
@@ -124,11 +138,9 @@ void plat_init(void)
        {
        case SOCID_MMSP2:
                mmsp2_init();
-               menu_plat_setup(0);
                break;
        case SOCID_POLLUX:
                pollux_init();
-               menu_plat_setup(1);
                break;
        default:
                dummy_init();

diff --git a/gp2x/plat_gp2x.h b/gp2x/plat_gp2x.h
index 5a59452..c77e061 100644 (file)
--- a/gp2x/plat_gp2x.h
+++ b/gp2x/plat_gp2x.h
@@ -12,4 +12,18 @@ void gp2x_make_fb_bufferable(int yes);
 /* input */
 int gp2x_touchpad_read(int *x, int *y);
 
+/* misc */
+enum {
+       GP2X_DEV_GP2X = 1,
+       GP2X_DEV_WIZ,
+       GP2X_DEV_CAANOO,
+};
+extern int gp2x_dev_id;
+extern int gp2x_current_bpp;
+
+unsigned int plat_get_ticks_ms_good(void);
+unsigned int plat_get_ticks_us_good(void);
+
+void gp2x_menu_init(void);
+
 #endif

diff --git a/gp2x/soc.c b/gp2x/soc.c
index 5de0d23..43ebd85 100644 (file)
--- a/gp2x/soc.c
+++ b/gp2x/soc.c
@@ -39,7 +39,7 @@ gp2x_soc_t soc_detect(void)
        int memdev;
        int i;
 
-       if (ret != -2)
+       if ((int)ret != -2)
                /* already detected */
                return ret;
 

diff --git a/gp2x/soc_dummy.c b/gp2x/soc_dummy.c
index ad01ab7..9991082 100644 (file)
--- a/gp2x/soc_dummy.c
+++ b/gp2x/soc_dummy.c
@@ -35,11 +35,6 @@ static void gp2x_video_wait_vsync_(void)
 {
 }
 
-/* CPU clock */
-static void gp2x_set_cpuclk_(unsigned int mhz)
-{
-}
-
 /* RAM timings */
 static void set_ram_timings_(void)
 {
@@ -81,8 +76,6 @@ void dummy_init(void)
        gp2x_video_RGB_setscaling = gp2x_video_RGB_setscaling_;
        gp2x_video_wait_vsync = gp2x_video_wait_vsync_;
 
-       gp2x_set_cpuclk = gp2x_set_cpuclk_;
-
        set_lcd_custom_rate = set_lcd_custom_rate_;
        unset_lcd_custom_rate = unset_lcd_custom_rate_;
        set_lcd_gamma = set_lcd_gamma_;

diff --git a/gp2x/soc_mmsp2.c b/gp2x/soc_mmsp2.c
index 155cdf9..35748d8 100644 (file)
--- a/gp2x/soc_mmsp2.c
+++ b/gp2x/soc_mmsp2.c
@@ -41,9 +41,6 @@ static unsigned short gp2x_screenaddr_old[4];
 static unsigned short memtimex_old[2];
 static unsigned short reg0910;
 
-extern unsigned int plat_get_ticks_ms_good(void);
-extern unsigned int plat_get_ticks_us_good(void);
-
 /* video stuff */
 static void gp2x_video_flip_(void)
 {

diff --git a/gp2x/soc_pollux.c b/gp2x/soc_pollux.c
index 3b2ca2d..b343e14 100644 (file)
--- a/gp2x/soc_pollux.c
+++ b/gp2x/soc_pollux.c
@@ -21,11 +21,12 @@
 #include "soc.h"
 #include "plat_gp2x.h"
 #include "../common/emu.h"
+#include "../common/plat.h"
 #include "../common/arm_utils.h"
 #include "pollux_set.h"
 
 static volatile unsigned short *memregs;
-static volatile unsigned long  *memregl;
+static volatile unsigned int   *memregl;
 static int memdev = -1;
 static int battdev = -1;
 
@@ -241,10 +242,29 @@ static void timer_cleanup(void)
        TIMER_REG(0x44) = 0;    /* dividers back to default */
 }
 
+/* note: both PLLs are programmed the same way,
+ * the databook incorrectly states that PLL1 differs */
+static int decode_pll(unsigned int reg)
+{
+       long long v;
+       int p, m, s;
+
+       p = (reg >> 18) & 0x3f;
+       m = (reg >> 8) & 0x3ff;
+       s = reg & 0xff;
+
+       if (p == 0)
+               p = 1;
+
+       v = 27000000; // master clock
+       v = v * m / (p << s);
+       return v;
+}
+
 void pollux_init(void)
 {
        struct fb_fix_screeninfo fbfix;
-       int i, ret;
+       int i, ret, rate;
 
        memdev = open("/dev/mem", O_RDWR);
        if (memdev == -1) {
@@ -297,13 +317,32 @@ void pollux_init(void)
        if (battdev < 0)
                perror("Warning: could't open pollux_batt");
 
+       /* find what PLL1 runs at, for the timer */
+       rate = decode_pll(memregl[0xf008>>2]);
+       printf("PLL1 @ %dHz\n", rate);
+       rate /= 1000000;
+
        /* setup timer */
-       if (TIMER_REG(0x08) & 8)
-               timer_cleanup();
+       if (1 <= rate && rate <= 256) {
+               if (TIMER_REG(0x08) & 8) {
+                       fprintf(stderr, "warning: timer in use, overriding!\n");
+                       timer_cleanup();
+               }
+
+               TIMER_REG(0x44) = ((rate - 1) << 4) | 2; /* using PLL1, divide by it's rate */
+               TIMER_REG(0x40) = 0x0c;  /* clocks on */
+               TIMER_REG(0x08) = 0x6b;  /* run timer, clear irq, latch value */
+
+               gp2x_get_ticks_ms = gp2x_get_ticks_ms_;
+               gp2x_get_ticks_us = gp2x_get_ticks_us_;
+       }
+       else {
+               fprintf(stderr, "warning: could not make use of timer\n");
 
-       TIMER_REG(0x44) = 0x922; /* using PLL1, divider value 147 */
-       TIMER_REG(0x40) = 0x0c;  /* clocks on */
-       TIMER_REG(0x08) = 0x6b;  /* run timer, clear irq, latch value */
+               // those functions are actually not good at all on Wiz kernel
+               gp2x_get_ticks_ms = plat_get_ticks_ms_good;
+               gp2x_get_ticks_us = plat_get_ticks_us_good;
+       }
 
        pllsetreg0 = memregl[0xf004>>2];
        memtimex_old[0] = memregs[0x14802>>1];
@@ -316,7 +355,15 @@ void pollux_init(void)
        gp2x_video_RGB_setscaling = gp2x_video_RGB_setscaling_;
        gp2x_video_wait_vsync = gp2x_video_wait_vsync_;
 
-       gp2x_set_cpuclk = gp2x_set_cpuclk_;
+       /* some firmwares have sys clk on PLL0, we can't adjust CPU clock
+        * by reprogramming the PLL0 then, as it overclocks system bus */
+       if ((memregl[0xf000>>2] & 0x03000030) == 0x01000000)
+               gp2x_set_cpuclk = gp2x_set_cpuclk_;
+       else {
+               fprintf(stderr, "unexpected PLL config (%08x), overclocking disabled\n",
+                       memregl[0xf000>>2]);
+               gp2x_set_cpuclk = NULL;
+       }
 
        set_lcd_custom_rate = set_lcd_custom_rate_;
        unset_lcd_custom_rate = unset_lcd_custom_rate_;
@@ -325,9 +372,6 @@ void pollux_init(void)
        set_ram_timings = set_ram_timings_;
        unset_ram_timings = unset_ram_timings_;
        gp2x_read_battery = gp2x_read_battery_;
-
-       gp2x_get_ticks_ms = gp2x_get_ticks_ms_;
-       gp2x_get_ticks_us = gp2x_get_ticks_us_;
 }
 
 void pollux_finish(void)

diff --git a/linux/emu.c b/linux/emu.c
index db5d6be..65d868b 100644 (file)
--- a/linux/emu.c
+++ b/linux/emu.c
@@ -17,7 +17,6 @@
 \r
 \r
 static short __attribute__((aligned(4))) sndBuffer[2*44100/50];\r
-char cpu_clk_name[] = "unused";\r
 const char *renderer_names[] = { "16bit accurate", " 8bit accurate", " 8bit fast", NULL };\r
 const char *renderer_names32x[] = { "accurate", "faster", "fastest", NULL };\r
 enum renderer_types { RT_16BIT, RT_8BIT_ACC, RT_8BIT_FAST, RT_COUNT };\r
@@ -125,9 +124,6 @@ void pemu_finalize_frame(const char *fps, const char *notice)
 \r
 static void apply_renderer(void)\r
 {\r
-       PicoScanBegin = NULL;\r
-       PicoScanEnd = NULL;\r
-\r
        switch (currentConfig.renderer) {\r
        case RT_16BIT:\r
                PicoOpt &= ~POPT_ALT_RENDERER;\r

diff --git a/pandora/menu.c b/pandora/menu.c
index ae2a079..bcbbc1c 100644 (file)
--- a/pandora/menu.c
+++ b/pandora/menu.c
@@ -81,6 +81,7 @@ static int menu_loop_cscaler(menu_id id, int keys)
 #include <errno.h>
 
 static menu_entry e_menu_gfx_options[];
+static menu_entry e_menu_options[];
 
 void pnd_menu_init(void)
 {
@@ -139,5 +140,8 @@ void pnd_menu_init(void)
        i = me_id2offset(e_menu_gfx_options, MA_OPT3_FILTERING);
        e_menu_gfx_options[i].data = (void *)mfilters;
        pnd_filter_list = mfilters;
+
+       i = me_id2offset(e_menu_options, MA_OPT_SCALING);
+       e_menu_options[i]->name = "Max CPU clock";
 }
 

diff --git a/pandora/plat.c b/pandora/plat.c
index e259f85..9951973 100644 (file)
--- a/pandora/plat.c
+++ b/pandora/plat.c
@@ -39,7 +39,6 @@ static unsigned char __attribute__((aligned(4))) fb_copy[g_screen_width * g_scre
 unsigned char *PicoDraw2FB = temp_frame;\r
 const char *renderer_names[] = { NULL };\r
 const char *renderer_names32x[] = { NULL };\r
-char cpu_clk_name[] = "Max CPU clock";\r
 \r
 static int get_cpu_clock(void)\r
 {\r
@@ -371,9 +370,8 @@ void emu_video_mode_change(int start_line, int line_count, int is_32cols)
 {\r
        int fb_w = 320, fb_h = 240, fb_left = 0, fb_right = 0, fb_top = 0, fb_bottom = 0;\r
 \r
-       PicoScanBegin = emuscan;\r
-       PicoScanEnd = NULL;\r
        PicoDrawSetOutFormat(PDF_RGB555, 1);\r
+       PicoDrawSetCallbacks(emuscan, NULL);\r
 \r
        if (is_32cols) {\r
                fb_w = 256;\r

diff --git a/psp/emu.c b/psp/emu.c
index 77b20d1..8ee4a96 100644 (file)
--- a/psp/emu.c
+++ b/psp/emu.c
@@ -466,8 +466,7 @@ static void vidResetMode(void)
 
        // slow rend.
        PicoDrawSetOutFormat(PDF_NONE, 0);
-       PicoScanBegin = EmuScanSlowBegin;
-       PicoScanEnd = EmuScanSlowEnd;
+       PicoDrawSetCallbacks(EmuScanSlowBegin, EmuScanSlowEnd);
 
        localPal[0xe0] = 0;
        localPal[0xf0] = 0x001f;
@@ -683,8 +682,7 @@ void pemu_forced_frame(int opts, int no_scale)
        memset32_uncached((int *)psp_screen + 512*264*2/4, 0, 512*8*2/4);
 
        PicoDrawSetOutFormat(PDF_NONE, 0);
-       PicoScanBegin = EmuScanSlowBegin;
-       PicoScanEnd = EmuScanSlowEnd;
+       PicoDrawSetCallbacks(EmuScanSlowBegin, EmuScanSlowEnd);
        EmuScanPrepare();
        PicoFrameDrawOnly();
        blit1();

diff --git a/win32/plat.c b/win32/plat.c
index 15aff22..f83a901 100644 (file)
--- a/win32/plat.c
+++ b/win32/plat.c
@@ -16,8 +16,6 @@ unsigned char *PicoDraw2FB = PicoDraw2FB_;
 const char *renderer_names[] = { NULL };
 const char *renderer_names32x[] = { NULL };
 
-char cpu_clk_name[] = "unused";
-
 void plat_init(void)
 {
        g_screen_ptr = (void *)screen_buff;