allow compiling without 32x and sms code

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

diff --git a/platform/gizmondo/emu.c b/platform/gizmondo/emu.c
index b8b1068..2dfcf96 100644 (file)
--- a/platform/gizmondo/emu.c
+++ b/platform/gizmondo/emu.c
@@ -74,15 +74,8 @@ void emu_stateCb(const char *str)
 
 void pemu_prep_defconfig(void)
 {
-       memset(&defaultConfig, 0, sizeof(defaultConfig));
-       defaultConfig.EmuOpt    = 0x1d | 0x680; // | confirm_save, cd_leds, 16bit rend
-       defaultConfig.s_PicoOpt = 0x0f | POPT_EN_MCD_PCM|POPT_EN_MCD_CDDA|POPT_EN_SVP_DRC|POPT_ACC_SPRITES;
        defaultConfig.s_PsndRate = 22050;
-       defaultConfig.s_PicoRegion = 0; // auto
-       defaultConfig.s_PicoAutoRgnOrder = 0x184; // US, EU, JP
        defaultConfig.s_PicoCDBuffers = 0;
-       defaultConfig.Frameskip = -1; // auto
-       defaultConfig.volume = 50;
        defaultConfig.KeyBinds[ 2] = 1<<0; // SACB RLDU
        defaultConfig.KeyBinds[ 3] = 1<<1;
        defaultConfig.KeyBinds[ 0] = 1<<2;
@@ -97,7 +90,6 @@ void pemu_prep_defconfig(void)
        defaultConfig.KeyBinds[12] = 1<<29; // vol up
        defaultConfig.KeyBinds[11] = 1<<30; // vol down
        defaultConfig.scaling = 0;
-       defaultConfig.turbo_rate = 15;
 }
 
 
@@ -170,7 +162,7 @@ static void blit(const char *fps, const char *notice)
                        vidConvCpyRGB565(localPal, Pico.cram, 0x40);
                }
                // a hack for VR
-               if (PicoRead16Hook == PicoSVPRead16)
+               if (PicoAHW & PAHW_SVP)
                        memset32((int *)(PicoDraw2FB+328*8+328*223), 0xe0e0e0e0, 328);
                if (!(Pico.video.reg[12]&1)) lines_flags|=0x10000;
                if (currentConfig.EmuOpt&0x4000)
@@ -238,10 +230,10 @@ static void vidResetMode(void)
 
        if (PicoOpt&0x10) {
        } else if (currentConfig.EmuOpt&0x80) {
-               PicoDrawSetColorFormat(1);
+               PicoDrawSetOutFormat(PDF_RGB555, 0);
                PicoScanBegin = EmuScanBegin16;
        } else {
-               PicoDrawSetColorFormat(-1);
+               PicoDrawSetOutFormat(PDF_NONE, 0);
                PicoScanBegin = EmuScanBegin8;
        }
        if ((PicoOpt&0x10) || !(currentConfig.EmuOpt&0x80)) {
@@ -314,7 +306,7 @@ void pemu_forced_frame(int opts)
        if (giz_screen == NULL)
                giz_screen = fb_lock(1);
 
-       PicoDrawSetColorFormat(1);
+       PicoDrawSetOutFormat(PDF_RGB555, 0);
        PicoScanBegin = EmuScanBegin16;
        Pico.m.dirtyPal = 1;
        PicoFrameDrawOnly();