as3525 usb: build as3525v2 file based on CONFIG_USBOTG, and fix warnings

build it on fuzev2 and clipv2 too, it should be the same controller
as3525v1 file is only build for CONFIG_USBOTG == USBOTG_AS3525, no need
to check for it in the .c file

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@26142 a1c6a512-1295-4272-9138-f99709370657

2 files changed, 5 insertions, 2 deletions

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 @@
 #include "usb_core.h"
 #include "string.h"
 
-#if defined(USE_ROCKBOX_USB) && CONFIG_USBOTG == USBOTG_AS3525
+#if defined(USE_ROCKBOX_USB)
 
 #define USB_NUM_EPS         4
 
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
     bool busy;
 };
 
+#if 0
 static struct usb_endpoint endpoints[USB_NUM_ENDPOINTS*2];
+#endif
 
 void usb_attach(void)
 {
@@ -116,7 +118,9 @@ static void core_reset(void)
         i++;
 
     if(USB_GRSTCTL & USB_GRSTCTL_csftrst)
+    {
         logf("oops, usb core soft reset hang :(");
+    }
 
     /* Wait for 3 PHY Clocks */
     /*mdelay(100);*/
@@ -256,6 +260,5 @@ bool usb_drv_stalled(int ep, bool in)
     (void) ep;
     (void) in;
     return true;
-    return true;
 }