devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

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

Browse source 
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
This commit is contained in:
Rafaël Carré 2010-05-18 12:56:14 +00:00
parent a01422c54b
commit f8f3fab62c
5 changed files with 9 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

5
firmware/SOURCES
View file

@ -337,6 +337,8 @@ drivers/m66591.c
target/arm/usb-drv-arc.c target/arm/usb-drv-arc.c
#elif CONFIG_USBOTG == USBOTG_AS3525 #elif CONFIG_USBOTG == USBOTG_AS3525
target/arm/as3525/usb-drv-as3525.c target/arm/as3525/usb-drv-as3525.c
#elif CONFIG_USBOTG == USBOTG_AS3525v2
target/arm/as3525/usb-drv-as3525v2.c
#elif CONFIG_USBOTG == USBOTG_ISP1583 #elif CONFIG_USBOTG == USBOTG_ISP1583
drivers/isp1583.c drivers/isp1583.c
#endif #endif
@ -444,9 +446,6 @@ target/arm/as3525/scrollwheel-as3525.c
#else /* AS3535v2 */ #else /* AS3535v2 */
target/arm/as3525/sd-as3525v2.c target/arm/as3525/sd-as3525v2.c
#endif #endif
#if CONFIG_CPU == AS3525v2
target/arm/as3525/usb-drv-as3525v2.c
#endif
target/arm/as3525/power-as3525.c target/arm/as3525/power-as3525.c
target/arm/as3525/usb-as3525.c target/arm/as3525/usb-as3525.c
target/arm/as3525/dma-pl081.c target/arm/as3525/dma-pl081.c

2
firmware/export/config/sansaclipv2.h
View file

@ -169,7 +169,7 @@
#define USB_HANDLED_BY_OF #define USB_HANDLED_BY_OF
/* USB On-the-go */ /* USB On-the-go */
#define CONFIG_USBOTG USBOTG_AS3525 #define CONFIG_USBOTG USBOTG_AS3525v2
/* enable these for the experimental usb stack */ /* enable these for the experimental usb stack */
#define HAVE_USBSTACK #define HAVE_USBSTACK

2
firmware/export/config/sansafuzev2.h
View file

@ -186,7 +186,7 @@
#define USB_HANDLED_BY_OF #define USB_HANDLED_BY_OF
/* USB On-the-go */ /* USB On-the-go */
#define CONFIG_USBOTG USBOTG_AS3525 #define CONFIG_USBOTG USBOTG_AS3525v2
/* enable these for the experimental usb stack */ /* enable these for the experimental usb stack */
#define HAVE_USBSTACK #define HAVE_USBSTACK

2
firmware/target/arm/as3525/usb-drv-as3525.c
View file

@ -35,7 +35,7 @@
#include "usb_core.h" #include "usb_core.h"
#include "string.h" #include "string.h"
#if defined(USE_ROCKBOX_USB) && CONFIG_USBOTG == USBOTG_AS3525 #if defined(USE_ROCKBOX_USB)
#define USB_NUM_EPS 4 #define USB_NUM_EPS 4

5
firmware/target/arm/as3525/usb-drv-as3525v2.c
View file

@ -44,7 +44,9 @@ struct usb_endpoint
bool busy; bool busy;
}; };
#if 0
static struct usb_endpoint endpoints[USB_NUM_ENDPOINTS*2]; static struct usb_endpoint endpoints[USB_NUM_ENDPOINTS*2];
#endif
void usb_attach(void) void usb_attach(void)
{ {
@ -116,7 +118,9 @@ static void core_reset(void)
i++; i++;
if(USB_GRSTCTL & USB_GRSTCTL_csftrst) if(USB_GRSTCTL & USB_GRSTCTL_csftrst)
{
logf("oops, usb core soft reset hang :("); logf("oops, usb core soft reset hang :(");
}
/* Wait for 3 PHY Clocks */ /* Wait for 3 PHY Clocks */
/*mdelay(100);*/ /*mdelay(100);*/
@ -256,6 +260,5 @@ bool usb_drv_stalled(int ep, bool in)
(void) ep; (void) ep;
(void) in; (void) in;
return true; return true;
return true;
} }