mirror of
https://github.com/RaySollium99/libpicofe.git
synced 2025-10-27 06:29:40 +01:00
port to updated Cyclone, debug menu
git-svn-id: file:///home/notaz/opt/svn/PicoDrive/platform@217 be3aeb3a-fb24-0410-a615-afba39da0efa
This commit is contained in:
parent
e52fb441a4
commit
0ae6813e48
3 changed files with 39 additions and 7 deletions
|
|
@ -6,7 +6,7 @@ CROSS = arm-linux-
|
||||||
|
|
||||||
# settings
|
# settings
|
||||||
#mz80 = 1
|
#mz80 = 1
|
||||||
debug_cyclone = 0
|
#debug_cyclone = 1
|
||||||
asm_memory = 1
|
asm_memory = 1
|
||||||
asm_render = 1
|
asm_render = 1
|
||||||
asm_ym2612 = 1
|
asm_ym2612 = 1
|
||||||
|
|
@ -180,7 +180,7 @@ testrefr.gpe : test.o gp2x.o asmutils.o
|
||||||
# build Cyclone
|
# build Cyclone
|
||||||
../../cpu/Cyclone/proj/Cyclone.s :
|
../../cpu/Cyclone/proj/Cyclone.s :
|
||||||
@echo building Cyclone...
|
@echo building Cyclone...
|
||||||
@make -C ../../cpu/Cyclone/proj
|
@make -C ../../cpu/Cyclone/proj CONFIG_FILE=config_pico.h
|
||||||
|
|
||||||
../../cpu/musashi/m68kops.c :
|
../../cpu/musashi/m68kops.c :
|
||||||
@make -C ../../cpu/musashi
|
@make -C ../../cpu/musashi
|
||||||
|
|
|
||||||
40
gp2x/menu.c
40
gp2x/menu.c
|
|
@ -419,6 +419,36 @@ static char *romsel_loop(char *curr_path)
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// ------------ debug menu ------------
|
||||||
|
|
||||||
|
char *debugString(void);
|
||||||
|
|
||||||
|
static void draw_debug(void)
|
||||||
|
{
|
||||||
|
char *p, *str = debugString();
|
||||||
|
int len, line;
|
||||||
|
|
||||||
|
gp2x_pd_clone_buffer2();
|
||||||
|
|
||||||
|
p = str;
|
||||||
|
for (line = 0; line < 24; line++)
|
||||||
|
{
|
||||||
|
while (*p && *p != '\n') p++;
|
||||||
|
len = p - str;
|
||||||
|
if (len > 55) len = 55;
|
||||||
|
gp2x_smalltext8_lim(1, line*10, str, len);
|
||||||
|
if (*p == 0) break;
|
||||||
|
p++; str = p;
|
||||||
|
}
|
||||||
|
gp2x_video_flip2();
|
||||||
|
}
|
||||||
|
|
||||||
|
static void debug_menu_loop(void)
|
||||||
|
{
|
||||||
|
draw_debug();
|
||||||
|
wait_for_input(GP2X_B|GP2X_X);
|
||||||
|
}
|
||||||
|
|
||||||
// ------------ patch/gg menu ------------
|
// ------------ patch/gg menu ------------
|
||||||
|
|
||||||
static void draw_patchlist(int sel)
|
static void draw_patchlist(int sel)
|
||||||
|
|
@ -444,7 +474,7 @@ static void draw_patchlist(int sel)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
void patches_menu_loop(void)
|
static void patches_menu_loop(void)
|
||||||
{
|
{
|
||||||
int menu_sel = 0;
|
int menu_sel = 0;
|
||||||
unsigned long inp = 0;
|
unsigned long inp = 0;
|
||||||
|
|
@ -1239,7 +1269,8 @@ static void draw_menu_root(int menu_sel)
|
||||||
|
|
||||||
static void menu_loop_root(void)
|
static void menu_loop_root(void)
|
||||||
{
|
{
|
||||||
int ret, menu_sel = 4, menu_sel_max = 8, menu_sel_min = 4;
|
static int menu_sel = 4;
|
||||||
|
int ret, menu_sel_max = 8, menu_sel_min = 4;
|
||||||
unsigned long inp = 0;
|
unsigned long inp = 0;
|
||||||
char curr_path[PATH_MAX], *selfname;
|
char curr_path[PATH_MAX], *selfname;
|
||||||
FILE *tstf;
|
FILE *tstf;
|
||||||
|
|
@ -1254,7 +1285,7 @@ static void menu_loop_root(void)
|
||||||
getcwd(curr_path, PATH_MAX);
|
getcwd(curr_path, PATH_MAX);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (rom_data) menu_sel = menu_sel_min = 0;
|
if (rom_data) menu_sel_min = 0;
|
||||||
if (PicoPatches) menu_sel_max = 9;
|
if (PicoPatches) menu_sel_max = 9;
|
||||||
|
|
||||||
/* make sure action buttons are not pressed on entering menu */
|
/* make sure action buttons are not pressed on entering menu */
|
||||||
|
|
@ -1264,9 +1295,10 @@ static void menu_loop_root(void)
|
||||||
for (;;)
|
for (;;)
|
||||||
{
|
{
|
||||||
draw_menu_root(menu_sel);
|
draw_menu_root(menu_sel);
|
||||||
inp = wait_for_input(GP2X_UP|GP2X_DOWN|GP2X_B|GP2X_X|GP2X_SELECT);
|
inp = wait_for_input(GP2X_UP|GP2X_DOWN|GP2X_B|GP2X_X|GP2X_SELECT|GP2X_L|GP2X_R);
|
||||||
if(inp & GP2X_UP ) { menu_sel--; if (menu_sel < menu_sel_min) menu_sel = menu_sel_max; }
|
if(inp & GP2X_UP ) { menu_sel--; if (menu_sel < menu_sel_min) menu_sel = menu_sel_max; }
|
||||||
if(inp & GP2X_DOWN) { menu_sel++; if (menu_sel > menu_sel_max) menu_sel = menu_sel_min; }
|
if(inp & GP2X_DOWN) { menu_sel++; if (menu_sel > menu_sel_max) menu_sel = menu_sel_min; }
|
||||||
|
if((inp & (GP2X_L|GP2X_R)) == (GP2X_L|GP2X_R)) debug_menu_loop();
|
||||||
if(inp &(GP2X_SELECT|GP2X_X)){
|
if(inp &(GP2X_SELECT|GP2X_X)){
|
||||||
if (rom_data) {
|
if (rom_data) {
|
||||||
while (gp2x_joystick_read(1) & (GP2X_SELECT|GP2X_X)) usleep(50*1000); // wait until select is released
|
while (gp2x_joystick_read(1) & (GP2X_SELECT|GP2X_X)) usleep(50*1000); // wait until select is released
|
||||||
|
|
|
||||||
|
|
@ -1,2 +1,2 @@
|
||||||
#define VERSION "1.32"
|
#define VERSION "1.33"
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue