X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=frontend%2Fmenu.c;h=8e663572253cb81905ceb20a84e24de5eb44d460;hp=e04d19eac187869c9fd15fdcb386cad2dbddd332;hb=e6eb2066c0d198d793067caed47b670b691eb865;hpb=c5061935e3f7b91d889d7546b06c4515c3004cb2 diff --git a/frontend/menu.c b/frontend/menu.c index e04d19ea..8e663572 100644 --- a/frontend/menu.c +++ b/frontend/menu.c @@ -12,6 +12,7 @@ #include #include #include +#include #include "main.h" #include "menu.h" @@ -78,9 +79,10 @@ extern int iXAPitch; 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; } @@ -128,10 +130,6 @@ static int emu_save_load_game(int load, int sram) return ret; } -static void draw_savestate_bg(int slot) -{ -} - static void menu_set_defconfig(void) { scaling = SCALE_4_3; @@ -354,6 +352,10 @@ static int menu_load_config(int is_game) } // 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; } @@ -389,11 +391,80 @@ static unsigned short fname2color(const char *fname) 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"; @@ -756,13 +827,17 @@ static int menu_loop_plugin_spu(int id, int keys) 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), @@ -775,7 +850,8 @@ 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]); @@ -899,7 +975,9 @@ const char *plat_get_credits(void) "(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"; } @@ -1064,22 +1142,61 @@ void menu_loop(void) 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; } @@ -1134,7 +1251,7 @@ void menu_init(void) strcpy(last_selected_fname, "/media"); - scan_plugins(); + scan_bios_plugins(); pnd_menu_init(); menu_init_common();