diff options
author | Björn Stenberg <bjorn@haxx.se> | 2002-09-24 17:22:12 +0000 |
---|---|---|
committer | Björn Stenberg <bjorn@haxx.se> | 2002-09-24 17:22:12 +0000 |
commit | b1b8bd4dd159e90f9e197c8870953da079162639 (patch) | |
tree | 27238f1b5a1535de0604e423ca91236bb3e2f833 /apps/menu.h | |
parent | c909b4b42e88a8e797e58a5e3e5ecf3716ae4783 (diff) | |
download | rockbox-b1b8bd4dd159e90f9e197c8870953da079162639.tar.gz rockbox-b1b8bd4dd159e90f9e197c8870953da079162639.zip |
Moved on_screen, f2_screen, f3_screen and handle_usb (renamed usb_screen) to a new file: screens.c.
typedef Menu replaced with a bool.
All code now calls usb_screen() for usb handling.
Nearly all code now deals with USB connect/disconnect properly.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@2401 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/menu.h')
-rw-r--r-- | apps/menu.h | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/apps/menu.h b/apps/menu.h index 49c0beb23d..a21d07a7ee 100644 --- a/apps/menu.h +++ b/apps/menu.h | |||
@@ -22,16 +22,9 @@ | |||
22 | 22 | ||
23 | #include <stdbool.h> | 23 | #include <stdbool.h> |
24 | 24 | ||
25 | typedef enum { | ||
26 | MENU_OK, | ||
27 | MENU_DISK_CHANGED, /* any file/directory contents need to be re-read */ | ||
28 | MENU_LAST /* don't use as return code, only for number of return codes | ||
29 | available */ | ||
30 | } Menu; | ||
31 | |||
32 | struct menu_items { | 25 | struct menu_items { |
33 | unsigned char *desc; | 26 | unsigned char *desc; |
34 | Menu (*function) (void); | 27 | bool (*function) (void); /* return true if USB was connected */ |
35 | }; | 28 | }; |
36 | 29 | ||
37 | int menu_init(struct menu_items* items, int count); | 30 | int menu_init(struct menu_items* items, int count); |
@@ -39,6 +32,6 @@ void menu_exit(int menu); | |||
39 | 32 | ||
40 | void put_cursorxy(int x, int y, bool on); | 33 | void put_cursorxy(int x, int y, bool on); |
41 | 34 | ||
42 | Menu menu_run(int menu); | 35 | bool menu_run(int menu); |
43 | 36 | ||
44 | #endif /* End __MENU_H__ */ | 37 | #endif /* End __MENU_H__ */ |