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 | |
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
-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) /* These functions are present in the firmware library, but we reimplement them here because the originals do a lot more than we want */ -void reset_poweroff_timer(void) -{ -} - int dbg_ports(void) { return 0; @@ -241,7 +237,3 @@ int dbg_ports(void) void mpeg_stop(void) { } - -void sys_poweroff(void) -{ -} 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) /* We never get here, but keep gcc happy */ return (void*)0; } - -/* These functions are present in the firmware library, but we reimplement - them here because the originals do a lot more than we want */ -void usb_acknowledge(void) -{ -} - -void usb_wait_for_disconnect(void) -{ -} 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) return (void*)loadbuffer; } - -#if !defined(SANSA_E200) && !defined(SANSA_C200) && !defined(PHILIPS_SA9200) -/* These functions are present in the firmware library, but we reimplement - them here because the originals do a lot more than we want */ -void usb_acknowledge(void) -{ -} - -void usb_wait_for_disconnect(void) -{ -} -#endif - 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) return 0; } - -#ifndef HAVE_USBSTACK -/* These functions are present in the firmware library, but we reimplement - them here because the originals do a lot more than we want */ -void usb_acknowledge(void) -{ -} - -void usb_wait_for_disconnect(void) -{ -} -#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) return 0; } - -/* These functions are present in the firmware library, but we reimplement - them here because the originals do a lot more than we want */ -void usb_acknowledge(void) -{ -} - -void usb_wait_for_disconnect(void) -{ -} 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) void sys_poweroff(void) { +#ifndef BOOTLOADER logf("sys_poweroff()"); /* If the main thread fails to shut down the system, we will force a power off after an 20 second timeout - 28 seconds if recording */ @@ -1139,6 +1140,7 @@ void sys_poweroff(void) } queue_broadcast(SYS_POWEROFF, 0); +#endif /* BOOTLOADER */ } 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) void usb_wait_for_disconnect(struct event_queue *q) { +#ifdef USB_FULL_INIT struct queue_event ev; /* Don't return until we get SYS_USB_DISCONNECTED */ @@ -499,10 +500,14 @@ void usb_wait_for_disconnect(struct event_queue *q) return; } } +#else + (void)q; +#endif /* USB_FULL_INIT */ } int usb_wait_for_disconnect_w_tmo(struct event_queue *q, int ticks) { +#ifdef USB_FULL_INIT struct queue_event ev; /* 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) break; } } +#else + (void)q; (void)ticks; + return 0; +#endif /* USB_FULL_INIT */ } void usb_start_monitoring(void) |