diff options
-rw-r--r-- | firmware/SOURCES | 5 | ||||
-rw-r--r-- | firmware/export/config/sansaclipv2.h | 2 | ||||
-rw-r--r-- | firmware/export/config/sansafuzev2.h | 2 | ||||
-rw-r--r-- | firmware/target/arm/as3525/usb-drv-as3525.c | 2 | ||||
-rw-r--r-- | firmware/target/arm/as3525/usb-drv-as3525v2.c | 5 |
5 files changed, 9 insertions, 7 deletions
diff --git a/firmware/SOURCES b/firmware/SOURCES index 9528ed0308..fe141eb366 100644 --- a/firmware/SOURCES +++ b/firmware/SOURCES | |||
@@ -337,6 +337,8 @@ drivers/m66591.c | |||
337 | target/arm/usb-drv-arc.c | 337 | target/arm/usb-drv-arc.c |
338 | #elif CONFIG_USBOTG == USBOTG_AS3525 | 338 | #elif CONFIG_USBOTG == USBOTG_AS3525 |
339 | target/arm/as3525/usb-drv-as3525.c | 339 | target/arm/as3525/usb-drv-as3525.c |
340 | #elif CONFIG_USBOTG == USBOTG_AS3525v2 | ||
341 | target/arm/as3525/usb-drv-as3525v2.c | ||
340 | #elif CONFIG_USBOTG == USBOTG_ISP1583 | 342 | #elif CONFIG_USBOTG == USBOTG_ISP1583 |
341 | drivers/isp1583.c | 343 | drivers/isp1583.c |
342 | #endif | 344 | #endif |
@@ -444,9 +446,6 @@ target/arm/as3525/scrollwheel-as3525.c | |||
444 | #else /* AS3535v2 */ | 446 | #else /* AS3535v2 */ |
445 | target/arm/as3525/sd-as3525v2.c | 447 | target/arm/as3525/sd-as3525v2.c |
446 | #endif | 448 | #endif |
447 | #if CONFIG_CPU == AS3525v2 | ||
448 | target/arm/as3525/usb-drv-as3525v2.c | ||
449 | #endif | ||
450 | target/arm/as3525/power-as3525.c | 449 | target/arm/as3525/power-as3525.c |
451 | target/arm/as3525/usb-as3525.c | 450 | target/arm/as3525/usb-as3525.c |
452 | target/arm/as3525/dma-pl081.c | 451 | target/arm/as3525/dma-pl081.c |
diff --git a/firmware/export/config/sansaclipv2.h b/firmware/export/config/sansaclipv2.h index 4c65e8fe86..262ed36167 100644 --- a/firmware/export/config/sansaclipv2.h +++ b/firmware/export/config/sansaclipv2.h | |||
@@ -169,7 +169,7 @@ | |||
169 | #define USB_HANDLED_BY_OF | 169 | #define USB_HANDLED_BY_OF |
170 | 170 | ||
171 | /* USB On-the-go */ | 171 | /* USB On-the-go */ |
172 | #define CONFIG_USBOTG USBOTG_AS3525 | 172 | #define CONFIG_USBOTG USBOTG_AS3525v2 |
173 | 173 | ||
174 | /* enable these for the experimental usb stack */ | 174 | /* enable these for the experimental usb stack */ |
175 | #define HAVE_USBSTACK | 175 | #define HAVE_USBSTACK |
diff --git a/firmware/export/config/sansafuzev2.h b/firmware/export/config/sansafuzev2.h index 96622818dd..8b2ffb3d93 100644 --- a/firmware/export/config/sansafuzev2.h +++ b/firmware/export/config/sansafuzev2.h | |||
@@ -186,7 +186,7 @@ | |||
186 | #define USB_HANDLED_BY_OF | 186 | #define USB_HANDLED_BY_OF |
187 | 187 | ||
188 | /* USB On-the-go */ | 188 | /* USB On-the-go */ |
189 | #define CONFIG_USBOTG USBOTG_AS3525 | 189 | #define CONFIG_USBOTG USBOTG_AS3525v2 |
190 | 190 | ||
191 | /* enable these for the experimental usb stack */ | 191 | /* enable these for the experimental usb stack */ |
192 | #define HAVE_USBSTACK | 192 | #define HAVE_USBSTACK |
diff --git a/firmware/target/arm/as3525/usb-drv-as3525.c b/firmware/target/arm/as3525/usb-drv-as3525.c index 15955276ab..2cb1318f72 100644 --- a/firmware/target/arm/as3525/usb-drv-as3525.c +++ b/firmware/target/arm/as3525/usb-drv-as3525.c | |||
@@ -35,7 +35,7 @@ | |||
35 | #include "usb_core.h" | 35 | #include "usb_core.h" |
36 | #include "string.h" | 36 | #include "string.h" |
37 | 37 | ||
38 | #if defined(USE_ROCKBOX_USB) && CONFIG_USBOTG == USBOTG_AS3525 | 38 | #if defined(USE_ROCKBOX_USB) |
39 | 39 | ||
40 | #define USB_NUM_EPS 4 | 40 | #define USB_NUM_EPS 4 |
41 | 41 | ||
diff --git a/firmware/target/arm/as3525/usb-drv-as3525v2.c b/firmware/target/arm/as3525/usb-drv-as3525v2.c index 9afe8255e5..83a5701a11 100644 --- a/firmware/target/arm/as3525/usb-drv-as3525v2.c +++ b/firmware/target/arm/as3525/usb-drv-as3525v2.c | |||
@@ -44,7 +44,9 @@ struct usb_endpoint | |||
44 | bool busy; | 44 | bool busy; |
45 | }; | 45 | }; |
46 | 46 | ||
47 | #if 0 | ||
47 | static struct usb_endpoint endpoints[USB_NUM_ENDPOINTS*2]; | 48 | static struct usb_endpoint endpoints[USB_NUM_ENDPOINTS*2]; |
49 | #endif | ||
48 | 50 | ||
49 | void usb_attach(void) | 51 | void usb_attach(void) |
50 | { | 52 | { |
@@ -116,7 +118,9 @@ static void core_reset(void) | |||
116 | i++; | 118 | i++; |
117 | 119 | ||
118 | if(USB_GRSTCTL & USB_GRSTCTL_csftrst) | 120 | if(USB_GRSTCTL & USB_GRSTCTL_csftrst) |
121 | { | ||
119 | logf("oops, usb core soft reset hang :("); | 122 | logf("oops, usb core soft reset hang :("); |
123 | } | ||
120 | 124 | ||
121 | /* Wait for 3 PHY Clocks */ | 125 | /* Wait for 3 PHY Clocks */ |
122 | /*mdelay(100);*/ | 126 | /*mdelay(100);*/ |
@@ -256,6 +260,5 @@ bool usb_drv_stalled(int ep, bool in) | |||
256 | (void) ep; | 260 | (void) ep; |
257 | (void) in; | 261 | (void) in; |
258 | return true; | 262 | return true; |
259 | return true; | ||
260 | } | 263 | } |
261 | 264 | ||