work on 'vblank on line start' problem, var changes, mask defines

[libpicofe.git] / psp / emu.c

diff --git a/psp/emu.c b/psp/emu.c
index 9c69d88..d721e20 100644 (file)
--- a/psp/emu.c
+++ b/psp/emu.c
@@ -35,7 +35,6 @@ char romFileName[PATH_MAX];
 unsigned char *PicoDraw2FB = (unsigned char *)VRAM_CACHED_STUFF + 8; // +8 to be able to skip border with 1 quadword..
 int engineState = PGS_Menu;
 
-static int combo_keys = 0, combo_acts = 0; // keys and actions which need button combos
 static unsigned int noticeMsgTime = 0;
 int reset_timing = 0; // do we need this?
 
@@ -111,19 +110,8 @@ void emu_Deinit(void)
                SRam.changed = 0;
        }
 
-       if (!(currentConfig.EmuOpt & 0x20)) {
-               FILE *f = fopen(PicoConfigFile, "r+b");
-               if (!f) emu_WriteConfig(0);
-               else {
-                       // if we already have config, reload it, except last ROM
-                       fseek(f, sizeof(currentConfig.lastRomFile), SEEK_SET);
-                       fread(&currentConfig.EmuOpt, 1, sizeof(currentConfig) - sizeof(currentConfig.lastRomFile), f);
-                       fseek(f, 0, SEEK_SET);
-                       fwrite(&currentConfig, 1, sizeof(currentConfig), f);
-                       fflush(f);
-                       fclose(f);
-               }
-       }
+       if (!(currentConfig.EmuOpt & 0x20))
+               config_writelrom(PicoConfigFile);
 
        PicoExit();
        sound_deinit();
@@ -288,7 +276,7 @@ static void EmuScanPrepare(void)
                do_pal_update(1);
 }
 
-static int EmuScanSlow(unsigned int num, void *sdata)
+static int EmuScanSlow(unsigned int num)
 {
        if (!(Pico.video.reg[1]&8)) num += 8;
 
@@ -434,7 +422,7 @@ static void blit2(const char *fps, const char *notice, int lagging_behind)
 
        //dbg_text();
 
-       if ((emu_opt & 0x400) && (PicoMCD & 1))
+       if ((emu_opt & 0x400) && (PicoAHW & PAHW_MCD))
                cd_leds();
 
        if (currentConfig.EmuOpt & 0x2000) { // want vsync
@@ -479,7 +467,7 @@ static void vidResetMode(void)
 
        // slow rend.
        PicoDrawSetColorFormat(-1);
-       PicoScan = EmuScanSlow;
+       PicoScanEnd = EmuScanSlow;
 
        localPal[0xe0] = 0;
        Pico.m.dirtyPal = 1;
@@ -682,7 +670,7 @@ void emu_forcedFrame(void)
        memset32_uncached((int *)psp_screen + 512*264*2/4, 0, 512*8*2/4);
 
        PicoDrawSetColorFormat(-1);
-       PicoScan = EmuScanSlow;
+       PicoScanEnd = EmuScanSlow;
        EmuScanPrepare();
        PicoFrameDrawOnly();
        blit1();
@@ -775,20 +763,21 @@ static void updateKeys(void)
                        int pl, acts = currentConfig.KeyBinds[i];
                        if (!acts) continue;
                        pl = (acts >> 16) & 1;
-                       if (combo_keys & (1 << i))
+                       if (kb_combo_keys & (1 << i))
                        {
-                               int u = i+1, acts_c = acts & combo_acts;
+                               int u = i+1, acts_c = acts & kb_combo_acts;
                                // let's try to find the other one
-                               if (acts_c)
+                               if (acts_c) {
                                        for (; u < 32; u++)
-                                               if ( (currentConfig.KeyBinds[u] & acts_c) && (keys & (1 << u)) ) {
-                                                       allActions[pl] |= acts_c;
+                                               if ( (keys & (1 << u)) && (currentConfig.KeyBinds[u] & acts_c) ) {
+                                                       allActions[pl] |= acts_c & currentConfig.KeyBinds[u];
                                                        keys &= ~((1 << i) | (1 << u));
                                                        break;
                                                }
+                               }
                                // add non-combo actions if combo ones were not found
                                if (!acts_c || u == 32)
-                                       allActions[pl] |= acts & ~combo_acts;
+                                       allActions[pl] |= acts & ~kb_combo_acts;
                        } else {
                                allActions[pl] |= acts;
                        }
@@ -822,44 +811,6 @@ static void updateKeys(void)
        prevEvents = (allActions[0] | allActions[1]) >> 16;
 }
 
-static void find_combos(void)
-{
-       int act, u;
-
-       // find out which keys and actions are combos
-       combo_keys = combo_acts = 0;
-       for (act = 0; act < 32; act++)
-       {
-               int keyc = 0, keyc2 = 0;
-               if (act == 16 || act == 17) continue; // player2 flag
-               if (act > 17)
-               {
-                       for (u = 0; u < 28; u++) // 28 because nub can't produce combos
-                               if (currentConfig.KeyBinds[u] & (1 << act)) keyc++;
-               }
-               else
-               {
-                       for (u = 0; u < 28; u++)
-                               if ((currentConfig.KeyBinds[u] & 0x30000) == 0 && // pl. 1
-                                       (currentConfig.KeyBinds[u] & (1 << act))) keyc++;
-                       for (u = 0; u < 28; u++)
-                               if ((currentConfig.KeyBinds[u] & 0x30000) == 1 && // pl. 2
-                                       (currentConfig.KeyBinds[u] & (1 << act))) keyc2++;
-               }
-               if (keyc > 1 || keyc2 > 1)
-               {
-                       // loop again and mark those keys and actions as combo
-                       for (u = 0; u < 28; u++)
-                       {
-                               if (currentConfig.KeyBinds[u] & (1 << act)) {
-                                       combo_keys |= 1 << u;
-                                       combo_acts |= 1 << act;
-                               }
-                       }
-               }
-       }
-}
-
 
 static void simpleWait(unsigned int until)
 {
@@ -897,14 +848,14 @@ void emu_Loop(void)
        clearArea(1);
        Pico.m.dirtyPal = 1;
        oldmodes = ((Pico.video.reg[12]&1)<<2) ^ 0xc;
-       find_combos();
+       emu_findKeyBindCombos();
 
        // pal/ntsc might have changed, reset related stuff
        target_fps = Pico.m.pal ? 50 : 60;
        target_frametime = Pico.m.pal ? (1000000<<8)/50 : (1000000<<8)/60+1;
        reset_timing = 1;
 
-       if (PicoMCD & 1) {
+       if (PicoAHW & PAHW_MCD) {
                // prepare CD buffer
                PicoCDBufferInit();
                // mp3...
@@ -1050,7 +1001,7 @@ void emu_Loop(void)
        }
 
 
-       if (PicoMCD & 1) PicoCDBufferFree();
+       if (PicoAHW & PAHW_MCD) PicoCDBufferFree();
 
        if (PsndOut != NULL) {
                PsndOut = NULL;
@@ -1071,7 +1022,23 @@ void emu_Loop(void)
 
 void emu_ResetGame(void)
 {
-       PicoReset(0);
+       PicoReset();
        reset_timing = 1;
 }
 
+void emu_HandleResume(void)
+{
+       if (!(PicoAHW & PAHW_MCD)) return;
+
+       // reopen files..
+       if (Pico_mcd->TOC.Tracks[0].F != NULL)
+       {
+               lprintf("emu_HandleResume: reopen %s\n", romFileName);
+               pm_close(Pico_mcd->TOC.Tracks[0].F);
+               Pico_mcd->TOC.Tracks[0].F = pm_open(romFileName);
+               lprintf("reopen %s\n", Pico_mcd->TOC.Tracks[0].F != NULL ? "ok" : "failed");
+       }
+
+       mp3_reopen_file();
+}
+