#include <string.h>
#include <errno.h>
#include <dlfcn.h>
+#include <zlib.h>
#include "main.h"
#include "menu.h"
MA_MAIN_LOAD_STATE,
MA_MAIN_RESET_GAME,
MA_MAIN_LOAD_ROM,
+ MA_MAIN_RUN_BIOS,
MA_MAIN_CONTROLS,
MA_MAIN_CREDITS,
MA_MAIN_EXIT,
// from softgpu plugin
extern int iUseDither;
extern int UseFrameSkip;
-extern int UseFrameLimit;
extern uint32_t dwActFixes;
extern float fFrameRateHz;
extern int dwFrameRateTicks;
extern int iSPUIRQWait;
extern int iUseTimer;
+static const char *bioses[24];
static const char *gpu_plugins[16];
static const char *spu_plugins[16];
-static int gpu_plugsel, spu_plugsel;
+static int bios_sel, gpu_plugsel, spu_plugsel;
static int min(int x, int y) { return x < y ? x : y; }
if (ret != 0)
return 0;
- if (load)
+ if (load) {
ret = LoadState(fname);
+
+ // reflect hle/bios mode from savestate
+ if (Config.HLE)
+ bios_sel = 0;
+ else if (bios_sel == 0 && bioses[1] != NULL)
+ // XXX: maybe find the right bios instead
+ bios_sel = 1;
+ }
else
ret = SaveState(fname);
return ret;
}
-static void draw_savestate_bg(int slot)
-{
-}
-
static void menu_set_defconfig(void)
{
+ g_opts = 0;
scaling = SCALE_4_3;
Config.Xa = Config.Cdda = Config.Sio =
Config.SpuIrq = Config.RCntFix = Config.VSyncWA = 0;
iUseDither = UseFrameSkip = 0;
- UseFrameLimit = 1;
dwActFixes = 1<<7;
iUseReverb = 2;
CE_CONFIG_STR(Bios),
CE_CONFIG_STR(Gpu),
CE_CONFIG_STR(Spu),
- CE_CONFIG_STR(Cdr),
+// CE_CONFIG_STR(Cdr),
CE_CONFIG_VAL(Xa),
CE_CONFIG_VAL(Sio),
CE_CONFIG_VAL(Mdec),
CE_INTVAL(g_opts),
CE_INTVAL(iUseDither),
CE_INTVAL(UseFrameSkip),
- CE_INTVAL(UseFrameLimit),
CE_INTVAL(dwActFixes),
CE_INTVAL(iUseReverb),
CE_INTVAL(iUseInterpolation),
CE_INTVAL(iUseTimer),
};
-static void make_cfg_fname(char *buf, size_t size, int is_game)
+static char *get_cd_label(void)
{
- char trimlabel[33];
+ static char trimlabel[33];
int j;
strncpy(trimlabel, CdromLabel, 32);
if (trimlabel[j] == ' ')
trimlabel[j] = 0;
+ return trimlabel;
+}
+
+static void make_cfg_fname(char *buf, size_t size, int is_game)
+{
if (is_game)
- snprintf(buf, size, "." PCSX_DOT_DIR "cfg/%.32s-%.9s.cfg", trimlabel, CdromId);
+ snprintf(buf, size, "." PCSX_DOT_DIR "cfg/%.32s-%.9s.cfg", get_cd_label(), CdromId);
else
snprintf(buf, size, "." PCSX_DOT_DIR "%s", cfgfile_basename);
}
}
// sync plugins
+ for (i = bios_sel = 0; bioses[i] != NULL; i++)
+ if (strcmp(Config.Bios, bioses[i]) == 0)
+ { bios_sel = i; break; }
+
for (i = gpu_plugsel = 0; gpu_plugins[i] != NULL; i++)
if (strcmp(Config.Gpu, gpu_plugins[i]) == 0)
{ gpu_plugsel = i; break; }
// rrrr rggg gggb bbbb
static unsigned short fname2color(const char *fname)
{
- static const char *cdimg_exts[] = { ".bin", ".img", ".iso", ".z", ".cue" };
- static const char *other_exts[] = { ".ccd", ".toc", ".mds", ".sub", ".table" };
+ static const char *cdimg_exts[] = { ".bin", ".img", ".iso", ".cue", ".z", ".bz", ".znx", ".pbp" };
+ static const char *other_exts[] = { ".ccd", ".toc", ".mds", ".sub", ".table", ".index" };
const char *ext = strrchr(fname, '.');
int i;
return 0xffff;
}
+static void draw_savestate_bg(int slot);
+
#define MENU_ALIGN_LEFT
#define menu_init menu_init_common
#include "common/menu.c"
#undef menu_init
+// a bit of black magic here
+static void draw_savestate_bg(int slot)
+{
+ extern void bgr555_to_rgb565(void *dst, void *src, int bytes);
+ static const int psx_widths[8] = { 256, 368, 320, 384, 512, 512, 640, 640 };
+ int x, y, w, h;
+ char fname[MAXPATHLEN];
+ GPUFreeze_t *gpu;
+ u16 *s, *d;
+ gzFile f;
+ int ret;
+ u32 tmp;
+
+ ret = get_state_filename(fname, sizeof(fname), slot);
+ if (ret != 0)
+ return;
+
+ f = gzopen(fname, "rb");
+ if (f == NULL)
+ return;
+
+ if (gzseek(f, 0x29933d, SEEK_SET) != 0x29933d) {
+ fprintf(stderr, "gzseek failed\n");
+ gzclose(f);
+ return;
+ }
+
+ gpu = malloc(sizeof(*gpu));
+ if (gpu == NULL) {
+ gzclose(f);
+ return;
+ }
+
+ ret = gzread(f, gpu, sizeof(*gpu));
+ gzclose(f);
+ if (ret != sizeof(*gpu)) {
+ fprintf(stderr, "gzread failed\n");
+ goto out;
+ }
+
+ memcpy(g_menubg_ptr, g_menubg_src_ptr, g_menuscreen_w * g_menuscreen_h * 2);
+
+ if ((gpu->ulStatus & 0x800000) || (gpu->ulStatus & 0x200000))
+ goto out; // disabled || 24bpp (NYET)
+
+ x = gpu->ulControl[5] & 0x3ff;
+ y = (gpu->ulControl[5] >> 10) & 0x1ff;
+ s = (u16 *)gpu->psxVRam + y * 1024 + (x & ~3);
+ w = psx_widths[(gpu->ulStatus >> 16) & 7];
+ tmp = gpu->ulControl[7];
+ h = ((tmp >> 10) & 0x3ff) - (tmp & 0x3ff);
+ if (gpu->ulStatus & 0x80000) // doubleheight
+ h *= 2;
+
+ x = max(0, g_menuscreen_w - w) & ~3;
+ y = max(0, g_menuscreen_h / 2 - h / 2);
+ w = min(g_menuscreen_w, w);
+ h = min(g_menuscreen_h, h);
+ d = (u16 *)g_menubg_ptr + g_menuscreen_w * y + x;
+
+ for (; h > 0; h--, d += g_menuscreen_w, s += 1024)
+ bgr555_to_rgb565(d, s, w * 2);
+
+out:
+ free(gpu);
+}
+
// ---------- pandora specific -----------
static const char pnd_script_base[] = "sudo -n /usr/pandora/scripts";
struct dirent *ent;
int i, count = 0;
char **mfilters;
- char buff[64], *p;
+ char buff[64];
DIR *dir;
cpu_clock_st = cpu_clock = get_cpu_clock();
perror("readdir");
break;
}
- p = strstr(ent->d_name, "_up");
- if (p != NULL && (p[3] == 0 || !strcmp(p + 3, "_h")))
- count++;
+
+ if (ent->d_type != DT_REG && ent->d_type != DT_LNK)
+ continue;
+
+ count++;
}
if (count == 0)
for (i = 0; (ent = readdir(dir)); ) {
size_t len;
- p = strstr(ent->d_name, "_up");
- if (p == NULL || (p[3] != 0 && strcmp(p + 3, "_h")))
+ if (ent->d_type != DT_REG && ent->d_type != DT_LNK)
continue;
- len = p - ent->d_name;
+ len = strlen(ent->d_name);
+
+ // skip pre-HF5 extra files
+ if (len >= 3 && strcmp(ent->d_name + len - 3, "_v3") == 0)
+ continue;
+ if (len >= 3 && strcmp(ent->d_name + len - 3, "_v5") == 0)
+ continue;
+
+ // have to cut "_up_h" for pre-HF5
+ if (len > 5 && strcmp(ent->d_name + len - 5, "_up_h") == 0)
+ len -= 5;
+
if (len > sizeof(buff) - 1)
continue;
{
static int sel = 0;
-// me_enable(e_menu_keyconfig, MA_OPT_SAVECFG_GAME, ready_to_go);
+// me_enable(e_menu_keyconfig, MA_OPT_SAVECFG_GAME, ready_to_go && CdromId[0]);
me_loop(e_menu_keyconfig, &sel, NULL);
return 0;
}
static const char *men_spu_reverb[] = { "Off", "Fake", "On", NULL };
static const char *men_spu_interp[] = { "None", "Simple", "Gaussian", "Cubic", NULL };
static const char h_spu_irq_wait[] = "Wait for CPU; only useful for some games, may cause glitches";
-static const char h_spu_thread[] = "Run sound emulation in separate thread";
+static const char h_spu_thread[] = "Run sound emulation in main thread (recommended)";
static menu_entry e_menu_plugin_spu[] =
{
mee_enum ("Interpolation", 0, iUseInterpolation, men_spu_interp),
mee_onoff ("Adjust XA pitch", 0, iXAPitch, 1),
mee_onoff_h ("SPU IRQ Wait", 0, iSPUIRQWait, 1, h_spu_irq_wait),
- mee_onoff_h ("Use sound thread", 0, iUseTimer, 1, h_spu_thread),
+ mee_onoff_h ("Sound in main thread", 0, iUseTimer, 2, h_spu_thread),
mee_end,
};
return 0;
}
-static const char h_gpu[] = "Configure built-in P.E.Op.S. SoftGL Driver V1.17";
-static const char h_spu[] = "Configure built-in P.E.Op.S. Sound Driver V1.7";
+static const char h_bios[] = "HLE is simulated BIOS. BIOS is saved in savestates.\n"
+ "Must save config and reload the game\n"
+ "for change to take effect";
static const char h_plugin_xpu[] = "Must save config and reload the game\n"
"for plugin change to take effect";
+static const char h_gpu[] = "Configure built-in P.E.Op.S. SoftGL Driver V1.17";
+static const char h_spu[] = "Configure built-in P.E.Op.S. Sound Driver V1.7";
static menu_entry e_menu_plugin_options[] =
{
+ mee_enum_h ("BIOS", 0, bios_sel, bioses, h_bios),
mee_enum_h ("GPU plugin", 0, gpu_plugsel, gpu_plugins, h_plugin_xpu),
mee_enum_h ("SPU plugin", 0, spu_plugsel, spu_plugins, h_plugin_xpu),
mee_handler_h ("Configure built-in GPU plugin", menu_loop_plugin_gpu, h_gpu),
mee_end,
};
+static menu_entry e_menu_main[];
+
static int menu_loop_plugin_options(int id, int keys)
{
static int sel = 0;
me_loop(e_menu_plugin_options, &sel, NULL);
- // sync plugins
+ // sync BIOS/plugins
+ snprintf(Config.Bios, sizeof(Config.Bios), "%s", bioses[bios_sel]);
snprintf(Config.Gpu, sizeof(Config.Gpu), "%s", gpu_plugins[gpu_plugsel]);
snprintf(Config.Spu, sizeof(Config.Spu), "%s", spu_plugins[spu_plugsel]);
+ me_enable(e_menu_main, MA_MAIN_RUN_BIOS, bios_sel != 0);
return 0;
}
// ------------ adv options menu ------------
static const char h_cfg_cpul[] = "Shows CPU usage in %%";
-static const char h_cfg_fl[] = "Keeps the game from running too fast";
+static const char h_cfg_fl[] = "Frame Limiter keeps the game from running too fast";
static const char h_cfg_xa[] = "Disables XA sound, which can sometimes improve performance";
static const char h_cfg_cdda[] = "Disable CD Audio for a performance boost\n"
"(proper .cue/.bin dump is needed otherwise)";
static const char h_cfg_spuirq[] = "Compatibility tweak; should probably be left off";
static const char h_cfg_rcnt1[] = "Parasite Eve 2, Vandal Hearts 1/2 Fix";
static const char h_cfg_rcnt2[] = "InuYasha Sengoku Battle Fix";
+static const char h_cfg_nodrc[] = "Disable dynamic recompiler and use interpreter\n"
+ "Might be useful to overcome some dynarec bugs";
static menu_entry e_menu_adv_options[] =
{
mee_onoff_h ("Show CPU load", 0, g_opts, OPT_SHOWCPU, h_cfg_cpul),
- mee_onoff_h ("Frame Limiter", 0, UseFrameLimit, 1, h_cfg_fl),
+ mee_onoff_h ("Disable Frame Limiter", 0, g_opts, OPT_NO_FRAMELIM, h_cfg_fl),
mee_onoff_h ("Disable XA Decoding", 0, Config.Xa, 1, h_cfg_xa),
mee_onoff_h ("Disable CD Audio", 0, Config.Cdda, 1, h_cfg_cdda),
mee_onoff_h ("SIO IRQ Always Enabled", 0, Config.Sio, 1, h_cfg_sio),
mee_onoff_h ("SPU IRQ Always Enabled", 0, Config.SpuIrq, 1, h_cfg_spuirq),
mee_onoff_h ("Rootcounter hack", 0, Config.RCntFix, 1, h_cfg_rcnt1),
mee_onoff_h ("Rootcounter hack 2", 0, Config.VSyncWA, 1, h_cfg_rcnt2),
+ mee_onoff_h ("Disable dynarec (slow!)",0, Config.Cpu, 1, h_cfg_nodrc),
mee_end,
};
i = me_id2offset(e_menu_options, MA_OPT_CPU_CLOCKS);
e_menu_options[i].enabled = cpu_clock != 0 ? 1 : 0;
- me_enable(e_menu_options, MA_OPT_SAVECFG_GAME, ready_to_go);
+ me_enable(e_menu_options, MA_OPT_SAVECFG_GAME, ready_to_go && CdromId[0]);
me_loop(e_menu_options, &sel, NULL);
void OnFile_Exit();
+static void draw_frame_main(void)
+{
+ if (CdromId[0] != 0) {
+ char buff[64];
+ snprintf(buff, sizeof(buff), "%.32s/%.9s", get_cd_label(), CdromId);
+ smalltext_out16(4, 1, buff, 0x105f);
+ }
+}
+
+static void draw_frame_credits(void)
+{
+ smalltext_out16(4, 1, "build: "__DATE__ " " __TIME__ " " REV, 0xe7fc);
+}
+
const char *plat_get_credits(void)
{
return "PCSX-ReARMed\n\n"
"(C) 2009-2010 PCSX-Reloaded Team\n\n"
"GPU and SPU code by Pete Bernert\n"
" and the P.E.Op.S. team\n"
- "ARM recompiler (C) 2009-2010 Ari64\n\n"
+ "ARM recompiler (C) 2009-2010 Ari64\n"
+ "PCSX4ALL plugins by PCSX4ALL team\n"
+ " Chui, Franxis, Unai\n\n"
"integration, optimization and\n"
" frontend (C) 2010-2011 notaz\n";
}
+static int reset_game(void)
+{
+ // sanity check
+ if (bios_sel == 0 && !Config.HLE)
+ return -1;
+
+ ClosePlugins();
+ OpenPlugins();
+ SysReset();
+ if (CheckCdrom() != -1) {
+ LoadCdrom();
+ }
+ return 0;
+}
+
+static int run_bios(void)
+{
+ if (bios_sel == 0)
+ return -1;
+
+ ready_to_go = 0;
+ pl_fbdev_buf = NULL;
+
+ ClosePlugins();
+ set_cd_image(NULL);
+ LoadPlugins();
+ NetOpened = 0;
+ if (OpenPlugins() == -1) {
+ me_update_msg("failed to open plugins");
+ return -1;
+ }
+ plugin_call_rearmed_cbs();
+
+ CdromId[0] = '\0';
+ CdromLabel[0] = '\0';
+
+ SysReset();
+
+ ready_to_go = 1;
+ return 0;
+}
+
static int run_cd_image(const char *fname)
{
- extern void set_cd_image(const char *fname);
ready_to_go = 0;
pl_fbdev_buf = NULL;
return menu_loop_savestate(1);
break;
case MA_MAIN_RESET_GAME:
- if (ready_to_go) {
- ClosePlugins();
- OpenPlugins();
- SysReset();
- if (CheckCdrom() != -1) {
- LoadCdrom();
- }
+ if (ready_to_go && reset_game() == 0)
return 1;
- }
break;
case MA_MAIN_LOAD_ROM:
if (romsel_run() == 0)
return 1;
break;
+ case MA_MAIN_RUN_BIOS:
+ if (run_bios() == 0)
+ return 1;
+ break;
case MA_MAIN_CREDITS:
- draw_menu_credits(draw_frame_debug);
+ draw_menu_credits(draw_frame_credits);
in_menu_wait(PBTN_MOK|PBTN_MBACK, 70);
break;
case MA_MAIN_EXIT:
mee_handler_id("Load State", MA_MAIN_LOAD_STATE, main_menu_handler),
mee_handler_id("Reset game", MA_MAIN_RESET_GAME, main_menu_handler),
mee_handler_id("Load CD image", MA_MAIN_LOAD_ROM, main_menu_handler),
+ mee_handler_id("Run BIOS", MA_MAIN_RUN_BIOS, main_menu_handler),
mee_handler ("Options", menu_loop_options),
mee_handler ("Controls", menu_loop_keyconfig),
mee_handler_id("Credits", MA_MAIN_CREDITS, main_menu_handler),
menu_leave_emu();
me_enable(e_menu_main, MA_MAIN_RESUME_GAME, ready_to_go);
- me_enable(e_menu_main, MA_MAIN_SAVE_STATE, ready_to_go);
- me_enable(e_menu_main, MA_MAIN_LOAD_STATE, ready_to_go);
+ me_enable(e_menu_main, MA_MAIN_SAVE_STATE, ready_to_go && CdromId[0]);
+ me_enable(e_menu_main, MA_MAIN_LOAD_STATE, ready_to_go && CdromId[0]);
me_enable(e_menu_main, MA_MAIN_RESET_GAME, ready_to_go);
+ me_enable(e_menu_main, MA_MAIN_RUN_BIOS, bios_sel != 0);
-// menu_enter(ready_to_go);
in_set_config_int(0, IN_CFG_BLOCKING, 1);
do {
- me_loop(e_menu_main, &sel, NULL);
+ me_loop(e_menu_main, &sel, draw_frame_main);
} while (!ready_to_go);
/* wait until menu, ok, back is released */
menu_prepare_emu();
}
-static void scan_plugins(void)
+static void scan_bios_plugins(void)
{
char fname[MAXPATHLEN];
struct dirent *ent;
- int gpu_i, spu_i;
+ int bios_i, gpu_i, spu_i;
char *p;
DIR *dir;
+ bioses[0] = "HLE";
gpu_plugins[0] = "builtin_gpu";
spu_plugins[0] = "builtin_spu";
- gpu_i = spu_i = 1;
+ bios_i = gpu_i = spu_i = 1;
+ snprintf(fname, sizeof(fname), "%s/", Config.BiosDir);
+ dir = opendir(fname);
+ if (dir == NULL) {
+ perror("scan_bios_plugins bios opendir");
+ goto do_plugins;
+ }
+
+ while (1) {
+ struct stat st;
+
+ errno = 0;
+ ent = readdir(dir);
+ if (ent == NULL) {
+ if (errno != 0)
+ perror("readdir");
+ break;
+ }
+
+ if (ent->d_type != DT_REG && ent->d_type != DT_LNK)
+ continue;
+
+ snprintf(fname, sizeof(fname), "%s/%s", Config.BiosDir, ent->d_name);
+ if (stat(fname, &st) != 0 || st.st_size != 512*1024) {
+ printf("bad BIOS file: %s\n", ent->d_name);
+ continue;
+ }
+
+ if (bios_i < ARRAY_SIZE(bioses) - 1) {
+ bioses[bios_i++] = strdup(ent->d_name);
+ continue;
+ }
+
+ printf("too many BIOSes, dropping \"%s\"\n", ent->d_name);
+ }
+
+ closedir(dir);
+
+do_plugins:
snprintf(fname, sizeof(fname), "%s/", Config.PluginsDir);
dir = opendir(fname);
if (dir == NULL) {
- perror("scan_plugins opendir");
+ perror("scan_bios_plugins opendir");
return;
}
strcpy(last_selected_fname, "/media");
- scan_plugins();
+ scan_bios_plugins();
pnd_menu_init();
menu_init_common();
menu_darken_bg(d, s, w, 0);
}
+ if (ready_to_go)
+ cpu_clock = get_cpu_clock();
+
plat_video_menu_enter(ready_to_go);
}
void menu_prepare_emu(void)
{
+ R3000Acpu *prev_cpu = psxCpu;
+
plat_video_menu_leave();
switch (scaling) {
apply_cpu_clock();
stop = 0;
+ psxCpu = (Config.Cpu == CPU_INTERPRETER) ? &psxInt : &psxRec;
+ if (psxCpu != prev_cpu)
+ // note that this does not really reset, just clears drc caches
+ psxCpu->Reset();
+
// core doesn't care about Config.Cdda changes,
// so handle them manually here
if (Config.Cdda)
CDR_stop();
- // HACK to set up the frame limiter if softgpu is not used..
- if (gpu_plugsel != 0) {
- fFrameRateHz = Config.PsxType ? 50.0f : 59.94f;
- dwFrameRateTicks = (100000*100 / (unsigned long)(fFrameRateHz*100));
- }
+ pl_frame_interval = Config.PsxType ? 20000 : 16667;
if (GPU_open != NULL) {
int ret = GPU_open(&gpuDisp, "PCSX", NULL);