summaryrefslogtreecommitdiff
path: root/firmware
diff options
context:
space:
mode:
authorLinus Nielsen Feltzing <linus@haxx.se>2006-01-10 23:11:57 +0000
committerLinus Nielsen Feltzing <linus@haxx.se>2006-01-10 23:11:57 +0000
commit54da924e43c75235d32c0f2c6d0fcb1028105bd5 (patch)
tree847ce635b67a18148f1f98483f1c9f281825f68d /firmware
parentbefd0ac3a61b70a86ee909ebb9dd59e074a9f9e8 (diff)
downloadrockbox-54da924e43c75235d32c0f2c6d0fcb1028105bd5.tar.gz
rockbox-54da924e43c75235d32c0f2c6d0fcb1028105bd5.zip
H300: Bootloader USB mode detection on EXTON wakeup
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@8326 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware')
-rw-r--r--firmware/drivers/pcf50606.c3
-rw-r--r--firmware/usb.c1
2 files changed, 3 insertions, 1 deletions
diff --git a/firmware/drivers/pcf50606.c b/firmware/drivers/pcf50606.c
index cb05d25345..2504498440 100644
--- a/firmware/drivers/pcf50606.c
+++ b/firmware/drivers/pcf50606.c
@@ -281,6 +281,9 @@ void pcf50606_init(void)
281 281
282 set_voltages(); 282 set_voltages();
283 283
284 pcf50606_write(0x08, 0x60); /* Wake on USB and charger insertion */
285 pcf50606_write(0x09, 0x60); /* USB and ON key debounce: 14ms */
286
284 /* Backlight PWM = 512Hz 50/50 */ 287 /* Backlight PWM = 512Hz 50/50 */
285 /*pcf50606_write(0x35, 0x13);*/ 288 /*pcf50606_write(0x35, 0x13);*/
286 pcf50606_set_bl_pwm(9); 289 pcf50606_set_bl_pwm(9);
diff --git a/firmware/usb.c b/firmware/usb.c
index 23e2e33737..98f224f781 100644
--- a/firmware/usb.c
+++ b/firmware/usb.c
@@ -394,7 +394,6 @@ bool usb_detect(void)
394 current_status = (P5 & 0x10)?true:false; 394 current_status = (P5 & 0x10)?true:false;
395#endif 395#endif
396#ifdef IRIVER_H300 396#ifdef IRIVER_H300
397 /* TODO: add proper code code for H300 USB style */
398 current_status = (GPIO1_READ & 0x80)?true:false; 397 current_status = (GPIO1_READ & 0x80)?true:false;
399#endif 398#endif
400#ifdef USB_IPODSTYLE 399#ifdef USB_IPODSTYLE