diff options
author | Rafaël Carré <rafael.carre@gmail.com> | 2011-12-31 20:08:34 +0000 |
---|---|---|
committer | Rafaël Carré <rafael.carre@gmail.com> | 2011-12-31 20:08:34 +0000 |
commit | cddb1cfb16f0616a43b2482dce2aea2a9a1d65f1 (patch) | |
tree | fb3d2f266ad4e24f08bd20f0ee9e0c16a42c8cb6 /firmware | |
parent | c55672bcef79ee2ea389cf50696054295dab91ad (diff) | |
download | rockbox-cddb1cfb16f0616a43b2482dce2aea2a9a1d65f1.tar.gz rockbox-cddb1cfb16f0616a43b2482dce2aea2a9a1d65f1.zip |
Remove USBOTG_AS3525v2
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@31502 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware')
-rw-r--r-- | firmware/SOURCES | 2 | ||||
-rw-r--r-- | firmware/export/config.h | 12 | ||||
-rw-r--r-- | firmware/export/config/sansaclipplus.h | 2 | ||||
-rw-r--r-- | firmware/export/config/sansaclipv2.h | 2 | ||||
-rw-r--r-- | firmware/export/config/sansaclipzip.h | 2 | ||||
-rw-r--r-- | firmware/export/config/sansafuzev2.h | 2 | ||||
-rw-r--r-- | 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 | |||
721 | target/arm/usb-drv-arc.c | 721 | target/arm/usb-drv-arc.c |
722 | #elif CONFIG_USBOTG == USBOTG_AS3525 | 722 | #elif CONFIG_USBOTG == USBOTG_AS3525 |
723 | target/arm/as3525/usb-drv-as3525.c | 723 | target/arm/as3525/usb-drv-as3525.c |
724 | #elif CONFIG_USBOTG == USBOTG_AS3525v2 | ||
725 | target/arm/as3525/usb-drv-as3525v2.c | ||
726 | #elif CONFIG_USBOTG == USBOTG_S3C6400X | 724 | #elif CONFIG_USBOTG == USBOTG_S3C6400X |
727 | target/arm/usb-s3c6400x.c | 725 | target/arm/usb-s3c6400x.c |
728 | #elif CONFIG_USBOTG == USBOTG_ISP1583 | 726 | #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 */ | |||
317 | #define USBOTG_ARC 5020 /* PortalPlayer 502x and IMX233 */ | 317 | #define USBOTG_ARC 5020 /* PortalPlayer 502x and IMX233 */ |
318 | #define USBOTG_JZ4740 4740 /* Ingenic Jz4740/Jz4732 */ | 318 | #define USBOTG_JZ4740 4740 /* Ingenic Jz4740/Jz4732 */ |
319 | #define USBOTG_AS3525 3525 /* AMS AS3525 */ | 319 | #define USBOTG_AS3525 3525 /* AMS AS3525 */ |
320 | #define USBOTG_AS3525v2 3535 /* AMS AS3525v2 FIXME : same as S3C6400X */ | ||
321 | #define USBOTG_S3C6400X 6400 /* Samsung S3C6400X, also used in the S5L8701/S5L8702/S5L8720 */ | 320 | #define USBOTG_S3C6400X 6400 /* Samsung S3C6400X, also used in the S5L8701/S5L8702/S5L8720 */ |
322 | #define USBOTG_RK27XX 2700 /* Rockchip rk27xx */ | 321 | #define USBOTG_RK27XX 2700 /* Rockchip rk27xx */ |
323 | #define USBOTG_TNETV105 105 /* TI TNETV105 */ | 322 | #define USBOTG_TNETV105 105 /* TI TNETV105 */ |
@@ -803,7 +802,7 @@ Lyre prototype 1 */ | |||
803 | #elif CONFIG_USBOTG == USBOTG_AS3525 | 802 | #elif CONFIG_USBOTG == USBOTG_AS3525 |
804 | #define USB_STATUS_BY_EVENT | 803 | #define USB_STATUS_BY_EVENT |
805 | #define USB_DETECT_BY_CORE | 804 | #define USB_DETECT_BY_CORE |
806 | #elif CONFIG_USBOTG == USBOTG_AS3525v2 | 805 | #elif CONFIG_USBOTG == USBOTG_S3C6400X /* FIXME */ && CONFIG_CPU == AS3525v2 |
807 | #define USB_STATUS_BY_EVENT | 806 | #define USB_STATUS_BY_EVENT |
808 | #define USB_DETECT_BY_CORE | 807 | #define USB_DETECT_BY_CORE |
809 | #elif CONFIG_USBOTG == USBOTG_RK27XX | 808 | #elif CONFIG_USBOTG == USBOTG_RK27XX |
@@ -1046,7 +1045,7 @@ Lyre prototype 1 */ | |||
1046 | #define USB_HAS_INTERRUPT | 1045 | #define USB_HAS_INTERRUPT |
1047 | #elif defined(CPU_TCC780X) || defined(CPU_TCC77X) | 1046 | #elif defined(CPU_TCC780X) || defined(CPU_TCC77X) |
1048 | #define USB_HAS_BULK | 1047 | #define USB_HAS_BULK |
1049 | #elif CONFIG_USBOTG == USBOTG_S3C6400X || CONFIG_USBOTG == USBOTG_AS3525v2 | 1048 | #elif CONFIG_USBOTG == USBOTG_S3C6400X |
1050 | #define USB_HAS_BULK | 1049 | #define USB_HAS_BULK |
1051 | //#define USB_HAS_INTERRUPT -- seems to be broken | 1050 | //#define USB_HAS_INTERRUPT -- seems to be broken |
1052 | #endif /* CONFIG_USBOTG */ | 1051 | #endif /* CONFIG_USBOTG */ |
@@ -1061,10 +1060,9 @@ Lyre prototype 1 */ | |||
1061 | 1060 | ||
1062 | /* enable usb storage for targets that do bootloader usb */ | 1061 | /* enable usb storage for targets that do bootloader usb */ |
1063 | #if defined(HAVE_BOOTLOADER_USB_MODE) || \ | 1062 | #if defined(HAVE_BOOTLOADER_USB_MODE) || \ |
1064 | ((defined(CREATIVE_ZVx) || \ | 1063 | defined(CREATIVE_ZVx) || defined(CPU_TCC77X) || defined(CPU_TCC780X) || \ |
1065 | defined(CPU_TCC77X) || defined(CPU_TCC780X))) || \ | 1064 | CONFIG_USBOTG == USBOTG_JZ4740 || CONFIG_USBOTG == USBOTG_AS3525 || \ |
1066 | (CONFIG_USBOTG == USBOTG_JZ4740) || defined(IPOD_NANO2G) || \ | 1065 | CONFIG_USBOTG == USBOTG_S3C6400x |
1067 | CONFIG_USBOTG == USBOTG_AS3525 || CONFIG_USBOTG == USBOTG_AS3525v2 | ||
1068 | #define USB_ENABLE_STORAGE | 1066 | #define USB_ENABLE_STORAGE |
1069 | #endif | 1067 | #endif |
1070 | 1068 | ||
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 @@ | |||
182 | #define CONFIG_LCD LCD_SSD1303 | 182 | #define CONFIG_LCD LCD_SSD1303 |
183 | 183 | ||
184 | /* USB On-the-go */ | 184 | /* USB On-the-go */ |
185 | #define CONFIG_USBOTG USBOTG_AS3525v2 | 185 | #define CONFIG_USBOTG USBOTG_S3C6400X |
186 | 186 | ||
187 | /* enable these for the experimental usb stack */ | 187 | /* enable these for the experimental usb stack */ |
188 | #define HAVE_USBSTACK | 188 | #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 @@ | |||
178 | #define CONFIG_LCD LCD_SSD1303 | 178 | #define CONFIG_LCD LCD_SSD1303 |
179 | 179 | ||
180 | /* USB On-the-go */ | 180 | /* USB On-the-go */ |
181 | #define CONFIG_USBOTG USBOTG_AS3525v2 | 181 | #define CONFIG_USBOTG USBOTG_S3C6400X |
182 | 182 | ||
183 | /* enable these for the experimental usb stack */ | 183 | /* enable these for the experimental usb stack */ |
184 | #define HAVE_USBSTACK | 184 | #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 @@ | |||
183 | #define CONFIG_LCD LCD_CLIPZIP | 183 | #define CONFIG_LCD LCD_CLIPZIP |
184 | 184 | ||
185 | /* USB On-the-go */ | 185 | /* USB On-the-go */ |
186 | #define CONFIG_USBOTG USBOTG_AS3525v2 | 186 | #define CONFIG_USBOTG USBOTG_S3C6400X |
187 | 187 | ||
188 | /* enable these for the experimental usb stack */ | 188 | /* enable these for the experimental usb stack */ |
189 | #define HAVE_USBSTACK | 189 | #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 @@ | |||
199 | #endif | 199 | #endif |
200 | 200 | ||
201 | /* USB On-the-go */ | 201 | /* USB On-the-go */ |
202 | #define CONFIG_USBOTG USBOTG_AS3525v2 | 202 | #define CONFIG_USBOTG USBOTG_S3C6400X |
203 | 203 | ||
204 | /* enable these for the experimental usb stack */ | 204 | /* enable these for the experimental usb stack */ |
205 | #define HAVE_USBSTACK | 205 | #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 @@ | |||
35 | #include <inttypes.h> | 35 | #include <inttypes.h> |
36 | #include "power.h" | 36 | #include "power.h" |
37 | 37 | ||
38 | #if CONFIG_CPU == AS3525v2 /* FIXME FIXME FIXME */ | ||
39 | # include "as3525/usb-drv-as3525v2.c" | ||
40 | #else | ||
41 | |||
38 | struct ep_type | 42 | struct ep_type |
39 | { | 43 | { |
40 | bool active; | 44 | bool active; |
@@ -374,3 +378,4 @@ void usb_attach(void) | |||
374 | { | 378 | { |
375 | usb_enable(true); | 379 | usb_enable(true); |
376 | } | 380 | } |
381 | #endif // CONFIG_CPU == AS3525v2 /* FIXME FIXME FIXME */ | ||