Nyaaori/rockbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Remove USBOTG_AS3525v2

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@31502 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Rafaël Carré 2011-12-31 20:08:34 +00:00
parent c55672bcef
commit cddb1cfb16
7 changed files with 14 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
firmware/SOURCES
View file

@ -721,8 +721,6 @@ 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_S3C6400X #elif CONFIG_USBOTG == USBOTG_S3C6400X
target/arm/usb-s3c6400x.c target/arm/usb-s3c6400x.c
#elif CONFIG_USBOTG == USBOTG_ISP1583 #elif CONFIG_USBOTG == USBOTG_ISP1583

12
firmware/export/config.h
View file

@ -317,7 +317,6 @@ Lyre prototype 1 */
#define USBOTG_ARC 5020 /* PortalPlayer 502x and IMX233 */ #define USBOTG_ARC 5020 /* PortalPlayer 502x and IMX233 */
#define USBOTG_JZ4740 4740 /* Ingenic Jz4740/Jz4732 */ #define USBOTG_JZ4740 4740 /* Ingenic Jz4740/Jz4732 */
#define USBOTG_AS3525 3525 /* AMS AS3525 */ #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_S3C6400X 6400 /* Samsung S3C6400X, also used in the S5L8701/S5L8702/S5L8720 */
#define USBOTG_RK27XX 2700 /* Rockchip rk27xx */ #define USBOTG_RK27XX 2700 /* Rockchip rk27xx */
#define USBOTG_TNETV105 105 /* TI TNETV105 */ #define USBOTG_TNETV105 105 /* TI TNETV105 */
@ -803,7 +802,7 @@ Lyre prototype 1 */
#elif CONFIG_USBOTG == USBOTG_AS3525 #elif CONFIG_USBOTG == USBOTG_AS3525
#define USB_STATUS_BY_EVENT #define USB_STATUS_BY_EVENT
#define USB_DETECT_BY_CORE #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_STATUS_BY_EVENT
#define USB_DETECT_BY_CORE #define USB_DETECT_BY_CORE
#elif CONFIG_USBOTG == USBOTG_RK27XX #elif CONFIG_USBOTG == USBOTG_RK27XX
@ -1046,7 +1045,7 @@ Lyre prototype 1 */
#define USB_HAS_INTERRUPT #define USB_HAS_INTERRUPT
#elif defined(CPU_TCC780X) || defined(CPU_TCC77X) #elif defined(CPU_TCC780X) || defined(CPU_TCC77X)
#define USB_HAS_BULK #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_BULK
//#define USB_HAS_INTERRUPT -- seems to be broken //#define USB_HAS_INTERRUPT -- seems to be broken
#endif /* CONFIG_USBOTG */ #endif /* CONFIG_USBOTG */
@ -1061,10 +1060,9 @@ Lyre prototype 1 */
/* enable usb storage for targets that do bootloader usb */ /* enable usb storage for targets that do bootloader usb */
#if defined(HAVE_BOOTLOADER_USB_MODE) || \ #if defined(HAVE_BOOTLOADER_USB_MODE) || \
((defined(CREATIVE_ZVx) || \ defined(CREATIVE_ZVx) || defined(CPU_TCC77X) || defined(CPU_TCC780X) || \
defined(CPU_TCC77X) || defined(CPU_TCC780X))) || \ CONFIG_USBOTG == USBOTG_JZ4740 || CONFIG_USBOTG == USBOTG_AS3525 || \
(CONFIG_USBOTG == USBOTG_JZ4740) || defined(IPOD_NANO2G) || \ CONFIG_USBOTG == USBOTG_S3C6400x
CONFIG_USBOTG == USBOTG_AS3525 || CONFIG_USBOTG == USBOTG_AS3525v2
#define USB_ENABLE_STORAGE #define USB_ENABLE_STORAGE
#endif #endif

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

@ -182,7 +182,7 @@
#define CONFIG_LCD LCD_SSD1303 #define CONFIG_LCD LCD_SSD1303
/* USB On-the-go */ /* USB On-the-go */
#define CONFIG_USBOTG USBOTG_AS3525v2 #define CONFIG_USBOTG USBOTG_S3C6400X
/* enable these for the experimental usb stack */ /* enable these for the experimental usb stack */
#define HAVE_USBSTACK #define HAVE_USBSTACK

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

@ -178,7 +178,7 @@
#define CONFIG_LCD LCD_SSD1303 #define CONFIG_LCD LCD_SSD1303
/* USB On-the-go */ /* USB On-the-go */
#define CONFIG_USBOTG USBOTG_AS3525v2 #define CONFIG_USBOTG USBOTG_S3C6400X
/* enable these for the experimental usb stack */ /* enable these for the experimental usb stack */
#define HAVE_USBSTACK #define HAVE_USBSTACK

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

@ -183,7 +183,7 @@
#define CONFIG_LCD LCD_CLIPZIP #define CONFIG_LCD LCD_CLIPZIP
/* USB On-the-go */ /* USB On-the-go */
#define CONFIG_USBOTG USBOTG_AS3525v2 #define CONFIG_USBOTG USBOTG_S3C6400X
/* 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

@ -199,7 +199,7 @@
#endif #endif
/* USB On-the-go */ /* USB On-the-go */
#define CONFIG_USBOTG USBOTG_AS3525v2 #define CONFIG_USBOTG USBOTG_S3C6400X
/* enable these for the experimental usb stack */ /* enable these for the experimental usb stack */
#define HAVE_USBSTACK #define HAVE_USBSTACK

5
firmware/target/arm/usb-s3c6400x.c
View file

@ -35,6 +35,10 @@
#include <inttypes.h> #include <inttypes.h>
#include "power.h" #include "power.h"
#if CONFIG_CPU == AS3525v2 /* FIXME FIXME FIXME */
# include "as3525/usb-drv-as3525v2.c"
#else
struct ep_type struct ep_type
{ {
bool active; bool active;
@ -374,3 +378,4 @@ void usb_attach(void)
{ {
usb_enable(true); usb_enable(true);
} }
#endif // CONFIG_CPU == AS3525v2 /* FIXME FIXME FIXME */