diff options
author | Amaury Pouly <pamaury@rockbox.org> | 2010-05-18 09:58:52 +0000 |
---|---|---|
committer | Amaury Pouly <pamaury@rockbox.org> | 2010-05-18 09:58:52 +0000 |
commit | 22cfbee27489d3658ab2155c65bcdfedce7e750c (patch) | |
tree | da28c1d243f518fbffa09bf625e4431a3c8811c7 /firmware/export | |
parent | ed96c935ecc38cbad99742551d1e8e4e6082b6ce (diff) | |
download | rockbox-22cfbee27489d3658ab2155c65bcdfedce7e750c.tar.gz rockbox-22cfbee27489d3658ab2155c65bcdfedce7e750c.zip |
as3525v2: add usb driver stub, enable usb phy&core init
clip+: add USBOTG_ define and enable usb stack
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@26132 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware/export')
-rw-r--r-- | firmware/export/as3525.h | 1 | ||||
-rw-r--r-- | firmware/export/config.h | 6 | ||||
-rw-r--r-- | firmware/export/config/sansaclipplus.h | 5 |
3 files changed, 8 insertions, 4 deletions
diff --git a/firmware/export/as3525.h b/firmware/export/as3525.h index 1d5fb1d820..699762a9b2 100644 --- a/firmware/export/as3525.h +++ b/firmware/export/as3525.h | |||
@@ -110,6 +110,7 @@ | |||
110 | #define CCU_VERS (*(volatile unsigned long *)(CCU_BASE + 0x14)) | 110 | #define CCU_VERS (*(volatile unsigned long *)(CCU_BASE + 0x14)) |
111 | #define CCU_SPARE1 (*(volatile unsigned long *)(CCU_BASE + 0x18)) | 111 | #define CCU_SPARE1 (*(volatile unsigned long *)(CCU_BASE + 0x18)) |
112 | #define CCU_SPARE2 (*(volatile unsigned long *)(CCU_BASE + 0x1C)) | 112 | #define CCU_SPARE2 (*(volatile unsigned long *)(CCU_BASE + 0x1C)) |
113 | #define CCU_USB_THINGY (*(volatile unsigned long *)(CCU_BASE + 0x20)) | ||
113 | 114 | ||
114 | /* DBOP */ | 115 | /* DBOP */ |
115 | #define DBOP_TIMPOL_01 (*(volatile unsigned long *)(DBOP_BASE + 0x00)) | 116 | #define DBOP_TIMPOL_01 (*(volatile unsigned long *)(DBOP_BASE + 0x00)) |
diff --git a/firmware/export/config.h b/firmware/export/config.h index 070bd959b7..5e986d47b9 100644 --- a/firmware/export/config.h +++ b/firmware/export/config.h | |||
@@ -276,6 +276,7 @@ Lyre prototype 1 */ | |||
276 | #define USBOTG_ARC 5020 /* PortalPlayer 502x */ | 276 | #define USBOTG_ARC 5020 /* PortalPlayer 502x */ |
277 | #define USBOTG_JZ4740 4740 /* Ingenic Jz4740/Jz4732 */ | 277 | #define USBOTG_JZ4740 4740 /* Ingenic Jz4740/Jz4732 */ |
278 | #define USBOTG_AS3525 3525 /* AMS AS3525 */ | 278 | #define USBOTG_AS3525 3525 /* AMS AS3525 */ |
279 | #define USBOTG_AS3525v2 3535 /* AMS AS3525v2 */ | ||
279 | #define USBOTG_S3C6400X 6400 /* Samsung S3C6400X, also used in the S5L8701 */ | 280 | #define USBOTG_S3C6400X 6400 /* Samsung S3C6400X, also used in the S5L8701 */ |
280 | 281 | ||
281 | /* Multiple cores */ | 282 | /* Multiple cores */ |
@@ -912,10 +913,11 @@ Lyre prototype 1 */ | |||
912 | 913 | ||
913 | #ifndef SIMULATOR | 914 | #ifndef SIMULATOR |
914 | //#define USB_ENABLE_SERIAL | 915 | //#define USB_ENABLE_SERIAL |
915 | #define USB_ENABLE_STORAGE | 916 | //#define USB_ENABLE_STORAGE |
916 | 917 | ||
917 | #ifdef USB_HAS_INTERRUPT | 918 | #ifdef USB_HAS_INTERRUPT |
918 | #define USB_ENABLE_HID | 919 | //#define USB_ENABLE_HID |
920 | #define USB_ENABLE_CHARGING_ONLY | ||
919 | #else | 921 | #else |
920 | #define USB_ENABLE_CHARGING_ONLY | 922 | #define USB_ENABLE_CHARGING_ONLY |
921 | #endif | 923 | #endif |
diff --git a/firmware/export/config/sansaclipplus.h b/firmware/export/config/sansaclipplus.h index 29694d87c2..55eacd2607 100644 --- a/firmware/export/config/sansaclipplus.h +++ b/firmware/export/config/sansaclipplus.h | |||
@@ -171,10 +171,11 @@ | |||
171 | 171 | ||
172 | #ifndef BOOTLOADER | 172 | #ifndef BOOTLOADER |
173 | 173 | ||
174 | #define USB_HANDLED_BY_OF | 174 | //#define USB_HANDLED_BY_OF |
175 | #define USE_ROCKBOX_USB | ||
175 | 176 | ||
176 | /* USB On-the-go */ | 177 | /* USB On-the-go */ |
177 | #define CONFIG_USBOTG USBOTG_AS3525 | 178 | #define CONFIG_USBOTG USBOTG_AS3525v2 |
178 | 179 | ||
179 | /* enable these for the experimental usb stack */ | 180 | /* enable these for the experimental usb stack */ |
180 | #define HAVE_USBSTACK | 181 | #define HAVE_USBSTACK |