diff options
author | Linus Nielsen Feltzing <linus@haxx.se> | 2006-02-16 20:44:38 +0000 |
---|---|---|
committer | Linus Nielsen Feltzing <linus@haxx.se> | 2006-02-16 20:44:38 +0000 |
commit | a4504bc276497aa7d30098446a71775045dbd16a (patch) | |
tree | d6db21ba363181b10c316efe1abde4ec58448928 /firmware/usb.c | |
parent | 41e1aa888b9d1fc41aaf158191980cce3e548302 (diff) | |
download | rockbox-a4504bc276497aa7d30098446a71775045dbd16a.tar.gz rockbox-a4504bc276497aa7d30098446a71775045dbd16a.zip |
Revert the ATA/USB power fix until I find an even more correct way of doing it :-)
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@8707 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 d6a154c51b..1c90d63519 100644 --- a/firmware/usb.c +++ b/firmware/usb.c | |||
@@ -151,6 +151,8 @@ void usb_enable(bool on) | |||
151 | /* Power on the Cypress chip */ | 151 | /* Power on the Cypress chip */ |
152 | #ifdef IRIVER_H100_SERIES | 152 | #ifdef IRIVER_H100_SERIES |
153 | or_l(0x01000040, &GPIO_OUT); | 153 | or_l(0x01000040, &GPIO_OUT); |
154 | #else | ||
155 | and_l(~0x00000008,&GPIO1_OUT); | ||
154 | #endif | 156 | #endif |
155 | sleep(2); | 157 | sleep(2); |
156 | } | 158 | } |
@@ -159,6 +161,8 @@ void usb_enable(bool on) | |||
159 | /* Power off the Cypress chip */ | 161 | /* Power off the Cypress chip */ |
160 | #ifdef IRIVER_H100_SERIES | 162 | #ifdef IRIVER_H100_SERIES |
161 | and_l(~0x01000040, &GPIO_OUT); | 163 | and_l(~0x01000040, &GPIO_OUT); |
164 | #else | ||
165 | or_l(0x00000008,&GPIO1_OUT); | ||
162 | #endif | 166 | #endif |
163 | } | 167 | } |
164 | 168 | ||
@@ -479,6 +483,11 @@ void usb_init(void) | |||
479 | or_l(0x00000080, &GPIO1_FUNCTION); /* GPIO39 is the USB detect input */ | 483 | or_l(0x00000080, &GPIO1_FUNCTION); /* GPIO39 is the USB detect input */ |
480 | 484 | ||
481 | #ifdef IRIVER_H300_SERIES | 485 | #ifdef IRIVER_H300_SERIES |
486 | /* ISD300 3.3V ON */ | ||
487 | or_l(8,&GPIO1_FUNCTION); | ||
488 | or_l(8,&GPIO1_OUT); | ||
489 | or_l(8,&GPIO1_ENABLE); | ||
490 | |||
482 | /* Tristate the SCK/SDA to the ISD300 config EEPROM */ | 491 | /* Tristate the SCK/SDA to the ISD300 config EEPROM */ |
483 | and_l(~0x03000000, &GPIO_ENABLE); | 492 | and_l(~0x03000000, &GPIO_ENABLE); |
484 | or_l(0x03000000, &GPIO_FUNCTION); | 493 | or_l(0x03000000, &GPIO_FUNCTION); |