From c633456460a2995bfa4732fb2fb0bca3c785936e Mon Sep 17 00:00:00 2001 From: notaz Date: Tue, 20 Nov 2007 21:38:07 +0000 Subject: [PATCH] 1.35a psp bugfix release git-svn-id: file:///home/notaz/opt/svn/PicoDrive/platform@300 be3aeb3a-fb24-0410-a615-afba39da0efa --- base_readme.txt | 11 ++++++++--- common/emu.c | 22 +++++++++++++++++++--- common/emu.h | 2 +- common/menu.h | 2 ++ psp/emu.c | 6 +++--- psp/menu.c | 34 +++++++++++++++++++++++----------- psp/psp.c | 2 ++ psp/version.h | 2 +- 8 files changed, 59 insertions(+), 22 deletions(-) diff --git a/base_readme.txt b/base_readme.txt index 62edaaf..471b3b6 100644 --- a/base_readme.txt +++ b/base_readme.txt @@ -49,9 +49,7 @@ If you are running a custom firmware, just copy the whole PicoDrive directory to /PSP/GAME or /PSP/GAMEXXX directory in your memory stick (it shouldn't matter which one GAME* directory to use). -If you are on 1.5, you will have to use KXploit tool to create the needed files -and directories, and then copy them to /PSP/GAME. I assume 1.5 users know how to -do this, if not, just google for KXploit. +If you are on 1.5, there is a separate KXploited version for it. #endif Note that this emulator may require some tweaking of configuration settings to run @@ -630,6 +628,13 @@ Additional thanks Changelog --------- +1.35a + * PSP: fixed a bug which prevented to load any ROMs after testing the BIOS. + * PSP: fixed incorrect CZ80 memory map setup, which caused Z80 crashes and + graphics corruption in EU Mega CD model1 BIOS menus. + + PSP: added additional "set to 4:3 scaled" display option for convenience. + + Added an option to disable frame limitter (works only with non-auto frameskip). + 1.35 + PSP port added. Lots of new code for it. Integrated modified FAME/C, CZ80 cores. + Some minor generic optimizations. diff --git a/common/emu.c b/common/emu.c index 117ec6d..644a502 100644 --- a/common/emu.c +++ b/common/emu.c @@ -137,6 +137,19 @@ int emu_findBios(int region, char **bios_file) } } +/* check if the name begins with BIOS name */ +static int emu_isBios(const char *name) +{ + int i; + for (i = 0; i < sizeof(biosfiles_us)/sizeof(biosfiles_us[0]); i++) + if (strstr(name, biosfiles_us[i]) != NULL) return 1; + for (i = 0; i < sizeof(biosfiles_eu)/sizeof(biosfiles_eu[0]); i++) + if (strstr(name, biosfiles_eu[i]) != NULL) return 1; + for (i = 0; i < sizeof(biosfiles_jp)/sizeof(biosfiles_jp[0]); i++) + if (strstr(name, biosfiles_jp[i]) != NULL) return 1; + return 0; +} + /* checks if romFileName points to valid MegaCD image * if so, checks for suitable BIOS */ int emu_cdCheck(int *pregion) @@ -340,9 +353,12 @@ int emu_ReloadRom(void) menu_romload_end(); - // emu_ReadConfig() might have messed currentConfig.lastRomFile - strncpy(currentConfig.lastRomFile, romFileName, sizeof(currentConfig.lastRomFile)-1); - currentConfig.lastRomFile[sizeof(currentConfig.lastRomFile)-1] = 0; + if (!emu_isBios(romFileName)) + { + // emu_ReadConfig() might have messed currentConfig.lastRomFile + strncpy(currentConfig.lastRomFile, romFileName, sizeof(currentConfig.lastRomFile)-1); + currentConfig.lastRomFile[sizeof(currentConfig.lastRomFile)-1] = 0; + } if (PicoPatches) { PicoPatchPrepare(); diff --git a/common/emu.h b/common/emu.h index b4f3c26..2d2aa49 100644 --- a/common/emu.h +++ b/common/emu.h @@ -9,7 +9,7 @@ typedef struct { // squidgehack, no_save_cfg_on_exit, , 16_bit_mode // craigix_ram, confirm_save, show_cd_leds, confirm_load // A_SNs_gamma, perfect_vsync, giz_scanlines, giz_dblbuff - // vsync_mode, show_clock + // vsync_mode, show_clock, no_frame_limitter int PicoOpt; // used for config saving only, see Pico.h int PsndRate; // ditto int PicoRegion; // ditto diff --git a/common/menu.h b/common/menu.h index df990d3..529d78d 100644 --- a/common/menu.h +++ b/common/menu.h @@ -64,11 +64,13 @@ typedef enum MA_OPT2_RAMTIMINGS, /* gp2x */ MA_OPT2_SQUIDGEHACK, /* gp2x */ MA_OPT2_STATUS_LINE, /* psp */ + MA_OPT2_NO_FRAME_LIMIT, /* psp */ MA_OPT2_DONE, MA_OPT3_SCALE, /* psp (all OPT3) */ MA_OPT3_HSCALE32, MA_OPT3_HSCALE40, MA_OPT3_PRES_NOSCALE, + MA_OPT3_PRES_SCALE43, MA_OPT3_PRES_FULLSCR, MA_OPT3_FILTERING, MA_OPT3_VSYNC, diff --git a/psp/emu.c b/psp/emu.c index aaa5a0e..c63c00b 100644 --- a/psp/emu.c +++ b/psp/emu.c @@ -197,7 +197,6 @@ static void set_scaling_params(void) if (fbimg_width >= 480) { g_vertices[0].u = (fbimg_width-480)/2; g_vertices[1].u = src_width - (fbimg_width-480)/2 - 1; - if (fbimg_width == 480) border_hack = 1; fbimg_width = 480; fbimg_xoffs = 0; } else { @@ -205,6 +204,7 @@ static void set_scaling_params(void) g_vertices[1].u = src_width; fbimg_xoffs = 240 - fbimg_width/2; } + if (fbimg_width > 320 && fbimg_width <= 480) border_hack = 1; if (fbimg_height >= 272) { g_vertices[0].v = (fbimg_height-272)/2; @@ -990,7 +990,7 @@ void emu_Loop(void) for (i = 0; i < currentConfig.Frameskip; i++) { updateKeys(); SkipFrame(); frames_done++; - if (PsndOut) { // do framelimitting if sound is enabled + if (!(currentConfig.EmuOpt&0x40000)) { // do framelimitting if needed int tval_diff; tval = sceKernelGetSystemTimeLow(); tval_diff = (int)(tval - tval_thissec) << 8; @@ -1035,7 +1035,7 @@ void emu_Loop(void) if (currentConfig.Frameskip < 0 && tval_diff - lim_time >= (300000<<8)) // slowdown detection reset_timing = 1; - else if (PsndOut != NULL || currentConfig.Frameskip < 0) + else if (!(currentConfig.EmuOpt&0x40000) || currentConfig.Frameskip < 0) { // sleep if we are still too fast if (tval_diff < lim_time) diff --git a/psp/menu.c b/psp/menu.c index 996f687..e1daabf 100644 --- a/psp/menu.c +++ b/psp/menu.c @@ -335,13 +335,14 @@ end: } +static SceIoStat cpstat; + static char *romsel_loop(char *curr_path) { struct my_dirent **namelist; int n, iret, sel = 0; unsigned long inp = 0; char *ret = NULL, *fname = NULL; - SceIoStat cpstat; // is this a dir or a full path? memset(&cpstat, 0, sizeof(cpstat)); @@ -349,8 +350,11 @@ static char *romsel_loop(char *curr_path) if (iret >= 0 && (cpstat.st_attr & FIO_SO_IFREG)) { // file char *p; for (p = curr_path + strlen(curr_path) - 1; p > curr_path && *p != '/'; p--); - *p = 0; - fname = p+1; + if (p > curr_path) { + *p = 0; + fname = p+1; + } + else strcpy(curr_path, "ms0:/"); } else if (iret >= 0 && (cpstat.st_attr & FIO_SO_IFDIR)); // dir else strcpy(curr_path, "ms0:/"); // something else @@ -402,7 +406,7 @@ static char *romsel_loop(char *curr_path) p = start + strlen(start) - 1; while (*p == '/' && p > start) p--; while (*p != '/' && *p != ':' && p > start) p--; - if (p <= start || *p == ':' || p[-1] == ':') strcpy(newdir, "ms0:/"); + if (p <= start || *p == ':') strcpy(newdir, "ms0:/"); else { strncpy(newdir, start, p-start); newdir[p-start] = 0; } } else { strcpy(newdir, curr_path); @@ -1004,6 +1008,7 @@ menu_entry opt3_entries[] = { NULL, MB_ONOFF, MA_OPT3_FILTERING, ¤tConfig.scaling, 1, 0, 0, 1 }, { NULL, MB_NONE, MA_OPT3_VSYNC, NULL, 0, 0, 0, 1 }, { "Set to unscaled centered", MB_NONE, MA_OPT3_PRES_NOSCALE, NULL, 0, 0, 0, 1 }, + { "Set to 4:3 scaled", MB_NONE, MA_OPT3_PRES_SCALE43, NULL, 0, 0, 0, 1 }, { "Set to fullscreen", MB_NONE, MA_OPT3_PRES_FULLSCR, NULL, 0, 0, 0, 1 }, { "done", MB_NONE, MA_OPT3_DONE, NULL, 0, 0, 0, 1 }, }; @@ -1137,6 +1142,12 @@ static void dispmenu_loop_options(void) currentConfig.scale = currentConfig.hscale40 = currentConfig.hscale32 = 1.0; menu_opt3_preview(is_32col); break; + case MA_OPT3_PRES_SCALE43: + currentConfig.scale = 1.20; + currentConfig.hscale40 = 1.00; + currentConfig.hscale32 = 1.25; + menu_opt3_preview(is_32col); + break; case MA_OPT3_PRES_FULLSCR: currentConfig.scale = 1.20; currentConfig.hscale40 = 1.25; @@ -1158,13 +1169,14 @@ static void dispmenu_loop_options(void) menu_entry opt2_entries[] = { - { "Emulate Z80", MB_ONOFF, MA_OPT2_ENABLE_Z80, ¤tConfig.PicoOpt,0x00004, 0, 0, 1 }, - { "Emulate YM2612 (FM)", MB_ONOFF, MA_OPT2_ENABLE_YM2612, ¤tConfig.PicoOpt,0x00001, 0, 0, 1 }, - { "Emulate SN76496 (PSG)", MB_ONOFF, MA_OPT2_ENABLE_SN76496,¤tConfig.PicoOpt,0x00002, 0, 0, 1 }, - { "gzip savestates", MB_ONOFF, MA_OPT2_GZIP_STATES, ¤tConfig.EmuOpt, 0x00008, 0, 0, 1 }, - { "Don't save last used ROM", MB_ONOFF, MA_OPT2_NO_LAST_ROM, ¤tConfig.EmuOpt, 0x00020, 0, 0, 1 }, - { "Status line in main menu", MB_ONOFF, MA_OPT2_STATUS_LINE, ¤tConfig.EmuOpt, 0x20000, 0, 0, 1 }, - { "done", MB_NONE, MA_OPT2_DONE, NULL, 0, 0, 0, 1 }, + { "Emulate Z80", MB_ONOFF, MA_OPT2_ENABLE_Z80, ¤tConfig.PicoOpt,0x00004, 0, 0, 1 }, + { "Emulate YM2612 (FM)", MB_ONOFF, MA_OPT2_ENABLE_YM2612, ¤tConfig.PicoOpt,0x00001, 0, 0, 1 }, + { "Emulate SN76496 (PSG)", MB_ONOFF, MA_OPT2_ENABLE_SN76496, ¤tConfig.PicoOpt,0x00002, 0, 0, 1 }, + { "gzip savestates", MB_ONOFF, MA_OPT2_GZIP_STATES, ¤tConfig.EmuOpt, 0x00008, 0, 0, 1 }, + { "Don't save last used ROM", MB_ONOFF, MA_OPT2_NO_LAST_ROM, ¤tConfig.EmuOpt, 0x00020, 0, 0, 1 }, + { "Status line in main menu", MB_ONOFF, MA_OPT2_STATUS_LINE, ¤tConfig.EmuOpt, 0x20000, 0, 0, 1 }, + { "Disable frame limitter", MB_ONOFF, MA_OPT2_NO_FRAME_LIMIT, ¤tConfig.EmuOpt, 0x40000, 0, 0, 1 }, + { "done", MB_NONE, MA_OPT2_DONE, NULL, 0, 0, 0, 1 }, }; #define OPT2_ENTRY_COUNT (sizeof(opt2_entries) / sizeof(opt2_entries[0])) diff --git a/psp/psp.c b/psp/psp.c index a4b7698..51b4471 100644 --- a/psp/psp.c +++ b/psp/psp.c @@ -212,6 +212,7 @@ char *psp_get_status_line(void) /* alt logging */ #define LOG_FILE "log.txt" +#ifndef LPRINTF_STDIO typedef struct _log_entry { char buff[256]; @@ -219,6 +220,7 @@ typedef struct _log_entry } log_entry; static log_entry *le_root = NULL; +#endif void lprintf_f(const char *fmt, ...) { diff --git a/psp/version.h b/psp/version.h index f2fb563..62a58a7 100644 --- a/psp/version.h +++ b/psp/version.h @@ -1,2 +1,2 @@ -#define VERSION "1.35" +#define VERSION "1.35a" -- 2.39.2