diff options
-rw-r--r-- | bootloader/iriver_h300.c | 7 | ||||
-rw-r--r-- | firmware/SOURCES | 7 |
2 files changed, 12 insertions, 2 deletions
diff --git a/bootloader/iriver_h300.c b/bootloader/iriver_h300.c index b2a667c8bd..00408cbb03 100644 --- a/bootloader/iriver_h300.c +++ b/bootloader/iriver_h300.c | |||
@@ -43,6 +43,7 @@ | |||
43 | #include "pcf50606.h" | 43 | #include "pcf50606.h" |
44 | #include "common.h" | 44 | #include "common.h" |
45 | #include "rbunicode.h" | 45 | #include "rbunicode.h" |
46 | #include "isp1362.h" | ||
46 | 47 | ||
47 | #include <stdarg.h> | 48 | #include <stdarg.h> |
48 | 49 | ||
@@ -189,6 +190,8 @@ void main(void) | |||
189 | coldfire_set_pllcr_audio_bits(DEFAULT_PLLCR_AUDIO_BITS); | 190 | coldfire_set_pllcr_audio_bits(DEFAULT_PLLCR_AUDIO_BITS); |
190 | set_irq_level(0); | 191 | set_irq_level(0); |
191 | 192 | ||
193 | isp1362_init(); | ||
194 | |||
192 | adc_init(); | 195 | adc_init(); |
193 | button_init(); | 196 | button_init(); |
194 | 197 | ||
@@ -245,6 +248,8 @@ void main(void) | |||
245 | bool blink_toggle = false; | 248 | bool blink_toggle = false; |
246 | bool request_start = false; | 249 | bool request_start = false; |
247 | 250 | ||
251 | cpu_idle_mode(true); | ||
252 | |||
248 | while(charger_inserted() && !request_start) | 253 | while(charger_inserted() && !request_start) |
249 | { | 254 | { |
250 | button = button_get_w_tmo(HZ); | 255 | button = button_get_w_tmo(HZ); |
@@ -286,6 +291,8 @@ void main(void) | |||
286 | __reset_cookie(); | 291 | __reset_cookie(); |
287 | power_off(); | 292 | power_off(); |
288 | } | 293 | } |
294 | |||
295 | cpu_idle_mode(false); | ||
289 | } | 296 | } |
290 | 297 | ||
291 | usb_init(); | 298 | usb_init(); |
diff --git a/firmware/SOURCES b/firmware/SOURCES index f07145ca06..c1a21171d0 100644 --- a/firmware/SOURCES +++ b/firmware/SOURCES | |||
@@ -209,10 +209,13 @@ drivers/tlv320.c | |||
209 | #endif /* SIMULATOR */ | 209 | #endif /* SIMULATOR */ |
210 | 210 | ||
211 | /* USBOTG */ | 211 | /* USBOTG */ |
212 | #if !defined(SIMULATOR) && !defined(BOOTLOADER) | 212 | #if !defined(SIMULATOR) |
213 | #if CONFIG_USBOTG == USBOTG_ISP1362 | 213 | #if CONFIG_USBOTG == USBOTG_ISP1362 |
214 | drivers/isp1362.c | 214 | drivers/isp1362.c |
215 | #elif CONFIG_USBOTG == USBOTG_M5636 | 215 | #endif |
216 | #endif | ||
217 | #if !defined(SIMULATOR) && !defined(BOOTLOADER) | ||
218 | #if CONFIG_USBOTG == USBOTG_M5636 | ||
216 | drivers/m5636.c | 219 | drivers/m5636.c |
217 | #elif CONFIG_USBOTG == USBOTG_ARC | 220 | #elif CONFIG_USBOTG == USBOTG_ARC |
218 | drivers/arcotg_udc.c | 221 | drivers/arcotg_udc.c |