diff options
-rw-r--r-- | firmware/export/usb_drv.h | 1 | ||||
-rw-r--r-- | firmware/target/arm/imx233/usb-imx233.c | 1 | ||||
-rw-r--r-- | firmware/target/arm/imx31/gigabeat-s/usb-gigabeat-s.c | 2 | ||||
-rw-r--r-- | firmware/target/arm/pp/usb-fw-pp502x.c | 8 | ||||
-rw-r--r-- | firmware/target/arm/usb-drv-arc.c | 11 |
5 files changed, 6 insertions, 17 deletions
diff --git a/firmware/export/usb_drv.h b/firmware/export/usb_drv.h index 969a7b358a..6ec9ac07e5 100644 --- a/firmware/export/usb_drv.h +++ b/firmware/export/usb_drv.h | |||
@@ -27,7 +27,6 @@ void usb_drv_startup(void); | |||
27 | void usb_drv_int_enable(bool enable); /* Target implemented */ | 27 | void usb_drv_int_enable(bool enable); /* Target implemented */ |
28 | void usb_drv_init(void); | 28 | void usb_drv_init(void); |
29 | void usb_drv_exit(void); | 29 | void usb_drv_exit(void); |
30 | void usb_drv_attach(void); | ||
31 | void usb_drv_int(void); /* Call from target INT handler */ | 30 | void usb_drv_int(void); /* Call from target INT handler */ |
32 | void usb_drv_stall(int endpoint, bool stall,bool in); | 31 | void usb_drv_stall(int endpoint, bool stall,bool in); |
33 | bool usb_drv_stalled(int endpoint,bool in); | 32 | bool usb_drv_stalled(int endpoint,bool in); |
diff --git a/firmware/target/arm/imx233/usb-imx233.c b/firmware/target/arm/imx233/usb-imx233.c index 409dcd340d..d27f3ee55c 100644 --- a/firmware/target/arm/imx233/usb-imx233.c +++ b/firmware/target/arm/imx233/usb-imx233.c | |||
@@ -42,7 +42,6 @@ void usb_remove_int(void) | |||
42 | 42 | ||
43 | void usb_attach(void) | 43 | void usb_attach(void) |
44 | { | 44 | { |
45 | usb_drv_attach(); | ||
46 | } | 45 | } |
47 | 46 | ||
48 | void usb_drv_int_enable(bool enable) | 47 | void usb_drv_int_enable(bool enable) |
diff --git a/firmware/target/arm/imx31/gigabeat-s/usb-gigabeat-s.c b/firmware/target/arm/imx31/gigabeat-s/usb-gigabeat-s.c index c838f65c8a..9129568b7a 100644 --- a/firmware/target/arm/imx31/gigabeat-s/usb-gigabeat-s.c +++ b/firmware/target/arm/imx31/gigabeat-s/usb-gigabeat-s.c | |||
@@ -123,8 +123,6 @@ void usb_attach(void) | |||
123 | bootloader_install_mode = | 123 | bootloader_install_mode = |
124 | (button_status() & USB_BL_INSTALL_MODE_BTN) != 0; | 124 | (button_status() & USB_BL_INSTALL_MODE_BTN) != 0; |
125 | } | 125 | } |
126 | |||
127 | usb_drv_attach(); | ||
128 | } | 126 | } |
129 | 127 | ||
130 | static void __attribute__((interrupt("IRQ"))) USB_OTG_HANDLER(void) | 128 | static void __attribute__((interrupt("IRQ"))) USB_OTG_HANDLER(void) |
diff --git a/firmware/target/arm/pp/usb-fw-pp502x.c b/firmware/target/arm/pp/usb-fw-pp502x.c index 010cdb718c..44cce14389 100644 --- a/firmware/target/arm/pp/usb-fw-pp502x.c +++ b/firmware/target/arm/pp/usb-fw-pp502x.c | |||
@@ -108,7 +108,7 @@ | |||
108 | static void usb_reset_controller(void) | 108 | static void usb_reset_controller(void) |
109 | { | 109 | { |
110 | /* enable usb module */ | 110 | /* enable usb module */ |
111 | outl(inl(0x7000002C) | 0x3000000, 0x7000002C); | 111 | outl(inl(0x7000002C) | 0x3000000, 0x7000002C); |
112 | 112 | ||
113 | DEV_EN |= DEV_USB0; | 113 | DEV_EN |= DEV_USB0; |
114 | DEV_EN |= DEV_USB1; | 114 | DEV_EN |= DEV_USB1; |
@@ -197,7 +197,11 @@ void usb_enable(bool on) | |||
197 | 197 | ||
198 | void usb_attach(void) | 198 | void usb_attach(void) |
199 | { | 199 | { |
200 | usb_drv_attach(); | 200 | #if defined(IPOD_VIDEO) |
201 | /* FIXME: Some iPod Video's need this 2nd call of usb_drv_init() to establish | ||
202 | * an USB connection. */ | ||
203 | usb_drv_init(); | ||
204 | #endif | ||
201 | } | 205 | } |
202 | 206 | ||
203 | bool usb_plugged(void) | 207 | bool usb_plugged(void) |
diff --git a/firmware/target/arm/usb-drv-arc.c b/firmware/target/arm/usb-drv-arc.c index f9aee18234..44d006b30f 100644 --- a/firmware/target/arm/usb-drv-arc.c +++ b/firmware/target/arm/usb-drv-arc.c | |||
@@ -489,17 +489,6 @@ void usb_drv_init(void) | |||
489 | /* now a bus reset will occur. see bus_reset() */ | 489 | /* now a bus reset will occur. see bus_reset() */ |
490 | } | 490 | } |
491 | 491 | ||
492 | /* fully enable driver */ | ||
493 | void usb_drv_attach(void) | ||
494 | { | ||
495 | logf("usb_drv_attach"); | ||
496 | #if defined(IPOD_VIDEO) | ||
497 | /* FIXME: Some iPod Video's need this 2nd call of usb_drv_init() to establish | ||
498 | * an USB connection. */ | ||
499 | usb_drv_init(); | ||
500 | #endif | ||
501 | } | ||
502 | |||
503 | void usb_drv_exit(void) | 492 | void usb_drv_exit(void) |
504 | { | 493 | { |
505 | usb_drv_stop(); | 494 | usb_drv_stop(); |