notaz.gp2x.de
/
picodrive.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Finish migrating to new mem handling. Make carthw db external.
[picodrive.git]
/
platform
/
common
/
menu.c
diff --git
a/platform/common/menu.c
b/platform/common/menu.c
index
688d538
..
e651694
100644
(file)
--- a/
platform/common/menu.c
+++ b/
platform/common/menu.c
@@
-22,8
+22,6
@@
#include <pico/pico_int.h>
\r
#include <pico/patch.h>
\r
\r
#include <pico/pico_int.h>
\r
#include <pico/patch.h>
\r
\r
-#define array_size(x) (sizeof(x) / sizeof(x[0]))
\r
-
\r
static char static_buff[64];
\r
static char menu_error_msg[64] = { 0, };
\r
static int menu_error_time = 0;
\r
static char static_buff[64];
\r
static char menu_error_msg[64] = { 0, };
\r
static int menu_error_time = 0;
\r
@@
-816,6
+814,11
@@
rescan:
}
\r
}
\r
\r
}
\r
}
\r
\r
+ /* make sure action buttons are not pressed on entering menu */
\r
+ draw_dirlist(curr_path, namelist, n, sel);
\r
+ while (in_menu_wait_any(50) & (PBTN_MOK|PBTN_MBACK|PBTN_MENU))
\r
+ ;
\r
+
\r
for (;;)
\r
{
\r
draw_dirlist(curr_path, namelist, n, sel);
\r
for (;;)
\r
{
\r
draw_dirlist(curr_path, namelist, n, sel);
\r
@@
-1805,7
+1808,7
@@
static void debug_menu_loop(void)
{
\r
case 0:
\r
if (inp & PBTN_MOK)
\r
{
\r
case 0:
\r
if (inp & PBTN_MOK)
\r
-
SekStepM68k
();
\r
+
PDebugCPUStep
();
\r
if (inp & PBTN_MA3) {
\r
while (inp & PBTN_MA3)
\r
inp = in_menu_wait_any(-1);
\r
if (inp & PBTN_MA3) {
\r
while (inp & PBTN_MA3)
\r
inp = in_menu_wait_any(-1);
\r
@@
-1947,7
+1950,8
@@
void menu_loop(void)
if (engineState == PGS_Menu)
\r
engineState = PGS_Running;
\r
/* wait until menu, ok, back is released */
\r
if (engineState == PGS_Menu)
\r
engineState = PGS_Running;
\r
/* wait until menu, ok, back is released */
\r
- while (in_menu_wait_any(50) & (PBTN_MENU|PBTN_MOK|PBTN_MBACK));
\r
+ while (in_menu_wait_any(50) & (PBTN_MENU|PBTN_MOK|PBTN_MBACK))
\r
+ ;
\r
}
\r
\r
in_set_blocking(0);
\r
}
\r
\r
in_set_blocking(0);
\r