summaryrefslogtreecommitdiff
path: root/firmware/usb.c
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2005-07-08 06:31:13 +0000
committerDaniel Stenberg <daniel@haxx.se>2005-07-08 06:31:13 +0000
commit8493ccb285937b54ddc8a50ae092c7a9a044b2a3 (patch)
treece6000516ac0023fc223a046e9df2fb34a9a26a8 /firmware/usb.c
parentc28969d11f16b53c50918b06dbe9e545e33ce323 (diff)
downloadrockbox-8493ccb285937b54ddc8a50ae092c7a9a044b2a3.zip
rockbox-8493ccb285937b54ddc8a50ae092c7a9a044b2a3.tar.gz
rockbox-8493ccb285937b54ddc8a50ae092c7a9a044b2a3.tar.bz2
rockbox-8493ccb285937b54ddc8a50ae092c7a9a044b2a3.tar.xz
Renamed the iriver h120 defines and configs to "h120"! Added initial support
for the h100 series. Please re-run configure. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@7062 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware/usb.c')
-rw-r--r--firmware/usb.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/firmware/usb.c b/firmware/usb.c
index 44e359f..a3fc196 100644
--- a/firmware/usb.c
+++ b/firmware/usb.c
@@ -349,7 +349,7 @@ bool usb_detect(void)
#ifdef USB_PLAYERSTYLE
current_status = (PADR & 0x8000)?false:true;
#endif
-#ifdef IRIVER_H100
+#ifdef IRIVER_H120
current_status = (GPIO1_READ & 0x80)?true:false;
#endif
#ifdef USB_GMINISTYLE
@@ -428,7 +428,7 @@ void usb_init(void)
usb_monitor_enabled = false;
countdown = -1;
-#ifdef IRIVER_H100
+#ifdef IRIVER_H120
GPIO_OUT &= ~0x01000000; /* GPIO24 is the Cypress chip power */
GPIO_ENABLE |= 0x01000000;
GPIO_FUNCTION |= 0x01000000;