From cddb1cfb16f0616a43b2482dce2aea2a9a1d65f1 Mon Sep 17 00:00:00 2001 From: Rafaël Carré Date: Sat, 31 Dec 2011 20:08:34 +0000 Subject: Remove USBOTG_AS3525v2 git-svn-id: svn://svn.rockbox.org/rockbox/trunk@31502 a1c6a512-1295-4272-9138-f99709370657 --- firmware/SOURCES | 2 -- firmware/export/config.h | 12 +++++------- firmware/export/config/sansaclipplus.h | 2 +- firmware/export/config/sansaclipv2.h | 2 +- firmware/export/config/sansaclipzip.h | 2 +- firmware/export/config/sansafuzev2.h | 2 +- firmware/target/arm/usb-s3c6400x.c | 5 +++++ 7 files changed, 14 insertions(+), 13 deletions(-) diff --git a/firmware/SOURCES b/firmware/SOURCES index 3b49206728..1eab0d5de8 100644 --- a/firmware/SOURCES +++ b/firmware/SOURCES @@ -721,8 +721,6 @@ drivers/m66591.c target/arm/usb-drv-arc.c #elif CONFIG_USBOTG == USBOTG_AS3525 target/arm/as3525/usb-drv-as3525.c -#elif CONFIG_USBOTG == USBOTG_AS3525v2 -target/arm/as3525/usb-drv-as3525v2.c #elif CONFIG_USBOTG == USBOTG_S3C6400X target/arm/usb-s3c6400x.c #elif CONFIG_USBOTG == USBOTG_ISP1583 diff --git a/firmware/export/config.h b/firmware/export/config.h index 89918f57b2..4d9636f3f9 100644 --- a/firmware/export/config.h +++ b/firmware/export/config.h @@ -317,7 +317,6 @@ Lyre prototype 1 */ #define USBOTG_ARC 5020 /* PortalPlayer 502x and IMX233 */ #define USBOTG_JZ4740 4740 /* Ingenic Jz4740/Jz4732 */ #define USBOTG_AS3525 3525 /* AMS AS3525 */ -#define USBOTG_AS3525v2 3535 /* AMS AS3525v2 FIXME : same as S3C6400X */ #define USBOTG_S3C6400X 6400 /* Samsung S3C6400X, also used in the S5L8701/S5L8702/S5L8720 */ #define USBOTG_RK27XX 2700 /* Rockchip rk27xx */ #define USBOTG_TNETV105 105 /* TI TNETV105 */ @@ -803,7 +802,7 @@ Lyre prototype 1 */ #elif CONFIG_USBOTG == USBOTG_AS3525 #define USB_STATUS_BY_EVENT #define USB_DETECT_BY_CORE -#elif CONFIG_USBOTG == USBOTG_AS3525v2 +#elif CONFIG_USBOTG == USBOTG_S3C6400X /* FIXME */ && CONFIG_CPU == AS3525v2 #define USB_STATUS_BY_EVENT #define USB_DETECT_BY_CORE #elif CONFIG_USBOTG == USBOTG_RK27XX @@ -1046,7 +1045,7 @@ Lyre prototype 1 */ #define USB_HAS_INTERRUPT #elif defined(CPU_TCC780X) || defined(CPU_TCC77X) #define USB_HAS_BULK -#elif CONFIG_USBOTG == USBOTG_S3C6400X || CONFIG_USBOTG == USBOTG_AS3525v2 +#elif CONFIG_USBOTG == USBOTG_S3C6400X #define USB_HAS_BULK //#define USB_HAS_INTERRUPT -- seems to be broken #endif /* CONFIG_USBOTG */ @@ -1061,10 +1060,9 @@ Lyre prototype 1 */ /* enable usb storage for targets that do bootloader usb */ #if defined(HAVE_BOOTLOADER_USB_MODE) || \ - ((defined(CREATIVE_ZVx) || \ - defined(CPU_TCC77X) || defined(CPU_TCC780X))) || \ - (CONFIG_USBOTG == USBOTG_JZ4740) || defined(IPOD_NANO2G) || \ - CONFIG_USBOTG == USBOTG_AS3525 || CONFIG_USBOTG == USBOTG_AS3525v2 + defined(CREATIVE_ZVx) || defined(CPU_TCC77X) || defined(CPU_TCC780X) || \ + CONFIG_USBOTG == USBOTG_JZ4740 || CONFIG_USBOTG == USBOTG_AS3525 || \ + CONFIG_USBOTG == USBOTG_S3C6400x #define USB_ENABLE_STORAGE #endif diff --git a/firmware/export/config/sansaclipplus.h b/firmware/export/config/sansaclipplus.h index 5fd68c0397..083b96a8f7 100644 --- a/firmware/export/config/sansaclipplus.h +++ b/firmware/export/config/sansaclipplus.h @@ -182,7 +182,7 @@ #define CONFIG_LCD LCD_SSD1303 /* USB On-the-go */ -#define CONFIG_USBOTG USBOTG_AS3525v2 +#define CONFIG_USBOTG USBOTG_S3C6400X /* enable these for the experimental usb stack */ #define HAVE_USBSTACK diff --git a/firmware/export/config/sansaclipv2.h b/firmware/export/config/sansaclipv2.h index 4599908282..cb2392ac76 100644 --- a/firmware/export/config/sansaclipv2.h +++ b/firmware/export/config/sansaclipv2.h @@ -178,7 +178,7 @@ #define CONFIG_LCD LCD_SSD1303 /* USB On-the-go */ -#define CONFIG_USBOTG USBOTG_AS3525v2 +#define CONFIG_USBOTG USBOTG_S3C6400X /* enable these for the experimental usb stack */ #define HAVE_USBSTACK diff --git a/firmware/export/config/sansaclipzip.h b/firmware/export/config/sansaclipzip.h index 1ff41a00ec..043b1025fb 100644 --- a/firmware/export/config/sansaclipzip.h +++ b/firmware/export/config/sansaclipzip.h @@ -183,7 +183,7 @@ #define CONFIG_LCD LCD_CLIPZIP /* USB On-the-go */ -#define CONFIG_USBOTG USBOTG_AS3525v2 +#define CONFIG_USBOTG USBOTG_S3C6400X /* enable these for the experimental usb stack */ #define HAVE_USBSTACK diff --git a/firmware/export/config/sansafuzev2.h b/firmware/export/config/sansafuzev2.h index 3e19d7239c..8231236104 100644 --- a/firmware/export/config/sansafuzev2.h +++ b/firmware/export/config/sansafuzev2.h @@ -199,7 +199,7 @@ #endif /* USB On-the-go */ -#define CONFIG_USBOTG USBOTG_AS3525v2 +#define CONFIG_USBOTG USBOTG_S3C6400X /* enable these for the experimental usb stack */ #define HAVE_USBSTACK diff --git a/firmware/target/arm/usb-s3c6400x.c b/firmware/target/arm/usb-s3c6400x.c index 84cee2be38..48eca85c8c 100644 --- a/firmware/target/arm/usb-s3c6400x.c +++ b/firmware/target/arm/usb-s3c6400x.c @@ -35,6 +35,10 @@ #include #include "power.h" +#if CONFIG_CPU == AS3525v2 /* FIXME FIXME FIXME */ +# include "as3525/usb-drv-as3525v2.c" +#else + struct ep_type { bool active; @@ -374,3 +378,4 @@ void usb_attach(void) { usb_enable(true); } +#endif // CONFIG_CPU == AS3525v2 /* FIXME FIXME FIXME */ -- cgit v1.2.3