summaryrefslogtreecommitdiff
path: root/firmware/usb.c
diff options
context:
space:
mode:
Diffstat (limited to 'firmware/usb.c')
-rw-r--r--firmware/usb.c41
1 files changed, 0 insertions, 41 deletions
diff --git a/firmware/usb.c b/firmware/usb.c
index f83cb44e17..a0ffef1011 100644
--- a/firmware/usb.c
+++ b/firmware/usb.c
@@ -155,26 +155,6 @@ void usb_enable(bool on)
155 } 155 }
156 } 156 }
157 } 157 }
158#elif defined(USB_IRIVERSTYLE)
159 if(on)
160 {
161 /* Power on the Cypress chip */
162#ifdef IRIVER_H100_SERIES
163 or_l(0x01000040, &GPIO_OUT);
164#else
165 and_l(~0x00000008,&GPIO1_OUT);
166#endif
167 sleep(2);
168 }
169 else
170 {
171 /* Power off the Cypress chip */
172#ifdef IRIVER_H100_SERIES
173 and_l(~0x01000040, &GPIO_OUT);
174#else
175 or_l(0x00000008,&GPIO1_OUT);
176#endif
177 }
178#elif defined(USB_ISP1582) 158#elif defined(USB_ISP1582)
179 /* TODO: Implement USB_ISP1582 */ 159 /* TODO: Implement USB_ISP1582 */
180 (void) on; 160 (void) on;
@@ -391,9 +371,6 @@ bool usb_detect(void)
391#ifdef USB_PLAYERSTYLE 371#ifdef USB_PLAYERSTYLE
392 current_status = (PADR & 0x8000)?false:true; 372 current_status = (PADR & 0x8000)?false:true;
393#endif 373#endif
394#ifdef USB_IRIVERSTYLE
395 current_status = (GPIO1_READ & 0x80)?true:false;
396#endif
397#ifdef USB_GMINISTYLE 374#ifdef USB_GMINISTYLE
398 current_status = (P5 & 0x10)?true:false; 375 current_status = (P5 & 0x10)?true:false;
399#endif 376#endif
@@ -481,24 +458,6 @@ void usb_init(void)
481 458
482#ifdef TARGET_TREE 459#ifdef TARGET_TREE
483 usb_init_device(); 460 usb_init_device();
484#elif defined USB_IRIVERSTYLE
485 or_l(0x00000080, &GPIO1_FUNCTION); /* GPIO39 is the USB detect input */
486
487#ifdef IRIVER_H300_SERIES
488 /* ISD300 3.3V ON */
489 or_l(8,&GPIO1_FUNCTION);
490 or_l(8,&GPIO1_OUT);
491 or_l(8,&GPIO1_ENABLE);
492
493 /* Tristate the SCK/SDA to the ISD300 config EEPROM */
494 and_l(~0x03000000, &GPIO_ENABLE);
495 or_l(0x03000000, &GPIO_FUNCTION);
496#else
497 and_l(~0x01000040, &GPIO_OUT); /* GPIO24 is the Cypress chip power */
498 or_l(0x01000040, &GPIO_ENABLE);
499 or_l(0x01000040, &GPIO_FUNCTION);
500#endif
501
502#endif 461#endif
503 462
504 usb_enable(false); 463 usb_enable(false);