summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Nielsen Feltzing <linus@haxx.se>2005-07-08 15:00:31 +0000
committerLinus Nielsen Feltzing <linus@haxx.se>2005-07-08 15:00:31 +0000
commit3b5fdbeb1fbe47fda11148d6c5c7011dbb39194f (patch)
tree2131b9cbf13fdd3ff80d95f00c1aa3fb08755825
parent2cf25d0c10f8589d0cccfe6e16b5e77a419ebe68 (diff)
USB is the same on all H1x0 models
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@7068 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--firmware/usb.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/firmware/usb.c b/firmware/usb.c
index a3fc1967c2..e217bf4680 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_H120
+#ifdef USB_IRIVERSTYLE
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_H120
+#ifdef USB_IRIVERSTYLE
GPIO_OUT &= ~0x01000000; /* GPIO24 is the Cypress chip power */
GPIO_ENABLE |= 0x01000000;
GPIO_FUNCTION |= 0x01000000;