updated EEPROM code, gmv fixed

[picodrive.git] / platform / gp2x / emu.c

diff --git a/platform/gp2x/emu.c b/platform/gp2x/emu.c
index a9a931a..3096edd 100644 (file)
--- a/platform/gp2x/emu.c
+++ b/platform/gp2x/emu.c
@@ -18,14 +18,15 @@
 #include "gp2x.h"\r
 #include "usbjoy.h"\r
 #include "menu.h"\r
-#include "asmutils.h"\r
+#include "../common/arm_utils.h"\r
+#include "../common/fonts.h"\r
 #include "cpuctrl.h"\r
-#include "fonts.h"\r
 \r
 #include <Pico/PicoInt.h>\r
 #include <Pico/Patch.h>\r
 #include <zlib/zlib.h>\r
 \r
+//#define PFRAMES\r
 \r
 #ifdef BENCHMARK\r
 #define OSD_FPS_X 220\r
@@ -52,7 +53,7 @@ static int combo_keys = 0, combo_acts = 0;    // keys and actions which need button
 static int gp2x_old_gamma = 100;\r
 static unsigned char *movie_data = NULL;\r
 static int movie_size = 0;\r
-unsigned char *framebuff = 0;  // temporary buffer for alt renderer\r
+unsigned char *PicoDraw2FB = NULL;  // temporary buffer for alt renderer\r
 int state_slot = 0;\r
 int reset_timing = 0;\r
 int config_slot = 0, config_slot_current = 0;\r
@@ -348,11 +349,11 @@ int emu_ReloadRom(void)
        }\r
 \r
        // additional movie stuff\r
-       if(movie_data) {\r
+       if (movie_data) {\r
                if(movie_data[0x14] == '6')\r
                     PicoOpt |=  0x20; // 6 button pad\r
                else PicoOpt &= ~0x20;\r
-               PicoOpt |= 0x40; // accurate timing\r
+               PicoOpt |= 0x10040; // accurate timing, no VDP fifo timing\r
                if(movie_data[0xF] >= 'A') {\r
                        if(movie_data[0x16] & 0x80) {\r
                                PicoRegionOverride = 8;\r
@@ -367,6 +368,7 @@ int emu_ReloadRom(void)
        }\r
        else\r
        {\r
+               PicoOpt &= ~0x10000;\r
                if(Pico.m.pal) {\r
                        strcpy(noticeMsg, "PAL SYSTEM / 50 FPS");\r
                } else {\r
@@ -389,10 +391,10 @@ static void emu_msg_tray_open(void);
 void emu_Init(void)\r
 {\r
        // make temp buffer for alt renderer\r
-       framebuff = malloc((8+320)*(8+240+8));\r
-       if (!framebuff)\r
+       PicoDraw2FB = malloc((8+320)*(8+240+8));\r
+       if (!PicoDraw2FB)\r
        {\r
-               printf("framebuff == 0\n");\r
+               printf("PicoDraw2FB == 0\n");\r
        }\r
 \r
        // make dirs for saves, cfgs, etc.\r
@@ -626,7 +628,7 @@ void emu_Deinit(void)
                }\r
        }\r
 \r
-       free(framebuff);\r
+       free(PicoDraw2FB);\r
 \r
        PicoExit();\r
 \r
@@ -768,7 +770,7 @@ static void blit(const char *fps, const char *notice)
                        // feed new palette to our device\r
                        gp2x_video_setpalette(localPal, 0x40);\r
                }\r
-               vidCpyM2((unsigned char *)gp2x_screen+320*8, framebuff+328*8);\r
+               vidCpyM2((unsigned char *)gp2x_screen+320*8, PicoDraw2FB+328*8);\r
        } else if (!(emu_opt&0x80)) {\r
                // 8bit accurate renderer\r
                if (Pico.m.dirtyPal) {\r
@@ -1112,7 +1114,7 @@ void emu_forced_frame(void)
                clearArea(1);\r
        } else  vidCpyM2 = vidCpyM2_40col;\r
 \r
-       vidCpyM2((unsigned char *)gp2x_screen+320*8, framebuff+328*8);\r
+       vidCpyM2((unsigned char *)gp2x_screen+320*8, PicoDraw2FB+328*8);\r
        vidConvCpyRGB32(localPal, Pico.cram, 0x40);\r
        gp2x_video_setpalette(localPal, 0x40);\r
 */\r
@@ -1185,17 +1187,18 @@ void emu_Loop(void)
        // prepare sound stuff\r
        if(currentConfig.EmuOpt & 4) {\r
                int snd_excess_add;\r
-               if(PsndRate != PsndRate_old || (PicoOpt&0x20b) != (PicoOpt_old&0x20b) || Pico.m.pal != pal_old || crashed_940) {\r
+               if (PsndRate != PsndRate_old || (PicoOpt&0x20b) != (PicoOpt_old&0x20b) || Pico.m.pal != pal_old ||\r
+                               ((PicoOpt&0x200) && crashed_940)) {\r
                        /* if 940 is turned off, we need it to be put back to sleep */\r
                        if (!(PicoOpt&0x200) && ((PicoOpt^PicoOpt_old)&0x200)) {\r
                                Reset940(1, 2);\r
                                Pause940(1);\r
                        }\r
-                       sound_rerate(1);\r
+                       sound_rerate(Pico.m.frame_count ? 1 : 0);\r
                }\r
-               //excess_samples = PsndRate - PsndLen*target_fps;\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", PsndRate, PsndLen, snd_excess_add, (PicoOpt&8)>>3, Pico.m.pal);\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
                gp2x_start_sound(PsndRate, 16, (PicoOpt&8)>>3);\r
                gp2x_sound_volume(currentConfig.volume, currentConfig.volume);\r
                PicoWriteSound = updateSound;\r
@@ -1307,6 +1310,9 @@ void emu_Loop(void)
                                if (frames_shown > frames_done) frames_shown = frames_done;\r
                        }\r
                }\r
+#ifdef PFRAMES\r
+               sprintf(fpsbuff, "%i", Pico.m.frame_count);\r
+#endif\r
 \r
                lim_time = (frames_done+1) * target_frametime + vsync_offset;\r
                if(currentConfig.Frameskip >= 0) { // frameskip enabled\r
@@ -1571,7 +1577,7 @@ int emu_SaveLoadGame(int load, int sram)
                        }\r
                } else {\r
                        sram_size = SRam.end-SRam.start+1;\r
-                       if(SRam.reg_back & 4) sram_size=0x2000;\r
+                       if(Pico.m.sram_reg & 4) sram_size=0x2000;\r
                        sram_data = SRam.data;\r
                }\r
                if (!sram_data) return 0; // SRam forcefully disabled for this game\r