Finish migrating to new mem handling. Make carthw db external.

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

diff --git a/platform/common/emu.c b/platform/common/emu.c
index aca54be..6fc25b4 100644 (file)
--- a/platform/common/emu.c
+++ b/platform/common/emu.c
@@ -977,7 +977,7 @@ int emu_save_load_game(int load, int sram)
                int truncate = 1;\r
                if (PicoAHW & PAHW_MCD)\r
                {\r
-                       if (PicoOpt&POPT_EN_MCD_RAMCART) {\r
+                       if (PicoOpt & POPT_EN_MCD_RAMCART) {\r
                                sram_size = 0x12000;\r
                                sram_data = SRam.data;\r
                                if (sram_data)\r
@@ -988,8 +988,7 @@ int emu_save_load_game(int load, int sram)
                                truncate  = 0; // the .brm may contain RAM cart data after normal brm\r
                        }\r
                } else {\r
-                       sram_size = SRam.end-SRam.start+1;\r
-                       if(Pico.m.sram_reg & 4) sram_size=0x2000;\r
+                       sram_size = SRam.size;\r
                        sram_data = SRam.data;\r
                }\r
                if (!sram_data) return 0; // SRam forcefully disabled for this game\r
@@ -1332,7 +1331,7 @@ void emu_loop(void)
 {\r
        int pframes_done;               /* "period" frames, used for sync */\r
        int frames_done, frames_shown;  /* actual frames for fps counter */\r
-       int oldmodes, target_fps, target_frametime;\r
+       int target_fps, target_frametime;\r
        unsigned int timestamp_base = 0, timestamp_fps;\r
        char *notice_msg = NULL;\r
        char fpsbuff[24];\r
@@ -1341,8 +1340,8 @@ void emu_loop(void)
        fpsbuff[0] = 0;\r
 \r
        /* make sure we are in correct mode */\r
-       oldmodes = ((Pico.video.reg[12]&1)<<2) ^ 0xc;\r
        Pico.m.dirtyPal = 1;\r
+       rendstatus_old = -1;\r
 \r
        /* number of ticks per frame */\r
        if (Pico.m.pal) {\r
@@ -1371,7 +1370,6 @@ void emu_loop(void)
        {\r
                unsigned int timestamp;\r
                int diff, diff_lim;\r
-               int modes;\r
 \r
                timestamp = get_ticks();\r
                if (reset_timing) {\r
@@ -1398,13 +1396,6 @@ void emu_loop(void)
                        }\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
-                       oldmodes = modes;\r
-                       pemu_video_mode_change(!(modes & 4), (modes & 8));\r
-               }\r
-\r
                // second changed?\r
                if (timestamp - timestamp_fps >= ms_to_ticks(1000))\r
                {\r