summaryrefslogtreecommitdiff
path: root/apps
diff options
context:
space:
mode:
authorThomas Martitz <kugel@rockbox.org>2010-03-08 23:43:11 +0000
committerThomas Martitz <kugel@rockbox.org>2010-03-08 23:43:11 +0000
commit61320ce0ebf39e47953086de95f1b48f2fd09333 (patch)
tree6c4a3963944aa8518727ed0e9e72dd72cb61ebc1 /apps
parenta2e788b55725a70f586cbe67affd5b54612b0b3c (diff)
downloadrockbox-61320ce0ebf39e47953086de95f1b48f2fd09333.tar.gz
rockbox-61320ce0ebf39e47953086de95f1b48f2fd09333.zip
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/SOURCES2
-rw-r--r--apps/gui/usb_screen.c8
-rw-r--r--apps/gui/usb_screen.h4
3 files changed, 7 insertions, 7 deletions
diff --git a/apps/SOURCES b/apps/SOURCES
index 4666ec9339..a23e676a8e 100644
--- a/apps/SOURCES
+++ b/apps/SOURCES
@@ -162,7 +162,9 @@ eq_arm.S
162#ifdef USB_ENABLE_HID 162#ifdef USB_ENABLE_HID
163usb_keymaps.c 163usb_keymaps.c
164#endif 164#endif
165#ifndef USB_NONE
165gui/usb_screen.c 166gui/usb_screen.c
167#endif
166metadata.c 168metadata.c
167metadata/mp3.c 169metadata/mp3.c
168#if CONFIG_CODEC == SWCODEC 170#if CONFIG_CODEC == SWCODEC
diff --git a/apps/gui/usb_screen.c b/apps/gui/usb_screen.c
index 527ae9fd15..a92ecac27f 100644
--- a/apps/gui/usb_screen.c
+++ b/apps/gui/usb_screen.c
@@ -112,13 +112,8 @@ static int handle_usb_events(void)
112 112
113 return 0; 113 return 0;
114} 114}
115#endif 115#endif /* SIMULATOR */
116 116
117#ifdef USB_NONE
118void gui_usb_screen_run(void)
119{
120}
121#else
122#define MODE_NAME_LEN 32 117#define MODE_NAME_LEN 32
123 118
124struct usb_screen_vps_t 119struct usb_screen_vps_t
@@ -315,5 +310,4 @@ void gui_usb_screen_run(void)
315 } 310 }
316 311
317} 312}
318#endif /* !defined(USB_NONE) */
319 313
diff --git a/apps/gui/usb_screen.h b/apps/gui/usb_screen.h
index deaca11aba..84d92d24ff 100644
--- a/apps/gui/usb_screen.h
+++ b/apps/gui/usb_screen.h
@@ -21,7 +21,11 @@
21#ifndef _USB_SCREEN_H_ 21#ifndef _USB_SCREEN_H_
22#define _USB_SCREEN_H_ 22#define _USB_SCREEN_H_
23 23
24#ifdef USB_NONE
25static inline void gui_usb_screen_run(void) {}
26#else
24extern void gui_usb_screen_run(void); 27extern void gui_usb_screen_run(void);
28#endif
25 29
26#endif 30#endif
27 31