giz port, restructuring
authornotaz <notasas@gmail.com>
Sat, 22 Sep 2007 22:53:18 +0000 (22:53 +0000)
committernotaz <notasas@gmail.com>
Sat, 22 Sep 2007 22:53:18 +0000 (22:53 +0000)
git-svn-id: file:///home/notaz/opt/svn/PicoDrive/platform@257 be3aeb3a-fb24-0410-a615-afba39da0efa

13 files changed:
common/emu.c [new file with mode: 0644]
common/emu.h [new file with mode: 0644]
common/menu.c
common/menu.h
gp2x/940ctl.c
gp2x/Makefile
gp2x/emu.c
gp2x/emu.h
gp2x/main.c
gp2x/menu.c
gp2x/menu.h
gp2x/port_config.h
gp2x/port_config.s

diff --git a/common/emu.c b/common/emu.c
new file mode 100644 (file)
index 0000000..99fca49
--- /dev/null
@@ -0,0 +1,775 @@
+// (c) Copyright 2006-2007 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 <ctype.h> // tolower\r
+#ifndef NO_SYNC\r
+#include <unistd.h>\r
+#endif\r
+\r
+#include "emu.h"\r
+#include "menu.h"\r
+#include "fonts.h"\r
+#include "lprintf.h"\r
+\r
+#include <Pico/PicoInt.h>\r
+#include <Pico/Patch.h>\r
+#include <zlib/zlib.h>\r
+\r
+#if   defined(__GP2X__)\r
+ #include "../gp2x/gp2x.h"\r
+ #define SCREEN_WIDTH 320\r
+ #define SCREEN_BUFFER gp2x_screen\r
+#elif defined(__GIZ__)\r
+ #include "../gizmondo/giz.h"\r
+ #define SCREEN_WIDTH 321\r
+ #define SCREEN_BUFFER giz_screen // ?\r
+#endif\r
+\r
+char *PicoConfigFile = "picoconfig.bin";\r
+currentConfig_t currentConfig;\r
+unsigned char *rom_data = NULL;\r
+char noticeMsg[64];\r
+int state_slot = 0;\r
+int config_slot = 0, config_slot_current = 0;\r
+\r
+unsigned char *movie_data = NULL;\r
+static int movie_size = 0;\r
+\r
+// provided by platform code:\r
+extern char romFileName[];\r
+extern void emu_noticeMsgUpdated(void);\r
+extern void emu_getMainDir(char *dst, int len);\r
+extern void emu_setDefaultConfig(void);\r
+extern void menu_romload_prepare(const char *rom_name);\r
+extern void menu_romload_end(void);\r
+\r
+\r
+// utilities\r
+static void strlwr_(char* string)\r
+{\r
+       while ( (*string++ = (char)tolower(*string)) );\r
+}\r
+\r
+static int try_rfn_cut(void)\r
+{\r
+       FILE *tmp;\r
+       char *p;\r
+\r
+       p = romFileName + strlen(romFileName) - 1;\r
+       for (; p > romFileName; p--)\r
+               if (*p == '.') break;\r
+       *p = 0;\r
+\r
+       if((tmp = fopen(romFileName, "rb"))) {\r
+               fclose(tmp);\r
+               return 1;\r
+       }\r
+       return 0;\r
+}\r
+\r
+static void get_ext(char *file, char *ext)\r
+{\r
+       char *p;\r
+\r
+       p = file + strlen(file) - 4;\r
+       if (p < file) p = file;\r
+       strncpy(ext, p, 4);\r
+       ext[4] = 0;\r
+       strlwr_(ext);\r
+}\r
+\r
+char *biosfiles_us[] = { "us_scd2_9306", "SegaCDBIOS9303", "us_scd1_9210" };\r
+char *biosfiles_eu[] = { "eu_mcd2_9306", "eu_mcd2_9303",   "eu_mcd1_9210" };\r
+char *biosfiles_jp[] = { "jp_mcd1_9112", "jp_mcd1_9111" };\r
+\r
+int emu_findBios(int region, char **bios_file)\r
+{\r
+       static char bios_path[1024];\r
+       int i, count;\r
+       char **files;\r
+       FILE *f = NULL;\r
+\r
+       if (region == 4) { // US\r
+               files = biosfiles_us;\r
+               count = sizeof(biosfiles_us) / sizeof(char *);\r
+       } else if (region == 8) { // EU\r
+               files = biosfiles_eu;\r
+               count = sizeof(biosfiles_eu) / sizeof(char *);\r
+       } else if (region == 1 || region == 2) {\r
+               files = biosfiles_jp;\r
+               count = sizeof(biosfiles_jp) / sizeof(char *);\r
+       } else {\r
+               return 0;\r
+       }\r
+\r
+       for (i = 0; i < count; i++)\r
+       {\r
+               emu_getMainDir(bios_path, sizeof(bios_path));\r
+               strcat(bios_path, files[i]);\r
+               strcat(bios_path, ".bin");\r
+               f = fopen(bios_path, "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
+               if (f) break;\r
+       }\r
+\r
+       if (f) {\r
+               lprintf("using bios: %s\n", bios_path);\r
+               fclose(f);\r
+               if (bios_file) *bios_file = bios_path;\r
+               return 1;\r
+       } else {\r
+               sprintf(menuErrorMsg, "no %s BIOS files found, read docs",\r
+                       region != 4 ? (region == 8 ? "EU" : "JAP") : "USA");\r
+               lprintf("%s\n", menuErrorMsg);\r
+               return 0;\r
+       }\r
+}\r
+\r
+/* checks if romFileName points to valid MegaCD image\r
+ * if so, checks for suitable BIOS */\r
+int emu_cdCheck(int *pregion)\r
+{\r
+       unsigned char buf[32];\r
+       pm_file *cd_f;\r
+       int type = 0, region = 4; // 1: Japan, 4: US, 8: Europe\r
+\r
+       cd_f = pm_open(romFileName);\r
+       if (!cd_f) return 0; // let the upper level handle this\r
+\r
+       if (pm_read(buf, 32, cd_f) != 32) {\r
+               pm_close(cd_f);\r
+               return 0;\r
+       }\r
+\r
+       if (!strncasecmp("SEGADISCSYSTEM", (char *)buf+0x00, 14)) type = 1;       // Sega CD (ISO)\r
+       if (!strncasecmp("SEGADISCSYSTEM", (char *)buf+0x10, 14)) type = 2;       // Sega CD (BIN)\r
+       if (type == 0) {\r
+               pm_close(cd_f);\r
+               return 0;\r
+       }\r
+\r
+       /* it seems we have a CD image here. Try to detect region now.. */\r
+       pm_seek(cd_f, (type == 1) ? 0x100+0x10B : 0x110+0x10B, SEEK_SET);\r
+       pm_read(buf, 1, cd_f);\r
+       pm_close(cd_f);\r
+\r
+       if (buf[0] == 0x64) region = 8; // EU\r
+       if (buf[0] == 0xa1) region = 1; // JAP\r
+\r
+       lprintf("detected %s Sega/Mega CD image with %s region\n",\r
+               type == 2 ? "BIN" : "ISO", region != 4 ? (region == 8 ? "EU" : "JAP") : "USA");\r
+\r
+       if (pregion != NULL) *pregion = region;\r
+\r
+       return type;\r
+}\r
+\r
+int emu_ReloadRom(void)\r
+{\r
+       unsigned int rom_size = 0;\r
+       char *used_rom_name = romFileName;\r
+       char ext[5];\r
+       pm_file *rom;\r
+       int ret, cd_state, cd_region, cfg_loaded = 0;\r
+\r
+       lprintf("emu_ReloadRom(%s)\n", romFileName);\r
+\r
+       get_ext(romFileName, ext);\r
+\r
+       // detect wrong extensions\r
+       if(!strcmp(ext, ".srm") || !strcmp(ext, "s.gz") || !strcmp(ext, ".mds")) { // s.gz ~ .mds.gz\r
+               sprintf(menuErrorMsg, "Not a ROM selected.");\r
+               return 0;\r
+       }\r
+\r
+       PicoPatchUnload();\r
+\r
+       // check for movie file\r
+       if(movie_data) {\r
+               free(movie_data);\r
+               movie_data = 0;\r
+       }\r
+       if(!strcmp(ext, ".gmv")) {\r
+               // check for both gmv and rom\r
+               int dummy;\r
+               FILE *movie_file = fopen(romFileName, "rb");\r
+               if(!movie_file) {\r
+                       sprintf(menuErrorMsg, "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
+                       sprintf(menuErrorMsg, "Invalid GMV file.");\r
+                       fclose(movie_file);\r
+                       return 0;\r
+               }\r
+               movie_data = malloc(movie_size);\r
+               if(movie_data == NULL) {\r
+                       sprintf(menuErrorMsg, "low memory.");\r
+                       fclose(movie_file);\r
+                       return 0;\r
+               }\r
+               fread(movie_data, 1, movie_size, movie_file);\r
+               fclose(movie_file);\r
+               if (strncmp((char *)movie_data, "Gens Movie TEST", 15) != 0) {\r
+                       sprintf(menuErrorMsg, "Invalid GMV file.");\r
+                       return 0;\r
+               }\r
+               dummy = try_rfn_cut() || try_rfn_cut();\r
+               if (!dummy) {\r
+                       sprintf(menuErrorMsg, "Could't find a ROM for movie.");\r
+                       return 0;\r
+               }\r
+               get_ext(romFileName, ext);\r
+       }\r
+       else if (!strcmp(ext, ".pat")) {\r
+               int dummy;\r
+               PicoPatchLoad(romFileName);\r
+               dummy = try_rfn_cut() || try_rfn_cut();\r
+               if (!dummy) {\r
+                       sprintf(menuErrorMsg, "Could't find a ROM to patch.");\r
+                       return 0;\r
+               }\r
+               get_ext(romFileName, ext);\r
+       }\r
+\r
+       if ((PicoMCD & 1) && Pico_mcd != NULL)\r
+               Stop_CD();\r
+\r
+       // check for MegaCD image\r
+       cd_state = emu_cdCheck(&cd_region);\r
+       if (cd_state > 0)\r
+       {\r
+               // valid CD image, check for BIOS..\r
+\r
+               // we need to have config loaded at this point\r
+               ret = emu_ReadConfig(1, 1);\r
+               if (!ret) emu_ReadConfig(0, 1);\r
+               cfg_loaded = 1;\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
+               }\r
+               if (!emu_findBios(cd_region, &used_rom_name)) {\r
+                       // bios_help() ?\r
+                       return 0;\r
+               }\r
+\r
+               PicoMCD |= 1;\r
+               get_ext(used_rom_name, ext);\r
+       }\r
+       else\r
+       {\r
+               if (PicoMCD & 1) Stop_CD();\r
+               PicoMCD &= ~1;\r
+       }\r
+\r
+       rom = pm_open(used_rom_name);\r
+       if(!rom) {\r
+               sprintf(menuErrorMsg, "Failed to open rom.");\r
+               return 0;\r
+       }\r
+\r
+       menu_romload_prepare(used_rom_name);\r
+\r
+       if(rom_data) {\r
+               free(rom_data);\r
+               rom_data = 0;\r
+               rom_size = 0;\r
+       }\r
+\r
+       if( (ret = PicoCartLoad(rom, &rom_data, &rom_size)) ) {\r
+               sprintf(menuErrorMsg, "PicoCartLoad() failed.");\r
+               lprintf("%s\n", menuErrorMsg);\r
+               pm_close(rom);\r
+               menu_romload_end();\r
+               return 0;\r
+       }\r
+       pm_close(rom);\r
+       menu_romload_end();\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
+               rom_data = 0;\r
+               sprintf(menuErrorMsg, "Not a ROM selected.");\r
+               return 0;\r
+       }\r
+\r
+       // load config for this ROM (do this before insert to get correct region)\r
+       if (!cfg_loaded) {\r
+               ret = emu_ReadConfig(1, 1);\r
+               if (!ret) emu_ReadConfig(0, 1);\r
+       }\r
+\r
+       lprintf("PicoCartInsert(%p, %d);\n", rom_data, rom_size);\r
+       if(PicoCartInsert(rom_data, rom_size)) {\r
+               sprintf(menuErrorMsg, "Failed to load ROM.");\r
+               return 0;\r
+       }\r
+\r
+       Pico.m.frame_count = 0;\r
+\r
+       // insert CD if it was detected\r
+       if (cd_state > 0) {\r
+               ret = Insert_CD(romFileName, cd_state == 2);\r
+               if (ret != 0) {\r
+                       sprintf(menuErrorMsg, "Insert_CD() failed, invalid CD image?");\r
+                       lprintf("%s\n", menuErrorMsg);\r
+                       return 0;\r
+               }\r
+       }\r
+\r
+       // emu_ReadConfig() might have messed currentConfig.lastRomFile\r
+       strncpy(currentConfig.lastRomFile, romFileName, sizeof(currentConfig.lastRomFile)-1);\r
+       currentConfig.lastRomFile[sizeof(currentConfig.lastRomFile)-1] = 0;\r
+\r
+       if (PicoPatches) {\r
+               PicoPatchPrepare();\r
+               PicoPatchApply();\r
+       }\r
+\r
+       // additional movie stuff\r
+       if (movie_data) {\r
+               if(movie_data[0x14] == '6')\r
+                    PicoOpt |=  0x20; // 6 button pad\r
+               else PicoOpt &= ~0x20;\r
+               PicoOpt |= 0x10040; // accurate timing, no VDP fifo timing\r
+               if(movie_data[0xF] >= 'A') {\r
+                       if(movie_data[0x16] & 0x80) {\r
+                               PicoRegionOverride = 8;\r
+                       } else {\r
+                               PicoRegionOverride = 4;\r
+                       }\r
+                       PicoReset(0);\r
+                       // TODO: bits 6 & 5\r
+               }\r
+               movie_data[0x18+30] = 0;\r
+               sprintf(noticeMsg, "MOVIE: %s", (char *) &movie_data[0x18]);\r
+       }\r
+       else\r
+       {\r
+               PicoOpt &= ~0x10000;\r
+               if(Pico.m.pal) {\r
+                       strcpy(noticeMsg, "PAL SYSTEM / 50 FPS");\r
+               } else {\r
+                       strcpy(noticeMsg, "NTSC SYSTEM / 60 FPS");\r
+               }\r
+       }\r
+       emu_noticeMsgUpdated();\r
+\r
+       // load SRAM for this ROM\r
+       if(currentConfig.EmuOpt & 1)\r
+               emu_SaveLoadGame(1, 1);\r
+\r
+       return 1;\r
+}\r
+\r
+\r
+static void romfname_ext(char *dst, const char *prefix, const char *ext)\r
+{\r
+       char *p;\r
+       int prefix_len = 0;\r
+\r
+       // make save filename\r
+       for (p = romFileName+strlen(romFileName)-1; p >= romFileName && *p != '/'; p--); p++;\r
+       *dst = 0;\r
+       if (prefix) {\r
+               strcpy(dst, prefix);\r
+               prefix_len = strlen(prefix);\r
+       }\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
+\r
+\r
+int emu_ReadConfig(int game, int no_defaults)\r
+{\r
+       FILE *f;\r
+       char cfg[512], extbuf[16];\r
+       int bread = 0;\r
+\r
+       if (!game)\r
+       {\r
+               if (!no_defaults)\r
+               {\r
+                       emu_setDefaultConfig();\r
+               }\r
+               strncpy(cfg, PicoConfigFile, 511);\r
+               if (config_slot != 0)\r
+               {\r
+                       char *p = strrchr(cfg, '.');\r
+                       if (p == NULL) p = cfg + strlen(cfg);\r
+                       sprintf(extbuf, ".%i.pbcfg", config_slot);\r
+                       strncpy(p, extbuf, 511 - (p - cfg));\r
+               }\r
+               cfg[511] = 0;\r
+       } else {\r
+               if (config_slot != 0)\r
+                    sprintf(extbuf, ".%i.pbcfg", config_slot);\r
+               else strcpy(extbuf, ".pbcfg");\r
+               romfname_ext(cfg, "cfg/", extbuf);\r
+               f = fopen(cfg, "rb");\r
+               if (!f) romfname_ext(cfg, NULL, ".pbcfg");\r
+               else fclose(f);\r
+       }\r
+\r
+       lprintf("emu_ReadConfig: %s ", cfg);\r
+       f = fopen(cfg, "rb");\r
+       if (f) {\r
+               bread = fread(&currentConfig, 1, sizeof(currentConfig), f);\r
+               fclose(f);\r
+       }\r
+       lprintf(bread > 0 ? "(ok)\n" : "(failed)\n");\r
+\r
+       PicoOpt = currentConfig.PicoOpt;\r
+       PsndRate = currentConfig.PsndRate;\r
+       PicoRegionOverride = currentConfig.PicoRegion;\r
+       PicoAutoRgnOrder = currentConfig.PicoAutoRgnOrder;\r
+       PicoCDBuffers = currentConfig.PicoCDBuffers;\r
+       //scaling_update();\r
+       // some sanity checks\r
+       if (currentConfig.CPUclock < 10 || currentConfig.CPUclock > 4096) currentConfig.CPUclock = 200;\r
+       if (currentConfig.gamma < 10 || currentConfig.gamma > 300) currentConfig.gamma = 100;\r
+       if (currentConfig.volume < 0 || currentConfig.volume > 99) currentConfig.volume = 50;\r
+       // if volume keys are unbound, bind them to volume control\r
+       if (!currentConfig.KeyBinds[23] && !currentConfig.KeyBinds[22]) {\r
+               currentConfig.KeyBinds[23] = 1<<29; // vol up\r
+               currentConfig.KeyBinds[22] = 1<<30; // vol down\r
+       }\r
+\r
+       if (bread > 0) config_slot_current = config_slot;\r
+       return (bread > 0); // == sizeof(currentConfig));\r
+}\r
+\r
+\r
+int emu_WriteConfig(int game)\r
+{\r
+       FILE *f;\r
+       char cfg[512], extbuf[16];\r
+       int bwrite = 0;\r
+\r
+       if (!game)\r
+       {\r
+               strncpy(cfg, PicoConfigFile, 511);\r
+               if (config_slot != 0)\r
+               {\r
+                       char *p = strrchr(cfg, '.');\r
+                       if (p == NULL) p = cfg + strlen(cfg);\r
+                       sprintf(extbuf, ".%i.pbcfg", config_slot);\r
+                       strncpy(p, extbuf, 511 - (p - cfg));\r
+               }\r
+               cfg[511] = 0;\r
+       } else {\r
+               if (config_slot != 0)\r
+                    sprintf(extbuf, ".%i.pbcfg", config_slot);\r
+               else strcpy(extbuf, ".pbcfg");\r
+               romfname_ext(cfg, "cfg/", extbuf);\r
+       }\r
+\r
+       lprintf("emu_WriteConfig: %s ", cfg);\r
+       f = fopen(cfg, "wb");\r
+       if (f) {\r
+               currentConfig.PicoOpt = PicoOpt;\r
+               currentConfig.PsndRate = PsndRate;\r
+               currentConfig.PicoRegion = PicoRegionOverride;\r
+               currentConfig.PicoAutoRgnOrder = PicoAutoRgnOrder;\r
+               currentConfig.PicoCDBuffers = PicoCDBuffers;\r
+               bwrite = fwrite(&currentConfig, 1, sizeof(currentConfig), f);\r
+               fflush(f);\r
+               fclose(f);\r
+#ifndef NO_SYNC\r
+               sync();\r
+#endif\r
+       }\r
+       lprintf((bwrite == sizeof(currentConfig)) ? "(ok)\n" : "(failed)\n");\r
+\r
+       if (bwrite == sizeof(currentConfig)) config_slot_current = config_slot;\r
+       return (bwrite == sizeof(currentConfig));\r
+}\r
+\r
+\r
+void emu_textOut8(int x, int y, const char *text)\r
+{\r
+       int i,l,len=strlen(text);\r
+       unsigned char *screen = (unsigned char *)SCREEN_BUFFER + x + y*SCREEN_WIDTH;\r
+\r
+       /* always using built-in font */\r
+       for (i = 0; i < len; i++)\r
+       {\r
+               for (l=0;l<8;l++)\r
+               {\r
+                       unsigned char fd = fontdata8x8[((text[i])*8)+l];\r
+                       if (fd&0x80) screen[l*SCREEN_WIDTH+0]=0xf0;\r
+                       if (fd&0x40) screen[l*SCREEN_WIDTH+1]=0xf0;\r
+                       if (fd&0x20) screen[l*SCREEN_WIDTH+2]=0xf0;\r
+                       if (fd&0x10) screen[l*SCREEN_WIDTH+3]=0xf0;\r
+                       if (fd&0x08) screen[l*SCREEN_WIDTH+4]=0xf0;\r
+                       if (fd&0x04) screen[l*SCREEN_WIDTH+5]=0xf0;\r
+                       if (fd&0x02) screen[l*SCREEN_WIDTH+6]=0xf0;\r
+                       if (fd&0x01) screen[l*SCREEN_WIDTH+7]=0xf0;\r
+               }\r
+               screen += 8;\r
+       }\r
+}\r
+\r
+void emu_textOut16(int x, int y, const char *text)\r
+{\r
+       int i,l,len=strlen(text);\r
+       unsigned short *screen = (unsigned short *)SCREEN_BUFFER + x + y*SCREEN_WIDTH;\r
+\r
+       for (i = 0; i < len; i++)\r
+       {\r
+               for (l=0;l<8;l++)\r
+               {\r
+                       unsigned char fd = fontdata8x8[((text[i])*8)+l];\r
+                       if(fd&0x80) screen[l*SCREEN_WIDTH+0]=0xffff;\r
+                       if(fd&0x40) screen[l*SCREEN_WIDTH+1]=0xffff;\r
+                       if(fd&0x20) screen[l*SCREEN_WIDTH+2]=0xffff;\r
+                       if(fd&0x10) screen[l*SCREEN_WIDTH+3]=0xffff;\r
+                       if(fd&0x08) screen[l*SCREEN_WIDTH+4]=0xffff;\r
+                       if(fd&0x04) screen[l*SCREEN_WIDTH+5]=0xffff;\r
+                       if(fd&0x02) screen[l*SCREEN_WIDTH+6]=0xffff;\r
+                       if(fd&0x01) screen[l*SCREEN_WIDTH+7]=0xffff;\r
+               }\r
+               screen += 8;\r
+       }\r
+}\r
+\r
+\r
+void emu_updateMovie(void)\r
+{\r
+       int offs = Pico.m.frame_count*3 + 0x40;\r
+       if (offs+3 > movie_size) {\r
+               free(movie_data);\r
+               movie_data = 0;\r
+               strcpy(noticeMsg, "END OF MOVIE.");\r
+               lprintf("END OF MOVIE.\n");\r
+               emu_noticeMsgUpdated();\r
+       } else {\r
+               // MXYZ SACB RLDU\r
+               PicoPad[0] = ~movie_data[offs]   & 0x8f; // ! SCBA RLDU\r
+               if(!(movie_data[offs]   & 0x10)) PicoPad[0] |= 0x40; // A\r
+               if(!(movie_data[offs]   & 0x20)) PicoPad[0] |= 0x10; // B\r
+               if(!(movie_data[offs]   & 0x40)) PicoPad[0] |= 0x20; // A\r
+               PicoPad[1] = ~movie_data[offs+1] & 0x8f; // ! SCBA RLDU\r
+               if(!(movie_data[offs+1] & 0x10)) PicoPad[1] |= 0x40; // A\r
+               if(!(movie_data[offs+1] & 0x20)) PicoPad[1] |= 0x10; // B\r
+               if(!(movie_data[offs+1] & 0x40)) PicoPad[1] |= 0x20; // A\r
+               PicoPad[0] |= (~movie_data[offs+2] & 0x0A) << 8; // ! MZYX\r
+               if(!(movie_data[offs+2] & 0x01)) PicoPad[0] |= 0x0400; // X\r
+               if(!(movie_data[offs+2] & 0x04)) PicoPad[0] |= 0x0100; // Z\r
+               PicoPad[1] |= (~movie_data[offs+2] & 0xA0) << 4; // ! MZYX\r
+               if(!(movie_data[offs+2] & 0x10)) PicoPad[1] |= 0x0400; // X\r
+               if(!(movie_data[offs+2] & 0x40)) PicoPad[1] |= 0x0100; // Z\r
+       }\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
+\r
+       f = fopen(fname, "rb");\r
+       if (f) {\r
+               fclose(f);\r
+               return 1;\r
+       }\r
+       return 0;\r
+}\r
+\r
+char *emu_GetSaveFName(int load, int is_sram, int slot)\r
+{\r
+       static char saveFname[512];\r
+       char ext[16];\r
+\r
+       if (is_sram)\r
+       {\r
+               romfname_ext(saveFname, (PicoMCD&1) ? "brm/" : "srm/", (PicoMCD&1) ? ".brm" : ".srm");\r
+               if (load) {\r
+                       if (try_ropen_file(saveFname)) return saveFname;\r
+                       // try in current dir..\r
+                       romfname_ext(saveFname, NULL, (PicoMCD&1) ? ".brm" : ".srm");\r
+                       if (try_ropen_file(saveFname)) return saveFname;\r
+                       return NULL; // give up\r
+               }\r
+       }\r
+       else\r
+       {\r
+               ext[0] = 0;\r
+               if(slot > 0 && slot < 10) sprintf(ext, ".%i", slot);\r
+               strcat(ext, (currentConfig.EmuOpt & 8) ? ".mds.gz" : ".mds");\r
+\r
+               romfname_ext(saveFname, "mds/", 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
+                       if (currentConfig.EmuOpt & 8) {\r
+                               ext[0] = 0;\r
+                               if(slot > 0 && slot < 10) sprintf(ext, ".%i", slot);\r
+                               strcat(ext, ".mds");\r
+\r
+                               romfname_ext(saveFname, "mds/", 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
+               }\r
+       }\r
+\r
+       return saveFname;\r
+}\r
+\r
+int emu_checkSaveFile(int slot)\r
+{\r
+       return emu_GetSaveFName(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_SaveLoadGame(int load, int sram)\r
+{\r
+       int ret = 0;\r
+       char *saveFname;\r
+\r
+       // make save filename\r
+       saveFname = emu_GetSaveFName(load, sram, state_slot);\r
+       if (saveFname == NULL) {\r
+               if (!sram) {\r
+                       strcpy(noticeMsg, load ? "LOAD FAILED (missing file)" : "SAVE FAILED  ");\r
+                       emu_noticeMsgUpdated();\r
+               }\r
+               return -1;\r
+       }\r
+\r
+       lprintf("saveLoad (%i, %i): %s\n", load, sram, saveFname);\r
+\r
+       if(sram) {\r
+               FILE *sramFile;\r
+               int sram_size;\r
+               unsigned char *sram_data;\r
+               int truncate = 1;\r
+               if (PicoMCD&1) {\r
+                       if (PicoOpt&0x8000) { // MCD RAM cart?\r
+                               sram_size = 0x12000;\r
+                               sram_data = SRam.data;\r
+                               if (sram_data)\r
+                                       memcpy32((int *)sram_data, (int *)Pico_mcd->bram, 0x2000/4);\r
+                       } else {\r
+                               sram_size = 0x2000;\r
+                               sram_data = Pico_mcd->bram;\r
+                               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_data = SRam.data;\r
+               }\r
+               if (!sram_data) return 0; // SRam forcefully disabled for this game\r
+\r
+               if (load) {\r
+                       sramFile = fopen(saveFname, "rb");\r
+                       if(!sramFile) return -1;\r
+                       fread(sram_data, 1, sram_size, sramFile);\r
+                       fclose(sramFile);\r
+                       if ((PicoMCD&1) && (PicoOpt&0x8000))\r
+                               memcpy32((int *)Pico_mcd->bram, (int *)sram_data, 0x2000/4);\r
+               } else {\r
+                       // sram save needs some special processing\r
+                       // see if we have anything to save\r
+                       for (; sram_size > 0; sram_size--)\r
+                               if (sram_data[sram_size-1]) break;\r
+\r
+                       if (sram_size) {\r
+                               sramFile = fopen(saveFname, truncate ? "wb" : "r+b");\r
+                               if (!sramFile) sramFile = fopen(saveFname, "wb"); // retry\r
+                               if (!sramFile) return -1;\r
+                               ret = fwrite(sram_data, 1, sram_size, sramFile);\r
+                               ret = (ret != sram_size) ? -1 : 0;\r
+                               fclose(sramFile);\r
+#ifndef NO_SYNC\r
+                               sync();\r
+#endif\r
+                       }\r
+               }\r
+               return ret;\r
+       }\r
+       else\r
+       {\r
+               void *PmovFile = NULL;\r
+               if (strcmp(saveFname + strlen(saveFname) - 3, ".gz") == 0) {\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
+#ifndef NO_SYNC\r
+                       else sync();\r
+#endif\r
+               }\r
+               else    ret = -1;\r
+               if (!ret)\r
+                       strcpy(noticeMsg, load ? "GAME LOADED  " : "GAME SAVED   ");\r
+               else\r
+               {\r
+                       strcpy(noticeMsg, load ? "LOAD FAILED  " : "SAVE FAILED  ");\r
+                       ret = -1;\r
+               }\r
+\r
+               emu_noticeMsgUpdated();\r
+               return ret;\r
+       }\r
+}\r
diff --git a/common/emu.h b/common/emu.h
new file mode 100644 (file)
index 0000000..67533cb
--- /dev/null
@@ -0,0 +1,48 @@
+// (c) Copyright 2006-2007 notaz, All rights reserved.
+// Free for non-commercial use.
+
+// For commercial use, separate licencing terms must be obtained.
+
+typedef struct {
+       char lastRomFile[512];
+       int EmuOpt;             // LSb->MSb: use_sram, show_fps, enable_sound, gzip_saves,
+                                       // squidgehack, no_save_cfg_on_exit, <unused>, 16_bit_mode
+                                       // craigix_ram, confirm_save, show_cd_leds, confirm_load
+                                       // A_SNs_gamma, perfect_vsync
+       int PicoOpt;  // used for config saving only, see Pico.h
+       int PsndRate; // ditto
+       int PicoRegion; // ditto
+       int Frameskip;
+       int CPUclock;
+       int KeyBinds[32];
+       int volume;
+       int gamma;
+       int JoyBinds[4][32];
+       int PicoAutoRgnOrder;
+       int PicoCDBuffers;
+       int scaling; // 0=center, 1=hscale, 2=hvscale, 3=hsoftscale
+} currentConfig_t;
+
+
+extern currentConfig_t currentConfig;
+extern char *PicoConfigFile;
+extern unsigned char *rom_data;
+extern char noticeMsg[64];
+extern int state_slot;
+extern int config_slot, config_slot_current;
+extern unsigned char *movie_data;
+
+
+int   emu_ReloadRom(void);
+int   emu_SaveLoadGame(int load, int sram);
+int   emu_ReadConfig(int game, int no_defaults);
+int   emu_WriteConfig(int game);
+char *emu_GetSaveFName(int load, int is_sram, int slot);
+int   emu_checkSaveFile(int slot);
+void  emu_setSaveStateCbs(int gz);
+void  emu_updateMovie(void);
+int   emu_cdCheck(int *pregion);
+int   emu_findBios(int region, char **bios_file);
+void  emu_textOut8 (int x, int y, const char *text);
+void  emu_textOut16(int x, int y, const char *text);
+
index ed02ff8..d2957c2 100644 (file)
 #include "lprintf.h"\r
 \r
 #if   defined(__GP2X__)\r
-#include "../gp2x/gp2x.h"\r
-#define SCREEN_WIDTH 320\r
-#define SCREEN_BUFFER gp2x_screen\r
+ #include "../gp2x/gp2x.h"\r
+ #define SCREEN_WIDTH 320\r
+ #define SCREEN_BUFFER gp2x_screen\r
 #elif defined(__GIZ__)\r
-#include "../gizmondo/giz.h"\r
-#define SCREEN_WIDTH 321\r
-#define SCREEN_BUFFER menu_screen\r
-extern unsigned char menu_screen[321*240*2];\r
+ //#include "../gizmondo/giz.h"\r
+ #define SCREEN_WIDTH 321\r
+ #define SCREEN_BUFFER menu_screen\r
+ extern unsigned char *menu_screen;\r
 #endif\r
 \r
+char menuErrorMsg[64] = { 0, };\r
+\r
 static unsigned char menu_font_data[10240];\r
 static int menu_text_color = 0xffff; // default to white\r
 static int menu_sel_color = -1; // disabled\r
index 1e096ff..b21818d 100644 (file)
@@ -7,6 +7,7 @@ void smalltext_out16(int x, int y, const char *texto, int color);
 void smalltext_out16_lim(int x, int y, const char *texto, int color, int max);
 void menu_draw_selection(int x, int y, int w);
 
+extern char menuErrorMsg[64];
 
 
 typedef enum
index 9498858..0cbdb1c 100644 (file)
@@ -17,6 +17,7 @@
 #include "mp3.h"\r
 #include "../common/arm_utils.h"\r
 #include "../common/menu.h"\r
+#include "../common/emu.h"\r
 #include "../../Pico/PicoInt.h"\r
 #include "../../Pico/sound/ym2612.h"\r
 #include "../../Pico/sound/mix.h"\r
index 1458a34..65565f1 100644 (file)
@@ -58,7 +58,7 @@ OBJS += main.o menu.o gp2x.o usbjoy.o emu.o squidgehack.o cpuctrl.o
 OBJS += 940ctl.o\r
 \r
 # common\r
-OBJS += ../common/menu.o ../common/fonts.o ../common/arm_utils.o ../common/readpng.o\r
+OBJS += ../common/emu.o ../common/menu.o ../common/fonts.o ../common/arm_utils.o ../common/readpng.o\r
 \r
 # Pico\r
 ifeq "$(amalgamate)" "1"\r
@@ -183,7 +183,7 @@ testrefr.gpe : test.o gp2x.o
 ../../Pico/sound/mix_asm.o : ../../Pico/sound/mix.s\r
        @echo $<\r
        @$(AS) $(ASOPT) $< -o $@\r
-../../Pico/misc_asm.o : ../../Pico/misc.s\r
+../../Pico/misc_asm.o : ../../Pico/Misc.s\r
        @echo $<\r
        @$(AS) $(ASOPT) $< -o $@\r
 ../../Pico/cd/pico_asm.o : ../../Pico/cd/Pico.s\r
@@ -192,7 +192,7 @@ testrefr.gpe : test.o gp2x.o
 ../../Pico/cd/memory_asm.o : ../../Pico/cd/Memory.s\r
        @echo $<\r
        @$(AS) $(ASOPT) $< -o $@\r
-../../Pico/cd/misc_asm.o : ../../Pico/cd/misc.s\r
+../../Pico/cd/misc_asm.o : ../../Pico/cd/Misc.s\r
        @echo $<\r
        @$(AS) $(ASOPT) $< -o $@\r
 \r
index 9615013..63b2d04 100644 (file)
@@ -20,6 +20,7 @@
 #include "menu.h"\r
 #include "../common/arm_utils.h"\r
 #include "../common/fonts.h"\r
+#include "../common/emu.h"\r
 #include "cpuctrl.h"\r
 \r
 #include <Pico/PicoInt.h>\r
 \r
 int engineState;\r
 int select_exits = 0;\r
-char *PicoConfigFile = "picoconfig.bin";\r
-currentConfig_t currentConfig;\r
 \r
 char romFileName[PATH_MAX];\r
-unsigned char *rom_data = NULL;\r
 \r
 extern int crashed_940;\r
 \r
 static short sndBuffer[2*44100/50];\r
-static char noticeMsg[64];                                     // notice msg to draw\r
 static struct timeval noticeMsgTime = { 0, 0 };        // when started showing\r
 static int osd_fps_x;\r
 static int combo_keys = 0, combo_acts = 0;     // keys and actions which need button combos\r
 static int gp2x_old_gamma = 100;\r
-static unsigned char *movie_data = NULL;\r
-static int movie_size = 0;\r
+char noticeMsg[64];                    // notice msg to draw\r
 unsigned char *PicoDraw2FB = NULL;  // temporary buffer for alt renderer\r
-int state_slot = 0;\r
 int reset_timing = 0;\r
-int config_slot = 0, config_slot_current = 0;\r
 \r
+static void emu_msg_cb(const char *msg);\r
+static void emu_msg_tray_open(void);\r
 \r
-// utilities\r
-static void strlwr(char* string)\r
-{\r
-       while ( (*string++ = (char)tolower(*string)) );\r
-}\r
 \r
-static int try_rfn_cut(void)\r
+void emu_noticeMsgUpdated(void)\r
 {\r
-       FILE *tmp;\r
-       char *p;\r
-\r
-       p = romFileName + strlen(romFileName) - 1;\r
-       for (; p > romFileName; p--)\r
-               if (*p == '.') break;\r
-       *p = 0;\r
-\r
-       if((tmp = fopen(romFileName, "rb"))) {\r
-               fclose(tmp);\r
-               return 1;\r
-       }\r
-       return 0;\r
+       gettimeofday(&noticeMsgTime, 0);\r
 }\r
 \r
-static void get_ext(char *file, char *ext)\r
+void emu_getMainDir(char *dst, int len)\r
 {\r
-       char *p;\r
+       extern char **g_argv;\r
+       int j;\r
 \r
-       p = file + strlen(file) - 4;\r
-       if (p < file) p = file;\r
-       strncpy(ext, p, 4);\r
-       ext[4] = 0;\r
-       strlwr(ext);\r
+       strncpy(dst, g_argv[0], len);\r
+       len -= 32; // reserve\r
+       if (len < 0) len = 0;\r
+       dst[len] = 0;\r
+       for (j = strlen(dst); j > 0; j--)\r
+               if (dst[j] == '/') { dst[j+1] = 0; break; }\r
 }\r
 \r
-char *biosfiles_us[] = { "us_scd2_9306", "SegaCDBIOS9303", "us_scd1_9210" };\r
-char *biosfiles_eu[] = { "eu_mcd2_9306", "eu_mcd2_9303",   "eu_mcd1_9210" };\r
-char *biosfiles_jp[] = { "jp_mcd1_9112", "jp_mcd1_9111" };\r
-\r
-extern char **g_argv;\r
-\r
-int find_bios(int region, char **bios_file)\r
-{\r
-       static char bios_path[1024];\r
-       int i, j, count;\r
-       char **files;\r
-       FILE *f = NULL;\r
-\r
-       if (region == 4) { // US\r
-               files = biosfiles_us;\r
-               count = sizeof(biosfiles_us) / sizeof(char *);\r
-       } else if (region == 8) { // EU\r
-               files = biosfiles_eu;\r
-               count = sizeof(biosfiles_eu) / sizeof(char *);\r
-       } else if (region == 1 || region == 2) {\r
-               files = biosfiles_jp;\r
-               count = sizeof(biosfiles_jp) / sizeof(char *);\r
-       } else {\r
-               return 0;\r
-       }\r
-\r
-       for (i = 0; i < count; i++)\r
-       {\r
-               strncpy(bios_path, g_argv[0], 1023);\r
-               bios_path[1024-32] = 0;\r
-               for (j = strlen(bios_path); j > 0; j--)\r
-                       if (bios_path[j] == '/') { bios_path[j+1] = 0; break; }\r
-               strcat(bios_path, files[i]);\r
-               strcat(bios_path, ".bin");\r
-               f = fopen(bios_path, "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
-               if (f) break;\r
-       }\r
-\r
-       if (f) {\r
-               printf("using bios: %s\n", bios_path);\r
-               fclose(f);\r
-               if (bios_file) *bios_file = bios_path;\r
-               return 1;\r
-       } else {\r
-               sprintf(menuErrorMsg, "no %s BIOS files found, read docs",\r
-                       region != 4 ? (region == 8 ? "EU" : "JAP") : "USA");\r
-               printf("%s\n", menuErrorMsg);\r
-               return 0;\r
-       }\r
-}\r
-\r
-/* checks if romFileName points to valid MegaCD image\r
- * if so, checks for suitable BIOS */\r
-int emu_cd_check(int *pregion)\r
-{\r
-       unsigned char buf[32];\r
-       pm_file *cd_f;\r
-       int type = 0, region = 4; // 1: Japan, 4: US, 8: Europe\r
-\r
-       cd_f = pm_open(romFileName);\r
-       if (!cd_f) return 0; // let the upper level handle this\r
-\r
-       if (pm_read(buf, 32, cd_f) != 32) {\r
-               pm_close(cd_f);\r
-               return 0;\r
-       }\r
-\r
-       if (!strncasecmp("SEGADISCSYSTEM", (char *)buf+0x00, 14)) type = 1;       // Sega CD (ISO)\r
-       if (!strncasecmp("SEGADISCSYSTEM", (char *)buf+0x10, 14)) type = 2;       // Sega CD (BIN)\r
-       if (type == 0) {\r
-               pm_close(cd_f);\r
-               return 0;\r
-       }\r
-\r
-       /* it seems we have a CD image here. Try to detect region now.. */\r
-       pm_seek(cd_f, (type == 1) ? 0x100+0x10B : 0x110+0x10B, SEEK_SET);\r
-       pm_read(buf, 1, cd_f);\r
-       pm_close(cd_f);\r
-\r
-       if (buf[0] == 0x64) region = 8; // EU\r
-       if (buf[0] == 0xa1) region = 1; // JAP\r
-\r
-       printf("detected %s Sega/Mega CD image with %s region\n",\r
-               type == 2 ? "BIN" : "ISO", region != 4 ? (region == 8 ? "EU" : "JAP") : "USA");\r
-\r
-       if (pregion != NULL) *pregion = region;\r
-\r
-       return type;\r
-}\r
-\r
-int emu_ReloadRom(void)\r
-{\r
-       unsigned int rom_size = 0;\r
-       char *used_rom_name = romFileName;\r
-       char ext[5];\r
-       pm_file *rom;\r
-       int ret, cd_state, cd_region, cfg_loaded = 0;\r
-\r
-       printf("emu_ReloadRom(%s)\n", romFileName);\r
-\r
-       get_ext(romFileName, ext);\r
-\r
-       // detect wrong extensions\r
-       if(!strcmp(ext, ".srm") || !strcmp(ext, "s.gz") || !strcmp(ext, ".mds")) { // s.gz ~ .mds.gz\r
-               sprintf(menuErrorMsg, "Not a ROM selected.");\r
-               return 0;\r
-       }\r
-\r
-       PicoPatchUnload();\r
-\r
-       // check for movie file\r
-       if(movie_data) {\r
-               free(movie_data);\r
-               movie_data = 0;\r
-       }\r
-       if(!strcmp(ext, ".gmv")) {\r
-               // check for both gmv and rom\r
-               int dummy;\r
-               FILE *movie_file = fopen(romFileName, "rb");\r
-               if(!movie_file) {\r
-                       sprintf(menuErrorMsg, "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
-                       sprintf(menuErrorMsg, "Invalid GMV file.");\r
-                       fclose(movie_file);\r
-                       return 0;\r
-               }\r
-               movie_data = malloc(movie_size);\r
-               if(movie_data == NULL) {\r
-                       sprintf(menuErrorMsg, "low memory.");\r
-                       fclose(movie_file);\r
-                       return 0;\r
-               }\r
-               fread(movie_data, 1, movie_size, movie_file);\r
-               fclose(movie_file);\r
-               if (strncmp((char *)movie_data, "Gens Movie TEST", 15) != 0) {\r
-                       sprintf(menuErrorMsg, "Invalid GMV file.");\r
-                       return 0;\r
-               }\r
-               dummy = try_rfn_cut() || try_rfn_cut();\r
-               if (!dummy) {\r
-                       sprintf(menuErrorMsg, "Could't find a ROM for movie.");\r
-                       return 0;\r
-               }\r
-               get_ext(romFileName, ext);\r
-       }\r
-       else if (!strcmp(ext, ".pat")) {\r
-               int dummy;\r
-               PicoPatchLoad(romFileName);\r
-               dummy = try_rfn_cut() || try_rfn_cut();\r
-               if (!dummy) {\r
-                       sprintf(menuErrorMsg, "Could't find a ROM to patch.");\r
-                       return 0;\r
-               }\r
-               get_ext(romFileName, ext);\r
-       }\r
-\r
-       if ((PicoMCD & 1) && Pico_mcd != NULL)\r
-               Stop_CD();\r
-\r
-       // check for MegaCD image\r
-       cd_state = emu_cd_check(&cd_region);\r
-       if (cd_state > 0)\r
-       {\r
-               // valid CD image, check for BIOS..\r
-\r
-               // we need to have config loaded at this point\r
-               ret = emu_ReadConfig(1, 1);\r
-               if (!ret) emu_ReadConfig(0, 1);\r
-               cfg_loaded = 1;\r
-\r
-               if (PicoRegionOverride) {\r
-                       cd_region = PicoRegionOverride;\r
-                       printf("overrided region to %s\n", cd_region != 4 ? (cd_region == 8 ? "EU" : "JAP") : "USA");\r
-               }\r
-               if (!find_bios(cd_region, &used_rom_name)) {\r
-                       // bios_help() ?\r
-                       return 0;\r
-               }\r
-\r
-               PicoMCD |= 1;\r
-               get_ext(used_rom_name, ext);\r
-       }\r
-       else\r
-       {\r
-               if (PicoMCD & 1) Stop_CD();\r
-               PicoMCD &= ~1;\r
-       }\r
-\r
-       rom = pm_open(used_rom_name);\r
-       if(!rom) {\r
-               sprintf(menuErrorMsg, "Failed to open rom.");\r
-               return 0;\r
-       }\r
-\r
-       menu_romload_prepare(used_rom_name);\r
-\r
-       if(rom_data) {\r
-               free(rom_data);\r
-               rom_data = 0;\r
-               rom_size = 0;\r
-       }\r
-\r
-       if( (ret = PicoCartLoad(rom, &rom_data, &rom_size)) ) {\r
-               sprintf(menuErrorMsg, "PicoCartLoad() failed.");\r
-               printf("%s\n", menuErrorMsg);\r
-               pm_close(rom);\r
-               menu_romload_end();\r
-               return 0;\r
-       }\r
-       pm_close(rom);\r
-       menu_romload_end();\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
-               rom_data = 0;\r
-               sprintf(menuErrorMsg, "Not a ROM selected.");\r
-               return 0;\r
-       }\r
-\r
-       // load config for this ROM (do this before insert to get correct region)\r
-       if (!cfg_loaded) {\r
-               ret = emu_ReadConfig(1, 1);\r
-               if (!ret) emu_ReadConfig(0, 1);\r
-       }\r
-\r
-       printf("PicoCartInsert(%p, %d);\n", rom_data, rom_size);\r
-       if(PicoCartInsert(rom_data, rom_size)) {\r
-               sprintf(menuErrorMsg, "Failed to load ROM.");\r
-               return 0;\r
-       }\r
-\r
-       Pico.m.frame_count = 0;\r
-\r
-       // insert CD if it was detected\r
-       if (cd_state > 0) {\r
-               ret = Insert_CD(romFileName, cd_state == 2);\r
-               if (ret != 0) {\r
-                       sprintf(menuErrorMsg, "Insert_CD() failed, invalid CD image?");\r
-                       printf("%s\n", menuErrorMsg);\r
-                       return 0;\r
-               }\r
-       }\r
-\r
-       // emu_ReadConfig() might have messed currentConfig.lastRomFile\r
-       strncpy(currentConfig.lastRomFile, romFileName, sizeof(currentConfig.lastRomFile)-1);\r
-       currentConfig.lastRomFile[sizeof(currentConfig.lastRomFile)-1] = 0;\r
-\r
-       if (PicoPatches) {\r
-               PicoPatchPrepare();\r
-               PicoPatchApply();\r
-       }\r
-\r
-       // additional movie stuff\r
-       if (movie_data) {\r
-               if(movie_data[0x14] == '6')\r
-                    PicoOpt |=  0x20; // 6 button pad\r
-               else PicoOpt &= ~0x20;\r
-               PicoOpt |= 0x10040; // accurate timing, no VDP fifo timing\r
-               if(movie_data[0xF] >= 'A') {\r
-                       if(movie_data[0x16] & 0x80) {\r
-                               PicoRegionOverride = 8;\r
-                       } else {\r
-                               PicoRegionOverride = 4;\r
-                       }\r
-                       PicoReset(0);\r
-                       // TODO: bits 6 & 5\r
-               }\r
-               movie_data[0x18+30] = 0;\r
-               sprintf(noticeMsg, "MOVIE: %s", (char *) &movie_data[0x18]);\r
-       }\r
-       else\r
-       {\r
-               PicoOpt &= ~0x10000;\r
-               if(Pico.m.pal) {\r
-                       strcpy(noticeMsg, "PAL SYSTEM / 50 FPS");\r
-               } else {\r
-                       strcpy(noticeMsg, "NTSC SYSTEM / 60 FPS");\r
-               }\r
-       }\r
-       gettimeofday(&noticeMsgTime, 0);\r
-\r
-       // load SRAM for this ROM\r
-       if(currentConfig.EmuOpt & 1)\r
-               emu_SaveLoadGame(1, 1);\r
-\r
-       return 1;\r
-}\r
-\r
-\r
-static void emu_msg_cb(const char *msg);\r
-static void emu_msg_tray_open(void);\r
-\r
 void emu_Init(void)\r
 {\r
        // make temp buffer for alt renderer\r
@@ -419,25 +96,6 @@ void emu_Init(void)
 }\r
 \r
 \r
-static void romfname_ext(char *dst, const char *prefix, const char *ext)\r
-{\r
-       char *p;\r
-       int prefix_len = 0;\r
-\r
-       // make save filename\r
-       for (p = romFileName+strlen(romFileName)-1; p >= romFileName && *p != '/'; p--); p++;\r
-       *dst = 0;\r
-       if (prefix) {\r
-               strcpy(dst, prefix);\r
-               prefix_len = strlen(prefix);\r
-       }\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
-\r
-\r
 static void find_combos(void)\r
 {\r
        int act, u;\r
@@ -468,7 +126,7 @@ static void find_combos(void)
 }\r
 \r
 \r
-void scaling_update(void)\r
+static void scaling_update(void)\r
 {\r
        PicoOpt &= ~0x4100;\r
        switch (currentConfig.scaling) {\r
@@ -480,138 +138,6 @@ void scaling_update(void)
 }\r
 \r
 \r
-int emu_ReadConfig(int game, int no_defaults)\r
-{\r
-       FILE *f;\r
-       char cfg[512], extbuf[16];\r
-       int bread = 0;\r
-\r
-       if (!game)\r
-       {\r
-               if (!no_defaults)\r
-               {\r
-                       // set default config\r
-                       memset(&currentConfig, 0, sizeof(currentConfig));\r
-                       currentConfig.lastRomFile[0] = 0;\r
-                       currentConfig.EmuOpt  = 0x1f | 0x600; // | confirm_save, cd_leds\r
-                       currentConfig.PicoOpt = 0x0f | 0xe00; // | use_940, cd_pcm, cd_cdda\r
-                       currentConfig.PsndRate = 22050; // 44100;\r
-                       currentConfig.PicoRegion = 0; // auto\r
-                       currentConfig.PicoAutoRgnOrder = 0x184; // US, EU, JP\r
-                       currentConfig.Frameskip = -1; // auto\r
-                       currentConfig.CPUclock = 200;\r
-                       currentConfig.volume = 50;\r
-                       currentConfig.KeyBinds[ 0] = 1<<0; // SACB RLDU\r
-                       currentConfig.KeyBinds[ 4] = 1<<1;\r
-                       currentConfig.KeyBinds[ 2] = 1<<2;\r
-                       currentConfig.KeyBinds[ 6] = 1<<3;\r
-                       currentConfig.KeyBinds[14] = 1<<4;\r
-                       currentConfig.KeyBinds[13] = 1<<5;\r
-                       currentConfig.KeyBinds[12] = 1<<6;\r
-                       currentConfig.KeyBinds[ 8] = 1<<7;\r
-                       currentConfig.KeyBinds[15] = 1<<26; // switch rend\r
-                       currentConfig.KeyBinds[10] = 1<<27; // save state\r
-                       currentConfig.KeyBinds[11] = 1<<28; // load state\r
-                       currentConfig.KeyBinds[23] = 1<<29; // vol up\r
-                       currentConfig.KeyBinds[22] = 1<<30; // vol down\r
-                       currentConfig.gamma = 100;\r
-                       currentConfig.PicoCDBuffers = 64;\r
-                       currentConfig.scaling = 0;\r
-               }\r
-               strncpy(cfg, PicoConfigFile, 511);\r
-               if (config_slot != 0)\r
-               {\r
-                       char *p = strrchr(cfg, '.');\r
-                       if (p == NULL) p = cfg + strlen(cfg);\r
-                       sprintf(extbuf, ".%i.pbcfg", config_slot);\r
-                       strncpy(p, extbuf, 511 - (p - cfg));\r
-               }\r
-               cfg[511] = 0;\r
-       } else {\r
-               if (config_slot != 0)\r
-                    sprintf(extbuf, ".%i.pbcfg", config_slot);\r
-               else strcpy(extbuf, ".pbcfg");\r
-               romfname_ext(cfg, "cfg/", extbuf);\r
-               f = fopen(cfg, "rb");\r
-               if (!f) romfname_ext(cfg, NULL, ".pbcfg");\r
-               else fclose(f);\r
-       }\r
-\r
-       printf("emu_ReadConfig: %s ", cfg);\r
-       f = fopen(cfg, "rb");\r
-       if (f) {\r
-               bread = fread(&currentConfig, 1, sizeof(currentConfig), f);\r
-               fclose(f);\r
-       }\r
-       printf(bread > 0 ? "(ok)\n" : "(failed)\n");\r
-\r
-       PicoOpt = currentConfig.PicoOpt;\r
-       PsndRate = currentConfig.PsndRate;\r
-       PicoRegionOverride = currentConfig.PicoRegion;\r
-       PicoAutoRgnOrder = currentConfig.PicoAutoRgnOrder;\r
-       PicoCDBuffers = currentConfig.PicoCDBuffers;\r
-       scaling_update();\r
-       // some sanity checks\r
-       if (currentConfig.CPUclock < 10 || currentConfig.CPUclock > 4096) currentConfig.CPUclock = 200;\r
-       if (currentConfig.gamma < 10 || currentConfig.gamma > 300) currentConfig.gamma = 100;\r
-       if (currentConfig.volume < 0 || currentConfig.volume > 99) currentConfig.volume = 50;\r
-       // if volume keys are unbound, bind them to volume control\r
-       if (!currentConfig.KeyBinds[23] && !currentConfig.KeyBinds[22]) {\r
-               currentConfig.KeyBinds[23] = 1<<29; // vol up\r
-               currentConfig.KeyBinds[22] = 1<<30; // vol down\r
-       }\r
-\r
-       if (bread > 0) config_slot_current = config_slot;\r
-       return (bread > 0); // == sizeof(currentConfig));\r
-}\r
-\r
-\r
-int emu_WriteConfig(int game)\r
-{\r
-       FILE *f;\r
-       char cfg[512], extbuf[16];\r
-       int bwrite = 0;\r
-\r
-       if (!game)\r
-       {\r
-               strncpy(cfg, PicoConfigFile, 511);\r
-               if (config_slot != 0)\r
-               {\r
-                       char *p = strrchr(cfg, '.');\r
-                       if (p == NULL) p = cfg + strlen(cfg);\r
-                       sprintf(extbuf, ".%i.pbcfg", config_slot);\r
-                       strncpy(p, extbuf, 511 - (p - cfg));\r
-               }\r
-               cfg[511] = 0;\r
-       } else {\r
-               if (config_slot != 0)\r
-                    sprintf(extbuf, ".%i.pbcfg", config_slot);\r
-               else strcpy(extbuf, ".pbcfg");\r
-               romfname_ext(cfg, "cfg/", extbuf);\r
-       }\r
-\r
-       printf("emu_WriteConfig: %s ", cfg);\r
-       f = fopen(cfg, "wb");\r
-       if (f) {\r
-               currentConfig.PicoOpt = PicoOpt;\r
-               currentConfig.PsndRate = PsndRate;\r
-               currentConfig.PicoRegion = PicoRegionOverride;\r
-               currentConfig.PicoAutoRgnOrder = PicoAutoRgnOrder;\r
-               currentConfig.PicoCDBuffers = PicoCDBuffers;\r
-               bwrite = fwrite(&currentConfig, 1, sizeof(currentConfig), f);\r
-               fflush(f);\r
-               fclose(f);\r
-#ifndef NO_SYNC\r
-               sync();\r
-#endif\r
-       }\r
-       printf((bwrite == sizeof(currentConfig)) ? "(ok)\n" : "(failed)\n");\r
-\r
-       if (bwrite == sizeof(currentConfig)) config_slot_current = config_slot;\r
-       return (bwrite == sizeof(currentConfig));\r
-}\r
-\r
-\r
 void emu_Deinit(void)\r
 {\r
        // save SRAM\r
@@ -646,54 +172,36 @@ void emu_Deinit(void)
                set_gamma(100, 0);\r
 }\r
 \r
-static void text_out8_builtin(int x, int y, const char *text)\r
-{\r
-       int i,l,len=strlen(text);\r
-       unsigned char *screen = (unsigned char *)gp2x_screen + x + y*320;\r
-\r
-       /* always using built-in font */\r
-       for (i = 0; i < len; i++)\r
-       {\r
-               for (l=0;l<8;l++)\r
-               {\r
-                       unsigned char fd = fontdata8x8[((text[i])*8)+l];\r
-                       if (fd&0x80) screen[l*320+0]=0xf0;\r
-                       if (fd&0x40) screen[l*320+1]=0xf0;\r
-                       if (fd&0x20) screen[l*320+2]=0xf0;\r
-                       if (fd&0x10) screen[l*320+3]=0xf0;\r
-                       if (fd&0x08) screen[l*320+4]=0xf0;\r
-                       if (fd&0x04) screen[l*320+5]=0xf0;\r
-                       if (fd&0x02) screen[l*320+6]=0xf0;\r
-                       if (fd&0x01) screen[l*320+7]=0xf0;\r
-               }\r
-               screen += 8;\r
-       }\r
-}\r
-\r
-static void text_out16_builtin(int x, int y, const char *text)\r
-{\r
-       int i,l,len=strlen(text);\r
-       unsigned short *screen = (unsigned short *)gp2x_screen + x + y*320;\r
-\r
-       for (i = 0; i < len; i++)\r
-       {\r
-               for (l=0;l<8;l++)\r
-               {\r
-                       unsigned char fd = fontdata8x8[((text[i])*8)+l];\r
-                       if(fd&0x80) screen[l*320+0]=0xffff;\r
-                       if(fd&0x40) screen[l*320+1]=0xffff;\r
-                       if(fd&0x20) screen[l*320+2]=0xffff;\r
-                       if(fd&0x10) screen[l*320+3]=0xffff;\r
-                       if(fd&0x08) screen[l*320+4]=0xffff;\r
-                       if(fd&0x04) screen[l*320+5]=0xffff;\r
-                       if(fd&0x02) screen[l*320+6]=0xffff;\r
-                       if(fd&0x01) screen[l*320+7]=0xffff;\r
-               }\r
-               screen += 8;\r
-       }\r
+void emu_setDefaultConfig(void)\r
+{\r
+       memset(&currentConfig, 0, sizeof(currentConfig));\r
+       currentConfig.lastRomFile[0] = 0;\r
+       currentConfig.EmuOpt  = 0x1f | 0x600; // | confirm_save, cd_leds\r
+       currentConfig.PicoOpt = 0x0f | 0xe00; // | use_940, cd_pcm, cd_cdda\r
+       currentConfig.PsndRate = 22050; // 44100;\r
+       currentConfig.PicoRegion = 0; // auto\r
+       currentConfig.PicoAutoRgnOrder = 0x184; // US, EU, JP\r
+       currentConfig.Frameskip = -1; // auto\r
+       currentConfig.CPUclock = 200;\r
+       currentConfig.volume = 50;\r
+       currentConfig.KeyBinds[ 0] = 1<<0; // SACB RLDU\r
+       currentConfig.KeyBinds[ 4] = 1<<1;\r
+       currentConfig.KeyBinds[ 2] = 1<<2;\r
+       currentConfig.KeyBinds[ 6] = 1<<3;\r
+       currentConfig.KeyBinds[14] = 1<<4;\r
+       currentConfig.KeyBinds[13] = 1<<5;\r
+       currentConfig.KeyBinds[12] = 1<<6;\r
+       currentConfig.KeyBinds[ 8] = 1<<7;\r
+       currentConfig.KeyBinds[15] = 1<<26; // switch rend\r
+       currentConfig.KeyBinds[10] = 1<<27; // save state\r
+       currentConfig.KeyBinds[11] = 1<<28; // load state\r
+       currentConfig.KeyBinds[23] = 1<<29; // vol up\r
+       currentConfig.KeyBinds[22] = 1<<30; // vol down\r
+       currentConfig.gamma = 100;\r
+       currentConfig.PicoCDBuffers = 64;\r
+       currentConfig.scaling = 0;\r
 }\r
 \r
-\r
 void osd_text(int x, int y, const char *text)\r
 {\r
        int len = strlen(text)*8;\r
@@ -706,7 +214,7 @@ void osd_text(int x, int y, const char *text)
                        p = (int *) ((unsigned char *) gp2x_screen+x+320*(y+h));\r
                        for (i = len; i; i--, p++) *p = 0xe0e0e0e0;\r
                }\r
-               text_out8_builtin(x, y, text);\r
+               emu_textOut8(x, y, text);\r
        } else {\r
                int *p, i, h;\r
                x &= ~1; // align x\r
@@ -715,7 +223,7 @@ void osd_text(int x, int y, const char *text)
                        p = (int *) ((unsigned short *) gp2x_screen+x+320*(y+h));\r
                        for (i = len; i; i--, p++) *p = (*p>>2)&0x39e7;\r
                }\r
-               text_out16_builtin(x, y, text);\r
+               emu_textOut16(x, y, text);\r
        }\r
 }\r
 \r
@@ -917,7 +425,7 @@ static void RunEvents(unsigned int which)
 {\r
        if(which & 0x1800) { // save or load (but not both)\r
                int do_it = 1;\r
-               if ( emu_check_save_file(state_slot) &&\r
+               if ( emu_checkSaveFile(state_slot) &&\r
                                (( (which & 0x1000) && (currentConfig.EmuOpt & 0x800)) ||   // load\r
                                 (!(which & 0x1000) && (currentConfig.EmuOpt & 0x200))) ) { // save\r
                        unsigned long keys;\r
@@ -962,7 +470,7 @@ static void RunEvents(unsigned int which)
                        state_slot += 1;\r
                        if(state_slot > 9) state_slot = 0;\r
                }\r
-               sprintf(noticeMsg, "SAVE SLOT %i [%s]", state_slot, emu_check_save_file(state_slot) ? "USED" : "FREE");\r
+               sprintf(noticeMsg, "SAVE SLOT %i [%s]", state_slot, emu_checkSaveFile(state_slot) ? "USED" : "FREE");\r
                gettimeofday(&noticeMsgTime, 0);\r
        }\r
        if(which & 0x0080) {\r
@@ -971,35 +479,6 @@ static void RunEvents(unsigned int which)
 }\r
 \r
 \r
-static void updateMovie(void)\r
-{\r
-       int offs = Pico.m.frame_count*3 + 0x40;\r
-       if (offs+3 > movie_size) {\r
-               free(movie_data);\r
-               movie_data = 0;\r
-               strcpy(noticeMsg, "END OF MOVIE.");\r
-               printf("END OF MOVIE.\n");\r
-               gettimeofday(&noticeMsgTime, 0);\r
-       } else {\r
-               // MXYZ SACB RLDU\r
-               PicoPad[0] = ~movie_data[offs]   & 0x8f; // ! SCBA RLDU\r
-               if(!(movie_data[offs]   & 0x10)) PicoPad[0] |= 0x40; // A\r
-               if(!(movie_data[offs]   & 0x20)) PicoPad[0] |= 0x10; // B\r
-               if(!(movie_data[offs]   & 0x40)) PicoPad[0] |= 0x20; // A\r
-               PicoPad[1] = ~movie_data[offs+1] & 0x8f; // ! SCBA RLDU\r
-               if(!(movie_data[offs+1] & 0x10)) PicoPad[1] |= 0x40; // A\r
-               if(!(movie_data[offs+1] & 0x20)) PicoPad[1] |= 0x10; // B\r
-               if(!(movie_data[offs+1] & 0x40)) PicoPad[1] |= 0x20; // A\r
-               PicoPad[0] |= (~movie_data[offs+2] & 0x0A) << 8; // ! MZYX\r
-               if(!(movie_data[offs+2] & 0x01)) PicoPad[0] |= 0x0400; // X\r
-               if(!(movie_data[offs+2] & 0x04)) PicoPad[0] |= 0x0100; // Z\r
-               PicoPad[1] |= (~movie_data[offs+2] & 0xA0) << 4; // ! MZYX\r
-               if(!(movie_data[offs+2] & 0x10)) PicoPad[1] |= 0x0400; // X\r
-               if(!(movie_data[offs+2] & 0x40)) PicoPad[1] |= 0x0100; // Z\r
-       }\r
-}\r
-\r
-\r
 static void updateKeys(void)\r
 {\r
        unsigned long keys, allActions[2] = { 0, 0 }, events;\r
@@ -1077,7 +556,7 @@ static void updateKeys(void)
 \r
        events &= ~prevEvents;\r
        if (events) RunEvents(events);\r
-       if (movie_data) updateMovie();\r
+       if (movie_data) emu_updateMovie();\r
 \r
        prevEvents = (allActions[0] | allActions[1]) >> 16;\r
 }\r
@@ -1101,7 +580,7 @@ static void SkipFrame(int do_audio)
 }\r
 \r
 \r
-void emu_forced_frame(void)\r
+void emu_forcedFrame(void)\r
 {\r
        int po_old = PicoOpt;\r
        int eo_old = currentConfig.EmuOpt;\r
@@ -1184,6 +663,7 @@ void emu_Loop(void)
 \r
        // make sure we are in correct mode\r
        vidResetMode();\r
+       scaling_update();\r
        Pico.m.dirtyPal = 1;\r
        oldmodes = ((Pico.video.reg[12]&1)<<2) ^ 0xc;\r
        find_combos();\r
@@ -1339,7 +819,7 @@ void emu_Loop(void)
                        }\r
                } else if(tval.tv_usec > lim_time) { // auto frameskip\r
                        // no time left for this frame - skip\r
-                       if (tval.tv_usec - lim_time >= 0x300000) {\r
+                       if (tval.tv_usec - lim_time >= 300000) {\r
                                /* something caused a slowdown for us (disk access? cache flush?)\r
                                 * try to recover by resetting timing... */\r
                                reset_timing = 1;\r
@@ -1415,7 +895,7 @@ if (Pico.m.frame_count == 31563) {
                gettimeofday(&tval, 0);\r
                if (thissec != tval.tv_sec) tval.tv_usec+=1000000;\r
 \r
-               if (currentConfig.Frameskip < 0 && tval.tv_usec - lim_time >= 0x300000) // slowdown detection\r
+               if (currentConfig.Frameskip < 0 && tval.tv_usec - lim_time >= 300000) // slowdown detection\r
                        reset_timing = 1;\r
                else if (PsndOut != NULL || currentConfig.Frameskip < 0)\r
                {\r
@@ -1451,7 +931,7 @@ if (Pico.m.frame_count == 31563) {
 \r
        // if in 8bit mode, generate 16bit image for menu background\r
        if ((PicoOpt&0x10) || !(currentConfig.EmuOpt&0x80))\r
-               emu_forced_frame();\r
+               emu_forcedFrame();\r
 }\r
 \r
 \r
@@ -1462,196 +942,3 @@ void emu_ResetGame(void)
 }\r
 \r
 \r
-size_t gzRead2(void *p, size_t _size, size_t _n, void *file)\r
-{\r
-       return gzread(file, p, _n);\r
-}\r
-\r
-\r
-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
-\r
-       f = fopen(fname, "rb");\r
-       if (f) {\r
-               fclose(f);\r
-               return 1;\r
-       }\r
-       return 0;\r
-}\r
-\r
-char *emu_GetSaveFName(int load, int is_sram, int slot)\r
-{\r
-       static char saveFname[512];\r
-       char ext[16];\r
-\r
-       if (is_sram)\r
-       {\r
-               romfname_ext(saveFname, (PicoMCD&1) ? "brm/" : "srm/", (PicoMCD&1) ? ".brm" : ".srm");\r
-               if (load) {\r
-                       if (try_ropen_file(saveFname)) return saveFname;\r
-                       // try in current dir..\r
-                       romfname_ext(saveFname, NULL, (PicoMCD&1) ? ".brm" : ".srm");\r
-                       if (try_ropen_file(saveFname)) return saveFname;\r
-                       return NULL; // give up\r
-               }\r
-       }\r
-       else\r
-       {\r
-               ext[0] = 0;\r
-               if(slot > 0 && slot < 10) sprintf(ext, ".%i", slot);\r
-               strcat(ext, (currentConfig.EmuOpt & 8) ? ".mds.gz" : ".mds");\r
-\r
-               romfname_ext(saveFname, "mds/", 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
-                       if (currentConfig.EmuOpt & 8) {\r
-                               ext[0] = 0;\r
-                               if(slot > 0 && slot < 10) sprintf(ext, ".%i", slot);\r
-                               strcat(ext, ".mds");\r
-\r
-                               romfname_ext(saveFname, "mds/", 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
-               }\r
-       }\r
-\r
-       return saveFname;\r
-}\r
-\r
-int emu_check_save_file(int slot)\r
-{\r
-       return emu_GetSaveFName(1, 0, slot) ? 1 : 0;\r
-}\r
-\r
-void emu_set_save_cbs(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_SaveLoadGame(int load, int sram)\r
-{\r
-       int ret = 0;\r
-       char *saveFname;\r
-\r
-       // make save filename\r
-       saveFname = emu_GetSaveFName(load, sram, state_slot);\r
-       if (saveFname == NULL) {\r
-               if (!sram) {\r
-                       strcpy(noticeMsg, load ? "LOAD FAILED (missing file)" : "SAVE FAILED  ");\r
-                       gettimeofday(&noticeMsgTime, 0);\r
-               }\r
-               return -1;\r
-       }\r
-\r
-       printf("saveLoad (%i, %i): %s\n", load, sram, saveFname);\r
-\r
-       if(sram) {\r
-               FILE *sramFile;\r
-               int sram_size;\r
-               unsigned char *sram_data;\r
-               int truncate = 1;\r
-               if (PicoMCD&1) {\r
-                       if (PicoOpt&0x8000) { // MCD RAM cart?\r
-                               sram_size = 0x12000;\r
-                               sram_data = SRam.data;\r
-                               if (sram_data)\r
-                                       memcpy32((int *)sram_data, (int *)Pico_mcd->bram, 0x2000/4);\r
-                       } else {\r
-                               sram_size = 0x2000;\r
-                               sram_data = Pico_mcd->bram;\r
-                               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_data = SRam.data;\r
-               }\r
-               if (!sram_data) return 0; // SRam forcefully disabled for this game\r
-\r
-               if (load) {\r
-                       sramFile = fopen(saveFname, "rb");\r
-                       if(!sramFile) return -1;\r
-                       fread(sram_data, 1, sram_size, sramFile);\r
-                       fclose(sramFile);\r
-                       if ((PicoMCD&1) && (PicoOpt&0x8000))\r
-                               memcpy32((int *)Pico_mcd->bram, (int *)sram_data, 0x2000/4);\r
-               } else {\r
-                       // sram save needs some special processing\r
-                       // see if we have anything to save\r
-                       for (; sram_size > 0; sram_size--)\r
-                               if (sram_data[sram_size-1]) break;\r
-\r
-                       if (sram_size) {\r
-                               sramFile = fopen(saveFname, truncate ? "wb" : "r+b");\r
-                               if (!sramFile) sramFile = fopen(saveFname, "wb"); // retry\r
-                               if (!sramFile) return -1;\r
-                               ret = fwrite(sram_data, 1, sram_size, sramFile);\r
-                               ret = (ret != sram_size) ? -1 : 0;\r
-                               fclose(sramFile);\r
-#ifndef NO_SYNC\r
-                               sync();\r
-#endif\r
-                       }\r
-               }\r
-               return ret;\r
-       }\r
-       else\r
-       {\r
-               void *PmovFile = NULL;\r
-               if (strcmp(saveFname + strlen(saveFname) - 3, ".gz") == 0) {\r
-                       if( (PmovFile = gzopen(saveFname, load ? "rb" : "wb")) ) {\r
-                               emu_set_save_cbs(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_set_save_cbs(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
-#ifndef NO_SYNC\r
-                       else sync();\r
-#endif\r
-               }\r
-               else    ret = -1;\r
-               if (!ret)\r
-                       strcpy(noticeMsg, load ? "GAME LOADED  " : "GAME SAVED   ");\r
-               else\r
-               {\r
-                       strcpy(noticeMsg, load ? "LOAD FAILED  " : "SAVE FAILED  ");\r
-                       ret = -1;\r
-               }\r
-\r
-               gettimeofday(&noticeMsgTime, 0);\r
-               return ret;\r
-       }\r
-}\r
index 6ae089d..8eddd1f 100644 (file)
@@ -16,44 +16,15 @@ enum TPicoGameState {
        PGS_RestartRun,\r
 };\r
 \r
-typedef struct {\r
-       char lastRomFile[512];\r
-       int EmuOpt;             // LSb->MSb: use_sram, show_fps, enable_sound, gzip_saves,\r
-                                       // squidgehack, no_save_cfg_on_exit, <unused>, 16_bit_mode\r
-                                       // craigix_ram, confirm_save, show_cd_leds, confirm_load\r
-                                       // A_SNs_gamma, perfect_vsync\r
-       int PicoOpt;  // used for config saving only, see Pico.h\r
-       int PsndRate; // ditto\r
-       int PicoRegion; // ditto\r
-       int Frameskip;\r
-       int CPUclock;\r
-       int KeyBinds[32];\r
-       int volume;\r
-       int gamma;\r
-       int JoyBinds[4][32];\r
-       int PicoAutoRgnOrder;\r
-       int PicoCDBuffers;\r
-       int scaling; // 0=center, 1=hscale, 2=hvscale, 3=hsoftscale\r
-} currentConfig_t;\r
-\r
 extern char romFileName[];\r
 extern int engineState;\r
-extern currentConfig_t currentConfig;\r
 \r
 \r
-int  emu_ReloadRom(void);\r
 void emu_Init(void);\r
 void emu_Deinit(void);\r
-int  emu_SaveLoadGame(int load, int sram);\r
 void emu_Loop(void);\r
 void emu_ResetGame(void);\r
-int  emu_ReadConfig(int game, int no_defaults);\r
-int  emu_WriteConfig(int game);\r
-char *emu_GetSaveFName(int load, int is_sram, int slot);\r
-int  emu_check_save_file(int slot);\r
-void emu_set_save_cbs(int gz);\r
-void emu_forced_frame(void);\r
-int  emu_cd_check(int *pregion);\r
-int  find_bios(int region, char **bios_file);\r
-void scaling_update(void);\r
+void emu_forcedFrame(void);\r
+\r
+void osd_text(int x, int y, const char *text);\r
 \r
index 13eb5a8..95e0e9f 100644 (file)
@@ -12,6 +12,7 @@
 #include "gp2x.h"\r
 #include "menu.h"\r
 #include "../common/menu.h"\r
+#include "../common/emu.h"\r
 #include "emu.h"\r
 #include "940ctl.h"\r
 #include "version.h"\r
index 63ba6a0..a60e4d8 100644 (file)
@@ -14,8 +14,9 @@
 #include "emu.h"\r
 #include "menu.h"\r
 #include "usbjoy.h"\r
-#include "../common/arm_utils.h"\r
+#include "../common/emu.h"\r
 #include "../common/menu.h"\r
+#include "../common/arm_utils.h"\r
 #include "../common/readpng.h"\r
 #include "version.h"\r
 \r
 #error "need d_type for file browser\r
 #endif\r
 \r
-extern char romFileName[PATH_MAX];\r
-extern char *rom_data;\r
 extern int  mmuhack_status;\r
-extern int  state_slot;\r
-extern int  config_slot, config_slot_current;\r
 \r
 static const char *gp2xKeyNames[] = {\r
        "UP",    "???",    "LEFT", "???",  "DOWN", "???", "RIGHT",    "???",\r
@@ -40,8 +37,6 @@ static const char *gp2xKeyNames[] = {
        "???",   "???",    "???",  "PUSH", "???",  "???", "???",      "???"\r
 };\r
 \r
-char menuErrorMsg[40] = {0, };\r
-\r
 static void menu_darken_bg(void *dst, int pixels, int darker);\r
 static void menu_prepare_bg(int use_game_bg);\r
 \r
@@ -452,7 +447,7 @@ static void state_check_slots(void)
 \r
        for (slot = 0; slot < 10; slot++)\r
        {\r
-               if (emu_check_save_file(slot))\r
+               if (emu_checkSaveFile(slot))\r
                {\r
                        state_slot_flags |= 1 << slot;\r
                }\r
@@ -480,10 +475,10 @@ static void draw_savestate_bg(int slot)
 \r
        if (strcmp(fname + strlen(fname) - 3, ".gz") == 0) {\r
                file = gzopen(fname, "rb");\r
-               emu_set_save_cbs(1);\r
+               emu_setSaveStateCbs(1);\r
        } else {\r
                file = fopen(fname, "rb");\r
-               emu_set_save_cbs(0);\r
+               emu_setSaveStateCbs(0);\r
        }\r
 \r
        if (file) {\r
@@ -501,7 +496,7 @@ static void draw_savestate_bg(int slot)
                areaClose(file);\r
        }\r
 \r
-       emu_forced_frame();\r
+       emu_forcedFrame();\r
        menu_prepare_bg(1);\r
 \r
        memcpy(Pico.vram, tmp_vram, sizeof(Pico.vram));\r
@@ -928,17 +923,17 @@ static void cd_menu_loop_options(void)
        menu_id selected_id;\r
        char *bios, *p;\r
 \r
-       if (find_bios(4, &bios)) { // US\r
+       if (emu_findBios(4, &bios)) { // US\r
                for (p = bios+strlen(bios)-1; p > bios && *p != '/'; p--); p++;\r
                strncpy(bios_names.us, p, sizeof(bios_names.us)); bios_names.us[sizeof(bios_names.us)-1] = 0;\r
        } else  strcpy(bios_names.us, "NOT FOUND");\r
 \r
-       if (find_bios(8, &bios)) { // EU\r
+       if (emu_findBios(8, &bios)) { // EU\r
                for (p = bios+strlen(bios)-1; p > bios && *p != '/'; p--); p++;\r
                strncpy(bios_names.eu, p, sizeof(bios_names.eu)); bios_names.eu[sizeof(bios_names.eu)-1] = 0;\r
        } else  strcpy(bios_names.eu, "NOT FOUND");\r
 \r
-       if (find_bios(1, &bios)) { // JP\r
+       if (emu_findBios(1, &bios)) { // JP\r
                for (p = bios+strlen(bios)-1; p > bios && *p != '/'; p--); p++;\r
                strncpy(bios_names.jp, p, sizeof(bios_names.jp)); bios_names.jp[sizeof(bios_names.jp)-1] = 0;\r
        } else  strcpy(bios_names.jp, "NOT FOUND");\r
@@ -972,21 +967,21 @@ static void cd_menu_loop_options(void)
                if (inp & GP2X_START) { // BIOS testers\r
                        switch (selected_id) {\r
                                case MA_CDOPT_TESTBIOS_USA:\r
-                                       if (find_bios(4, &bios)) { // test US\r
+                                       if (emu_findBios(4, &bios)) { // test US\r
                                                strcpy(romFileName, bios);\r
                                                engineState = PGS_ReloadRom;\r
                                                return;\r
                                        }\r
                                        break;\r
                                case MA_CDOPT_TESTBIOS_EUR:\r
-                                       if (find_bios(8, &bios)) { // test EU\r
+                                       if (emu_findBios(8, &bios)) { // test EU\r
                                                strcpy(romFileName, bios);\r
                                                engineState = PGS_ReloadRom;\r
                                                return;\r
                                        }\r
                                        break;\r
                                case MA_CDOPT_TESTBIOS_JAP:\r
-                                       if (find_bios(1, &bios)) { // test JP\r
+                                       if (emu_findBios(1, &bios)) { // test JP\r
                                                strcpy(romFileName, bios);\r
                                                engineState = PGS_ReloadRom;\r
                                                return;\r
@@ -1259,7 +1254,6 @@ static void menu_options_save(void)
                // unbind XYZ MODE, just in case\r
                unbind_action(0xf00, -1, -1);\r
        }\r
-       scaling_update();\r
 }\r
 \r
 static int menu_loop_options(void)\r
@@ -1697,7 +1691,7 @@ int menu_loop_tray(void)
                                        selfname = romsel_loop(curr_path);\r
                                        if (selfname) {\r
                                                int ret = -1, cd_type;\r
-                                               cd_type = emu_cd_check(NULL);\r
+                                               cd_type = emu_cdCheck(NULL);\r
                                                if (cd_type > 0)\r
                                                        ret = Insert_CD(romFileName, cd_type == 2);\r
                                                if (ret != 0) {\r
index bd216a4..7561d34 100644 (file)
@@ -3,8 +3,6 @@
 \r
 // For commercial use, separate licencing terms must be obtained.\r
 \r
-extern char menuErrorMsg[40];\r
-\r
 void menu_loop(void);\r
 int  menu_loop_tray(void);\r
 void menu_romload_prepare(const char *rom_name);\r
index fd28f79..dcd5032 100644 (file)
@@ -5,6 +5,9 @@
 \r
 #define CPU_CALL\r
 \r
+// draw.c\r
+#define OVERRIDE_HIGHCOL 0\r
+\r
 // draw2.c\r
 #define START_ROW  0 // which row of tiles to start rendering at?\r
 #define END_ROW   28 // ..end\r
index 9fac2a3..87c3e52 100644 (file)
@@ -1,10 +1,13 @@
 @ vim:filetype=armasm\r
 \r
-@ .equiv START_ROW,    1\r
-@ .equiv END_ROW,              27\r
+@ .equiv START_ROW,         1\r
+@ .equiv END_ROW,          27\r
 @ one row means 8 pixels. If above example was used, (27-1)*8=208 lines would be rendered.\r
-.equiv START_ROW,              0\r
-.equiv END_ROW,                28\r
+.equiv START_ROW,         0\r
+.equiv END_ROW,          28\r
+\r
+.equiv OVERRIDE_HIGHCOL,  0\r
 \r
 @ this should be set to one only for GP2X port\r
-.equiv EXTERNAL_YM2612, 1\r
+.equiv EXTERNAL_YM2612,   1\r
+\r