bugfixes, CD swap, autorepeat

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

diff --git a/gp2x/emu.c b/gp2x/emu.c
index 99357b2..c16b658 100644 (file)
--- a/gp2x/emu.c
+++ b/gp2x/emu.c
@@ -156,7 +156,7 @@ int find_bios(int region, char **bios_file)
 \r
 /* checks if romFileName points to valid MegaCD image\r
  * if so, checks for suitable BIOS */\r
-static int cd_check(char **bios_file)\r
+int emu_cd_check(char **bios_file)\r
 {\r
        unsigned char buf[32];\r
        pm_file *cd_f;\r
@@ -177,7 +177,7 @@ static int cd_check(char **bios_file)
                return 0;\r
        }\r
 \r
-       /* it seems we have a CD image here. Try to detect region and load a suitable BIOS now.. */\r
+       /* it seems we have a CD image here. Try to detect region now.. */\r
        pm_seek(cd_f, (type == 1) ? 0x100+0x10B : 0x110+0x10B, SEEK_SET);\r
        pm_read(buf, 1, cd_f);\r
        pm_close(cd_f);\r
@@ -193,7 +193,9 @@ static int cd_check(char **bios_file)
                printf("overrided region to %s\n", region != 4 ? (region == 8 ? "EU" : "JAP") : "USA");\r
        }\r
 \r
-       if(find_bios(region, bios_file))\r
+       if (bios_file == NULL) return type;\r
+\r
+       if (find_bios(region, bios_file))\r
                 return type;   // CD and BIOS detected\r
 \r
        return -1;              // CD detected but load failed\r
@@ -271,7 +273,7 @@ int emu_ReloadRom(void)
        }\r
 \r
        // check for MegaCD image\r
-       cd_state = cd_check(&used_rom_name);\r
+       cd_state = emu_cd_check(&used_rom_name);\r
        if (cd_state > 0) {\r
                PicoMCD |= 1;\r
                get_ext(used_rom_name, ext);\r
@@ -381,6 +383,7 @@ int emu_ReloadRom(void)
 \r
 \r
 static void emu_msg_cb(const char *msg);\r
+static void emu_msg_tray_open(void);\r
 \r
 void emu_Init(void)\r
 {\r
@@ -399,8 +402,8 @@ void emu_Init(void)
 \r
        PicoInit();\r
        PicoMessage = emu_msg_cb;\r
-\r
-//     logf = fopen("log.txt", "w");\r
+       PicoMCDopenTray = emu_msg_tray_open;\r
+       PicoMCDcloseTray = menu_loop_tray;\r
 }\r
 \r
 \r
@@ -528,8 +531,9 @@ int emu_ReadConfig(int game)
        }\r
        scaling_update();\r
        // some sanity checks\r
-       if (currentConfig.CPUclock < 1 || currentConfig.CPUclock > 4096) currentConfig.CPUclock = 200;\r
+       if (currentConfig.CPUclock < 10 || currentConfig.CPUclock > 4096) currentConfig.CPUclock = 200;\r
        if (currentConfig.gamma < 10 || currentConfig.gamma > 300) currentConfig.gamma = 100;\r
+       if (currentConfig.volume < 0 || currentConfig.volume > 99) currentConfig.volume = 50;\r
        // if volume keys are unbound, bind them to volume control\r
        if (!currentConfig.KeyBinds[23] && !currentConfig.KeyBinds[22]) {\r
                currentConfig.KeyBinds[23] = 1<<29; // vol up\r
@@ -603,7 +607,6 @@ void emu_Deinit(void)
        free(framebuff);\r
 \r
        PicoExit();\r
-//     fclose(logf);\r
 \r
        // restore gamma\r
        if (gp2x_old_gamma != 100)\r
@@ -824,6 +827,12 @@ static void emu_state_cb(const char *str)
        blit("", str);\r
 }\r
 \r
+static void emu_msg_tray_open(void)\r
+{\r
+       strcpy(noticeMsg, "CD tray opened");\r
+       gettimeofday(&noticeMsgTime, 0);\r
+}\r
+\r
 static void RunEvents(unsigned int which)\r
 {\r
        if(which & 0x1800) { // save or load (but not both)\r
@@ -974,7 +983,7 @@ static void updateKeys(void)
        if(events & 0x6000) {\r
                int vol = currentConfig.volume;\r
                if (events & 0x2000) {\r
-                       if (vol < 90) vol++;\r
+                       if (vol < 99) vol++;\r
                } else {\r
                        if (vol >  0) vol--;\r
                }\r
@@ -1196,7 +1205,7 @@ void emu_Loop(void)
                                if (frames_shown > frames_done) frames_shown = frames_done;\r
                        }\r
                }\r
-#if 1\r
+#if 0\r
                sprintf(fpsbuff, "%05i", Pico.m.frame_count);\r
 #endif\r
                lim_time = (frames_done+1) * target_frametime;\r

diff --git a/gp2x/emu.h b/gp2x/emu.h
index b487c51..627c226 100644 (file)
--- a/gp2x/emu.h
+++ b/gp2x/emu.h
@@ -13,6 +13,7 @@ enum TPicoGameState {
        PGS_KeyConfig,\r
        PGS_ReloadRom,\r
        PGS_Menu,\r
+       PGS_RestartRun,\r
 };\r
 \r
 typedef struct {\r
@@ -52,6 +53,7 @@ char *emu_GetSaveFName(int load, int is_sram, int slot);
 int  emu_check_save_file(int slot);\r
 void emu_set_save_cbs(int gz);\r
 void emu_forced_frame(void);\r
+int  emu_cd_check(char **bios_file);\r
 int  find_bios(int region, char **bios_file);\r
 void scaling_update(void);\r
 \r

diff --git a/gp2x/main.c b/gp2x/main.c
index 23d6241..61579cf 100644 (file)
--- a/gp2x/main.c
+++ b/gp2x/main.c
@@ -120,6 +120,9 @@ int main(int argc, char *argv[])
                                }\r
                                break;\r
 \r
+                       case PGS_RestartRun:\r
+                               engineState = PGS_Running;\r
+\r
                        case PGS_Running:\r
                                emu_Loop();\r
                                break;\r

diff --git a/gp2x/menu.c b/gp2x/menu.c
index f9c8065..881ea98 100644 (file)
--- a/gp2x/menu.c
+++ b/gp2x/menu.c
@@ -15,6 +15,7 @@
 #include "menu.h"\r
 #include "fonts.h"\r
 #include "usbjoy.h"\r
+#include "asmutils.h"\r
 #include "version.h"\r
 \r
 #include <Pico/PicoInt.h>\r
@@ -170,14 +171,16 @@ static int inp_prevjoy = 0;
 static unsigned long wait_for_input(unsigned long interesting)\r
 {\r
        unsigned long ret;\r
-       static int repeats = 0, wait = 300*1000;\r
+       static int repeats = 0, wait = 50*1000;\r
        int release = 0, i;\r
 \r
-       if (repeats == 5 || repeats == 15 || repeats == 30) wait /= 2;\r
+       if (repeats == 2 || repeats == 4) wait /= 2;\r
+       if (repeats == 6) wait = 15 * 1000;\r
 \r
        for (i = 0; i < 6 && inp_prev == gp2x_joystick_read(1); i++) {\r
-               if(i == 0) repeats++;\r
-               usleep(wait/6);\r
+               if (i == 0) repeats++;\r
+               if (wait >= 30*1000) usleep(wait); // usleep sleeps for ~30ms minimum\r
+               else spend_cycles(wait * currentConfig.CPUclock);\r
        }\r
 \r
        while ( !((ret = gp2x_joystick_read(1)) & interesting) ) {\r
@@ -187,7 +190,7 @@ static unsigned long wait_for_input(unsigned long interesting)
 \r
        if (release || ret != inp_prev) {\r
                repeats = 0;\r
-               wait = 300*1000;\r
+               wait = 50*1000;\r
        }\r
        inp_prev = ret;\r
        inp_prevjoy = 0;\r
@@ -356,8 +359,10 @@ static char *romsel_loop(char *curr_path)
                inp = wait_for_input(GP2X_UP|GP2X_DOWN|GP2X_LEFT|GP2X_RIGHT|GP2X_L|GP2X_R|GP2X_B|GP2X_X);\r
                if(inp & GP2X_UP  )  { sel--;   if (sel < 0)   sel = n-2; }\r
                if(inp & GP2X_DOWN)  { sel++;   if (sel > n-2) sel = 0; }\r
-               if(inp &(GP2X_LEFT|GP2X_L))  { sel-=10; if (sel < 0)   sel = 0; }\r
-               if(inp &(GP2X_RIGHT|GP2X_R)) { sel+=10; if (sel > n-2) sel = n-2; }\r
+               if(inp & GP2X_LEFT)  { sel-=10; if (sel < 0)   sel = 0; }\r
+               if(inp & GP2X_L)     { sel-=24; if (sel < 0)   sel = 0; }\r
+               if(inp & GP2X_RIGHT) { sel+=10; if (sel > n-2) sel = n-2; }\r
+               if(inp & GP2X_R)     { sel+=24; if (sel > n-2) sel = n-2; }\r
                if(inp & GP2X_B)     { // enter dir/select\r
                        again:\r
                        if (namelist[sel+1]->d_type == DT_REG) {\r
@@ -872,7 +877,7 @@ static void draw_amenu_options(int menu_sel)
        gp2x_text_out8(tl_x, (y+=10), "Emulate YM2612 (FM)        %s", (currentConfig.PicoOpt&0x001)?"ON":"OFF"); // 2\r
        gp2x_text_out8(tl_x, (y+=10), "Emulate SN76496 (PSG)      %s", (currentConfig.PicoOpt&0x002)?"ON":"OFF"); // 3\r
        gp2x_text_out8(tl_x, (y+=10), "gzip savestates            %s", (currentConfig.EmuOpt &0x008)?"ON":"OFF"); // 4\r
-       gp2x_text_out8(tl_x, (y+=10), "Don't save config on exit  %s", (currentConfig.EmuOpt &0x020)?"ON":"OFF"); // 5\r
+       gp2x_text_out8(tl_x, (y+=10), "Don't save last used ROM   %s", (currentConfig.EmuOpt &0x020)?"ON":"OFF"); // 5\r
        gp2x_text_out8(tl_x, (y+=10), "needs restart:");\r
        gp2x_text_out8(tl_x, (y+=10), "craigix's RAM timings      %s", (currentConfig.EmuOpt &0x100)?"ON":"OFF"); // 7\r
        gp2x_text_out8(tl_x, (y+=10), "squidgehack (now %s %s",   mms, (currentConfig.EmuOpt &0x010)?"ON":"OFF"); // 8\r
@@ -1256,7 +1261,11 @@ static void menu_loop_root(void)
                if(inp & GP2X_B   )  {\r
                        switch (menu_sel) {\r
                                case 0: // resume game\r
-                                       if (rom_data) { engineState = PGS_Running; return; }\r
+                                       if (rom_data) {\r
+                                               while (gp2x_joystick_read(1) & GP2X_B) usleep(50*1000);\r
+                                               engineState = PGS_Running;\r
+                                               return;\r
+                                       }\r
                                        break;\r
                                case 1: // save state\r
                                        if (rom_data) {\r
@@ -1355,3 +1364,85 @@ void menu_loop(void)
 \r
        menuErrorMsg[0] = 0;\r
 }\r
+\r
+\r
+// --------- CD tray close menu ----------\r
+\r
+static void draw_menu_tray(int menu_sel)\r
+{\r
+       int tl_x = 70, tl_y = 90, y;\r
+       memset(gp2x_screen, 0xe0, 320*240);\r
+\r
+       gp2x_text_out8(tl_x, 20, "The unit is about to");\r
+       gp2x_text_out8(tl_x, 30, "close the CD tray.");\r
+\r
+       y = tl_y;\r
+       gp2x_text_out8(tl_x, y,       "Load new CD image");\r
+       gp2x_text_out8(tl_x, (y+=10), "Insert nothing");\r
+\r
+       // draw cursor\r
+       gp2x_text_out8(tl_x - 16, tl_y + menu_sel*10, ">");\r
+       // error\r
+       if (menuErrorMsg[0]) gp2x_text_out8(5, 226, menuErrorMsg);\r
+       gp2x_video_flip2();\r
+}\r
+\r
+\r
+int menu_loop_tray(void)\r
+{\r
+       int menu_sel = 0, menu_sel_max = 1;\r
+       unsigned long inp = 0;\r
+       char curr_path[PATH_MAX], *selfname;\r
+       FILE *tstf;\r
+\r
+       gp2x_memset_all_buffers(0, 0xe0, 320*240);\r
+       menu_gfx_prepare();\r
+\r
+       if ( (tstf = fopen(currentConfig.lastRomFile, "rb")) )\r
+       {\r
+               fclose(tstf);\r
+               strcpy(curr_path, currentConfig.lastRomFile);\r
+       }\r
+       else\r
+       {\r
+               getcwd(curr_path, PATH_MAX);\r
+       }\r
+\r
+       /* make sure action buttons are not pressed on entering menu */\r
+       draw_menu_tray(menu_sel);\r
+       while (gp2x_joystick_read(1) & GP2X_B) usleep(50*1000);\r
+\r
+       for (;;)\r
+       {\r
+               draw_menu_tray(menu_sel);\r
+               inp = wait_for_input(GP2X_UP|GP2X_DOWN|GP2X_B);\r
+               if(inp & GP2X_UP  )  { menu_sel--; if (menu_sel < 0) menu_sel = menu_sel_max; }\r
+               if(inp & GP2X_DOWN)  { menu_sel++; if (menu_sel > menu_sel_max) menu_sel = 0; }\r
+               if(inp & GP2X_B   )  {\r
+                       switch (menu_sel) {\r
+                               case 0: // select image\r
+                                       selfname = romsel_loop(curr_path);\r
+                                       if (selfname) {\r
+                                               int ret = -1, cd_type;\r
+                                               cd_type = emu_cd_check(NULL);\r
+                                               if (cd_type > 0)\r
+                                                       ret = Insert_CD(romFileName, cd_type == 2);\r
+                                               if (ret != 0) {\r
+                                                       sprintf(menuErrorMsg, "Load failed, invalid CD image?");\r
+                                                       printf("%s\n", menuErrorMsg);\r
+                                                       continue;\r
+                                               }\r
+                                               engineState = PGS_RestartRun;\r
+                                               return 1;\r
+                                       }\r
+                                       break;\r
+                               case 1: // insert nothing\r
+                                       engineState = PGS_RestartRun;\r
+                                       return 0;\r
+                       }\r
+               }\r
+               menuErrorMsg[0] = 0; // clear error msg\r
+       }\r
+}\r
+\r
+\r

diff --git a/gp2x/menu.h b/gp2x/menu.h
index 727f46a..87c51b5 100644 (file)
--- a/gp2x/menu.h
+++ b/gp2x/menu.h
@@ -9,6 +9,7 @@ void gp2x_text_out8  (int x, int y, const char *texto, ...);
 void gp2x_text_out15 (int x, int y, const char *text);\r
 void gp2x_text_out8_2(int x, int y, const char *texto, int color);\r
 void menu_loop(void);\r
+int  menu_loop_tray(void);\r
 \r
 #define CONFIGURABLE_KEYS \\r
        (GP2X_UP|GP2X_DOWN|GP2X_LEFT|GP2X_RIGHT|GP2X_A|GP2X_B|GP2X_X|GP2X_Y| \\r