more sms wip, better ROM detect, line callback change

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

diff --git a/platform/gizmondo/emu.c b/platform/gizmondo/emu.c
index e628f06..b8b1068 100644 (file)
--- a/platform/gizmondo/emu.c
+++ b/platform/gizmondo/emu.c
@@ -28,7 +28,6 @@
 unsigned char gfx_buffer[321*240*2*2];
 unsigned char *PicoDraw2FB = gfx_buffer;  // temporary buffer for alt renderer ( (8+320)*(8+240+8) )
 
-static DWORD noticeMsgTime = 0;
 static short *snd_cbuff = NULL;
 static int snd_cbuf_samples = 0, snd_all_samples = 0;
 
@@ -36,12 +35,6 @@ static int snd_cbuf_samples = 0, snd_all_samples = 0;
 static void blit(const char *fps, const char *notice);
 static void clearArea(int full);
 
-void plat_status_msg(const char *format, ...)
-{
-       /* TODO */
-       noticeMsgTime = GetTickCount();
-}
-
 int plat_get_root_dir(char *dst, int len)
 {
        if (len > 0) *dst = 0;
@@ -55,7 +48,7 @@ static void emu_msg_cb(const char *msg)
        giz_screen = fb_lock(1);
 
        memset32((int *)((char *)giz_screen + 321*232*2), 0, 321*8*2/4);
-       emu_textOut16(4, 232, msg);
+       emu_text_out16(4, 232, msg);
        noticeMsgTime = GetTickCount() - 2000;
 
        /* assumption: emu_msg_cb gets called only when something slow is about to happen */
@@ -110,7 +103,6 @@ void pemu_prep_defconfig(void)
 
 static int EmuScanBegin16(unsigned int num)
 {
-       if (!(Pico.video.reg[1]&8)) num += 8;
        DrawLineDest = (unsigned short *) giz_screen + 321 * num;
 
        if ((currentConfig.EmuOpt&0x4000) && (num&1) == 0) // (Pico.m.frame_count&1))
@@ -122,7 +114,6 @@ static int EmuScanBegin16(unsigned int num)
 static int EmuScanBegin8(unsigned int num)
 {
        // draw like the fast renderer
-       if (!(Pico.video.reg[1]&8)) num += 8;
        HighCol = gfx_buffer + 328 * num;
 
        return 0;
@@ -137,7 +128,7 @@ static void osd_text(int x, int y, const char *text)
                p = (int *) ((int)p & ~3); // align
                memset32(p, 0, len);
        }
-       emu_textOut16(x, y, text);
+       emu_text_out16(x, y, text);
 }
 
 /*
@@ -346,7 +337,7 @@ static void RunEvents(unsigned int which)
                        FrameworkAudio_SetPause(1);
                if (giz_screen == NULL)
                        giz_screen = fb_lock(1);
-               if ( emu_checkSaveFile(state_slot) &&
+               if ( emu_check_save_file(state_slot) &&
                                (( (which & 0x1000) && (currentConfig.EmuOpt & 0x800)) || // load
                                 (!(which & 0x1000) && (currentConfig.EmuOpt & 0x200))) ) // save
                {
@@ -364,7 +355,7 @@ static void RunEvents(unsigned int which)
                {
                        osd_text(4, 232, (which & 0x1000) ? "LOADING GAME" : "SAVING GAME");
                        PicoStateProgressCB = emu_stateCb;
-                       emu_SaveLoadGame((which & 0x1000) >> 12, 0);
+                       emu_save_load_game((which & 0x1000) >> 12, 0);
                        PicoStateProgressCB = NULL;
                        Sleep(0);
                }
@@ -399,7 +390,7 @@ static void RunEvents(unsigned int which)
                        state_slot += 1;
                        if(state_slot > 9) state_slot = 0;
                }
-               sprintf(noticeMsg, "SAVE SLOT %i [%s]", state_slot, emu_checkSaveFile(state_slot) ? "USED" : "FREE");
+               sprintf(noticeMsg, "SAVE SLOT %i [%s]", state_slot, emu_check_save_file(state_slot) ? "USED" : "FREE");
                noticeMsgTime = GetTickCount();
        }
 }
@@ -709,7 +700,7 @@ void pemu_loop(void)
        // save SRAM
        if ((currentConfig.EmuOpt & 1) && SRam.changed) {
                emu_stateCb("Writing SRAM/BRAM..");
-               emu_SaveLoadGame(0, 1);
+               emu_save_load_game(0, 1);
                SRam.changed = 0;
        }
 }