diff options
author | Daniel Stenberg <daniel@haxx.se> | 2002-08-23 12:32:52 +0000 |
---|---|---|
committer | Daniel Stenberg <daniel@haxx.se> | 2002-08-23 12:32:52 +0000 |
commit | b285076925fed906d95573b64115cb3f6bdafe65 (patch) | |
tree | 6d959f585fc210acf39e667991038d21aef48d13 /apps/debug_menu.c | |
parent | ad4a92eb87eb98ff316f54f06650f1c5e1dcd7ca (diff) | |
download | rockbox-b285076925fed906d95573b64115cb3f6bdafe65.tar.gz rockbox-b285076925fed906d95573b64115cb3f6bdafe65.zip |
Remade the menu system slightly. All functions invoked from menus now use
the Menu typedef as return type, and *ALL* menus that intercept USB connect
can then return MENU_REFRESH_DIR so that the parent (any parent really) that
do file or dir-accesses knows that and can do the refresh. If no refresh
is needed by the parent, MENU_OK is returned.
Somewhat biggish commit this close to 1.3, but we need to sort out this
refresh-after-usb-connected business.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@1948 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/debug_menu.c')
-rw-r--r-- | apps/debug_menu.c | 51 |
1 files changed, 31 insertions, 20 deletions
diff --git a/apps/debug_menu.c b/apps/debug_menu.c index 44079a789d..ed5e8268ea 100644 --- a/apps/debug_menu.c +++ b/apps/debug_menu.c | |||
@@ -82,7 +82,7 @@ void dbg_os(void) | |||
82 | } | 82 | } |
83 | } | 83 | } |
84 | #else | 84 | #else |
85 | void dbg_os(void) | 85 | Menu dbg_os(void) |
86 | { | 86 | { |
87 | char buf[32]; | 87 | char buf[32]; |
88 | int button; | 88 | int button; |
@@ -109,7 +109,7 @@ void dbg_os(void) | |||
109 | switch(button) | 109 | switch(button) |
110 | { | 110 | { |
111 | case BUTTON_STOP: | 111 | case BUTTON_STOP: |
112 | return; | 112 | return MENU_OK; |
113 | 113 | ||
114 | case BUTTON_LEFT: | 114 | case BUTTON_LEFT: |
115 | currval--; | 115 | currval--; |
@@ -124,12 +124,13 @@ void dbg_os(void) | |||
124 | break; | 124 | break; |
125 | } | 125 | } |
126 | } | 126 | } |
127 | return MENU_OK; | ||
127 | } | 128 | } |
128 | #endif | 129 | #endif |
129 | 130 | ||
130 | #ifdef HAVE_LCD_BITMAP | 131 | #ifdef HAVE_LCD_BITMAP |
131 | /* Test code!!! */ | 132 | /* Test code!!! */ |
132 | void dbg_ports(void) | 133 | Menu dbg_ports(void) |
133 | { | 134 | { |
134 | unsigned short porta; | 135 | unsigned short porta; |
135 | unsigned short portb; | 136 | unsigned short portb; |
@@ -199,12 +200,13 @@ void dbg_ports(void) | |||
199 | case BUTTON_LEFT: | 200 | case BUTTON_LEFT: |
200 | charger_enable(false); | 201 | charger_enable(false); |
201 | ide_power_enable(true); | 202 | ide_power_enable(true); |
202 | return; | 203 | return MENU_OK; |
203 | } | 204 | } |
204 | } | 205 | } |
206 | return MENU_OK; | ||
205 | } | 207 | } |
206 | #else | 208 | #else |
207 | void dbg_ports(void) | 209 | Menu dbg_ports(void) |
208 | { | 210 | { |
209 | unsigned short porta; | 211 | unsigned short porta; |
210 | unsigned short portb; | 212 | unsigned short portb; |
@@ -280,7 +282,7 @@ void dbg_ports(void) | |||
280 | switch(button) | 282 | switch(button) |
281 | { | 283 | { |
282 | case BUTTON_STOP: | 284 | case BUTTON_STOP: |
283 | return; | 285 | return MENU_OK; |
284 | 286 | ||
285 | case BUTTON_LEFT: | 287 | case BUTTON_LEFT: |
286 | currval--; | 288 | currval--; |
@@ -295,12 +297,13 @@ void dbg_ports(void) | |||
295 | break; | 297 | break; |
296 | } | 298 | } |
297 | } | 299 | } |
300 | return MENU_OK; | ||
298 | } | 301 | } |
299 | #endif | 302 | #endif |
300 | 303 | ||
301 | #ifdef HAVE_RTC | 304 | #ifdef HAVE_RTC |
302 | /* Read RTC RAM contents and display them */ | 305 | /* Read RTC RAM contents and display them */ |
303 | void dbg_rtc(void) | 306 | Menu dbg_rtc(void) |
304 | { | 307 | { |
305 | char buf[32]; | 308 | char buf[32]; |
306 | unsigned char addr = 0, r, c; | 309 | unsigned char addr = 0, r, c; |
@@ -344,14 +347,15 @@ void dbg_rtc(void) | |||
344 | break; | 347 | break; |
345 | case BUTTON_OFF: | 348 | case BUTTON_OFF: |
346 | case BUTTON_LEFT: | 349 | case BUTTON_LEFT: |
347 | return; | 350 | return MENU_OK; |
348 | } | 351 | } |
349 | } | 352 | } |
353 | return MENU_OK; | ||
350 | } | 354 | } |
351 | #else | 355 | #else |
352 | void dbg_rtc(void) | 356 | Menu dbg_rtc(void) |
353 | { | 357 | { |
354 | return; | 358 | return MENU_OK; |
355 | } | 359 | } |
356 | #endif | 360 | #endif |
357 | 361 | ||
@@ -361,7 +365,7 @@ void dbg_rtc(void) | |||
361 | #define NUMROWS 4 | 365 | #define NUMROWS 4 |
362 | #endif | 366 | #endif |
363 | /* Read MAS registers and display them */ | 367 | /* Read MAS registers and display them */ |
364 | void dbg_mas(void) | 368 | Menu dbg_mas(void) |
365 | { | 369 | { |
366 | char buf[32]; | 370 | char buf[32]; |
367 | unsigned int addr = 0, r, i; | 371 | unsigned int addr = 0, r, i; |
@@ -405,13 +409,14 @@ void dbg_mas(void) | |||
405 | #else | 409 | #else |
406 | case BUTTON_DOWN: | 410 | case BUTTON_DOWN: |
407 | #endif | 411 | #endif |
408 | return; | 412 | return MENU_OK; |
409 | } | 413 | } |
410 | } | 414 | } |
415 | return MENU_OK; | ||
411 | } | 416 | } |
412 | 417 | ||
413 | #ifdef HAVE_MAS3587F | 418 | #ifdef HAVE_MAS3587F |
414 | void dbg_mas_codec(void) | 419 | Menu dbg_mas_codec(void) |
415 | { | 420 | { |
416 | char buf[32]; | 421 | char buf[32]; |
417 | unsigned int addr = 0, r, i; | 422 | unsigned int addr = 0, r, i; |
@@ -442,9 +447,10 @@ void dbg_mas_codec(void) | |||
442 | if (addr) { addr -= 4; } | 447 | if (addr) { addr -= 4; } |
443 | break; | 448 | break; |
444 | case BUTTON_LEFT: | 449 | case BUTTON_LEFT: |
445 | return; | 450 | return MENU_OK; |
446 | } | 451 | } |
447 | } | 452 | } |
453 | return MENU_OK; | ||
448 | } | 454 | } |
449 | #endif | 455 | #endif |
450 | 456 | ||
@@ -458,7 +464,7 @@ void dbg_mas_codec(void) | |||
458 | #define BAT_FIRST_VAL MAX(POWER_HISTORY_LEN - LCD_WIDTH - 1, 0) | 464 | #define BAT_FIRST_VAL MAX(POWER_HISTORY_LEN - LCD_WIDTH - 1, 0) |
459 | #define BAT_YSPACE (LCD_HEIGHT - 20) | 465 | #define BAT_YSPACE (LCD_HEIGHT - 20) |
460 | 466 | ||
461 | void view_battery(void) | 467 | Menu view_battery(void) |
462 | { | 468 | { |
463 | int view = 0; | 469 | int view = 0; |
464 | int i, x, y; | 470 | int i, x, y; |
@@ -579,15 +585,16 @@ void view_battery(void) | |||
579 | 585 | ||
580 | case BUTTON_LEFT: | 586 | case BUTTON_LEFT: |
581 | case BUTTON_OFF: | 587 | case BUTTON_OFF: |
582 | return; | 588 | return MENU_OK; |
583 | } | 589 | } |
584 | } | 590 | } |
591 | return MENU_OK; | ||
585 | } | 592 | } |
586 | 593 | ||
587 | #endif | 594 | #endif |
588 | 595 | ||
589 | #ifdef HAVE_MAS3507D | 596 | #ifdef HAVE_MAS3507D |
590 | void dbg_mas_info(void) | 597 | Menu dbg_mas_info(void) |
591 | { | 598 | { |
592 | int button; | 599 | int button; |
593 | char buf[32]; | 600 | char buf[32]; |
@@ -721,7 +728,7 @@ void dbg_mas_info(void) | |||
721 | switch(button) | 728 | switch(button) |
722 | { | 729 | { |
723 | case BUTTON_STOP: | 730 | case BUTTON_STOP: |
724 | return; | 731 | return MENU_OK; |
725 | 732 | ||
726 | case BUTTON_LEFT: | 733 | case BUTTON_LEFT: |
727 | currval--; | 734 | currval--; |
@@ -757,12 +764,14 @@ void dbg_mas_info(void) | |||
757 | break; | 764 | break; |
758 | } | 765 | } |
759 | } | 766 | } |
767 | return MENU_OK; | ||
760 | } | 768 | } |
761 | #endif | 769 | #endif |
762 | 770 | ||
763 | void debug_menu(void) | 771 | Menu debug_menu(void) |
764 | { | 772 | { |
765 | int m; | 773 | int m; |
774 | Menu result; | ||
766 | 775 | ||
767 | struct menu_items items[] = { | 776 | struct menu_items items[] = { |
768 | { "View I/O ports", dbg_ports }, | 777 | { "View I/O ports", dbg_ports }, |
@@ -785,8 +794,10 @@ void debug_menu(void) | |||
785 | }; | 794 | }; |
786 | 795 | ||
787 | m=menu_init( items, sizeof items / sizeof(struct menu_items) ); | 796 | m=menu_init( items, sizeof items / sizeof(struct menu_items) ); |
788 | menu_run(m); | 797 | result = menu_run(m); |
789 | menu_exit(m); | 798 | menu_exit(m); |
799 | |||
800 | return result; | ||
790 | } | 801 | } |
791 | 802 | ||
792 | #endif /* SIMULATOR */ | 803 | #endif /* SIMULATOR */ |