diff options
| author | Thomas Martitz <kugel@rockbox.org> | 2010-03-08 23:43:11 +0000 |
|---|---|---|
| committer | Thomas Martitz <kugel@rockbox.org> | 2010-03-08 23:43:11 +0000 |
| commit | 61320ce0ebf39e47953086de95f1b48f2fd09333 (patch) | |
| tree | 6c4a3963944aa8518727ed0e9e72dd72cb61ebc1 /apps | |
| parent | a2e788b55725a70f586cbe67affd5b54612b0b3c (diff) | |
| download | rockbox-61320ce0ebf39e47953086de95f1b48f2fd09333.zip rockbox-61320ce0ebf39e47953086de95f1b48f2fd09333.tar.gz rockbox-61320ce0ebf39e47953086de95f1b48f2fd09333.tar.bz2 rockbox-61320ce0ebf39e47953086de95f1b48f2fd09333.tar.xz | |
Make mini2440 compile again.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@25081 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/SOURCES | 2 | ||||
| -rw-r--r-- | apps/gui/usb_screen.c | 8 | ||||
| -rw-r--r-- | apps/gui/usb_screen.h | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/apps/SOURCES b/apps/SOURCES index 4666ec9..a23e676 100644 --- a/apps/SOURCES +++ b/apps/SOURCES @@ -162,7 +162,9 @@ eq_arm.S #ifdef USB_ENABLE_HID usb_keymaps.c #endif +#ifndef USB_NONE gui/usb_screen.c +#endif metadata.c metadata/mp3.c #if CONFIG_CODEC == SWCODEC diff --git a/apps/gui/usb_screen.c b/apps/gui/usb_screen.c index 527ae9f..a92ecac 100644 --- a/apps/gui/usb_screen.c +++ b/apps/gui/usb_screen.c @@ -112,13 +112,8 @@ static int handle_usb_events(void) return 0; } -#endif +#endif /* SIMULATOR */ -#ifdef USB_NONE -void gui_usb_screen_run(void) -{ -} -#else #define MODE_NAME_LEN 32 struct usb_screen_vps_t @@ -315,5 +310,4 @@ void gui_usb_screen_run(void) } } -#endif /* !defined(USB_NONE) */ diff --git a/apps/gui/usb_screen.h b/apps/gui/usb_screen.h index deaca11..84d92d2 100644 --- a/apps/gui/usb_screen.h +++ b/apps/gui/usb_screen.h @@ -21,7 +21,11 @@ #ifndef _USB_SCREEN_H_ #define _USB_SCREEN_H_ +#ifdef USB_NONE +static inline void gui_usb_screen_run(void) {} +#else extern void gui_usb_screen_run(void); +#endif #endif |