extend mmap wrapper functionality

[libpicofe.git] / psp / emu.c

diff --git a/psp/emu.c b/psp/emu.c
index 9af4fe5..feab5f5 100644 (file)
--- a/psp/emu.c
+++ b/psp/emu.c
@@ -465,9 +465,8 @@ static void vidResetMode(void)
        sceGuTexImage(0,512,512,512,(char *)VRAM_STUFF + 16);
 
        // slow rend.
-       PicoDrawSetColorFormat(-1);
-       PicoScanBegin = EmuScanSlowBegin;
-       PicoScanEnd = EmuScanSlowEnd;
+       PicoDrawSetOutFormat(PDF_NONE, 0);
+       PicoDrawSetCallbacks(EmuScanSlowBegin, EmuScanSlowEnd);
 
        localPal[0xe0] = 0;
        localPal[0xf0] = 0x001f;
@@ -638,9 +637,8 @@ static void sound_deinit(void)
 static void writeSound(int len)
 {
        int ret;
-       if (PicoOpt&8) len<<=1;
 
-       PsndOut += len;
+       PsndOut += len / 2;
        /*if (PsndOut > sndBuffer_endptr) {
                memcpy32((int *)(void *)sndBuffer, (int *)endptr, (PsndOut - endptr + 1) / 2);
                PsndOut = &sndBuffer[PsndOut - endptr];
@@ -652,7 +650,7 @@ static void writeSound(int len)
                PsndOut = sndBuffer;
 
        // signal the snd thread
-       samples_made += len;
+       samples_made += len / 2;
        if (samples_made - samples_done > samples_block*2) {
                // lprintf("signal, %i/%i\n", samples_done, samples_made);
                ret = sceKernelSignalSema(sound_sem, 1);
@@ -668,13 +666,15 @@ static void SkipFrame(void)
        PicoSkipFrame=0;
 }
 
-void pemu_forced_frame(int opts)
+void pemu_forced_frame(int no_scale, int do_emu)
 {
        int po_old = PicoOpt;
        int eo_old = currentConfig.EmuOpt;
 
-       PicoOpt &= ~0x10;
-       PicoOpt |= opts|POPT_ACC_SPRITES;
+       PicoOpt &= ~POPT_ALT_RENDERER;
+       PicoOpt |= POPT_ACC_SPRITES;
+       if (!no_scale)
+               PicoOpt |= POPT_EN_SOFTSCALE;
        currentConfig.EmuOpt |= 0x80;
 
        vidResetMode();
@@ -682,9 +682,8 @@ 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);
-       PicoScanBegin = EmuScanSlowBegin;
-       PicoScanEnd = EmuScanSlowEnd;
+       PicoDrawSetOutFormat(PDF_NONE, 0);
+       PicoDrawSetCallbacks(EmuScanSlowBegin, EmuScanSlowEnd);
        EmuScanPrepare();
        PicoFrameDrawOnly();
        blit1();