diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2005-07-08 06:31:13 +0000 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2005-07-08 06:31:13 +0000 |
| commit | 8493ccb285937b54ddc8a50ae092c7a9a044b2a3 (patch) | |
| tree | ce6000516ac0023fc223a046e9df2fb34a9a26a8 /firmware/usb.c | |
| parent | c28969d11f16b53c50918b06dbe9e545e33ce323 (diff) | |
| download | rockbox-8493ccb285937b54ddc8a50ae092c7a9a044b2a3.tar.gz rockbox-8493ccb285937b54ddc8a50ae092c7a9a044b2a3.zip | |
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.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/firmware/usb.c b/firmware/usb.c index 44e359f8e9..a3fc1967c2 100644 --- a/firmware/usb.c +++ b/firmware/usb.c | |||
| @@ -349,7 +349,7 @@ bool usb_detect(void) | |||
| 349 | #ifdef USB_PLAYERSTYLE | 349 | #ifdef USB_PLAYERSTYLE |
| 350 | current_status = (PADR & 0x8000)?false:true; | 350 | current_status = (PADR & 0x8000)?false:true; |
| 351 | #endif | 351 | #endif |
| 352 | #ifdef IRIVER_H100 | 352 | #ifdef IRIVER_H120 |
| 353 | current_status = (GPIO1_READ & 0x80)?true:false; | 353 | current_status = (GPIO1_READ & 0x80)?true:false; |
| 354 | #endif | 354 | #endif |
| 355 | #ifdef USB_GMINISTYLE | 355 | #ifdef USB_GMINISTYLE |
| @@ -428,7 +428,7 @@ void usb_init(void) | |||
| 428 | usb_monitor_enabled = false; | 428 | usb_monitor_enabled = false; |
| 429 | countdown = -1; | 429 | countdown = -1; |
| 430 | 430 | ||
| 431 | #ifdef IRIVER_H100 | 431 | #ifdef IRIVER_H120 |
| 432 | GPIO_OUT &= ~0x01000000; /* GPIO24 is the Cypress chip power */ | 432 | GPIO_OUT &= ~0x01000000; /* GPIO24 is the Cypress chip power */ |
| 433 | GPIO_ENABLE |= 0x01000000; | 433 | GPIO_ENABLE |= 0x01000000; |
| 434 | GPIO_FUNCTION |= 0x01000000; | 434 | GPIO_FUNCTION |= 0x01000000; |