#include "../common/lprintf.h"
#include "version.h"
-#include <Pico/PicoInt.h>
-#include <Pico/Patch.h>
+#include <pico/pico_int.h>
+#include <pico/patch.h>
#include <zlib/zlib.h>
static unsigned short bg_buffer[480*272] __attribute__((aligned(16)));
#define menu_screen psp_screen
-static void menu_darken_bg(void *dst, const void *src, int pixels, int darker);
+void menu_darken_bg(void *dst, const void *src, int pixels, int darker);
static void menu_prepare_bg(int use_game_bg, int use_fg);
static unsigned int inp_prev = 0;
-static unsigned long wait_for_input(unsigned int interesting, int is_key_config)
+unsigned long wait_for_input(unsigned int interesting, int is_key_config)
{
unsigned int ret;
static int repeats = 0, wait = 20;
else if (repeats == 4) wait = 2;
else if (repeats == 6) wait = 1;
- for (i = 0; i < wait && inp_prev == gp2x_joystick_read(1); i++) {
-
for (i = 0; i < wait && inp_prev == psp_pad_read(1); i++) {
if (i == 0) repeats++;
psp_msleep(30);
return ret;
}
-static void menu_draw_begin(void)
+void menu_draw_begin(void)
{
// short *src = (short *)bg_buffer, *dst = (short *)menu_screen;
// int i;
}
-static void menu_draw_end(void)
+void menu_draw_end(void)
{
psp_video_flip(1);
}
// -------------- ROM selector --------------
-// SceIoDirent
-#define DT_DIR FIO_SO_IFDIR
-#define DT_REG FIO_SO_IFREG
-
struct my_dirent
{
- unsigned char d_type;
+ unsigned int d_type;
char d_name[255];
};
pos = start + i;
if (pos < 0) continue;
if (pos > 26) break;
- if (namelist[i+1]->d_type & DT_DIR) {
+ if (namelist[i+1]->d_type & FIO_S_IFDIR) {
smalltext_out16_lim(14, pos*10, "/", 0xd7ff, 1);
smalltext_out16_lim(14+6, pos*10, namelist[i+1]->d_name, 0xd7ff, 80-3);
} else {
static int scandir_cmp(const void *p1, const void *p2)
{
struct my_dirent **d1 = (struct my_dirent **)p1, **d2 = (struct my_dirent **)p2;
- if ((*d1)->d_type == (*d2)->d_type) return strcasecmp((*d1)->d_name, (*d2)->d_name);
- if ((*d1)->d_type & DT_DIR) return -1; // put before
- if ((*d2)->d_type & DT_DIR) return 1;
+ if ((*d1)->d_type & (*d2)->d_type & FIO_S_IFDIR)
+ return strcasecmp((*d1)->d_name, (*d2)->d_name);
+ if ((*d1)->d_type & FIO_S_IFDIR) return -1; // put before
+ if ((*d2)->d_type & FIO_S_IFDIR) return 1;
return strcasecmp((*d1)->d_name, (*d2)->d_name);
}
{
ent = malloc(sizeof(*ent));
if (ent == NULL) { lprintf("%s:%i: OOM\n", __FILE__, __LINE__); goto fail; }
- ent->d_type = sce_ent.d_stat.st_attr;
+ ent->d_type = sce_ent.d_stat.st_mode;
strncpy(ent->d_name, sce_ent.d_name, sizeof(ent->d_name));
ent->d_name[sizeof(ent->d_name)-1] = 0;
if (filter == NULL || filter(ent))
// is this a dir or a full path?
memset(&cpstat, 0, sizeof(cpstat));
iret = sceIoGetstat(curr_path, &cpstat);
- if (iret >= 0 && (cpstat.st_attr & FIO_SO_IFREG)) { // file
+ if (iret >= 0 && (cpstat.st_mode & FIO_S_IFDIR)); // dir
+ else if (iret >= 0 && (cpstat.st_mode & FIO_S_IFREG)) { // file
char *p;
for (p = curr_path + strlen(curr_path) - 1; p > curr_path && *p != '/'; p--);
if (p > curr_path) {
}
else strcpy(curr_path, "ms0:/");
}
- else if (iret >= 0 && (cpstat.st_attr & FIO_SO_IFDIR)); // dir
else strcpy(curr_path, "ms0:/"); // something else
n = my_scandir(curr_path, &namelist, scandir_filter, scandir_cmp);
if(inp & BTN_L) { sel-=24; if (sel < 0) sel = 0; }
if(inp & BTN_RIGHT) { sel+=10; if (sel > n-2) sel = n-2; }
if(inp & BTN_R) { sel+=24; if (sel > n-2) sel = n-2; }
- if(inp & BTN_CIRCLE) { // enter dir/select
- if (namelist[sel+1]->d_type & DT_REG) {
- strcpy(romFileName, curr_path);
- strcat(romFileName, "/");
- strcat(romFileName, namelist[sel+1]->d_name);
- ret = romFileName;
- break;
- } else if (namelist[sel+1]->d_type & DT_DIR) {
+ if(inp & BTN_CIRCLE) // enter dir/select
+ {
+ if (namelist[sel+1]->d_type & FIO_S_IFDIR)
+ {
int newlen = strlen(curr_path) + strlen(namelist[sel+1]->d_name) + 2;
char *p, *newdir = malloc(newlen);
if (strcmp(namelist[sel+1]->d_name, "..") == 0) {
free(newdir);
break;
}
+ else if (namelist[sel+1]->d_type & FIO_S_IFREG)
+ {
+ strcpy(romFileName, curr_path);
+ strcat(romFileName, "/");
+ strcat(romFileName, namelist[sel+1]->d_name);
+ ret = romFileName;
+ break;
+ }
}
if(inp & BTN_X) break; // cancel
}
return ret;
}
-// ------------ debug menu ------------
-
-char *debugString(void);
-
-static void draw_debug(void)
-{
- char *p, *str = debugString();
- int len, line;
-
- menu_draw_begin();
-
- p = str;
- for (line = 0; line < 24; line++)
- {
- while (*p && *p != '\n') p++;
- len = p - str;
- if (len > 55) len = 55;
- smalltext_out16_lim(1, line*10, str, 0xffff, len);
- if (*p == 0) break;
- p++; str = p;
- }
- menu_draw_end();
-}
-
-static void debug_menu_loop(void)
-{
- int ret = 0;
- draw_debug();
- while (!(ret & (BTN_X|BTN_CIRCLE)))
- ret = wait_for_input(BTN_X|BTN_CIRCLE, 0);
-}
-
// ------------ patch/gg menu ------------
static void draw_patchlist(int sel)
areaClose(file);
}
- emu_forcedFrame();
+ emu_forcedFrame(0);
menu_prepare_bg(1, 0);
restore_oldstate(oldstate);
static void draw_key_config(const me_bind_action *opts, int opt_cnt, int player_idx, int sel)
{
- int x, y, tl_y = 16+40, i;
+ int x, y, tl_y = 16+20, i;
menu_draw_begin();
if (player_idx >= 0) {
- text_out16(80+80, 16+20, "Player %i controls", player_idx + 1);
+ text_out16(80+80, 16, "Player %i controls", player_idx + 1);
x = 80+80;
} else {
- text_out16(80+80, 16+20, "Emulator controls");
+ text_out16(80+80, 16, "Emulator controls");
x = 80+40;
}
}
}
+menu_entry ctrlopt_entries[] =
+{
+ { "Player 1", MB_NONE, MA_CTRL_PLAYER1, NULL, 0, 0, 0, 1, 0 },
+ { "Player 2", MB_NONE, MA_CTRL_PLAYER2, NULL, 0, 0, 0, 1, 0 },
+ { "Emulator controls", MB_NONE, MA_CTRL_EMU, NULL, 0, 0, 0, 1, 0 },
+ { "6 button pad", MB_ONOFF, MA_OPT_6BUTTON_PAD, &PicoOpt, 0x020, 0, 0, 1, 1 },
+ { "Turbo rate", MB_RANGE, MA_CTRL_TURBO_RATE, ¤tConfig.turbo_rate, 0, 1, 30, 1, 1 },
+ { "Done", MB_NONE, MA_CTRL_DONE, NULL, 0, 0, 0, 1, 0 },
+};
+
+#define CTRLOPT_ENTRY_COUNT (sizeof(ctrlopt_entries) / sizeof(ctrlopt_entries[0]))
+const int ctrlopt_entry_count = CTRLOPT_ENTRY_COUNT;
+
static void draw_kc_sel(int menu_sel)
{
int tl_x = 80+25+40, tl_y = 16+60, y;
menu_draw_begin();
menu_draw_selection(tl_x - 16, tl_y + menu_sel*10, 138);
- text_out16(tl_x, y, "Player 1");
- text_out16(tl_x, (y+=10), "Player 2");
- text_out16(tl_x, (y+=10), "Emulator controls");
- text_out16(tl_x, (y+=10), "Done");
+ me_draw(ctrlopt_entries, ctrlopt_entry_count, tl_x, tl_y, NULL, NULL);
menu_draw_end();
}
// "LOAD STATE", "VOLUME UP", "VOLUME DOWN", "DONE"
me_bind_action emuctrl_actions[] =
{
- { "Load State ", 1<<28 },
- { "Save State ", 1<<27 },
- { "Prev Save Slot ", 1<<25 },
- { "Next Save Slot ", 1<<24 },
- { "Switch Renderer", 1<<26 },
- { NULL, 0 }
+ { "Load State ", 1<<28 },
+ { "Save State ", 1<<27 },
+ { "Prev Save Slot ", 1<<25 },
+ { "Next Save Slot ", 1<<24 },
+ { "Switch Renderer ", 1<<26 },
+ { "Fast forward ", 1<<22 },
+ { "Pico Next page ", 1<<21 },
+ { "Pico Prev page ", 1<<20 },
+ { "Pico Switch input", 1<<19 },
+ { NULL, 0 }
};
static void kc_sel_loop(void)
{
- int menu_sel = 3, menu_sel_max = 3;
+ int menu_sel = 5, menu_sel_max = 5;
unsigned long inp = 0;
- int is_6button = PicoOpt & POPT_6BTN_PAD;
+ menu_id selected_id;
while (1)
{
draw_kc_sel(menu_sel);
- inp = wait_for_input(BTN_UP|BTN_DOWN|BTN_X|BTN_CIRCLE, 0);
+ inp = wait_for_input(BTN_UP|BTN_DOWN|BTN_LEFT|BTN_RIGHT|BTN_X|BTN_CIRCLE, 0);
+ selected_id = me_index2id(ctrlopt_entries, CTRLOPT_ENTRY_COUNT, menu_sel);
+ if (inp & (BTN_LEFT|BTN_RIGHT)) // multi choise
+ me_process(ctrlopt_entries, CTRLOPT_ENTRY_COUNT, selected_id, (inp&BTN_RIGHT) ? 1 : 0);
if (inp & BTN_UP ) { menu_sel--; if (menu_sel < 0) menu_sel = menu_sel_max; }
if (inp & BTN_DOWN) { menu_sel++; if (menu_sel > menu_sel_max) menu_sel = 0; }
if (inp & BTN_CIRCLE) {
- switch (menu_sel) {
- case 0: key_config_loop(me_ctrl_actions, is_6button ? 12 : 8, 0); return;
- case 1: key_config_loop(me_ctrl_actions, is_6button ? 12 : 8, 1); return;
- case 2: key_config_loop(emuctrl_actions,
- sizeof(emuctrl_actions)/sizeof(emuctrl_actions[0]) - 1, -1); return;
- case 3: if (!rom_loaded) emu_WriteConfig(0); return;
+ int is_6button = PicoOpt & POPT_6BTN_PAD;
+ switch (selected_id) {
+ case MA_CTRL_PLAYER1: key_config_loop(me_ctrl_actions, is_6button ? 15 : 11, 0); return;
+ case MA_CTRL_PLAYER2: key_config_loop(me_ctrl_actions, is_6button ? 15 : 11, 1); return;
+ case MA_CTRL_EMU: key_config_loop(emuctrl_actions,
+ sizeof(emuctrl_actions)/sizeof(emuctrl_actions[0]) - 1, -1); return;
+ case MA_CTRL_DONE: if (!rom_loaded) emu_WriteConfig(0); return;
default: return;
}
}
{ NULL, MB_NONE, MA_CDOPT_TESTBIOS_EUR, NULL, 0, 0, 0, 1, 0 },
{ NULL, MB_NONE, MA_CDOPT_TESTBIOS_JAP, NULL, 0, 0, 0, 1, 0 },
{ "CD LEDs", MB_ONOFF, MA_CDOPT_LEDS, ¤tConfig.EmuOpt, 0x0400, 0, 0, 1, 1 },
- { "CDDA audio (using mp3s)", MB_ONOFF, MA_CDOPT_CDDA, &PicoOpt, 0x0800, 0, 0, 1, 1 },
+ { "CDDA audio", MB_ONOFF, MA_CDOPT_CDDA, &PicoOpt, 0x0800, 0, 0, 1, 1 },
{ "PCM audio", MB_ONOFF, MA_CDOPT_PCM, &PicoOpt, 0x0400, 0, 0, 1, 1 },
{ NULL, MB_NONE, MA_CDOPT_READAHEAD, NULL, 0, 0, 0, 1, 1 },
{ "SaveRAM cart", MB_ONOFF, MA_CDOPT_SAVERAM, &PicoOpt, 0x8000, 0, 0, 1, 1 },
}
memset32_uncached(psp_screen, 0, 512*272*2/4);
- emu_forcedFrame();
+ emu_forcedFrame(0);
menu_prepare_bg(1, 0);
if (oldstate) restore_oldstate(oldstate);
{ "gzip savestates", MB_ONOFF, MA_OPT2_GZIP_STATES, ¤tConfig.EmuOpt, 0x00008, 0, 0, 1, 1 },
{ "Don't save last used ROM", MB_ONOFF, MA_OPT2_NO_LAST_ROM, ¤tConfig.EmuOpt, 0x00020, 0, 0, 1, 1 },
{ "Status line in main menu", MB_ONOFF, MA_OPT2_STATUS_LINE, ¤tConfig.EmuOpt, 0x20000, 0, 0, 1, 1 },
- { "Disable frame limitter", MB_ONOFF, MA_OPT2_NO_FRAME_LIMIT, ¤tConfig.EmuOpt, 0x40000, 0, 0, 1, 1 },
+ { "Disable idle loop patching",MB_ONOFF, MA_OPT2_NO_IDLE_LOOPS, &PicoOpt, 0x80000, 0, 0, 1, 1 },
+ { "Disable frame limiter", MB_ONOFF, MA_OPT2_NO_FRAME_LIMIT, ¤tConfig.EmuOpt, 0x40000, 0, 0, 1, 1 },
{ "done", MB_NONE, MA_OPT2_DONE, NULL, 0, 0, 0, 1, 0 },
};
menu_entry opt_entries[] =
{
{ NULL, MB_NONE, MA_OPT_RENDERER, NULL, 0, 0, 0, 1, 1 },
- { "Accurate timing (slower)", MB_ONOFF, MA_OPT_ACC_TIMING, &PicoOpt, 0x0040, 0, 0, 1, 1 },
- { "Accurate sprites (slower)", MB_ONOFF, MA_OPT_ACC_SPRITES, &PicoOpt, 0x0080, 0, 0, 1, 1 },
+ { "Accurate sprites", MB_ONOFF, MA_OPT_ACC_SPRITES, &PicoOpt, 0x080, 0, 0, 0, 1 },
{ "Show FPS", MB_ONOFF, MA_OPT_SHOW_FPS, ¤tConfig.EmuOpt, 0x0002, 0, 0, 1, 1 },
{ NULL, MB_RANGE, MA_OPT_FRAMESKIP, ¤tConfig.Frameskip, 0, -1, 16, 1, 1 },
{ "Enable sound", MB_ONOFF, MA_OPT_ENABLE_SOUND, ¤tConfig.EmuOpt, 0x0004, 0, 0, 1, 1 },
{ NULL, MB_NONE, MA_OPT_SOUND_QUALITY, NULL, 0, 0, 0, 1, 1 },
- { "6 button pad", MB_ONOFF, MA_OPT_6BUTTON_PAD, &PicoOpt, 0x0020, 0, 0, 1, 1 },
{ NULL, MB_NONE, MA_OPT_REGION, NULL, 0, 0, 0, 1, 1 },
{ "Use SRAM/BRAM savestates", MB_ONOFF, MA_OPT_SRAM_STATES, ¤tConfig.EmuOpt, 0x0001, 0, 0, 1, 1 },
{ NULL, MB_NONE, MA_OPT_CONFIRM_STATES,NULL, 0, 0, 0, 1, 1 },
text_out16(tl_x, (y+=10), "ps2dev.org people: PSP SDK/code");
text_out16(tl_x, (y+=10), "ketchupgun: skin design");
- text_out16(tl_x, (y+=20), "special thanks (for code, docs, ideas):");
+ text_out16(tl_x, (y+=20), "special thanks (for docs, ideas):");
text_out16(tl_x, (y+=10), " Charles MacDonald, Haze,");
text_out16(tl_x, (y+=10), " Stephane Dallongeville,");
text_out16(tl_x, (y+=10), " Lordus, Exophase, Rokas,");
{
char curr_path[PATH_MAX], *selfname;
FILE *tstf;
- if ( (tstf = fopen(lastRomFile, "rb")) )
+ if ( (tstf = fopen(loadedRomFName, "rb")) )
{
fclose(tstf);
- strcpy(curr_path, lastRomFile);
+ strcpy(curr_path, loadedRomFName);
}
else
getcwd(curr_path, PATH_MAX);
}
}
-// warning: alignment
-static void menu_darken_bg(void *dst, const void *src, int pixels, int darker)
+void menu_darken_bg(void *dst, const void *src, int pixels, int darker)
{
unsigned int *dest = dst;
const unsigned int *srce = src;
menu_gfx_prepare();
- if ( (tstf = fopen(lastRomFile, "rb")) )
+ if ( (tstf = fopen(loadedRomFName, "rb")) )
{
fclose(tstf);
- strcpy(curr_path, lastRomFile);
+ strcpy(curr_path, loadedRomFName);
}
else
{
if (selfname) {
int ret = -1;
cd_img_type cd_type;
- cd_type = emu_cdCheck(NULL);
+ cd_type = emu_cdCheck(NULL, romFileName);
if (cd_type != CIT_NOT_CD)
ret = Insert_CD(romFileName, cd_type);
if (ret != 0) {
notaz.gp2x.de / picodrive.git / blobdiff