new 32x renderers, auto fskip change, massive refactoring

[libpicofe.git] / psp / emu.c

diff --git a/psp/emu.c b/psp/emu.c
index 21abfca..6169940 100644 (file)
--- a/psp/emu.c
+++ b/psp/emu.c
@@ -36,8 +36,6 @@ int sceAudioOutput2GetRestSample();
 unsigned char *PicoDraw2FB = (unsigned char *)VRAM_CACHED_STUFF + 8; // +8 to be able to skip border with 1 quadword..
 int engineStateSuspend;
 
-static unsigned int noticeMsgTime = 0;
-
 #define PICO_PEN_ADJUST_X 4
 #define PICO_PEN_ADJUST_Y 2
 static int pico_pen_x = 320/2, pico_pen_y = 240/2;
@@ -47,17 +45,6 @@ static void sound_deinit(void);
 static void blit2(const char *fps, const char *notice, int lagging_behind);
 static void clearArea(int full);
 
-void plat_status_msg(const char *format, ...)
-{
-       va_list vl;
-
-       va_start(vl, format);
-       vsnprintf(noticeMsg, sizeof(noticeMsg), fmt, vl);
-       va_end(vl);
-
-       noticeMsgTime = sceKernelGetSystemTimeLow();
-}
-
 int plat_get_root_dir(char *dst, int len)
 {
        if (len > 0) *dst = 0;
@@ -76,7 +63,7 @@ static void osd_text(int x, const char *text, int is_active, int clear_all)
                memset32_uncached(p, 0, len);
        }
        if (is_active) { tmp = psp_screen; psp_screen = screen; } // nasty pointer tricks
-       emu_textOut16(x, 264, text);
+       emu_text_out16(x, 264, text);
        if (is_active) psp_screen = tmp;
 }
 
@@ -102,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;
@@ -130,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;
 }
 
 
@@ -274,8 +254,6 @@ static void EmuScanPrepare(void)
 
 static int EmuScanSlowBegin(unsigned int num)
 {
-       if (!(Pico.video.reg[1]&8)) num += 8;
-
        if (!dynamic_palette)
                HighCol = (unsigned char *)VRAM_CACHED_STUFF + num * 512 + 8;
 
@@ -284,8 +262,6 @@ static int EmuScanSlowBegin(unsigned int num)
 
 static int EmuScanSlowEnd(unsigned int num)
 {
-       if (!(Pico.video.reg[1]&8)) num += 8;
-
        if (Pico.m.dirtyPal) {
                if (!dynamic_palette) {
                        do_slowmode_lines(num);
@@ -409,7 +385,7 @@ static void dbg_text(void)
                p = (int *) ((int)p & ~3); // align
                memset32_uncached(p, 0, len);
        }
-       emu_textOut16(2, 256, text);
+       emu_text_out16(2, 256, text);
 }
 #endif
 
@@ -489,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;
 
@@ -610,7 +586,7 @@ void pemu_sound_start(void)
        ret = sceAudio_38553111(samples_block/2, PsndRate, 2); // seems to not need that stupid 64byte alignment
        if (ret < 0) {
                lprintf("sceAudio_38553111() failed: %i\n", ret);
-               plat_status_msg("sound init failed (%i), snd disabled", ret);
+               emu_status_msg("sound init failed (%i), snd disabled", ret);
                currentConfig.EmuOpt &= ~EOPT_EN_SOUND;
        } else {
                PicoWriteSound = writeSound;
@@ -706,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();
@@ -782,9 +758,9 @@ static void RunEvents(unsigned int which)
                vidResetMode();
 
                if (PicoOpt & POPT_ALT_RENDERER)
-                       plat_status_msg("fast renderer");
+                       emu_status_msg("fast renderer");
                else if (currentConfig.EmuOpt&0x80)
-                       plat_status_msg("accurate renderer");
+                       emu_status_msg("accurate renderer");
        }
        if (which & 0x0300)
        {
@@ -795,7 +771,7 @@ static void RunEvents(unsigned int which)
                        state_slot += 1;
                        if(state_slot > 9) state_slot = 0;
                }
-               plat_status_msg("SAVE SLOT %i [%s]", state_slot,
+               emu_status_msg("SAVE SLOT %i [%s]", state_slot,
                        emu_check_save_file(state_slot) ? "USED" : "FREE");
        }
 }