menu: support seeking the filelist with letter keys
[libpicofe.git] / common / emu.c
index 08efdb2..7d680b8 100644 (file)
@@ -1,10 +1,11 @@
-// (c) Copyright 2006-2007 notaz, All rights reserved.\r
+// (c) Copyright 2006-2009 notaz, All rights reserved.\r
 // Free for non-commercial use.\r
 \r
 // For commercial use, separate licencing terms must be obtained.\r
 \r
 #include <stdio.h>\r
 #include <stdlib.h>\r
+#include <stdarg.h>\r
 #ifndef NO_SYNC\r
 #include <unistd.h>\r
 #endif\r
 #include <pico/pico_int.h>\r
 #include <pico/patch.h>\r
 #include <pico/cd/cue.h>\r
-#include <zlib/zlib.h>\r
 \r
 \r
+#define STATUS_MSG_TIMEOUT 2000\r
+\r
 void *g_screen_ptr;\r
 \r
 #if !SCREEN_SIZE_FIXED\r
@@ -39,11 +41,15 @@ int pico_pen_x = 320/2, pico_pen_y = 240/2;
 int pico_inp_mode = 0;\r
 int engineState = PGS_Menu;\r
 \r
+/* tmp buff to reduce stack usage for plats with small stack */\r
+static char static_buff[512];\r
 /* TODO: len checking */\r
-char rom_fname_reload[512] = { 0, };\r
-char rom_fname_loaded[512] = { 0, };\r
+char rom_fname_reload[512];\r
+char rom_fname_loaded[512];\r
 int rom_loaded = 0;\r
 int reset_timing = 0;\r
+static unsigned int notice_msg_time;   /* when started showing */\r
+static char noticeMsg[40];\r
 \r
 unsigned char *movie_data = NULL;\r
 static int movie_size = 0;\r
@@ -75,9 +81,9 @@ static int try_rfn_cut(char *fname)
        return 0;\r
 }\r
 \r
-static void get_ext(char *file, char *ext)\r
+static void get_ext(const char *file, char *ext)\r
 {\r
-       char *p;\r
+       const char *p;\r
 \r
        p = file + strlen(file) - 4;\r
        if (p < file) p = file;\r
@@ -86,15 +92,61 @@ static void get_ext(char *file, char *ext)
        strlwr_(ext);\r
 }\r
 \r
-static const char *biosfiles_us[] = { "us_scd1_9210", "us_scd2_9306", "SegaCDBIOS9303" };\r
-static const char *biosfiles_eu[] = { "eu_mcd1_9210", "eu_mcd2_9306", "eu_mcd2_9303"   };\r
-static const char *biosfiles_jp[] = { "jp_mcd1_9112", "jp_mcd1_9111" };\r
+static void fname_ext(char *dst, int dstlen, const char *prefix, const char *ext, const char *fname)\r
+{\r
+       int prefix_len = 0;\r
+       const char *p;\r
+\r
+       *dst = 0;\r
+       if (prefix) {\r
+               int len = plat_get_root_dir(dst, dstlen);\r
+               strcpy(dst + len, prefix);\r
+               prefix_len = len + strlen(prefix);\r
+       }\r
+\r
+       p = fname + strlen(fname) - 1;\r
+       for (; p >= fname && *p != PATH_SEP_C; p--)\r
+               ;\r
+       p++;\r
+       strncpy(dst + prefix_len, p, dstlen - prefix_len - 1);\r
+\r
+       dst[dstlen - 8] = 0;\r
+       if (dst[strlen(dst) - 4] == '.')\r
+               dst[strlen(dst) - 4] = 0;\r
+       if (ext)\r
+               strcat(dst, ext);\r
+}\r
+\r
+static void romfname_ext(char *dst, int dstlen, const char *prefix, const char *ext)\r
+{\r
+       fname_ext(dst, dstlen, prefix, ext, rom_fname_loaded);\r
+}\r
+\r
+void emu_status_msg(const char *format, ...)\r
+{\r
+       va_list vl;\r
+       int ret;\r
+\r
+       va_start(vl, format);\r
+       ret = vsnprintf(noticeMsg, sizeof(noticeMsg), format, vl);\r
+       va_end(vl);\r
+\r
+       /* be sure old text gets overwritten */\r
+       for (; ret < 28; ret++)\r
+               noticeMsg[ret] = ' ';\r
+       noticeMsg[ret] = 0;\r
+\r
+       notice_msg_time = plat_get_ticks_ms();\r
+}\r
+\r
+static const char * const biosfiles_us[] = { "us_scd1_9210", "us_scd2_9306", "SegaCDBIOS9303" };\r
+static const char * const biosfiles_eu[] = { "eu_mcd1_9210", "eu_mcd2_9306", "eu_mcd2_9303"   };\r
+static const char * const biosfiles_jp[] = { "jp_mcd1_9112", "jp_mcd1_9111" };\r
 \r
 static int find_bios(int region, char **bios_file)\r
 {\r
-       static char bios_path[1024];\r
        int i, count;\r
-       const char **files;\r
+       const char * const *files;\r
        FILE *f = NULL;\r
 \r
        if (region == 4) { // US\r
@@ -112,26 +164,27 @@ static int find_bios(int region, char **bios_file)
 \r
        for (i = 0; i < count; i++)\r
        {\r
-               emu_make_path(bios_path, files[i], sizeof(bios_path) - 4);\r
-               strcat(bios_path, ".bin");\r
-               f = fopen(bios_path, "rb");\r
+               emu_make_path(static_buff, files[i], sizeof(static_buff) - 4);\r
+               strcat(static_buff, ".bin");\r
+               f = fopen(static_buff, "rb");\r
                if (f) break;\r
 \r
-               bios_path[strlen(bios_path) - 4] = 0;\r
-               strcat(bios_path, ".zip");\r
-               f = fopen(bios_path, "rb");\r
+               static_buff[strlen(static_buff) - 4] = 0;\r
+               strcat(static_buff, ".zip");\r
+               f = fopen(static_buff, "rb");\r
                if (f) break;\r
        }\r
 \r
        if (f) {\r
-               lprintf("using bios: %s\n", bios_path);\r
+               lprintf("using bios: %s\n", static_buff);\r
                fclose(f);\r
-               if (bios_file) *bios_file = bios_path;\r
+               if (bios_file)\r
+                       *bios_file = static_buff;\r
                return 1;\r
        } else {\r
-               sprintf(bios_path, "no %s BIOS files found, read docs",\r
+               sprintf(static_buff, "no %s BIOS files found, read docs",\r
                        region != 4 ? (region == 8 ? "EU" : "JAP") : "USA");\r
-               me_update_msg(bios_path);\r
+               me_update_msg(static_buff);\r
                return 0;\r
        }\r
 }\r
@@ -153,14 +206,14 @@ static int emu_isBios(const char *name)
 \r
 static unsigned char id_header[0x100];\r
 \r
-/* checks if fname points to valid MegaCD image\r
- * if so, checks for suitable BIOS */\r
-int emu_cd_check(int *pregion, char *fname_in)\r
+/* checks if fname points to valid MegaCD image */\r
+static int emu_cd_check(int *pregion, const char *fname_in)\r
 {\r
+       const char *fname = fname_in;\r
        unsigned char buf[32];\r
        pm_file *cd_f;\r
        int region = 4; // 1: Japan, 4: US, 8: Europe\r
-       char ext[5], *fname = fname_in;\r
+       char ext[5];\r
        cue_track_type type = CT_UNKNOWN;\r
        cue_data_t *cue_data = NULL;\r
 \r
@@ -221,6 +274,96 @@ int emu_cd_check(int *pregion, char *fname_in)
        return type;\r
 }\r
 \r
+static int detect_media(const char *fname)\r
+{\r
+       static const short sms_offsets[] = { 0x7ff0, 0x3ff0, 0x1ff0 };\r
+       static const char *sms_exts[] = { "sms", "gg", "sg" };\r
+       static const char *md_exts[] = { "gen", "bin", "smd" };\r
+       char buff0[32], buff[32];\r
+       unsigned short *d16;\r
+       pm_file *pmf;\r
+       char ext[5];\r
+       int i;\r
+\r
+       get_ext(fname, ext);\r
+\r
+       // detect wrong extensions\r
+       if (!strcmp(ext, ".srm") || !strcmp(ext, "s.gz") || !strcmp(ext, ".mds")) // s.gz ~ .mds.gz\r
+               return PM_BAD;\r
+\r
+       /* don't believe in extensions, except .cue */\r
+       if (strcasecmp(ext, ".cue") == 0)\r
+               return PM_CD;\r
+\r
+       pmf = pm_open(fname);\r
+       if (pmf == NULL)\r
+               return PM_BAD;\r
+\r
+       if (pm_read(buff0, 32, pmf) != 32) {\r
+               pm_close(pmf);\r
+               return PM_BAD;\r
+       }\r
+\r
+       if (strncasecmp("SEGADISCSYSTEM", buff0 + 0x00, 14) == 0 ||\r
+           strncasecmp("SEGADISCSYSTEM", buff0 + 0x10, 14) == 0) {\r
+               pm_close(pmf);\r
+               return PM_CD;\r
+       }\r
+\r
+       /* check for SMD evil */\r
+       if (pmf->size >= 0x4200 && (pmf->size & 0x3fff) == 0x200) {\r
+               if (pm_seek(pmf, sms_offsets[0] + 0x200, SEEK_SET) == sms_offsets[0] + 0x200 &&\r
+                   pm_read(buff, 16, pmf) == 16 &&\r
+                   strncmp("TMR SEGA", buff, 8) == 0)\r
+                       goto looks_like_sms;\r
+\r
+               /* could parse further but don't bother */\r
+               goto extension_check;\r
+       }\r
+\r
+       /* MD header? Act as TMSS BIOS here */\r
+       if (pm_seek(pmf, 0x100, SEEK_SET) == 0x100 && pm_read(buff, 16, pmf) == 16) {\r
+               if (strncmp(buff, "SEGA", 4) == 0 || strncmp(buff, " SEG", 4) == 0)\r
+                       goto looks_like_md;\r
+       }\r
+\r
+       for (i = 0; i < array_size(sms_offsets); i++) {\r
+               if (pm_seek(pmf, sms_offsets[i], SEEK_SET) != sms_offsets[i])\r
+                       continue;\r
+\r
+               if (pm_read(buff, 16, pmf) != 16)\r
+                       continue;\r
+\r
+               if (strncmp("TMR SEGA", buff, 8) == 0)\r
+                       goto looks_like_sms;\r
+       }\r
+\r
+extension_check:\r
+       /* probably some headerless thing. Maybe check the extension after all. */\r
+       for (i = 0; i < array_size(md_exts); i++)\r
+               if (strcasecmp(pmf->ext, md_exts[i]) == 0)\r
+                       goto looks_like_md;\r
+\r
+       for (i = 0; i < array_size(sms_exts); i++)\r
+               if (strcasecmp(pmf->ext, sms_exts[i]) == 0)\r
+                       goto looks_like_sms;\r
+\r
+       /* If everything else fails, make a guess on the reset vector */\r
+       d16 = (unsigned short *)(buff0 + 4);\r
+       if ((((d16[0] << 16) | d16[1]) & 0xffffff) >= pmf->size) {\r
+               lprintf("bad MD reset vector, assuming SMS\n");\r
+               goto looks_like_sms;\r
+       }\r
+\r
+looks_like_md:\r
+       pm_close(pmf);\r
+       return PM_MD_CART;\r
+\r
+looks_like_sms:\r
+       pm_close(pmf);\r
+       return PM_MARK3;\r
+}\r
+\r
 static int extract_text(char *dest, const unsigned char *src, int len, int swab)\r
 {\r
        char *p = dest;\r
@@ -252,7 +395,7 @@ static int extract_text(char *dest, const unsigned char *src, int len, int swab)
        return p - dest;\r
 }\r
 \r
-static char *emu_make_rom_id(void)\r
+static char *emu_make_rom_id(const char *fname)\r
 {\r
        static char id_string[3+0xe*3+0x3*3+0x30*3+3];\r
        int pos, swab = 1;\r
@@ -261,15 +404,25 @@ static char *emu_make_rom_id(void)
                strcpy(id_string, "CD|");\r
                swab = 0;\r
        }\r
-       else strcpy(id_string, "MD|");\r
+       else if (PicoAHW & PAHW_SMS)\r
+               strcpy(id_string, "MS|");\r
+       else    strcpy(id_string, "MD|");\r
        pos = 3;\r
 \r
-       pos += extract_text(id_string + pos, id_header + 0x80, 0x0e, swab); // serial\r
-       id_string[pos] = '|'; pos++;\r
-       pos += extract_text(id_string + pos, id_header + 0xf0, 0x03, swab); // region\r
-       id_string[pos] = '|'; pos++;\r
-       pos += extract_text(id_string + pos, id_header + 0x50, 0x30, swab); // overseas name\r
-       id_string[pos] = 0;\r
+       if (!(PicoAHW & PAHW_SMS)) {\r
+               pos += extract_text(id_string + pos, id_header + 0x80, 0x0e, swab); // serial\r
+               id_string[pos] = '|'; pos++;\r
+               pos += extract_text(id_string + pos, id_header + 0xf0, 0x03, swab); // region\r
+               id_string[pos] = '|'; pos++;\r
+               pos += extract_text(id_string + pos, id_header + 0x50, 0x30, swab); // overseas name\r
+               id_string[pos] = 0;\r
+               if (pos > 5)\r
+                       return id_string;\r
+               pos = 3;\r
+       }\r
+\r
+       // can't find name in ROM, use filename\r
+       fname_ext(id_string + 3, sizeof(id_string) - 3, NULL, NULL, fname);\r
 \r
        return id_string;\r
 }\r
@@ -298,7 +451,37 @@ static void shutdown_MCD(void)
        PicoAHW &= ~PAHW_MCD;\r
 }\r
 \r
+static void system_announce(void)\r
+{\r
+       const char *sys_name, *tv_standard, *extra = "";\r
+       int fps;\r
+\r
+       if (PicoAHW & PAHW_SMS) {\r
+               sys_name = "Master System";\r
+#ifdef NO_SMS\r
+               extra = " [no support]";\r
+#endif\r
+       } else if (PicoAHW & PAHW_PICO) {\r
+               sys_name = "Pico";\r
+       } else if (PicoAHW & PAHW_MCD) {\r
+               sys_name = "Mega CD";\r
+               if ((Pico.m.hardware & 0xc0) == 0x80)\r
+                       sys_name = "Sega CD";\r
+       } else if (PicoAHW & PAHW_32X) {\r
+               sys_name = "32X";\r
+       } else {\r
+               sys_name = "MegaDrive";\r
+               if ((Pico.m.hardware & 0xc0) == 0x80)\r
+                       sys_name = "Genesis";\r
+       }\r
+       tv_standard = Pico.m.pal ? "PAL" : "NTSC";\r
+       fps = Pico.m.pal ? 50 : 60;\r
+\r
+       emu_status_msg("%s %s / %dFPS%s", tv_standard, sys_name, fps, extra);\r
+}\r
+\r
 // note: this function might mangle rom_fname\r
+// XXX: portions of this code should move to pico/\r
 int emu_reload_rom(char *rom_fname)\r
 {\r
        unsigned int rom_size = 0;\r
@@ -306,49 +489,45 @@ int emu_reload_rom(char *rom_fname)
        unsigned char *rom_data = NULL;\r
        char ext[5];\r
        pm_file *rom = NULL;\r
-       int ret, cd_state, cd_region, cfg_loaded = 0;\r
+       int cd_state = CIT_NOT_CD;\r
+       int ret, media_type, cd_region;\r
+       int cfg_loaded = 0, bad_rom = 0;\r
 \r
        lprintf("emu_ReloadRom(%s)\n", rom_fname);\r
 \r
        get_ext(rom_fname, ext);\r
 \r
-       // detect wrong extensions\r
-       if (!strcmp(ext, ".srm") || !strcmp(ext, "s.gz") || !strcmp(ext, ".mds")) { // s.gz ~ .mds.gz\r
-               me_update_msg("Not a ROM/CD selected.");\r
-               return 0;\r
-       }\r
-\r
+       // early cleanup\r
        PicoPatchUnload();\r
-\r
-       // check for movie file\r
        if (movie_data) {\r
                free(movie_data);\r
                movie_data = 0;\r
        }\r
+\r
        if (!strcmp(ext, ".gmv"))\r
        {\r
                // check for both gmv and rom\r
                int dummy;\r
                FILE *movie_file = fopen(rom_fname, "rb");\r
-               if(!movie_file) {\r
+               if (!movie_file) {\r
                        me_update_msg("Failed to open movie.");\r
                        return 0;\r
                }\r
                fseek(movie_file, 0, SEEK_END);\r
                movie_size = ftell(movie_file);\r
                fseek(movie_file, 0, SEEK_SET);\r
-               if(movie_size < 64+3) {\r
+               if (movie_size < 64+3) {\r
                        me_update_msg("Invalid GMV file.");\r
                        fclose(movie_file);\r
                        return 0;\r
                }\r
                movie_data = malloc(movie_size);\r
-               if(movie_data == NULL) {\r
+               if (movie_data == NULL) {\r
                        me_update_msg("low memory.");\r
                        fclose(movie_file);\r
                        return 0;\r
                }\r
-               fread(movie_data, 1, movie_size, movie_file);\r
+               dummy = fread(movie_data, 1, movie_size, movie_file);\r
                fclose(movie_file);\r
                if (strncmp((char *)movie_data, "Gens Movie TEST", 15) != 0) {\r
                        me_update_msg("Invalid GMV file.");\r
@@ -374,90 +553,108 @@ int emu_reload_rom(char *rom_fname)
                get_ext(rom_fname, ext);\r
        }\r
 \r
+       media_type = detect_media(rom_fname);\r
+       if (media_type == PM_BAD) {\r
+               me_update_msg("Not a ROM/CD img selected.");\r
+               return 0;\r
+       }\r
+\r
        shutdown_MCD();\r
+       PicoCartUnload();\r
+       rom_loaded = 0;\r
 \r
-       // check for MegaCD image\r
-       cd_state = emu_cd_check(&cd_region, rom_fname);\r
-       if (cd_state >= 0 && cd_state != CIT_NOT_CD)\r
+       PicoAHW = 0;\r
+\r
+       if (media_type == PM_CD)\r
        {\r
-               PicoAHW |= PAHW_MCD;\r
-               // valid CD image, check for BIOS..\r
+               // check for MegaCD image\r
+               cd_state = emu_cd_check(&cd_region, rom_fname);\r
+               if (cd_state >= 0 && cd_state != CIT_NOT_CD)\r
+               {\r
+                       // valid CD image, check for BIOS..\r
+\r
+                       // we need to have config loaded at this point\r
+                       ret = emu_read_config(rom_fname, 0);\r
+                       if (!ret) emu_read_config(NULL, 0);\r
+                       cfg_loaded = 1;\r
 \r
-               // we need to have config loaded at this point\r
-               ret = emu_read_config(1, 1);\r
-               if (!ret) emu_read_config(0, 1);\r
-               cfg_loaded = 1;\r
+                       if (PicoRegionOverride) {\r
+                               cd_region = PicoRegionOverride;\r
+                               lprintf("override region to %s\n", cd_region != 4 ?\r
+                                       (cd_region == 8 ? "EU" : "JAP") : "USA");\r
+                       }\r
+                       if (!find_bios(cd_region, &used_rom_name))\r
+                               return 0;\r
 \r
-               if (PicoRegionOverride) {\r
-                       cd_region = PicoRegionOverride;\r
-                       lprintf("overrided region to %s\n", cd_region != 4 ? (cd_region == 8 ? "EU" : "JAP") : "USA");\r
+                       get_ext(used_rom_name, ext);\r
+                       PicoAHW |= PAHW_MCD;\r
                }\r
-               if (!find_bios(cd_region, &used_rom_name)) {\r
-                       PicoAHW &= ~PAHW_MCD;\r
+               else {\r
+                       me_update_msg("Invalid CD image");\r
                        return 0;\r
                }\r
-\r
-               get_ext(used_rom_name, ext);\r
        }\r
-       else\r
-       {\r
-               if (PicoAHW & PAHW_MCD) Stop_CD();\r
-               PicoAHW &= ~PAHW_MCD;\r
+       else if (media_type == PM_MARK3) {\r
+               lprintf("detected SMS ROM\n");\r
+               PicoAHW = PAHW_SMS;\r
        }\r
 \r
        rom = pm_open(used_rom_name);\r
-       if (!rom) {\r
-               me_update_msg("Failed to open ROM/CD image");\r
-               goto fail;\r
-       }\r
-\r
-       if (cd_state < 0) {\r
-               me_update_msg("Invalid CD image");\r
-               goto fail;\r
+       if (rom == NULL) {\r
+               me_update_msg("Failed to open ROM");\r
+               return 0;\r
        }\r
 \r
        menu_romload_prepare(used_rom_name); // also CD load\r
+       used_rom_name = NULL; // uses static_buff\r
 \r
-       PicoCartUnload();\r
-       rom_loaded = 0;\r
-\r
-       if ( (ret = PicoCartLoad(rom, &rom_data, &rom_size)) ) {\r
+       ret = PicoCartLoad(rom, &rom_data, &rom_size, (PicoAHW & PAHW_SMS) ? 1 : 0);\r
+       pm_close(rom);\r
+       if (ret != 0) {\r
                if      (ret == 2) me_update_msg("Out of memory");\r
                else if (ret == 3) me_update_msg("Read failed");\r
                else               me_update_msg("PicoCartLoad() failed.");\r
-               goto fail2;\r
+               goto fail;\r
        }\r
-       pm_close(rom);\r
-       rom = NULL;\r
 \r
-       // detect wrong files (Pico crashes on very small files), also see if ROM EP is good\r
-       if (rom_size <= 0x200 || strncmp((char *)rom_data, "Pico", 4) == 0 ||\r
-         ((*(unsigned char *)(rom_data+4)<<16)|(*(unsigned short *)(rom_data+6))) >= (int)rom_size) {\r
-               if (rom_data) free(rom_data);\r
-               me_update_msg("Not a ROM selected.");\r
-               goto fail2;\r
+       // detect wrong files\r
+       if (strncmp((char *)rom_data, "Pico", 4) == 0)\r
+               bad_rom = 1;\r
+       else if (!(PicoAHW & PAHW_SMS)) {\r
+               unsigned short *d = (unsigned short *)(rom_data + 4);\r
+               if ((((d[0] << 16) | d[1]) & 0xffffff) >= (int)rom_size) {\r
+                       lprintf("bad reset vector\n");\r
+                       bad_rom = 1;\r
+               }\r
+       }\r
+\r
+       if (bad_rom) {\r
+               me_update_msg("Bad ROM detected.");\r
+               goto fail;\r
        }\r
 \r
        // load config for this ROM (do this before insert to get correct region)\r
        if (!(PicoAHW & PAHW_MCD))\r
                memcpy(id_header, rom_data + 0x100, sizeof(id_header));\r
        if (!cfg_loaded) {\r
-               ret = emu_read_config(1, 1);\r
-               if (!ret) emu_read_config(0, 1);\r
+               ret = emu_read_config(rom_fname, 0);\r
+               if (!ret) emu_read_config(NULL, 0);\r
        }\r
 \r
-       lprintf("PicoCartInsert(%p, %d);\n", rom_data, rom_size);\r
-       if (PicoCartInsert(rom_data, rom_size)) {\r
+       emu_make_path(static_buff, "carthw.cfg", sizeof(static_buff));\r
+       if (PicoCartInsert(rom_data, rom_size, static_buff)) {\r
                me_update_msg("Failed to load ROM.");\r
-               goto fail2;\r
+               goto fail;\r
        }\r
 \r
        // insert CD if it was detected\r
        if (cd_state != CIT_NOT_CD) {\r
                ret = Insert_CD(rom_fname, cd_state);\r
                if (ret != 0) {\r
+                       PicoCartUnload();\r
+                       rom_data = NULL; // freed by unload\r
                        me_update_msg("Insert_CD() failed, invalid CD image?");\r
-                       goto fail2;\r
+                       goto fail;\r
                }\r
        }\r
 \r
@@ -485,53 +682,50 @@ int emu_reload_rom(char *rom_fname)
                        // TODO: bits 6 & 5\r
                }\r
                movie_data[0x18+30] = 0;\r
-               plat_status_msg("MOVIE: %s", (char *) &movie_data[0x18]);\r
+               emu_status_msg("MOVIE: %s", (char *) &movie_data[0x18]);\r
        }\r
        else\r
        {\r
+               system_announce();\r
                PicoOpt &= ~POPT_DIS_VDP_FIFO;\r
-               plat_status_msg(Pico.m.pal ? "PAL SYSTEM / 50 FPS" : "NTSC SYSTEM / 60 FPS");\r
        }\r
 \r
+       strncpy(rom_fname_loaded, rom_fname, sizeof(rom_fname_loaded)-1);\r
+       rom_fname_loaded[sizeof(rom_fname_loaded)-1] = 0;\r
+       rom_loaded = 1;\r
+\r
        // load SRAM for this ROM\r
        if (currentConfig.EmuOpt & EOPT_EN_SRAM)\r
                emu_save_load_game(1, 1);\r
 \r
-       strncpy(rom_fname_loaded, rom_fname, sizeof(rom_fname_loaded)-1);\r
-       rom_fname_loaded[sizeof(rom_fname_loaded)-1] = 0;\r
-       rom_loaded = 1;\r
        return 1;\r
 \r
-fail2:\r
-       menu_romload_end();\r
 fail:\r
-       if (rom != NULL) pm_close(rom);\r
+       if (rom_data)\r
+               free(rom_data);\r
+       menu_romload_end();\r
        return 0;\r
 }\r
 \r
-static void romfname_ext(char *dst, const char *prefix, const char *ext)\r
+int emu_swap_cd(const char *fname)\r
 {\r
-       char *p;\r
-       int prefix_len = 0;\r
-\r
-       // make save filename\r
-       p = rom_fname_loaded + strlen(rom_fname_loaded) - 1;\r
-       for (; p >= rom_fname_loaded && *p != PATH_SEP_C; p--); p++;\r
-       *dst = 0;\r
-       if (prefix) {\r
-               int len = plat_get_root_dir(dst, 512);\r
-               strcpy(dst + len, prefix);\r
-               prefix_len = len + strlen(prefix);\r
+       cd_img_type cd_type;\r
+       int ret = -1;\r
+\r
+       cd_type = emu_cd_check(NULL, fname);\r
+       if (cd_type != CIT_NOT_CD)\r
+               ret = Insert_CD(fname, cd_type);\r
+       if (ret != 0) {\r
+               me_update_msg("Load failed, invalid CD image?");\r
+               return 0;\r
        }\r
-#ifdef UIQ3\r
-       else p = rom_fname_loaded; // backward compatibility\r
-#endif\r
-       strncpy(dst + prefix_len, p, 511-prefix_len);\r
-       dst[511-8] = 0;\r
-       if (dst[strlen(dst)-4] == '.') dst[strlen(dst)-4] = 0;\r
-       if (ext) strcat(dst, ext);\r
+\r
+       strncpy(rom_fname_loaded, fname, sizeof(rom_fname_loaded)-1);\r
+       rom_fname_loaded[sizeof(rom_fname_loaded)-1] = 0;\r
+       return 1;\r
 }\r
 \r
+// <base dir><end>\r
 void emu_make_path(char *buff, const char *end, int size)\r
 {\r
        int pos, end_len;\r
@@ -557,7 +751,29 @@ static void make_config_cfg(char *cfg_buff_512)
        cfg_buff_512[511] = 0;\r
 }\r
 \r
-static void emu_setDefaultConfig(void)\r
+void emu_prep_defconfig(void)\r
+{\r
+       memset(&defaultConfig, 0, sizeof(defaultConfig));\r
+       defaultConfig.EmuOpt    = 0x9d | EOPT_RAM_TIMINGS|EOPT_EN_CD_LEDS;\r
+       defaultConfig.s_PicoOpt = POPT_EN_STEREO|POPT_EN_FM|POPT_EN_PSG|POPT_EN_Z80 |\r
+                                 POPT_EN_MCD_PCM|POPT_EN_MCD_CDDA|POPT_EN_SVP_DRC|POPT_ACC_SPRITES |\r
+                                 POPT_EN_32X|POPT_EN_PWM;\r
+       defaultConfig.s_PsndRate = 44100;\r
+       defaultConfig.s_PicoRegion = 0; // auto\r
+       defaultConfig.s_PicoAutoRgnOrder = 0x184; // US, EU, JP\r
+       defaultConfig.s_PicoCDBuffers = 0;\r
+       defaultConfig.confirm_save = EOPT_CONFIRM_SAVE;\r
+       defaultConfig.Frameskip = -1; // auto\r
+       defaultConfig.volume = 50;\r
+       defaultConfig.gamma = 100;\r
+       defaultConfig.scaling = 0;\r
+       defaultConfig.turbo_rate = 15;\r
+\r
+       // platform specific overrides\r
+       pemu_prep_defconfig();\r
+}\r
+\r
+void emu_set_defconfig(void)\r
 {\r
        memcpy(&currentConfig, &defaultConfig, sizeof(currentConfig));\r
        PicoOpt = currentConfig.s_PicoOpt;\r
@@ -565,25 +781,28 @@ static void emu_setDefaultConfig(void)
        PicoRegionOverride = currentConfig.s_PicoRegion;\r
        PicoAutoRgnOrder = currentConfig.s_PicoAutoRgnOrder;\r
        PicoCDBuffers = currentConfig.s_PicoCDBuffers;\r
+       p32x_msh2_multiplier = MSH2_MULTI_DEFAULT;\r
+       p32x_ssh2_multiplier = SSH2_MULTI_DEFAULT;\r
 }\r
 \r
-int emu_read_config(int game, int no_defaults)\r
+int emu_read_config(const char *rom_fname, int no_defaults)\r
 {\r
        char cfg[512];\r
        int ret;\r
 \r
-       if (!game)\r
+       if (!no_defaults)\r
+               emu_set_defconfig();\r
+\r
+       if (rom_fname == NULL)\r
        {\r
-               if (!no_defaults)\r
-                       emu_setDefaultConfig();\r
+               // global config\r
                make_config_cfg(cfg);\r
                ret = config_readsect(cfg, NULL);\r
        }\r
        else\r
        {\r
-               char *sect = emu_make_rom_id();\r
+               char *sect = emu_make_rom_id(rom_fname);\r
 \r
-               // try new .cfg way\r
                if (config_slot != 0)\r
                     sprintf(cfg, "game.%i.cfg", config_slot);\r
                else strcpy(cfg,  "game.cfg");\r
@@ -593,7 +812,7 @@ int emu_read_config(int game, int no_defaults)
                {\r
                        // read user's config\r
                        int vol = currentConfig.volume;\r
-                       emu_setDefaultConfig();\r
+                       emu_set_defconfig();\r
                        ret = config_readsect(cfg, sect);\r
                        currentConfig.volume = vol; // make vol global (bah)\r
                }\r
@@ -602,7 +821,8 @@ int emu_read_config(int game, int no_defaults)
                        // read global config, and apply game_def.cfg on top\r
                        make_config_cfg(cfg);\r
                        config_readsect(cfg, NULL);\r
-                       ret = config_readsect("game_def.cfg", sect);\r
+                       emu_make_path(cfg, "game_def.cfg", sizeof(cfg));\r
+                       ret = config_readsect(cfg, sect);\r
                }\r
 \r
                if (ret == 0)\r
@@ -611,7 +831,7 @@ int emu_read_config(int game, int no_defaults)
                }\r
        }\r
 \r
-       plat_validate_config();\r
+       pemu_validate_config();\r
 \r
        // some sanity checks\r
 #ifdef PSP\r
@@ -643,7 +863,7 @@ int emu_write_config(int is_game)
                if (config_slot != 0)\r
                     sprintf(cfg, "game.%i.cfg", config_slot);\r
                else strcpy(cfg,  "game.cfg");\r
-               game_sect = emu_make_rom_id();\r
+               game_sect = emu_make_rom_id(rom_fname_loaded);\r
                lprintf("emu_write_config: sect \"%s\"\n", game_sect);\r
        }\r
 \r
@@ -662,32 +882,36 @@ int emu_write_config(int is_game)
 \r
 /* always using built-in font */\r
 \r
-#define mk_text_out(name, type, val) \\r
+#define mk_text_out(name, type, val, topleft, step_x, step_y) \\r
 void name(int x, int y, const char *text)                              \\r
 {                                                                      \\r
        int i, l, len = strlen(text);                                   \\r
-       type *screen = (type *)g_screen_ptr + x + y * g_screen_width;   \\r
+       type *screen = (type *)(topleft) + x * step_x + y * step_y;     \\r
                                                                        \\r
-       for (i = 0; i < len; i++, screen += 8)                          \\r
+       for (i = 0; i < len; i++, screen += 8 * step_x)                 \\r
        {                                                               \\r
                for (l = 0; l < 8; l++)                                 \\r
                {                                                       \\r
                        unsigned char fd = fontdata8x8[text[i] * 8 + l];\\r
-                       type *s = screen + l * g_screen_width;          \\r
-                       if (fd&0x80) s[0] = val;                        \\r
-                       if (fd&0x40) s[1] = val;                        \\r
-                       if (fd&0x20) s[2] = val;                        \\r
-                       if (fd&0x10) s[3] = val;                        \\r
-                       if (fd&0x08) s[4] = val;                        \\r
-                       if (fd&0x04) s[5] = val;                        \\r
-                       if (fd&0x02) s[6] = val;                        \\r
-                       if (fd&0x01) s[7] = val;                        \\r
+                       type *s = screen + l * step_y;                  \\r
+                       if (fd&0x80) s[step_x * 0] = val;               \\r
+                       if (fd&0x40) s[step_x * 1] = val;               \\r
+                       if (fd&0x20) s[step_x * 2] = val;               \\r
+                       if (fd&0x10) s[step_x * 3] = val;               \\r
+                       if (fd&0x08) s[step_x * 4] = val;               \\r
+                       if (fd&0x04) s[step_x * 5] = val;               \\r
+                       if (fd&0x02) s[step_x * 6] = val;               \\r
+                       if (fd&0x01) s[step_x * 7] = val;               \\r
                }                                                       \\r
        }                                                               \\r
 }\r
 \r
-mk_text_out(emu_textOut8, unsigned char, 0xf0)\r
-mk_text_out(emu_textOut16, unsigned short, 0xffff)\r
+mk_text_out(emu_text_out8,      unsigned char,    0xf0, g_screen_ptr, 1, g_screen_width)\r
+mk_text_out(emu_text_out16,     unsigned short, 0xffff, g_screen_ptr, 1, g_screen_width)\r
+mk_text_out(emu_text_out8_rot,  unsigned char,    0xf0,\r
+       (char *)g_screen_ptr  + (g_screen_width - 1) * g_screen_height, -g_screen_height, 1)\r
+mk_text_out(emu_text_out16_rot, unsigned short, 0xffff,\r
+       (short *)g_screen_ptr + (g_screen_width - 1) * g_screen_height, -g_screen_height, 1)\r
 \r
 #undef mk_text_out\r
 \r
@@ -698,7 +922,7 @@ void update_movie(void)
        if (offs+3 > movie_size) {\r
                free(movie_data);\r
                movie_data = 0;\r
-               plat_status_msg("END OF MOVIE.");\r
+               emu_status_msg("END OF MOVIE.");\r
                lprintf("END OF MOVIE.\n");\r
        } else {\r
                // MXYZ SACB RLDU\r
@@ -719,18 +943,6 @@ void update_movie(void)
        }\r
 }\r
 \r
-\r
-static size_t gzRead2(void *p, size_t _size, size_t _n, void *file)\r
-{\r
-       return gzread(file, p, _n);\r
-}\r
-\r
-\r
-static size_t gzWrite2(void *p, size_t _size, size_t _n, void *file)\r
-{\r
-       return gzwrite(file, p, _n);\r
-}\r
-\r
 static int try_ropen_file(const char *fname)\r
 {\r
        FILE *f;\r
@@ -745,72 +957,66 @@ static int try_ropen_file(const char *fname)
 \r
 char *emu_get_save_fname(int load, int is_sram, int slot)\r
 {\r
-       static char saveFname[512];\r
+       char *saveFname = static_buff;\r
        char ext[16];\r
 \r
        if (is_sram)\r
        {\r
-               romfname_ext(saveFname, (PicoAHW&1) ? "brm"PATH_SEP : "srm"PATH_SEP, (PicoAHW&1) ? ".brm" : ".srm");\r
-               if (load) {\r
-                       if (try_ropen_file(saveFname)) return saveFname;\r
-                       // try in current dir..\r
-                       romfname_ext(saveFname, NULL, (PicoAHW & PAHW_MCD) ? ".brm" : ".srm");\r
-                       if (try_ropen_file(saveFname)) return saveFname;\r
-                       return NULL; // give up\r
-               }\r
+               strcpy(ext, (PicoAHW & PAHW_MCD) ? ".brm" : ".srm");\r
+               romfname_ext(saveFname, sizeof(static_buff),\r
+                       (PicoAHW & PAHW_MCD) ? "brm"PATH_SEP : "srm"PATH_SEP, ext);\r
+               if (!load)\r
+                       return saveFname;\r
+\r
+               if (try_ropen_file(saveFname))\r
+                       return saveFname;\r
+\r
+               romfname_ext(saveFname, sizeof(static_buff), NULL, ext);\r
+               if (try_ropen_file(saveFname))\r
+                       return saveFname;\r
        }\r
        else\r
        {\r
+               const char *ext_main = (currentConfig.EmuOpt & EOPT_GZIP_SAVES) ? ".mds.gz" : ".mds";\r
+               const char *ext_othr = (currentConfig.EmuOpt & EOPT_GZIP_SAVES) ? ".mds" : ".mds.gz";\r
                ext[0] = 0;\r
-               if(slot > 0 && slot < 10) sprintf(ext, ".%i", slot);\r
-               strcat(ext, (currentConfig.EmuOpt & EOPT_GZIP_SAVES) ? ".mds.gz" : ".mds");\r
-\r
-               romfname_ext(saveFname, "mds" PATH_SEP, ext);\r
-               if (load) {\r
-                       if (try_ropen_file(saveFname)) return saveFname;\r
-                       romfname_ext(saveFname, NULL, ext);\r
-                       if (try_ropen_file(saveFname)) return saveFname;\r
-                       // no gzipped states, search for non-gzipped\r
-                       if (currentConfig.EmuOpt & EOPT_GZIP_SAVES)\r
-                       {\r
-                               ext[0] = 0;\r
-                               if(slot > 0 && slot < 10) sprintf(ext, ".%i", slot);\r
-                               strcat(ext, ".mds");\r
-\r
-                               romfname_ext(saveFname, "mds"PATH_SEP, ext);\r
-                               if (try_ropen_file(saveFname)) return saveFname;\r
-                               romfname_ext(saveFname, NULL, ext);\r
-                               if (try_ropen_file(saveFname)) return saveFname;\r
-                       }\r
-                       return NULL;\r
+               if (slot > 0 && slot < 10)\r
+                       sprintf(ext, ".%i", slot);\r
+               strcat(ext, ext_main);\r
+\r
+               if (!load) {\r
+                       romfname_ext(saveFname, sizeof(static_buff), "mds" PATH_SEP, ext);\r
+                       return saveFname;\r
+               }\r
+               else {\r
+                       romfname_ext(saveFname, sizeof(static_buff), "mds" PATH_SEP, ext);\r
+                       if (try_ropen_file(saveFname))\r
+                               return saveFname;\r
+\r
+                       romfname_ext(saveFname, sizeof(static_buff), NULL, ext);\r
+                       if (try_ropen_file(saveFname))\r
+                               return saveFname;\r
+\r
+                       // try the other ext\r
+                       ext[0] = 0;\r
+                       if (slot > 0 && slot < 10)\r
+                               sprintf(ext, ".%i", slot);\r
+                       strcat(ext, ext_othr);\r
+\r
+                       romfname_ext(saveFname, sizeof(static_buff), "mds"PATH_SEP, ext);\r
+                       if (try_ropen_file(saveFname))\r
+                               return saveFname;\r
                }\r
        }\r
 \r
-       return saveFname;\r
+       return NULL;\r
 }\r
 \r
-int emu_check_save_file(int slot)\r
+int emu_check_save_file(int slot, int *time)\r
 {\r
        return emu_get_save_fname(1, 0, slot) ? 1 : 0;\r
 }\r
 \r
-void emu_setSaveStateCbs(int gz)\r
-{\r
-       if (gz) {\r
-               areaRead  = gzRead2;\r
-               areaWrite = gzWrite2;\r
-               areaEof   = (areaeof *) gzeof;\r
-               areaSeek  = (areaseek *) gzseek;\r
-               areaClose = (areaclose *) gzclose;\r
-       } else {\r
-               areaRead  = (arearw *) fread;\r
-               areaWrite = (arearw *) fwrite;\r
-               areaEof   = (areaeof *) feof;\r
-               areaSeek  = (areaseek *) fseek;\r
-               areaClose = (areaclose *) fclose;\r
-       }\r
-}\r
-\r
 int emu_save_load_game(int load, int sram)\r
 {\r
        int ret = 0;\r
@@ -820,7 +1026,7 @@ int emu_save_load_game(int load, int sram)
        saveFname = emu_get_save_fname(load, sram, state_slot);\r
        if (saveFname == NULL) {\r
                if (!sram)\r
-                       plat_status_msg(load ? "LOAD FAILED (missing file)" : "SAVE FAILED");\r
+                       emu_status_msg(load ? "LOAD FAILED (missing file)" : "SAVE FAILED");\r
                return -1;\r
        }\r
 \r
@@ -834,7 +1040,7 @@ int emu_save_load_game(int load, int sram)
                int truncate = 1;\r
                if (PicoAHW & PAHW_MCD)\r
                {\r
-                       if (PicoOpt&POPT_EN_MCD_RAMCART) {\r
+                       if (PicoOpt & POPT_EN_MCD_RAMCART) {\r
                                sram_size = 0x12000;\r
                                sram_data = SRam.data;\r
                                if (sram_data)\r
@@ -845,17 +1051,19 @@ int emu_save_load_game(int load, int sram)
                                truncate  = 0; // the .brm may contain RAM cart data after normal brm\r
                        }\r
                } else {\r
-                       sram_size = SRam.end-SRam.start+1;\r
-                       if(Pico.m.sram_reg & 4) sram_size=0x2000;\r
+                       sram_size = SRam.size;\r
                        sram_data = SRam.data;\r
                }\r
-               if (!sram_data) return 0; // SRam forcefully disabled for this game\r
+               if (sram_data == NULL)\r
+                       return 0; // SRam forcefully disabled for this game\r
 \r
                if (load)\r
                {\r
                        sramFile = fopen(saveFname, "rb");\r
-                       if(!sramFile) return -1;\r
-                       fread(sram_data, 1, sram_size, sramFile);\r
+                       if (!sramFile)\r
+                               return -1;\r
+                       ret = fread(sram_data, 1, sram_size, sramFile);\r
+                       ret = ret > 0 ? 0 : -1;\r
                        fclose(sramFile);\r
                        if ((PicoAHW & PAHW_MCD) && (PicoOpt&POPT_EN_MCD_RAMCART))\r
                                memcpy32((int *)Pico_mcd->bram, (int *)sram_data, 0x2000/4);\r
@@ -881,35 +1089,14 @@ int emu_save_load_game(int load, int sram)
        }\r
        else\r
        {\r
-               void *PmovFile = NULL;\r
-               if (strcmp(saveFname + strlen(saveFname) - 3, ".gz") == 0)\r
-               {\r
-                       if( (PmovFile = gzopen(saveFname, load ? "rb" : "wb")) ) {\r
-                               emu_setSaveStateCbs(1);\r
-                               if (!load) gzsetparams(PmovFile, 9, Z_DEFAULT_STRATEGY);\r
-                       }\r
-               }\r
-               else\r
-               {\r
-                       if( (PmovFile = fopen(saveFname, load ? "rb" : "wb")) ) {\r
-                               emu_setSaveStateCbs(0);\r
-                       }\r
-               }\r
-               if(PmovFile) {\r
-                       ret = PmovState(load ? 6 : 5, PmovFile);\r
-                       areaClose(PmovFile);\r
-                       PmovFile = 0;\r
-                       if (load) Pico.m.dirtyPal=1;\r
+               ret = PicoState(saveFname, !load);\r
+               if (!ret) {\r
 #ifndef NO_SYNC\r
-                       else sync();\r
+                       if (!load) sync();\r
 #endif\r
-               }\r
-               else    ret = -1;\r
-               if (!ret)\r
-                       plat_status_msg(load ? "GAME LOADED" : "GAME SAVED");\r
-               else\r
-               {\r
-                       plat_status_msg(load ? "LOAD FAILED" : "SAVE FAILED");\r
+                       emu_status_msg(load ? "STATE LOADED" : "STATE SAVED");\r
+               } else {\r
+                       emu_status_msg(load ? "LOAD FAILED" : "SAVE FAILED");\r
                        ret = -1;\r
                }\r
 \r
@@ -931,7 +1118,7 @@ void emu_set_fastforward(int set_on)
                currentConfig.EmuOpt &= ~4;\r
                currentConfig.EmuOpt |= 0x40000;\r
                is_on = 1;\r
-               plat_status_msg("FAST FORWARD");\r
+               emu_status_msg("FAST FORWARD");\r
        }\r
        else if (!set_on && is_on) {\r
                PsndOut = set_PsndOut;\r
@@ -942,9 +1129,23 @@ void emu_set_fastforward(int set_on)
        }\r
 }\r
 \r
-static void emu_msg_tray_open(void)\r
+static void emu_tray_open(void)\r
 {\r
-       plat_status_msg("CD tray opened");\r
+       engineState = PGS_TrayMenu;\r
+}\r
+\r
+static void emu_tray_close(void)\r
+{\r
+       emu_status_msg("CD tray closed.");\r
+}\r
+\r
+void emu_32x_startup(void)\r
+{\r
+       plat_video_toggle_renderer(0, 0); // HACK\r
+       system_announce();\r
+\r
+       // force mode change event\r
+       rendstatus_old = -1;\r
 }\r
 \r
 void emu_reset_game(void)\r
@@ -962,9 +1163,9 @@ void run_events_pico(unsigned int events)
                if (pico_inp_mode > 2)\r
                        pico_inp_mode = 0;\r
                switch (pico_inp_mode) {\r
-                       case 2: plat_status_msg("Input: Pen on Pad"); break;\r
-                       case 1: plat_status_msg("Input: Pen on Storyware"); break;\r
-                       case 0: plat_status_msg("Input: Joystick");\r
+                       case 2: emu_status_msg("Input: Pen on Pad"); break;\r
+                       case 1: emu_status_msg("Input: Pen on Storyware"); break;\r
+                       case 0: emu_status_msg("Input: Joystick");\r
                                PicoPicohw.pen_pos[0] = PicoPicohw.pen_pos[1] = 0x8000;\r
                                break;\r
                }\r
@@ -973,13 +1174,13 @@ void run_events_pico(unsigned int events)
                PicoPicohw.page--;\r
                if (PicoPicohw.page < 0)\r
                        PicoPicohw.page = 0;\r
-               plat_status_msg("Page %i", PicoPicohw.page);\r
+               emu_status_msg("Page %i", PicoPicohw.page);\r
        }\r
        if (events & PEV_PICO_PNEXT) {\r
                PicoPicohw.page++;\r
                if (PicoPicohw.page > 6)\r
                        PicoPicohw.page = 6;\r
-               plat_status_msg("Page %i", PicoPicohw.page);\r
+               emu_status_msg("Page %i", PicoPicohw.page);\r
        }\r
 \r
        if (pico_inp_mode == 0)\r
@@ -1038,9 +1239,9 @@ static void run_events_ui(unsigned int which)
        if (which & (PEV_STATE_LOAD|PEV_STATE_SAVE))\r
        {\r
                int do_it = 1;\r
-               if ( emu_check_save_file(state_slot) &&\r
-                               (((which & PEV_STATE_LOAD) && (currentConfig.EmuOpt & EOPT_CONFIRM_LOAD)) ||\r
-                                ((which & PEV_STATE_SAVE) && (currentConfig.EmuOpt & EOPT_CONFIRM_SAVE))) )\r
+               if ( emu_check_save_file(state_slot, NULL) &&\r
+                       (((which & PEV_STATE_LOAD) && (currentConfig.confirm_save & EOPT_CONFIRM_LOAD)) ||\r
+                        ((which & PEV_STATE_SAVE) && (currentConfig.confirm_save & EOPT_CONFIRM_SAVE))) )\r
                {\r
                        const char *nm;\r
                        char tmp[64];\r
@@ -1056,19 +1257,19 @@ static void run_events_ui(unsigned int which)
 \r
                        plat_status_msg_busy_first(tmp);\r
 \r
-                       in_set_blocking(1);\r
-                       while (in_menu_wait_any(50) & (PBTN_MA3|PBTN_MBACK))\r
+                       in_set_config_int(0, IN_CFG_BLOCKING, 1);\r
+                       while (in_menu_wait_any(NULL, 50) & (PBTN_MA3|PBTN_MBACK))\r
                                ;\r
-                       while ( !((keys = in_menu_wait_any(50)) & (PBTN_MA3|PBTN_MBACK)) )\r
+                       while ( !((keys = in_menu_wait_any(NULL, 50)) & (PBTN_MA3|PBTN_MBACK)) )\r
                                ;\r
                        if (keys & PBTN_MBACK)\r
                                do_it = 0;\r
-                       while (in_menu_wait_any(50) & (PBTN_MA3|PBTN_MBACK))\r
+                       while (in_menu_wait_any(NULL, 50) & (PBTN_MA3|PBTN_MBACK))\r
                                ;\r
-                       in_set_blocking(0);\r
+                       in_set_config_int(0, IN_CFG_BLOCKING, 0);\r
                }\r
                if (do_it) {\r
-                       plat_status_msg_busy_first((which & PEV_STATE_LOAD) ? "LOADING GAME" : "SAVING GAME");\r
+                       plat_status_msg_busy_first((which & PEV_STATE_LOAD) ? "LOADING STATE" : "SAVING STATE");\r
                        PicoStateProgressCB = plat_status_msg_busy_next;\r
                        emu_save_load_game((which & PEV_STATE_LOAD) ? 1 : 0, 0);\r
                        PicoStateProgressCB = NULL;\r
@@ -1076,7 +1277,7 @@ static void run_events_ui(unsigned int which)
        }\r
        if (which & PEV_SWITCH_RND)\r
        {\r
-               plat_video_toggle_renderer();\r
+               plat_video_toggle_renderer(1, 0);\r
        }\r
        if (which & (PEV_SSLOT_PREV|PEV_SSLOT_NEXT))\r
        {\r
@@ -1090,8 +1291,8 @@ static void run_events_ui(unsigned int which)
                                state_slot = 0;\r
                }\r
 \r
-               plat_status_msg("SAVE SLOT %i [%s]", state_slot,\r
-                       emu_check_save_file(state_slot) ? "USED" : "FREE");\r
+               emu_status_msg("SAVE SLOT %i [%s]", state_slot,\r
+                       emu_check_save_file(state_slot, NULL) ? "USED" : "FREE");\r
        }\r
        if (which & PEV_MENU)\r
                engineState = PGS_Menu;\r
@@ -1150,24 +1351,60 @@ static void mkdir_path(char *path_with_reserve, int pos, const char *name)
                lprintf("failed to create: %s\n", path_with_reserve);\r
 }\r
 \r
+void emu_cmn_forced_frame(int no_scale, int do_emu)\r
+{\r
+       int po_old = PicoOpt;\r
+\r
+       memset32(g_screen_ptr, 0, g_screen_width * g_screen_height * 2 / 4);\r
+\r
+       PicoOpt &= ~POPT_ALT_RENDERER;\r
+       PicoOpt |= POPT_ACC_SPRITES;\r
+       if (!no_scale)\r
+               PicoOpt |= POPT_EN_SOFTSCALE;\r
+\r
+       PicoDrawSetOutFormat(PDF_RGB555, 1);\r
+       Pico.m.dirtyPal = 1;\r
+       if (do_emu)\r
+               PicoFrame();\r
+       else\r
+               PicoFrameDrawOnly();\r
+\r
+       PicoOpt = po_old;\r
+}\r
+\r
 void emu_init(void)\r
 {\r
        char path[512];\r
        int pos;\r
 \r
+#if 0\r
+       // FIXME: handle through menu, etc\r
+       FILE *f;\r
+       f = fopen("32X_M_BIOS.BIN", "rb");\r
+       p32x_bios_m = malloc(2048);\r
+       fread(p32x_bios_m, 1, 2048, f);\r
+       fclose(f);\r
+       f = fopen("32X_S_BIOS.BIN", "rb");\r
+       p32x_bios_s = malloc(1024);\r
+       fread(p32x_bios_s, 1, 1024, f);\r
+       fclose(f);\r
+#endif\r
+\r
        /* make dirs for saves */\r
        pos = plat_get_root_dir(path, sizeof(path) - 4);\r
        mkdir_path(path, pos, "mds");\r
        mkdir_path(path, pos, "srm");\r
        mkdir_path(path, pos, "brm");\r
 \r
+       pprof_init();\r
+\r
        make_config_cfg(path);\r
        config_readlrom(path);\r
 \r
        PicoInit();\r
        PicoMessage = plat_status_msg_busy_next;\r
-       PicoMCDopenTray = emu_msg_tray_open;\r
-       PicoMCDcloseTray = menu_loop_tray;\r
+       PicoMCDopenTray = emu_tray_open;\r
+       PicoMCDcloseTray = emu_tray_close;\r
 }\r
 \r
 void emu_finish(void)\r
@@ -1187,6 +1424,213 @@ void emu_finish(void)
 #endif\r
        }\r
 \r
+       pprof_finish();\r
+\r
        PicoExit();\r
 }\r
 \r
+static void skip_frame(int do_audio)\r
+{\r
+       PicoSkipFrame = do_audio ? 1 : 2;\r
+       PicoFrame();\r
+       PicoSkipFrame = 0;\r
+}\r
+\r
+/* our tick here is 1 us right now */\r
+#define ms_to_ticks(x) (unsigned int)(x * 1000)\r
+#define get_ticks() plat_get_ticks_us()\r
+\r
+void emu_loop(void)\r
+{\r
+       int pframes_done;               /* "period" frames, used for sync */\r
+       int frames_done, frames_shown;  /* actual frames for fps counter */\r
+       int target_fps, target_frametime;\r
+       unsigned int timestamp_base = 0, timestamp_fps;\r
+       char *notice_msg = NULL;\r
+       char fpsbuff[24];\r
+       int i;\r
+\r
+       fpsbuff[0] = 0;\r
+\r
+       /* make sure we are in correct mode */\r
+       Pico.m.dirtyPal = 1;\r
+       rendstatus_old = -1;\r
+\r
+       PicoLoopPrepare();\r
+\r
+       // prepare CD buffer\r
+       if (PicoAHW & PAHW_MCD)\r
+               PicoCDBufferInit();\r
+\r
+       pemu_loop_prep();\r
+\r
+       /* number of ticks per frame */\r
+       if (Pico.m.pal) {\r
+               target_fps = 50;\r
+               target_frametime = ms_to_ticks(1000) / 50;\r
+       } else {\r
+               target_fps = 60;\r
+               target_frametime = ms_to_ticks(1000) / 60 + 1;\r
+       }\r
+\r
+       timestamp_fps = get_ticks();\r
+       reset_timing = 1;\r
+\r
+       frames_done = frames_shown = pframes_done = 0;\r
+\r
+       plat_video_wait_vsync();\r
+\r
+       /* loop with resync every 1 sec. */\r
+       while (engineState == PGS_Running)\r
+       {\r
+               unsigned int timestamp;\r
+               int diff, diff_lim;\r
+\r
+               pprof_start(main);\r
+\r
+               timestamp = get_ticks();\r
+               if (reset_timing) {\r
+                       reset_timing = 0;\r
+                       timestamp_base = timestamp;\r
+                       pframes_done = 0;\r
+               }\r
+\r
+               // show notice_msg message?\r
+               if (notice_msg_time != 0)\r
+               {\r
+                       static int noticeMsgSum;\r
+                       if (timestamp - ms_to_ticks(notice_msg_time) > ms_to_ticks(STATUS_MSG_TIMEOUT)) {\r
+                               notice_msg_time = 0;\r
+                               plat_status_msg_clear();\r
+                               notice_msg = NULL;\r
+                       } else {\r
+                               int sum = noticeMsg[0] + noticeMsg[1] + noticeMsg[2];\r
+                               if (sum != noticeMsgSum) {\r
+                                       plat_status_msg_clear();\r
+                                       noticeMsgSum = sum;\r
+                               }\r
+                               notice_msg = noticeMsg;\r
+                       }\r
+               }\r
+\r
+               // second changed?\r
+               if (timestamp - timestamp_fps >= ms_to_ticks(1000))\r
+               {\r
+#ifdef BENCHMARK\r
+                       static int bench = 0, bench_fps = 0, bench_fps_s = 0, bfp = 0, bf[4];\r
+                       if (++bench == 10) {\r
+                               bench = 0;\r
+                               bench_fps_s = bench_fps;\r
+                               bf[bfp++ & 3] = bench_fps;\r
+                               bench_fps = 0;\r
+                       }\r
+                       bench_fps += frames_shown;\r
+                       sprintf(fpsbuff, "%02i/%02i/%02i", frames_shown, bench_fps_s, (bf[0]+bf[1]+bf[2]+bf[3])>>2);\r
+                       printf("%s\n", fpsbuff);\r
+#else\r
+                       if (currentConfig.EmuOpt & EOPT_SHOW_FPS) {\r
+                               sprintf(fpsbuff, "%02i/%02i", frames_shown, frames_done);\r
+                               if (fpsbuff[5] == 0) { fpsbuff[5] = fpsbuff[6] = ' '; fpsbuff[7] = 0; }\r
+                       }\r
+#endif\r
+                       frames_shown = frames_done = 0;\r
+                       timestamp_fps += ms_to_ticks(1000);\r
+               }\r
+#ifdef PFRAMES\r
+               sprintf(fpsbuff, "%i", Pico.m.frame_count);\r
+#endif\r
+\r
+               if (timestamp - timestamp_base >= ms_to_ticks(1000))\r
+               {\r
+                       if ((currentConfig.EmuOpt & EOPT_NO_FRMLIMIT) && currentConfig.Frameskip >= 0)\r
+                               pframes_done = 0;\r
+                       else\r
+                               pframes_done -= target_fps;\r
+                       if (pframes_done < -2) {\r
+                               /* don't drag more than 2 frames behind */\r
+                               pframes_done = -2;\r
+                               timestamp_base = timestamp - 2 * target_frametime;\r
+                       }\r
+                       else\r
+                               timestamp_base += ms_to_ticks(1000);\r
+               }\r
+\r
+               diff = timestamp - timestamp_base;\r
+               diff_lim = (pframes_done + 1) * target_frametime;\r
+\r
+               if (currentConfig.Frameskip >= 0) // frameskip enabled\r
+               {\r
+                       for (i = 0; i < currentConfig.Frameskip; i++) {\r
+                               emu_update_input();\r
+                               skip_frame(1);\r
+                               pframes_done++; frames_done++;\r
+                               diff_lim += target_frametime;\r
+\r
+                               if (!(currentConfig.EmuOpt & (EOPT_NO_FRMLIMIT|EOPT_EXT_FRMLIMIT))) {\r
+                                       timestamp = get_ticks();\r
+                                       diff = timestamp - timestamp_base;\r
+                                       if (!reset_timing && diff < diff_lim) // we are too fast\r
+                                               plat_wait_till_us(timestamp_base + diff_lim);\r
+                               }\r
+                       }\r
+               }\r
+               else if (diff > diff_lim)\r
+               {\r
+                       /* no time left for this frame - skip */\r
+                       /* limit auto frameskip to 8 */\r
+                       if (frames_done / 8 <= frames_shown) {\r
+                               emu_update_input();\r
+                               skip_frame(diff < diff_lim + target_frametime * 16);\r
+                               pframes_done++; frames_done++;\r
+                               continue;\r
+                       }\r
+               }\r
+\r
+               emu_update_input();\r
+               PicoFrame();\r
+               pemu_finalize_frame(fpsbuff, notice_msg);\r
+\r
+               // plat_video_flip();\r
+\r
+               /* frame limiter */\r
+               if (!reset_timing && !(currentConfig.EmuOpt & (EOPT_NO_FRMLIMIT|EOPT_EXT_FRMLIMIT)))\r
+               {\r
+                       timestamp = get_ticks();\r
+                       diff = timestamp - timestamp_base;\r
+\r
+                       // sleep or vsync if we are still too fast\r
+                       if (diff < diff_lim)\r
+                       {\r
+                               // we are too fast\r
+                               plat_wait_till_us(timestamp_base + diff_lim - target_frametime / 4);\r
+                               if (currentConfig.EmuOpt & EOPT_VSYNC)\r
+                                       plat_video_wait_vsync();\r
+                       }\r
+               }\r
+\r
+               // XXX: for some plats it might be better to flip before vsync\r
+               // (due to shadow registers in display hw)\r
+               plat_video_flip();\r
+\r
+               pframes_done++; frames_done++; frames_shown++;\r
+\r
+               pprof_end(main);\r
+       }\r
+\r
+       emu_set_fastforward(0);\r
+\r
+       // save SRAM\r
+       if ((currentConfig.EmuOpt & EOPT_EN_SRAM) && SRam.changed) {\r
+               plat_status_msg_busy_first("Writing SRAM/BRAM...");\r
+               emu_save_load_game(0, 1);\r
+               SRam.changed = 0;\r
+       }\r
+\r
+       pemu_loop_end();\r
+\r
+       // pemu_loop_end() might want to do 1 frame for bg image,\r
+       // so free CD buffer here\r
+       if (PicoAHW & PAHW_MCD)\r
+               PicoCDBufferFree();\r
+}\r
+\r