diff options
author | Michael Sevakis <jethead71@rockbox.org> | 2008-12-03 21:15:44 +0000 |
---|---|---|
committer | Michael Sevakis <jethead71@rockbox.org> | 2008-12-03 21:15:44 +0000 |
commit | bc963c34aedddcd3185ecda708ee2196cca7294c (patch) | |
tree | b4edba49b67ca6279bcbe916dbd731803836b5d0 /firmware/usb.c | |
parent | add677fca8b9d42dfa013915db5c5f8bda5ca92b (diff) | |
download | rockbox-bc963c34aedddcd3185ecda708ee2196cca7294c.tar.gz rockbox-bc963c34aedddcd3185ecda708ee2196cca7294c.zip |
Hopefully mop-up remaining red.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@19317 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware/usb.c')
-rw-r--r-- | firmware/usb.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/firmware/usb.c b/firmware/usb.c index 9d4bb00180..f9bfbc4dbf 100644 --- a/firmware/usb.c +++ b/firmware/usb.c | |||
@@ -487,6 +487,7 @@ void usb_init(void) | |||
487 | 487 | ||
488 | void usb_wait_for_disconnect(struct event_queue *q) | 488 | void usb_wait_for_disconnect(struct event_queue *q) |
489 | { | 489 | { |
490 | #ifdef USB_FULL_INIT | ||
490 | struct queue_event ev; | 491 | struct queue_event ev; |
491 | 492 | ||
492 | /* Don't return until we get SYS_USB_DISCONNECTED */ | 493 | /* Don't return until we get SYS_USB_DISCONNECTED */ |
@@ -499,10 +500,14 @@ void usb_wait_for_disconnect(struct event_queue *q) | |||
499 | return; | 500 | return; |
500 | } | 501 | } |
501 | } | 502 | } |
503 | #else | ||
504 | (void)q; | ||
505 | #endif /* USB_FULL_INIT */ | ||
502 | } | 506 | } |
503 | 507 | ||
504 | int usb_wait_for_disconnect_w_tmo(struct event_queue *q, int ticks) | 508 | int usb_wait_for_disconnect_w_tmo(struct event_queue *q, int ticks) |
505 | { | 509 | { |
510 | #ifdef USB_FULL_INIT | ||
506 | struct queue_event ev; | 511 | struct queue_event ev; |
507 | 512 | ||
508 | /* Don't return until we get SYS_USB_DISCONNECTED or SYS_TIMEOUT */ | 513 | /* Don't return until we get SYS_USB_DISCONNECTED or SYS_TIMEOUT */ |
@@ -520,6 +525,10 @@ int usb_wait_for_disconnect_w_tmo(struct event_queue *q, int ticks) | |||
520 | break; | 525 | break; |
521 | } | 526 | } |
522 | } | 527 | } |
528 | #else | ||
529 | (void)q; (void)ticks; | ||
530 | return 0; | ||
531 | #endif /* USB_FULL_INIT */ | ||
523 | } | 532 | } |
524 | 533 | ||
525 | void usb_start_monitoring(void) | 534 | void usb_start_monitoring(void) |