some pandora tweaks

[libpicofe.git] / psp / emu.c

diff --git a/psp/emu.c b/psp/emu.c
index 5eca789..77b20d1 100644 (file)
--- a/psp/emu.c
+++ b/psp/emu.c
@@ -89,14 +89,8 @@ void emu_Deinit(void)
 
 void pemu_prep_defconfig(void)
 {
-       memset(&defaultConfig, 0, sizeof(defaultConfig));
-       defaultConfig.EmuOpt    = 0x1d | 0x680; // | <- confirm_save, cd_leds, acc rend
-       defaultConfig.s_PicoOpt = 0x0f | POPT_EN_MCD_PCM|POPT_EN_MCD_CDDA|POPT_EN_MCD_GFX|POPT_ACC_SPRITES;
        defaultConfig.s_PsndRate = 22050;
-       defaultConfig.s_PicoRegion = 0; // auto
-       defaultConfig.s_PicoAutoRgnOrder = 0x184; // US, EU, JP
        defaultConfig.s_PicoCDBuffers = 64;
-       defaultConfig.Frameskip = -1; // auto
        defaultConfig.CPUclock = 333;
        defaultConfig.KeyBinds[ 4] = 1<<0; // SACB RLDU
        defaultConfig.KeyBinds[ 6] = 1<<1;
@@ -117,7 +111,6 @@ void pemu_prep_defconfig(void)
        defaultConfig.scale = 1.20;    // fullscreen
        defaultConfig.hscale40 = 1.25;
        defaultConfig.hscale32 = 1.56;
-       defaultConfig.turbo_rate = 15;
 }
 
 
@@ -472,7 +465,7 @@ static void vidResetMode(void)
        sceGuTexImage(0,512,512,512,(char *)VRAM_STUFF + 16);
 
        // slow rend.
-       PicoDrawSetColorFormat(-1);
+       PicoDrawSetOutFormat(PDF_NONE, 0);
        PicoScanBegin = EmuScanSlowBegin;
        PicoScanEnd = EmuScanSlowEnd;
 
@@ -675,7 +668,7 @@ static void SkipFrame(void)
        PicoSkipFrame=0;
 }
 
-void pemu_forced_frame(int opts)
+void pemu_forced_frame(int opts, int no_scale)
 {
        int po_old = PicoOpt;
        int eo_old = currentConfig.EmuOpt;
@@ -689,7 +682,7 @@ void pemu_forced_frame(int opts)
        memset32((int *)VRAM_CACHED_STUFF + 512*232/4, 0xe0e0e0e0, 512*8/4);
        memset32_uncached((int *)psp_screen + 512*264*2/4, 0, 512*8*2/4);
 
-       PicoDrawSetColorFormat(-1);
+       PicoDrawSetOutFormat(PDF_NONE, 0);
        PicoScanBegin = EmuScanSlowBegin;
        PicoScanEnd = EmuScanSlowEnd;
        EmuScanPrepare();