diff options
-rw-r--r-- | bootloader/common.c | 8 | ||||
-rw-r--r-- | bootloader/ipod.c | 10 | ||||
-rw-r--r-- | bootloader/main-pp.c | 13 | ||||
-rw-r--r-- | bootloader/telechips.c | 12 | ||||
-rw-r--r-- | bootloader/tpj1022.c | 10 | ||||
-rw-r--r-- | firmware/powermgmt.c | 2 | ||||
-rw-r--r-- | firmware/usb.c | 9 |
7 files changed, 11 insertions, 53 deletions
diff --git a/bootloader/common.c b/bootloader/common.c index 40e460bed9..e0401a1406 100644 --- a/bootloader/common.c +++ b/bootloader/common.c | |||
@@ -229,10 +229,6 @@ int load_raw_firmware(unsigned char* buf, char* firmware, int buffer_size) | |||
229 | 229 | ||
230 | /* These functions are present in the firmware library, but we reimplement | 230 | /* These functions are present in the firmware library, but we reimplement |
231 | them here because the originals do a lot more than we want */ | 231 | them here because the originals do a lot more than we want */ |
232 | void reset_poweroff_timer(void) | ||
233 | { | ||
234 | } | ||
235 | |||
236 | int dbg_ports(void) | 232 | int dbg_ports(void) |
237 | { | 233 | { |
238 | return 0; | 234 | return 0; |
@@ -241,7 +237,3 @@ int dbg_ports(void) | |||
241 | void mpeg_stop(void) | 237 | void mpeg_stop(void) |
242 | { | 238 | { |
243 | } | 239 | } |
244 | |||
245 | void sys_poweroff(void) | ||
246 | { | ||
247 | } | ||
diff --git a/bootloader/ipod.c b/bootloader/ipod.c index ec5fbd1a38..d5da776383 100644 --- a/bootloader/ipod.c +++ b/bootloader/ipod.c | |||
@@ -362,13 +362,3 @@ void* main(void) | |||
362 | /* We never get here, but keep gcc happy */ | 362 | /* We never get here, but keep gcc happy */ |
363 | return (void*)0; | 363 | return (void*)0; |
364 | } | 364 | } |
365 | |||
366 | /* These functions are present in the firmware library, but we reimplement | ||
367 | them here because the originals do a lot more than we want */ | ||
368 | void usb_acknowledge(void) | ||
369 | { | ||
370 | } | ||
371 | |||
372 | void usb_wait_for_disconnect(void) | ||
373 | { | ||
374 | } | ||
diff --git a/bootloader/main-pp.c b/bootloader/main-pp.c index f227e0f4f3..b279628a29 100644 --- a/bootloader/main-pp.c +++ b/bootloader/main-pp.c | |||
@@ -628,16 +628,3 @@ void* main(void) | |||
628 | 628 | ||
629 | return (void*)loadbuffer; | 629 | return (void*)loadbuffer; |
630 | } | 630 | } |
631 | |||
632 | #if !defined(SANSA_E200) && !defined(SANSA_C200) && !defined(PHILIPS_SA9200) | ||
633 | /* These functions are present in the firmware library, but we reimplement | ||
634 | them here because the originals do a lot more than we want */ | ||
635 | void usb_acknowledge(void) | ||
636 | { | ||
637 | } | ||
638 | |||
639 | void usb_wait_for_disconnect(void) | ||
640 | { | ||
641 | } | ||
642 | #endif | ||
643 | |||
diff --git a/bootloader/telechips.c b/bootloader/telechips.c index f5abb8c919..1e54f5d37d 100644 --- a/bootloader/telechips.c +++ b/bootloader/telechips.c | |||
@@ -240,15 +240,3 @@ void* main(void) | |||
240 | 240 | ||
241 | return 0; | 241 | return 0; |
242 | } | 242 | } |
243 | |||
244 | #ifndef HAVE_USBSTACK | ||
245 | /* These functions are present in the firmware library, but we reimplement | ||
246 | them here because the originals do a lot more than we want */ | ||
247 | void usb_acknowledge(void) | ||
248 | { | ||
249 | } | ||
250 | |||
251 | void usb_wait_for_disconnect(void) | ||
252 | { | ||
253 | } | ||
254 | #endif | ||
diff --git a/bootloader/tpj1022.c b/bootloader/tpj1022.c index aaf6e9fcfd..7e99f2df27 100644 --- a/bootloader/tpj1022.c +++ b/bootloader/tpj1022.c | |||
@@ -105,13 +105,3 @@ void* main(void) | |||
105 | 105 | ||
106 | return 0; | 106 | return 0; |
107 | } | 107 | } |
108 | |||
109 | /* These functions are present in the firmware library, but we reimplement | ||
110 | them here because the originals do a lot more than we want */ | ||
111 | void usb_acknowledge(void) | ||
112 | { | ||
113 | } | ||
114 | |||
115 | void usb_wait_for_disconnect(void) | ||
116 | { | ||
117 | } | ||
diff --git a/firmware/powermgmt.c b/firmware/powermgmt.c index 899e103d59..a2017a76fd 100644 --- a/firmware/powermgmt.c +++ b/firmware/powermgmt.c | |||
@@ -1123,6 +1123,7 @@ void powermgmt_init(void) | |||
1123 | 1123 | ||
1124 | void sys_poweroff(void) | 1124 | void sys_poweroff(void) |
1125 | { | 1125 | { |
1126 | #ifndef BOOTLOADER | ||
1126 | logf("sys_poweroff()"); | 1127 | logf("sys_poweroff()"); |
1127 | /* If the main thread fails to shut down the system, we will force a | 1128 | /* If the main thread fails to shut down the system, we will force a |
1128 | power off after an 20 second timeout - 28 seconds if recording */ | 1129 | power off after an 20 second timeout - 28 seconds if recording */ |
@@ -1139,6 +1140,7 @@ void sys_poweroff(void) | |||
1139 | } | 1140 | } |
1140 | 1141 | ||
1141 | queue_broadcast(SYS_POWEROFF, 0); | 1142 | queue_broadcast(SYS_POWEROFF, 0); |
1143 | #endif /* BOOTLOADER */ | ||
1142 | } | 1144 | } |
1143 | 1145 | ||
1144 | void cancel_shutdown(void) | 1146 | void cancel_shutdown(void) |
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) |