diff options
author | Daniel Stenberg <daniel@haxx.se> | 2003-12-12 13:30:15 +0000 |
---|---|---|
committer | Daniel Stenberg <daniel@haxx.se> | 2003-12-12 13:30:15 +0000 |
commit | 4009334d332ed7174be0c1556546c3bf8a1d1312 (patch) | |
tree | 082e64dc2163fd1227004488bfceed67e9d8d295 /firmware | |
parent | f74dd393716efe56beb2e348b87daf04ddf0f717 (diff) | |
download | rockbox-4009334d332ed7174be0c1556546c3bf8a1d1312.tar.gz rockbox-4009334d332ed7174be0c1556546c3bf8a1d1312.zip |
All platforms don't have USB
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@4134 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware')
-rw-r--r-- | firmware/mpeg.c | 4 | ||||
-rw-r--r-- | firmware/usb.c | 11 |
2 files changed, 11 insertions, 4 deletions
diff --git a/firmware/mpeg.c b/firmware/mpeg.c index 50320fc824..4c711db1ef 100644 --- a/firmware/mpeg.c +++ b/firmware/mpeg.c | |||
@@ -1842,7 +1842,8 @@ static void mpeg_thread(void) | |||
1842 | case MPEG_TRACK_CHANGE: | 1842 | case MPEG_TRACK_CHANGE: |
1843 | track_change(); | 1843 | track_change(); |
1844 | break; | 1844 | break; |
1845 | 1845 | ||
1846 | #ifndef USB_NONE | ||
1846 | case SYS_USB_CONNECTED: | 1847 | case SYS_USB_CONNECTED: |
1847 | is_playing = false; | 1848 | is_playing = false; |
1848 | paused = false; | 1849 | paused = false; |
@@ -1857,6 +1858,7 @@ static void mpeg_thread(void) | |||
1857 | usb_wait_for_disconnect(&mpeg_queue); | 1858 | usb_wait_for_disconnect(&mpeg_queue); |
1858 | #endif | 1859 | #endif |
1859 | break; | 1860 | break; |
1861 | #endif /* USB_NONE */ | ||
1860 | 1862 | ||
1861 | #ifdef HAVE_MAS3587F | 1863 | #ifdef HAVE_MAS3587F |
1862 | case MPEG_INIT_RECORDING: | 1864 | case MPEG_INIT_RECORDING: |
diff --git a/firmware/usb.c b/firmware/usb.c index 431c2954aa..2da2484255 100644 --- a/firmware/usb.c +++ b/firmware/usb.c | |||
@@ -37,8 +37,7 @@ extern void dbg_ports(void); /* NASTY! defined in apps/ */ | |||
37 | 37 | ||
38 | #define USB_REALLY_BRAVE | 38 | #define USB_REALLY_BRAVE |
39 | 39 | ||
40 | 40 | #if !defined(SIMULATOR) && !defined(USB_NONE) | |
41 | #ifndef SIMULATOR | ||
42 | 41 | ||
43 | /* Messages from usb_tick */ | 42 | /* Messages from usb_tick */ |
44 | #define USB_INSERTED 1 | 43 | #define USB_INSERTED 1 |
@@ -338,6 +337,12 @@ bool usb_inserted(void) | |||
338 | 337 | ||
339 | #else | 338 | #else |
340 | 339 | ||
340 | #ifdef USB_NONE | ||
341 | bool usb_inserted(void) | ||
342 | { | ||
343 | } | ||
344 | #endif | ||
345 | |||
341 | /* Dummy simulator functions */ | 346 | /* Dummy simulator functions */ |
342 | void usb_acknowledge(int id) | 347 | void usb_acknowledge(int id) |
343 | { | 348 | { |
@@ -357,4 +362,4 @@ bool usb_detect(void) | |||
357 | return false; | 362 | return false; |
358 | } | 363 | } |
359 | 364 | ||
360 | #endif | 365 | #endif /* USB_NONE or SIMULATOR */ |