some pandora tweaks

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

diff --git a/common/menu.c b/common/menu.c
index fdc8e89..39a71b1 100644 (file)
--- a/common/menu.c
+++ b/common/menu.c
@@ -164,7 +164,7 @@ static void smalltext_out16_(int x, int y, const char *texto, int color)
 static void smalltext_out16(int x, int y, const char *texto, int color)\r
 {\r
        char buffer[128];\r
-       int maxw = (g_screen_width - x) / 6;\r
+       int maxw = (g_screen_width - x) / me_sfont_w;\r
 \r
        if (maxw < 0)\r
                return;\r
@@ -274,7 +274,7 @@ void menu_init(void)
        memcpy(menu_font_data, menu_font_data + ((int)'>') * me_mfont_w * me_mfont_h / 2,\r
                me_mfont_w * me_mfont_h / 2);\r
        emu_make_path(buff, "skin/selector.png", sizeof(buff));\r
-       readpng(menu_font_data, buff, READPNG_SELECTOR, MENU_X2 ? 16 : 8, MENU_X2 ? 20 : 10);\r
+       readpng(menu_font_data, buff, READPNG_SELECTOR, me_mfont_w, me_mfont_h);\r
 \r
        // load custom colors\r
        emu_make_path(buff, "skin/skin.txt", sizeof(buff));\r
@@ -413,9 +413,12 @@ static void me_draw(const menu_entry *entries, int sel, void (*draw_more)(void))
                        wt = col2_offs;\r
 \r
                        switch (ent->beh) {\r
-                       case MB_NONE: break;\r
+                       case MB_NONE:\r
+                               break;\r
                        case MB_OPT_ONOFF:\r
-                       case MB_OPT_RANGE: wt += me_mfont_w * 3; break;\r
+                       case MB_OPT_RANGE:\r
+                               wt += me_mfont_w * 3;\r
+                               break;\r
                        case MB_OPT_CUSTOM:\r
                        case MB_OPT_CUSTONOFF:\r
                        case MB_OPT_CUSTRANGE:\r
@@ -694,11 +697,11 @@ static int cdload_called = 0;
 static void load_progress_cb(int percent)\r
 {\r
        int ln, len = percent * g_screen_width / 100;\r
-       unsigned short *dst = (unsigned short *)g_screen_ptr + g_screen_width * 10 * 2;\r
+       unsigned short *dst = (unsigned short *)g_screen_ptr + g_screen_width * me_sfont_h * 2;\r
 \r
        if (len > g_screen_width)\r
                len = g_screen_width;\r
-       for (ln = 10 - 2; ln > 0; ln--, dst += g_screen_width)\r
+       for (ln = me_sfont_h - 2; ln > 0; ln--, dst += g_screen_width)\r
                memset(dst, 0xff, len * 2);\r
        plat_video_menu_end();\r
 }\r
@@ -706,7 +709,7 @@ static void load_progress_cb(int percent)
 static void cdload_progress_cb(const char *fname, int percent)\r
 {\r
        int ln, len = percent * g_screen_width / 100;\r
-       unsigned short *dst = (unsigned short *)g_screen_ptr + g_screen_width * 10 * 2;\r
+       unsigned short *dst = (unsigned short *)g_screen_ptr + g_screen_width * me_sfont_h * 2;\r
 \r
        memset(dst, 0xff, g_screen_width * (me_sfont_h - 2) * 2);\r
 \r
@@ -767,8 +770,8 @@ static void do_delete(const char *fpath, const char *fname)
                menu_darken_bg(g_screen_ptr, g_screen_ptr, g_screen_width * g_screen_height, 0);\r
 \r
        len = strlen(fname);\r
-       if (len > g_screen_width/6)\r
-               len = g_screen_width/6;\r
+       if (len > g_screen_width / me_sfont_w)\r
+               len = g_screen_width / me_sfont_w;\r
 \r
        mid = g_screen_width / 2;\r
        text_out16(mid - me_mfont_w * 15 / 2,  8 * me_mfont_h, "About to delete");\r
@@ -1021,7 +1024,7 @@ static void draw_patchlist(int sel)
 {\r
        int max_cnt, start, i, pos, active;\r
 \r
-       max_cnt = g_screen_height / 10;\r
+       max_cnt = g_screen_height / me_sfont_h;\r
        start = max_cnt / 2 - sel;\r
 \r
        plat_video_menu_begin();\r
@@ -1031,8 +1034,8 @@ static void draw_patchlist(int sel)
                if (pos < 0) continue;\r
                if (pos >= max_cnt) break;\r
                active = PicoPatches[i].active;\r
-               smalltext_out16(14,     pos * me_sfont_h, active ? "ON " : "OFF", active ? 0xfff6 : 0xffff);\r
-               smalltext_out16(14+6*4, pos * me_sfont_h, PicoPatches[i].name,    active ? 0xfff6 : 0xffff);\r
+               smalltext_out16(14,                pos * me_sfont_h, active ? "ON " : "OFF", active ? 0xfff6 : 0xffff);\r
+               smalltext_out16(14 + me_sfont_w*4, pos * me_sfont_h, PicoPatches[i].name,    active ? 0xfff6 : 0xffff);\r
        }\r
        pos = start + i;\r
        if (pos < max_cnt)\r
@@ -1095,7 +1098,7 @@ static void draw_savestate_bg(int slot)
        PicoStateLoadGfx(fname);\r
 \r
        /* do a frame and fetch menu bg */\r
-       pemu_forced_frame(POPT_EN_SOFTSCALE);\r
+       pemu_forced_frame(POPT_EN_SOFTSCALE, 0);\r
        menu_enter(1);\r
 \r
        PicoTmpStateRestore(tmp_state);\r
@@ -1539,6 +1542,8 @@ static int menu_loop_cd_options(menu_id id, int keys)
 \r
 // ------------ 32X options menu ------------\r
 \r
+#ifndef NO_32X\r
+\r
 // convert from multiplier of VClk\r
 static int mh_opt_sh2cycles(menu_id id, int keys)\r
 {\r
@@ -1591,6 +1596,8 @@ static int menu_loop_32x_options(menu_id id, int keys)
        return 0;\r
 }\r
 \r
+#endif\r
+\r
 // ------------ adv options menu ------------\r
 \r
 static menu_entry e_menu_adv_options[] =\r
@@ -1814,7 +1821,9 @@ static menu_entry e_menu_options[] =
        mee_range     (cpu_clk_name,               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
        mee_handler   ("[32X options]",            menu_loop_32x_options),\r
+#endif\r
        mee_handler   ("[Advanced options]",       menu_loop_adv_options),\r
        mee_cust_nosave("Save global config",      MA_OPT_SAVECFG, mh_saveloadcfg, mgn_saveloadcfg),\r
        mee_cust_nosave("Save cfg for loaded game",MA_OPT_SAVECFG_GAME, mh_saveloadcfg, mgn_saveloadcfg),\r
@@ -1899,7 +1908,7 @@ static void draw_frame_debug(void)
        if (PicoDrawMask & PDRAW_32X_ON)         memcpy(layer_str + 26, "32x", 4);\r
 \r
        memset(g_screen_ptr, 0, g_screen_width * g_screen_height * 2);\r
-       pemu_forced_frame(0);\r
+       pemu_forced_frame(0, 0);\r
        smalltext_out16(4, 1, "build: r" REVISION "  "__DATE__ " " __TIME__ " " COMPILER, 0xffff);\r
        smalltext_out16(4, g_screen_height - me_sfont_h, layer_str, 0xffff);\r
 }\r
@@ -1924,12 +1933,14 @@ static void debug_menu_loop(void)
                                        dumped = 0;\r
                                }\r
                                break;\r
-                       case 1: draw_frame_debug(); break;\r
+                       case 1: draw_frame_debug();\r
+                               break;\r
                        case 2: memset(g_screen_ptr, 0, g_screen_width * g_screen_height * 2);\r
-                               pemu_forced_frame(0);\r
+                               pemu_forced_frame(0, 1);\r
                                menu_darken_bg(g_screen_ptr, g_screen_ptr, g_screen_width * g_screen_height, 0);\r
                                PDebugShowSpriteStats((unsigned short *)g_screen_ptr + (g_screen_height/2 - 240/2)*g_screen_width +\r
-                                       g_screen_width/2 - 320/2, g_screen_width); break;\r
+                                       g_screen_width/2 - 320/2, g_screen_width);\r
+                               break;\r
                        case 3: memset(g_screen_ptr, 0, g_screen_width * g_screen_height * 2);\r
                                PDebugShowPalette(g_screen_ptr, g_screen_width);\r
                                PDebugShowSprite((unsigned short *)g_screen_ptr + g_screen_width*120 + g_screen_width/2 + 16,\r
@@ -2199,7 +2210,9 @@ static menu_entry *e_menu_table[] =
        e_menu_gfx_options,\r
        e_menu_adv_options,\r
        e_menu_cd_options,\r
+#ifndef NO_32X\r
        e_menu_32x_options,\r
+#endif\r
        e_menu_keyconfig,\r
        e_menu_hidden,\r
 };\r

diff --git a/common/plat.h b/common/plat.h
index 99557da..bc48e83 100644 (file)
--- a/common/plat.h
+++ b/common/plat.h
@@ -11,7 +11,7 @@ void pemu_prep_defconfig(void);
 void pemu_validate_config(void);
 void pemu_loop_prep(void);
 void pemu_loop_end(void);
-void pemu_forced_frame(int opts);
+void pemu_forced_frame(int opts, int no_scale);
 void pemu_finalize_frame(const char *fps, const char *notice_msg);
 
 void pemu_sound_start(void);

diff --git a/gp2x/emu.c b/gp2x/emu.c
index 1f60e16..ad6b59b 100644 (file)
--- a/gp2x/emu.c
+++ b/gp2x/emu.c
@@ -730,7 +730,7 @@ void pemu_sound_wait(void)
 }\r
 \r
 \r
-void pemu_forced_frame(int opts)\r
+void pemu_forced_frame(int opts, int no_scale)\r
 {\r
        int po_old = PicoOpt;\r
 \r

diff --git a/linux/emu.c b/linux/emu.c
index 08421fa..1d9c2bb 100644 (file)
--- a/linux/emu.c
+++ b/linux/emu.c
@@ -212,7 +212,7 @@ void plat_update_volume(int has_changed, int is_up)
 {\r
 }\r
 \r
-void pemu_forced_frame(int opts)\r
+void pemu_forced_frame(int opts, int no_scale)\r
 {\r
        int po_old = PicoOpt;\r
        int eo_old = currentConfig.EmuOpt;\r

diff --git a/linux/oshide.c b/linux/oshide.c
index 881fcb7..548315f 100644 (file)
--- a/linux/oshide.c
+++ b/linux/oshide.c
@@ -186,6 +186,7 @@ static void hidecon_start(void)
                goto fail;
        }
 
+       g_kbd_termios_saved = kbd_termios;
        kbd_termios.c_lflag &= ~(ICANON | ECHO); // | ISIG);
        kbd_termios.c_iflag &= ~(ISTRIP | IGNCR | ICRNL | INLCR | IXOFF | IXON);
        kbd_termios.c_cc[VMIN] = 0;

diff --git a/pandora/Makefile b/pandora/Makefile
index 72cc9f2..0f73777 100644 (file)
--- a/pandora/Makefile
+++ b/pandora/Makefile
@@ -1,6 +1,7 @@
 #export CROSS = arm-none-linux-gnueabi-\r
 CROSS ?= $(CROSS_COMPILE)\r
 LIBROOT = /home/notaz/dev/pnd/libroot\r
+PND_MAKE ?= $(HOME)/dev/pnd/src/pandora-libraries/testdata/scripts/pnd_make.sh\r
 \r
 # settings\r
 use_cyclone = 1\r
@@ -18,6 +19,9 @@ asm_cdmemory = 1
 #profile = 1\r
 #drc_debug = 3\r
 \r
+no_32x = 1\r
+no_sms = 1\r
+\r
 -include Makefile.local\r
 \r
 ifeq "$(use_musashi)" "1"\r
@@ -87,13 +91,18 @@ tidy:
        $(RM) $(OBJS)\r
 \r
 readme.txt: ../../tools/textfilter ../base_readme.txt\r
-       ../../tools/textfilter ../base_readme.txt $@ GP2X\r
+       ../../tools/textfilter ../base_readme.txt $@ PANDORA\r
 \r
 # ----------- release -----------\r
 ifneq ($(findstring rel,$(MAKECMDGOALS)),)\r
-$(error TODO)\r
 ifeq ($(VER),)\r
 $(error need VER)\r
 endif\r
 endif\r
 \r
+rel: PicoDrive PicoDrive.run picorestore ../../pico/carthw.cfg readme.txt \\r
+       skin PicoDrive.png PicoDrive_p.png PicoDrive.pxml\r
+       rm -rf out\r
+       mkdir out\r
+       cp -r $^ out/\r
+       $(PND_MAKE) -p PicoDrive_$(VER).pnd -d out -x PicoDrive.pxml -i PicoDrive.png -c\r

diff --git a/pandora/emu.c b/pandora/emu.c
index a9556b1..7996a79 100644 (file)
--- a/pandora/emu.c
+++ b/pandora/emu.c
@@ -49,6 +49,7 @@ void pemu_prep_defconfig(void)
        g_menubg_ptr = temp_frame;\r
 \r
        defaultConfig.EmuOpt |= EOPT_VSYNC;\r
+       defaultConfig.s_PicoOpt |= POPT_EN_MCD_GFX|POPT_EN_MCD_PSYNC;\r
        defaultConfig.scaling = SCALE_2x2_3x2;\r
 }\r
 \r
@@ -113,9 +114,9 @@ static void draw_cd_leds(void)
 \r
 static int emuscan_1x1(unsigned int num)\r
 {\r
-       DrawLineDest = (unsigned short *)g_screen_ptr + num*800 + 800/2 - 320/2;\r
-       //int w = (Pico.video.reg[12]&1) ? 320 : 256;\r
-       //DrawLineDest = (unsigned short *)g_screen_ptr + num*w;\r
+       DrawLineDest = (unsigned short *)g_screen_ptr +\r
+               g_screen_width * g_screen_height / 2 - g_screen_width * 240 / 2 +\r
+               num*g_screen_width + g_screen_width/2 - 320/2;\r
 \r
        return 0;\r
 }\r
@@ -250,17 +251,24 @@ void plat_update_volume(int has_changed, int is_up)
        }\r
 }\r
 \r
-void pemu_forced_frame(int opts)\r
+void pemu_forced_frame(int opts, int no_scale)\r
 {\r
+       int oldscale = currentConfig.scaling;\r
        int po_old = PicoOpt;\r
 \r
-       PicoOpt &= ~0x10;\r
+       if (no_scale) {\r
+               currentConfig.scaling = SCALE_1x1;\r
+               emu_video_mode_change(0, 0, 0);\r
+       }\r
+\r
+       PicoOpt &= ~POPT_ALT_RENDERER;\r
        PicoOpt |= opts|POPT_ACC_SPRITES; // acc_sprites\r
 \r
        Pico.m.dirtyPal = 1;\r
        PicoFrameDrawOnly();\r
 \r
        PicoOpt = po_old;\r
+       currentConfig.scaling = oldscale;\r
 }\r
 \r
 static void updateSound(int len)\r
@@ -368,14 +376,11 @@ void emu_video_mode_change(int start_line, int line_count, int is_32cols)
 \r
 void pemu_loop_prep(void)\r
 {\r
-       emu_video_mode_change(0, 0, 0);\r
-       \r
        if (currentConfig.CPUclock != get_cpu_clock()) {\r
-               FILE *f = fopen("/proc/pandora/cpu_mhz_max", "w");\r
-               if (f != NULL) {\r
-                       fprintf(f, "%d\n", currentConfig.CPUclock);\r
-                       fclose(f);\r
-               }\r
+               char buf[64];\r
+               snprintf(buf, sizeof(buf), "sudo /usr/pandora/scripts/op_cpuspeed.sh %d",\r
+                       currentConfig.CPUclock);\r
+               system(buf);\r
        }\r
 \r
        pemu_sound_start();\r
@@ -434,7 +439,7 @@ const char *plat_get_credits(void)
                "Reesy & FluBBa: DrZ80 core\n"\r
                "MAME devs: YM2612 and SN76496 cores\n"\r
                "Pandora team: Pandora\n"\r
-               "Inder: menu bg\n"\r
+               "Inder, ketchupgun: graphics\n"\r
                "\n"\r
                "special thanks (for docs, ideas):\n"\r
                " Charles MacDonald, Haze,\n"\r

diff --git a/psp/emu.c b/psp/emu.c
index 6169940..77b20d1 100644 (file)
--- a/psp/emu.c
+++ b/psp/emu.c
@@ -668,7 +668,7 @@ static void SkipFrame(void)
        PicoSkipFrame=0;
 }
 
-void pemu_forced_frame(int opts)
+void pemu_forced_frame(int opts, int no_scale)
 {
        int po_old = PicoOpt;
        int eo_old = currentConfig.EmuOpt;

diff --git a/win32/plat.c b/win32/plat.c
index ecf4719..91ef0e0 100644 (file)
--- a/win32/plat.c
+++ b/win32/plat.c
@@ -82,7 +82,7 @@ void pemu_loop_end(void)
        pemu_sound_stop();
 }
 
-void pemu_forced_frame(int opts)
+void pemu_forced_frame(int opts, int no_scale)
 {
 }