linux port fixed; some cleanups

[libpicofe.git] / psp / emu.c

diff --git a/psp/emu.c b/psp/emu.c
index a9acac7..500f219 100644 (file)
--- a/psp/emu.c
+++ b/psp/emu.c
@@ -33,9 +33,8 @@ int sceAudio_E0727056(int volume, void *buffer);      // blocking output
 int sceAudioOutput2GetRestSample();
 
 
-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, engineStateSuspend;
+int engineStateSuspend;
 
 static unsigned int noticeMsgTime = 0;
 int reset_timing = 0; // do we need this?
@@ -832,6 +831,7 @@ static void updateKeys(void)
        static unsigned int prevEvents = 0;
        int i;
 
+       /* FIXME: port to input fw */
        keys = psp_pad_read(0);
        if (keys & PSP_CTRL_HOME)
                sceDisplayWaitVblankStart();
@@ -841,34 +841,6 @@ static void updateKeys(void)
 
        keys &= CONFIGURABLE_KEYS;
 
-       for (i = 0; i < 32; i++)
-       {
-               if (keys & (1 << i))
-               {
-                       int pl, acts = currentConfig.KeyBinds[i];
-                       if (!acts) continue;
-                       pl = (acts >> 16) & 1;
-                       if (kb_combo_keys & (1 << i))
-                       {
-                               int u = i+1, acts_c = acts & kb_combo_acts;
-                               // let's try to find the other one
-                               if (acts_c) {
-                                       for (; u < 32; u++)
-                                               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 & ~kb_combo_acts;
-                       } else {
-                               allActions[pl] |= acts;
-                       }
-               }
-       }
-
        PicoPad[0] = allActions[0] & 0xfff;
        PicoPad[1] = allActions[1] & 0xfff;
 
@@ -930,7 +902,6 @@ void emu_Loop(void)
        clearArea(1);
        Pico.m.dirtyPal = 1;
        oldmodes = ((Pico.video.reg[12]&1)<<2) ^ 0xc;
-       emu_findKeyBindCombos();
 
        // pal/ntsc might have changed, reset related stuff
        target_fps = Pico.m.pal ? 50 : 60;
@@ -1127,13 +1098,13 @@ void emu_HandleResume(void)
        // reopen first CD track
        if (Pico_mcd->TOC.Tracks[0].F != NULL)
        {
-               char *fname = romFileName;
-               int len = strlen(romFileName);
+               char *fname = rom_fname_reload;
+               int len = strlen(rom_fname_reload);
                cue_data_t *cue_data = NULL;
 
                if (len > 4 && strcasecmp(fname + len - 4,  ".cue") == 0)
                {
-                       cue_data = cue_parse(romFileName);
+                       cue_data = cue_parse(rom_fname_reload);
                        if (cue_data != NULL)
                                fname = cue_data->tracks[1].fname;
                }