diff options
author | Amaury Pouly <amaury.pouly@gmail.com> | 2014-12-30 17:36:59 +0100 |
---|---|---|
committer | Amaury Pouly <amaury.pouly@gmail.com> | 2015-01-08 16:07:12 +0100 |
commit | 66690ca98709773c2591d6090d9c0274bb723c37 (patch) | |
tree | 6cfcebd734c58e4dada1f4ed28fb07e48d20f25d /firmware/export | |
parent | f91434cc7b4204ca47c86090928cdd454dd52606 (diff) | |
download | rockbox-66690ca98709773c2591d6090d9c0274bb723c37.tar.gz rockbox-66690ca98709773c2591d6090d9c0274bb723c37.zip |
Get rid of USE_ROCKBOX_USB
Except for unfinished or experimental ports, it isthe case that
USE_ROCKBOX_USB and HAVE_USBSTACK are both defined or both undefined.
Furthermore, it is a leftover of some early developments on the USB stack and
doesn't make sense anymore.
Change-Id: Ic87a865b6bb4c7c9a8d45d1f0bb0f2fb536b8cad
Reviewed-on: http://gerrit.rockbox.org/1091
Reviewed-by: Amaury Pouly <amaury.pouly@gmail.com>
Diffstat (limited to 'firmware/export')
62 files changed, 0 insertions, 63 deletions
diff --git a/firmware/export/config.h b/firmware/export/config.h index bf95dc4c09..1f57734231 100644 --- a/firmware/export/config.h +++ b/firmware/export/config.h | |||
@@ -1178,9 +1178,7 @@ Lyre prototype 1 */ | |||
1178 | #if (CONFIG_PLATFORM & PLATFORM_NATIVE) | 1178 | #if (CONFIG_PLATFORM & PLATFORM_NATIVE) |
1179 | #ifdef USB_HAS_BULK | 1179 | #ifdef USB_HAS_BULK |
1180 | //#define USB_ENABLE_SERIAL | 1180 | //#define USB_ENABLE_SERIAL |
1181 | #ifdef USE_ROCKBOX_USB | ||
1182 | #define USB_ENABLE_STORAGE | 1181 | #define USB_ENABLE_STORAGE |
1183 | #endif /* USE_ROCKBOX_USB */ | ||
1184 | #endif /* USB_HAS_BULK */ | 1182 | #endif /* USB_HAS_BULK */ |
1185 | 1183 | ||
1186 | #ifdef USB_HAS_INTERRUPT | 1184 | #ifdef USB_HAS_INTERRUPT |
diff --git a/firmware/export/config/cowond2.h b/firmware/export/config/cowond2.h index 1d9961b2ae..d4623381fc 100644 --- a/firmware/export/config/cowond2.h +++ b/firmware/export/config/cowond2.h | |||
@@ -9,7 +9,6 @@ | |||
9 | 9 | ||
10 | #if 0 | 10 | #if 0 |
11 | #define HAVE_USBSTACK | 11 | #define HAVE_USBSTACK |
12 | #define USE_ROCKBOX_USB | ||
13 | #define USB_VENDOR_ID 0x0e21 | 12 | #define USB_VENDOR_ID 0x0e21 |
14 | #define USB_PRODUCT_ID 0x0800 | 13 | #define USB_PRODUCT_ID 0x0800 |
15 | #endif | 14 | #endif |
diff --git a/firmware/export/config/creativezen.h b/firmware/export/config/creativezen.h index ab9506772a..3667142791 100644 --- a/firmware/export/config/creativezen.h +++ b/firmware/export/config/creativezen.h | |||
@@ -180,7 +180,6 @@ | |||
180 | /* enable these for the experimental usb stack */ | 180 | /* enable these for the experimental usb stack */ |
181 | #define HAVE_USBSTACK | 181 | #define HAVE_USBSTACK |
182 | //#define USB_HANDLED_BY_OF | 182 | //#define USB_HANDLED_BY_OF |
183 | #define USE_ROCKBOX_USB | ||
184 | #define USB_VENDOR_ID 0x041e | 183 | #define USB_VENDOR_ID 0x041e |
185 | #define USB_PRODUCT_ID 0x4162 | 184 | #define USB_PRODUCT_ID 0x4162 |
186 | #define HAVE_USB_HID_MOUSE | 185 | #define HAVE_USB_HID_MOUSE |
diff --git a/firmware/export/config/creativezenmozaic.h b/firmware/export/config/creativezenmozaic.h index 664459bf89..3a95d0388a 100644 --- a/firmware/export/config/creativezenmozaic.h +++ b/firmware/export/config/creativezenmozaic.h | |||
@@ -180,7 +180,6 @@ | |||
180 | /* enable these for the experimental usb stack */ | 180 | /* enable these for the experimental usb stack */ |
181 | #define HAVE_USBSTACK | 181 | #define HAVE_USBSTACK |
182 | //#define USB_HANDLED_BY_OF | 182 | //#define USB_HANDLED_BY_OF |
183 | #define USE_ROCKBOX_USB | ||
184 | #define USB_VENDOR_ID 0x041e | 183 | #define USB_VENDOR_ID 0x041e |
185 | #define USB_PRODUCT_ID 0x4133 | 184 | #define USB_PRODUCT_ID 0x4133 |
186 | #define HAVE_USB_HID_MOUSE | 185 | #define HAVE_USB_HID_MOUSE |
diff --git a/firmware/export/config/creativezenv.h b/firmware/export/config/creativezenv.h index 03dc261b85..3e9be8ba29 100644 --- a/firmware/export/config/creativezenv.h +++ b/firmware/export/config/creativezenv.h | |||
@@ -177,7 +177,6 @@ | |||
177 | /* enable these for the experimental usb stack */ | 177 | /* enable these for the experimental usb stack */ |
178 | #define HAVE_USBSTACK | 178 | #define HAVE_USBSTACK |
179 | //#define USB_HANDLED_BY_OF | 179 | //#define USB_HANDLED_BY_OF |
180 | #define USE_ROCKBOX_USB | ||
181 | #define USB_VENDOR_ID 0x041e | 180 | #define USB_VENDOR_ID 0x041e |
182 | #define USB_PRODUCT_ID 0x4133 | 181 | #define USB_PRODUCT_ID 0x4133 |
183 | #define HAVE_USB_HID_MOUSE | 182 | #define HAVE_USB_HID_MOUSE |
diff --git a/firmware/export/config/creativezenxfi.h b/firmware/export/config/creativezenxfi.h index db68617c78..35bd1efdfb 100644 --- a/firmware/export/config/creativezenxfi.h +++ b/firmware/export/config/creativezenxfi.h | |||
@@ -187,7 +187,6 @@ | |||
187 | /* enable these for the experimental usb stack */ | 187 | /* enable these for the experimental usb stack */ |
188 | #define HAVE_USBSTACK | 188 | #define HAVE_USBSTACK |
189 | //#define USB_HANDLED_BY_OF | 189 | //#define USB_HANDLED_BY_OF |
190 | #define USE_ROCKBOX_USB | ||
191 | #define USB_VENDOR_ID 0x041e | 190 | #define USB_VENDOR_ID 0x041e |
192 | #define USB_PRODUCT_ID 0x4162 | 191 | #define USB_PRODUCT_ID 0x4162 |
193 | #define HAVE_USB_HID_MOUSE | 192 | #define HAVE_USB_HID_MOUSE |
diff --git a/firmware/export/config/creativezenxfi2.h b/firmware/export/config/creativezenxfi2.h index cc38aae123..5b275b1de8 100644 --- a/firmware/export/config/creativezenxfi2.h +++ b/firmware/export/config/creativezenxfi2.h | |||
@@ -189,7 +189,6 @@ | |||
189 | /* enable these for the experimental usb stack */ | 189 | /* enable these for the experimental usb stack */ |
190 | #define HAVE_USBSTACK | 190 | #define HAVE_USBSTACK |
191 | //#define USB_HANDLED_BY_OF | 191 | //#define USB_HANDLED_BY_OF |
192 | #define USE_ROCKBOX_USB | ||
193 | #define USB_VENDOR_ID 0x041e | 192 | #define USB_VENDOR_ID 0x041e |
194 | #define USB_PRODUCT_ID 0x2020 | 193 | #define USB_PRODUCT_ID 0x2020 |
195 | #define HAVE_USB_HID_MOUSE | 194 | #define HAVE_USB_HID_MOUSE |
diff --git a/firmware/export/config/creativezenxfi3.h b/firmware/export/config/creativezenxfi3.h index 1a5fa25ae5..9adf593a99 100644 --- a/firmware/export/config/creativezenxfi3.h +++ b/firmware/export/config/creativezenxfi3.h | |||
@@ -193,7 +193,6 @@ | |||
193 | /* enable these for the experimental usb stack */ | 193 | /* enable these for the experimental usb stack */ |
194 | #define HAVE_USBSTACK | 194 | #define HAVE_USBSTACK |
195 | //#define USB_HANDLED_BY_OF | 195 | //#define USB_HANDLED_BY_OF |
196 | #define USE_ROCKBOX_USB | ||
197 | #define USB_VENDOR_ID 0x041e | 196 | #define USB_VENDOR_ID 0x041e |
198 | #define USB_PRODUCT_ID 0x2020 | 197 | #define USB_PRODUCT_ID 0x2020 |
199 | #define HAVE_USB_HID_MOUSE | 198 | #define HAVE_USB_HID_MOUSE |
diff --git a/firmware/export/config/creativezenxfistyle.h b/firmware/export/config/creativezenxfistyle.h index 7b8415c8c8..b7d3d61d85 100644 --- a/firmware/export/config/creativezenxfistyle.h +++ b/firmware/export/config/creativezenxfistyle.h | |||
@@ -183,7 +183,6 @@ | |||
183 | /* enable these for the experimental usb stack */ | 183 | /* enable these for the experimental usb stack */ |
184 | #define HAVE_USBSTACK | 184 | #define HAVE_USBSTACK |
185 | //#define USB_HANDLED_BY_OF | 185 | //#define USB_HANDLED_BY_OF |
186 | #define USE_ROCKBOX_USB | ||
187 | #define USB_VENDOR_ID 0x041e | 186 | #define USB_VENDOR_ID 0x041e |
188 | #define USB_PRODUCT_ID 0x200a | 187 | #define USB_PRODUCT_ID 0x200a |
189 | #define HAVE_USB_HID_MOUSE | 188 | #define HAVE_USB_HID_MOUSE |
diff --git a/firmware/export/config/creativezv.h b/firmware/export/config/creativezv.h index b96bfcce77..ce812d38c9 100644 --- a/firmware/export/config/creativezv.h +++ b/firmware/export/config/creativezv.h | |||
@@ -163,7 +163,6 @@ | |||
163 | 163 | ||
164 | #define CONFIG_USBOTG USBOTG_ISP1583 | 164 | #define CONFIG_USBOTG USBOTG_ISP1583 |
165 | #define HAVE_USBSTACK | 165 | #define HAVE_USBSTACK |
166 | #define USE_ROCKBOX_USB | ||
167 | #define USB_VENDOR_ID 0x041e | 166 | #define USB_VENDOR_ID 0x041e |
168 | #define USB_PRODUCT_ID 0x4133 | 167 | #define USB_PRODUCT_ID 0x4133 |
169 | #define USB_NUM_ENDPOINTS 7 | 168 | #define USB_NUM_ENDPOINTS 7 |
diff --git a/firmware/export/config/gigabeats.h b/firmware/export/config/gigabeats.h index 6657134f9d..b20a6934a7 100644 --- a/firmware/export/config/gigabeats.h +++ b/firmware/export/config/gigabeats.h | |||
@@ -217,7 +217,6 @@ | |||
217 | #define CONFIG_USBOTG USBOTG_ARC | 217 | #define CONFIG_USBOTG USBOTG_ARC |
218 | 218 | ||
219 | /* enable these for the usb stack */ | 219 | /* enable these for the usb stack */ |
220 | #define USE_ROCKBOX_USB | ||
221 | #define HAVE_USBSTACK | 220 | #define HAVE_USBSTACK |
222 | /* usb stack and driver settings */ | 221 | /* usb stack and driver settings */ |
223 | #define USB_PORTSCX_PHY_TYPE PORTSCX_PTS_ULPI | 222 | #define USB_PORTSCX_PHY_TYPE PORTSCX_PTS_ULPI |
diff --git a/firmware/export/config/gogearhdd1630.h b/firmware/export/config/gogearhdd1630.h index e1e0af0566..3898c3f4fd 100644 --- a/firmware/export/config/gogearhdd1630.h +++ b/firmware/export/config/gogearhdd1630.h | |||
@@ -192,7 +192,6 @@ | |||
192 | 192 | ||
193 | /* enable these for the experimental usb stack */ | 193 | /* enable these for the experimental usb stack */ |
194 | #define HAVE_USBSTACK | 194 | #define HAVE_USBSTACK |
195 | #define USE_ROCKBOX_USB | ||
196 | #define USB_VENDOR_ID 0x0471 | 195 | #define USB_VENDOR_ID 0x0471 |
197 | #define USB_PRODUCT_ID 0x014C | 196 | #define USB_PRODUCT_ID 0x014C |
198 | #define HAVE_USB_HID_MOUSE | 197 | #define HAVE_USB_HID_MOUSE |
diff --git a/firmware/export/config/gogearhdd6330.h b/firmware/export/config/gogearhdd6330.h index fde8364ded..b250de86be 100644 --- a/firmware/export/config/gogearhdd6330.h +++ b/firmware/export/config/gogearhdd6330.h | |||
@@ -194,7 +194,6 @@ | |||
194 | 194 | ||
195 | /* enable these for the experimental usb stack */ | 195 | /* enable these for the experimental usb stack */ |
196 | #define HAVE_USBSTACK | 196 | #define HAVE_USBSTACK |
197 | #define USE_ROCKBOX_USB | ||
198 | #define USB_VENDOR_ID 0x0471 | 197 | #define USB_VENDOR_ID 0x0471 |
199 | #define USB_PRODUCT_ID 0x014B | 198 | #define USB_PRODUCT_ID 0x014B |
200 | #define HAVE_USB_HID_MOUSE | 199 | #define HAVE_USB_HID_MOUSE |
diff --git a/firmware/export/config/gogearsa9200.h b/firmware/export/config/gogearsa9200.h index 90d5ad6938..04dcf8abc4 100644 --- a/firmware/export/config/gogearsa9200.h +++ b/firmware/export/config/gogearsa9200.h | |||
@@ -173,7 +173,6 @@ | |||
173 | 173 | ||
174 | /* enable these for the experimental usb stack */ | 174 | /* enable these for the experimental usb stack */ |
175 | #define HAVE_USBSTACK | 175 | #define HAVE_USBSTACK |
176 | #define USE_ROCKBOX_USB | ||
177 | #define USB_VENDOR_ID 0x0471 | 176 | #define USB_VENDOR_ID 0x0471 |
178 | #define USB_PRODUCT_ID 0x014f | 177 | #define USB_PRODUCT_ID 0x014f |
179 | #define HAVE_USB_HID_MOUSE | 178 | #define HAVE_USB_HID_MOUSE |
diff --git a/firmware/export/config/hifietma8.h b/firmware/export/config/hifietma8.h index f5cf8cfac3..53aee996c8 100644 --- a/firmware/export/config/hifietma8.h +++ b/firmware/export/config/hifietma8.h | |||
@@ -115,7 +115,6 @@ | |||
115 | /* enable these for the experimental usb stack */ | 115 | /* enable these for the experimental usb stack */ |
116 | #define HAVE_USBSTACK | 116 | #define HAVE_USBSTACK |
117 | 117 | ||
118 | #define USE_ROCKBOX_USB | ||
119 | #define USB_VENDOR_ID 0x071b | 118 | #define USB_VENDOR_ID 0x071b |
120 | #define USB_PRODUCT_ID 0x3202 | 119 | #define USB_PRODUCT_ID 0x3202 |
121 | #define HAVE_BOOTLOADER_USB_MODE | 120 | #define HAVE_BOOTLOADER_USB_MODE |
diff --git a/firmware/export/config/hifietma8c.h b/firmware/export/config/hifietma8c.h index 897716b3c8..bc49701165 100644 --- a/firmware/export/config/hifietma8c.h +++ b/firmware/export/config/hifietma8c.h | |||
@@ -115,7 +115,6 @@ | |||
115 | /* enable these for the experimental usb stack */ | 115 | /* enable these for the experimental usb stack */ |
116 | #define HAVE_USBSTACK | 116 | #define HAVE_USBSTACK |
117 | 117 | ||
118 | #define USE_ROCKBOX_USB | ||
119 | #define USB_VENDOR_ID 0x071b | 118 | #define USB_VENDOR_ID 0x071b |
120 | #define USB_PRODUCT_ID 0x3202 | 119 | #define USB_PRODUCT_ID 0x3202 |
121 | #define HAVE_BOOTLOADER_USB_MODE | 120 | #define HAVE_BOOTLOADER_USB_MODE |
diff --git a/firmware/export/config/hifietma9.h b/firmware/export/config/hifietma9.h index 5df1a5fac4..81eedb3421 100644 --- a/firmware/export/config/hifietma9.h +++ b/firmware/export/config/hifietma9.h | |||
@@ -115,7 +115,6 @@ | |||
115 | /* enable these for the experimental usb stack */ | 115 | /* enable these for the experimental usb stack */ |
116 | #define HAVE_USBSTACK | 116 | #define HAVE_USBSTACK |
117 | 117 | ||
118 | #define USE_ROCKBOX_USB | ||
119 | #define USB_VENDOR_ID 0x071b | 118 | #define USB_VENDOR_ID 0x071b |
120 | #define USB_PRODUCT_ID 0x3202 | 119 | #define USB_PRODUCT_ID 0x3202 |
121 | #define HAVE_BOOTLOADER_USB_MODE | 120 | #define HAVE_BOOTLOADER_USB_MODE |
diff --git a/firmware/export/config/hifietma9c.h b/firmware/export/config/hifietma9c.h index 43f20de0c8..21106c7e50 100644 --- a/firmware/export/config/hifietma9c.h +++ b/firmware/export/config/hifietma9c.h | |||
@@ -115,7 +115,6 @@ | |||
115 | /* enable these for the experimental usb stack */ | 115 | /* enable these for the experimental usb stack */ |
116 | #define HAVE_USBSTACK | 116 | #define HAVE_USBSTACK |
117 | 117 | ||
118 | #define USE_ROCKBOX_USB | ||
119 | #define USB_VENDOR_ID 0x071b | 118 | #define USB_VENDOR_ID 0x071b |
120 | #define USB_PRODUCT_ID 0x3202 | 119 | #define USB_PRODUCT_ID 0x3202 |
121 | #define HAVE_BOOTLOADER_USB_MODE | 120 | #define HAVE_BOOTLOADER_USB_MODE |
diff --git a/firmware/export/config/hifimanhm60x.h b/firmware/export/config/hifimanhm60x.h index dbd7478338..433b2c4beb 100644 --- a/firmware/export/config/hifimanhm60x.h +++ b/firmware/export/config/hifimanhm60x.h | |||
@@ -149,7 +149,6 @@ | |||
149 | /* enable these for the experimental usb stack */ | 149 | /* enable these for the experimental usb stack */ |
150 | #define HAVE_USBSTACK | 150 | #define HAVE_USBSTACK |
151 | 151 | ||
152 | #define USE_ROCKBOX_USB | ||
153 | #define USB_VENDOR_ID 0x071b | 152 | #define USB_VENDOR_ID 0x071b |
154 | #define USB_PRODUCT_ID 0x3202 | 153 | #define USB_PRODUCT_ID 0x3202 |
155 | #define HAVE_BOOTLOADER_USB_MODE | 154 | #define HAVE_BOOTLOADER_USB_MODE |
diff --git a/firmware/export/config/hifimanhm801.h b/firmware/export/config/hifimanhm801.h index b1c1550183..9b4feea083 100644 --- a/firmware/export/config/hifimanhm801.h +++ b/firmware/export/config/hifimanhm801.h | |||
@@ -137,7 +137,6 @@ | |||
137 | /* enable these for the experimental usb stack */ | 137 | /* enable these for the experimental usb stack */ |
138 | #define HAVE_USBSTACK | 138 | #define HAVE_USBSTACK |
139 | 139 | ||
140 | #define USE_ROCKBOX_USB | ||
141 | #define USB_VENDOR_ID 0x071b | 140 | #define USB_VENDOR_ID 0x071b |
142 | #define USB_PRODUCT_ID 0x3202 | 141 | #define USB_PRODUCT_ID 0x3202 |
143 | #define HAVE_BOOTLOADER_USB_MODE | 142 | #define HAVE_BOOTLOADER_USB_MODE |
diff --git a/firmware/export/config/ihifi760.h b/firmware/export/config/ihifi760.h index f31d64cac9..e618c1bf56 100644 --- a/firmware/export/config/ihifi760.h +++ b/firmware/export/config/ihifi760.h | |||
@@ -149,7 +149,6 @@ | |||
149 | /* enable these for the experimental usb stack */ | 149 | /* enable these for the experimental usb stack */ |
150 | #define HAVE_USBSTACK | 150 | #define HAVE_USBSTACK |
151 | 151 | ||
152 | #define USE_ROCKBOX_USB | ||
153 | #define USB_VENDOR_ID 0x071b | 152 | #define USB_VENDOR_ID 0x071b |
154 | #define USB_PRODUCT_ID 0x3202 | 153 | #define USB_PRODUCT_ID 0x3202 |
155 | #define HAVE_BOOTLOADER_USB_MODE | 154 | #define HAVE_BOOTLOADER_USB_MODE |
diff --git a/firmware/export/config/ihifi960.h b/firmware/export/config/ihifi960.h index 06dcc8681e..d39ef82f98 100644 --- a/firmware/export/config/ihifi960.h +++ b/firmware/export/config/ihifi960.h | |||
@@ -149,7 +149,6 @@ | |||
149 | /* enable these for the experimental usb stack */ | 149 | /* enable these for the experimental usb stack */ |
150 | #define HAVE_USBSTACK | 150 | #define HAVE_USBSTACK |
151 | 151 | ||
152 | #define USE_ROCKBOX_USB | ||
153 | #define USB_VENDOR_ID 0x071b | 152 | #define USB_VENDOR_ID 0x071b |
154 | #define USB_PRODUCT_ID 0x3202 | 153 | #define USB_PRODUCT_ID 0x3202 |
155 | #define HAVE_BOOTLOADER_USB_MODE | 154 | #define HAVE_BOOTLOADER_USB_MODE |
diff --git a/firmware/export/config/ipod4g.h b/firmware/export/config/ipod4g.h index 39890cbb19..dc83a594fc 100644 --- a/firmware/export/config/ipod4g.h +++ b/firmware/export/config/ipod4g.h | |||
@@ -202,7 +202,6 @@ | |||
202 | 202 | ||
203 | /* enable these for the experimental usb stack */ | 203 | /* enable these for the experimental usb stack */ |
204 | #define HAVE_USBSTACK | 204 | #define HAVE_USBSTACK |
205 | #define USE_ROCKBOX_USB | ||
206 | #define USB_VENDOR_ID 0x05ac | 205 | #define USB_VENDOR_ID 0x05ac |
207 | #define USB_PRODUCT_ID 0x1203 | 206 | #define USB_PRODUCT_ID 0x1203 |
208 | #define HAVE_USB_HID_MOUSE | 207 | #define HAVE_USB_HID_MOUSE |
diff --git a/firmware/export/config/ipod6g.h b/firmware/export/config/ipod6g.h index 5590c96be1..d38f604f9f 100644 --- a/firmware/export/config/ipod6g.h +++ b/firmware/export/config/ipod6g.h | |||
@@ -243,7 +243,6 @@ | |||
243 | #define USB_VENDOR_ID 0x05AC | 243 | #define USB_VENDOR_ID 0x05AC |
244 | #define USB_PRODUCT_ID 0x1261 | 244 | #define USB_PRODUCT_ID 0x1261 |
245 | #define USB_NUM_ENDPOINTS 6 | 245 | #define USB_NUM_ENDPOINTS 6 |
246 | #define USE_ROCKBOX_USB | ||
247 | #define USB_DEVBSS_ATTR __attribute__((aligned(16))) | 246 | #define USB_DEVBSS_ATTR __attribute__((aligned(16))) |
248 | 247 | ||
249 | /* Define this if you can switch on/off the accessory power supply */ | 248 | /* Define this if you can switch on/off the accessory power supply */ |
diff --git a/firmware/export/config/ipodcolor.h b/firmware/export/config/ipodcolor.h index 960adf97d6..9f34a7955b 100644 --- a/firmware/export/config/ipodcolor.h +++ b/firmware/export/config/ipodcolor.h | |||
@@ -189,7 +189,6 @@ | |||
189 | 189 | ||
190 | /* enable these for the experimental usb stack */ | 190 | /* enable these for the experimental usb stack */ |
191 | #define HAVE_USBSTACK | 191 | #define HAVE_USBSTACK |
192 | #define USE_ROCKBOX_USB | ||
193 | #define USB_VENDOR_ID 0x05ac | 192 | #define USB_VENDOR_ID 0x05ac |
194 | #define USB_PRODUCT_ID 0x1204 | 193 | #define USB_PRODUCT_ID 0x1204 |
195 | #define HAVE_USB_HID_MOUSE | 194 | #define HAVE_USB_HID_MOUSE |
diff --git a/firmware/export/config/ipodmini1g.h b/firmware/export/config/ipodmini1g.h index 147812124a..71dfe16c04 100644 --- a/firmware/export/config/ipodmini1g.h +++ b/firmware/export/config/ipodmini1g.h | |||
@@ -201,7 +201,6 @@ | |||
201 | 201 | ||
202 | /* enable these for the experimental usb stack */ | 202 | /* enable these for the experimental usb stack */ |
203 | #define HAVE_USBSTACK | 203 | #define HAVE_USBSTACK |
204 | #define USE_ROCKBOX_USB | ||
205 | #define USB_VENDOR_ID 0x05ac | 204 | #define USB_VENDOR_ID 0x05ac |
206 | #define USB_PRODUCT_ID 0x1205 | 205 | #define USB_PRODUCT_ID 0x1205 |
207 | #define HAVE_USB_HID_MOUSE | 206 | #define HAVE_USB_HID_MOUSE |
diff --git a/firmware/export/config/ipodmini2g.h b/firmware/export/config/ipodmini2g.h index 60959d64e8..a2b199afee 100644 --- a/firmware/export/config/ipodmini2g.h +++ b/firmware/export/config/ipodmini2g.h | |||
@@ -202,7 +202,6 @@ | |||
202 | 202 | ||
203 | /* enable these for the experimental usb stack */ | 203 | /* enable these for the experimental usb stack */ |
204 | #define HAVE_USBSTACK | 204 | #define HAVE_USBSTACK |
205 | #define USE_ROCKBOX_USB | ||
206 | #define USB_VENDOR_ID 0x05ac | 205 | #define USB_VENDOR_ID 0x05ac |
207 | #define USB_PRODUCT_ID 0x1205 | 206 | #define USB_PRODUCT_ID 0x1205 |
208 | #define HAVE_USB_HID_MOUSE | 207 | #define HAVE_USB_HID_MOUSE |
diff --git a/firmware/export/config/ipodnano1g.h b/firmware/export/config/ipodnano1g.h index 2a3bf4bb7a..acdfff3c15 100644 --- a/firmware/export/config/ipodnano1g.h +++ b/firmware/export/config/ipodnano1g.h | |||
@@ -189,7 +189,6 @@ | |||
189 | 189 | ||
190 | /* enable these for the experimental usb stack */ | 190 | /* enable these for the experimental usb stack */ |
191 | #define HAVE_USBSTACK | 191 | #define HAVE_USBSTACK |
192 | #define USE_ROCKBOX_USB | ||
193 | #define USB_VENDOR_ID 0x05ac | 192 | #define USB_VENDOR_ID 0x05ac |
194 | #define USB_PRODUCT_ID 0x120a | 193 | #define USB_PRODUCT_ID 0x120a |
195 | #define HAVE_USB_HID_MOUSE | 194 | #define HAVE_USB_HID_MOUSE |
diff --git a/firmware/export/config/ipodnano2g.h b/firmware/export/config/ipodnano2g.h index 2c7db2a095..5ad41a16c1 100644 --- a/firmware/export/config/ipodnano2g.h +++ b/firmware/export/config/ipodnano2g.h | |||
@@ -227,7 +227,6 @@ | |||
227 | #define USB_VENDOR_ID 0x05AC | 227 | #define USB_VENDOR_ID 0x05AC |
228 | #define USB_PRODUCT_ID 0x1260 | 228 | #define USB_PRODUCT_ID 0x1260 |
229 | #define USB_NUM_ENDPOINTS 6 | 229 | #define USB_NUM_ENDPOINTS 6 |
230 | #define USE_ROCKBOX_USB | ||
231 | #define USB_DEVBSS_ATTR __attribute__((aligned(16))) | 230 | #define USB_DEVBSS_ATTR __attribute__((aligned(16))) |
232 | 231 | ||
233 | /* Define this if you can switch on/off the accessory power supply */ | 232 | /* Define this if you can switch on/off the accessory power supply */ |
diff --git a/firmware/export/config/ipodvideo.h b/firmware/export/config/ipodvideo.h index 8a6e53dc16..2f28182731 100644 --- a/firmware/export/config/ipodvideo.h +++ b/firmware/export/config/ipodvideo.h | |||
@@ -208,7 +208,6 @@ | |||
208 | 208 | ||
209 | /* enable these for the experimental usb stack */ | 209 | /* enable these for the experimental usb stack */ |
210 | #define HAVE_USBSTACK | 210 | #define HAVE_USBSTACK |
211 | #define USE_ROCKBOX_USB | ||
212 | #define USB_VENDOR_ID 0x05ac | 211 | #define USB_VENDOR_ID 0x05ac |
213 | #define USB_PRODUCT_ID 0x1209 | 212 | #define USB_PRODUCT_ID 0x1209 |
214 | #define HAVE_USB_HID_MOUSE | 213 | #define HAVE_USB_HID_MOUSE |
diff --git a/firmware/export/config/iriverh10.h b/firmware/export/config/iriverh10.h index a5d0bf5d47..efa0c993a1 100644 --- a/firmware/export/config/iriverh10.h +++ b/firmware/export/config/iriverh10.h | |||
@@ -173,7 +173,6 @@ | |||
173 | 173 | ||
174 | /* enable these for the experimental usb stack */ | 174 | /* enable these for the experimental usb stack */ |
175 | #define HAVE_USBSTACK | 175 | #define HAVE_USBSTACK |
176 | #define USE_ROCKBOX_USB | ||
177 | #define USB_VENDOR_ID 0x0B70 | 176 | #define USB_VENDOR_ID 0x0B70 |
178 | #define USB_PRODUCT_ID 0x00BA | 177 | #define USB_PRODUCT_ID 0x00BA |
179 | #define HAVE_USB_HID_MOUSE | 178 | #define HAVE_USB_HID_MOUSE |
diff --git a/firmware/export/config/iriverh10_5gb.h b/firmware/export/config/iriverh10_5gb.h index 9d52c8b317..4d3c3f28b0 100644 --- a/firmware/export/config/iriverh10_5gb.h +++ b/firmware/export/config/iriverh10_5gb.h | |||
@@ -160,7 +160,6 @@ | |||
160 | 160 | ||
161 | /* enable these for the experimental usb stack */ | 161 | /* enable these for the experimental usb stack */ |
162 | #define HAVE_USBSTACK | 162 | #define HAVE_USBSTACK |
163 | #define USE_ROCKBOX_USB | ||
164 | #define USB_VENDOR_ID 0x0B70 | 163 | #define USB_VENDOR_ID 0x0B70 |
165 | #define USB_PRODUCT_ID 0x00BA | 164 | #define USB_PRODUCT_ID 0x00BA |
166 | #define HAVE_USB_HID_MOUSE | 165 | #define HAVE_USB_HID_MOUSE |
diff --git a/firmware/export/config/mrobe100.h b/firmware/export/config/mrobe100.h index c020bbc700..5b6a489550 100644 --- a/firmware/export/config/mrobe100.h +++ b/firmware/export/config/mrobe100.h | |||
@@ -178,7 +178,6 @@ | |||
178 | 178 | ||
179 | /* enable these for the experimental usb stack */ | 179 | /* enable these for the experimental usb stack */ |
180 | #define HAVE_USBSTACK | 180 | #define HAVE_USBSTACK |
181 | #define USE_ROCKBOX_USB | ||
182 | #define USB_VENDOR_ID 0x07B4 | 181 | #define USB_VENDOR_ID 0x07B4 |
183 | #define USB_PRODUCT_ID 0x0280 | 182 | #define USB_PRODUCT_ID 0x0280 |
184 | #define HAVE_USB_HID_MOUSE | 183 | #define HAVE_USB_HID_MOUSE |
diff --git a/firmware/export/config/mrobe500.h b/firmware/export/config/mrobe500.h index c2738f94c5..32b4f7c99d 100644 --- a/firmware/export/config/mrobe500.h +++ b/firmware/export/config/mrobe500.h | |||
@@ -211,7 +211,6 @@ | |||
211 | 211 | ||
212 | /* enable these for the usb stack */ | 212 | /* enable these for the usb stack */ |
213 | #define CONFIG_USBOTG USBOTG_M66591 | 213 | #define CONFIG_USBOTG USBOTG_M66591 |
214 | #define USE_ROCKBOX_USB | ||
215 | 214 | ||
216 | #define HAVE_USBSTACK | 215 | #define HAVE_USBSTACK |
217 | //#define HAVE_USB_POWER | 216 | //#define HAVE_USB_POWER |
diff --git a/firmware/export/config/ondavx747.h b/firmware/export/config/ondavx747.h index 8499c15ce9..d02845808f 100644 --- a/firmware/export/config/ondavx747.h +++ b/firmware/export/config/ondavx747.h | |||
@@ -207,7 +207,6 @@ No access to the NAND yet.. | |||
207 | 207 | ||
208 | #define CONFIG_USBOTG USBOTG_JZ4740 | 208 | #define CONFIG_USBOTG USBOTG_JZ4740 |
209 | #define HAVE_USBSTACK | 209 | #define HAVE_USBSTACK |
210 | #define USE_ROCKBOX_USB | ||
211 | /* Connect by events, not by tick polling */ | 210 | /* Connect by events, not by tick polling */ |
212 | #define USB_STATUS_BY_EVENT | 211 | #define USB_STATUS_BY_EVENT |
213 | 212 | ||
diff --git a/firmware/export/config/ondavx767.h b/firmware/export/config/ondavx767.h index 7499873537..77fce1d1a4 100644 --- a/firmware/export/config/ondavx767.h +++ b/firmware/export/config/ondavx767.h | |||
@@ -163,7 +163,6 @@ | |||
163 | 163 | ||
164 | #define CONFIG_USBOTG USBOTG_JZ4740 | 164 | #define CONFIG_USBOTG USBOTG_JZ4740 |
165 | #define HAVE_USBSTACK | 165 | #define HAVE_USBSTACK |
166 | #define USE_ROCKBOX_USB | ||
167 | #define USB_VENDOR_ID 0x07C4 | 166 | #define USB_VENDOR_ID 0x07C4 |
168 | #define USB_PRODUCT_ID 0xA4A5 | 167 | #define USB_PRODUCT_ID 0xA4A5 |
169 | 168 | ||
diff --git a/firmware/export/config/ondavx777.h b/firmware/export/config/ondavx777.h index a254b0177c..404d193d4a 100644 --- a/firmware/export/config/ondavx777.h +++ b/firmware/export/config/ondavx777.h | |||
@@ -194,7 +194,6 @@ No access to the NAND yet.. | |||
194 | 194 | ||
195 | #define CONFIG_USBOTG USBOTG_JZ4740 | 195 | #define CONFIG_USBOTG USBOTG_JZ4740 |
196 | #define HAVE_USBSTACK | 196 | #define HAVE_USBSTACK |
197 | #define USE_ROCKBOX_USB | ||
198 | /* Connect by events, not by tick polling */ | 197 | /* Connect by events, not by tick polling */ |
199 | #define USB_STATUS_BY_EVENT | 198 | #define USB_STATUS_BY_EVENT |
200 | #define USB_VENDOR_ID 0x07C4 | 199 | #define USB_VENDOR_ID 0x07C4 |
diff --git a/firmware/export/config/rk27generic.h b/firmware/export/config/rk27generic.h index 4d5f1b6c5c..786ac283e2 100644 --- a/firmware/export/config/rk27generic.h +++ b/firmware/export/config/rk27generic.h | |||
@@ -157,7 +157,6 @@ | |||
157 | /* enable these for the experimental usb stack */ | 157 | /* enable these for the experimental usb stack */ |
158 | #define HAVE_USBSTACK | 158 | #define HAVE_USBSTACK |
159 | 159 | ||
160 | #define USE_ROCKBOX_USB | ||
161 | #define USB_VENDOR_ID 0x071b | 160 | #define USB_VENDOR_ID 0x071b |
162 | #define USB_PRODUCT_ID 0x3202 | 161 | #define USB_PRODUCT_ID 0x3202 |
163 | #define HAVE_BOOTLOADER_USB_MODE | 162 | #define HAVE_BOOTLOADER_USB_MODE |
diff --git a/firmware/export/config/samsungyh820.h b/firmware/export/config/samsungyh820.h index fef914e445..52ed821370 100644 --- a/firmware/export/config/samsungyh820.h +++ b/firmware/export/config/samsungyh820.h | |||
@@ -165,7 +165,6 @@ | |||
165 | 165 | ||
166 | /* enable these for the experimental usb stack */ | 166 | /* enable these for the experimental usb stack */ |
167 | #define HAVE_USBSTACK | 167 | #define HAVE_USBSTACK |
168 | #define USE_ROCKBOX_USB | ||
169 | #define USB_VENDOR_ID 0x04e8 | 168 | #define USB_VENDOR_ID 0x04e8 |
170 | #define USB_PRODUCT_ID 0x5023 | 169 | #define USB_PRODUCT_ID 0x5023 |
171 | #define HAVE_USB_HID_MOUSE | 170 | #define HAVE_USB_HID_MOUSE |
diff --git a/firmware/export/config/samsungyh920.h b/firmware/export/config/samsungyh920.h index a05ee94ddd..27f1ca76a3 100644 --- a/firmware/export/config/samsungyh920.h +++ b/firmware/export/config/samsungyh920.h | |||
@@ -181,7 +181,6 @@ | |||
181 | 181 | ||
182 | /* enable these for the experimental usb stack */ | 182 | /* enable these for the experimental usb stack */ |
183 | #define HAVE_USBSTACK | 183 | #define HAVE_USBSTACK |
184 | #define USE_ROCKBOX_USB | ||
185 | #define USB_VENDOR_ID 0x04e8 | 184 | #define USB_VENDOR_ID 0x04e8 |
186 | #define USB_PRODUCT_ID 0x5022 | 185 | #define USB_PRODUCT_ID 0x5022 |
187 | #define HAVE_USB_HID_MOUSE | 186 | #define HAVE_USB_HID_MOUSE |
diff --git a/firmware/export/config/samsungyh925.h b/firmware/export/config/samsungyh925.h index 4816117fb3..e6c2133034 100644 --- a/firmware/export/config/samsungyh925.h +++ b/firmware/export/config/samsungyh925.h | |||
@@ -172,7 +172,6 @@ | |||
172 | 172 | ||
173 | /* enable these for the experimental usb stack */ | 173 | /* enable these for the experimental usb stack */ |
174 | #define HAVE_USBSTACK | 174 | #define HAVE_USBSTACK |
175 | #define USE_ROCKBOX_USB | ||
176 | #define USB_VENDOR_ID 0x04e8 | 175 | #define USB_VENDOR_ID 0x04e8 |
177 | #define USB_PRODUCT_ID 0x5024 | 176 | #define USB_PRODUCT_ID 0x5024 |
178 | #define HAVE_USB_HID_MOUSE | 177 | #define HAVE_USB_HID_MOUSE |
diff --git a/firmware/export/config/samsungyps3.h b/firmware/export/config/samsungyps3.h index ddfe176020..3843a3c08d 100644 --- a/firmware/export/config/samsungyps3.h +++ b/firmware/export/config/samsungyps3.h | |||
@@ -149,7 +149,6 @@ | |||
149 | 149 | ||
150 | /* USB */ | 150 | /* USB */ |
151 | //#define HAVE_USBSTACK | 151 | //#define HAVE_USBSTACK |
152 | #define USE_ROCKBOX_USB | ||
153 | #define USB_VENDOR_ID 0x04E8 | 152 | #define USB_VENDOR_ID 0x04E8 |
154 | #define USB_PRODUCT_ID 0x5090 | 153 | #define USB_PRODUCT_ID 0x5090 |
155 | 154 | ||
diff --git a/firmware/export/config/samsungypz5.h b/firmware/export/config/samsungypz5.h index b1f382e042..0580fbbe0b 100644 --- a/firmware/export/config/samsungypz5.h +++ b/firmware/export/config/samsungypz5.h | |||
@@ -184,7 +184,6 @@ | |||
184 | 184 | ||
185 | /* enable these for the experimental usb stack */ | 185 | /* enable these for the experimental usb stack */ |
186 | #define HAVE_USBSTACK | 186 | #define HAVE_USBSTACK |
187 | #define USE_ROCKBOX_USB | ||
188 | #define USB_VENDOR_ID 0x04e8 | 187 | #define USB_VENDOR_ID 0x04e8 |
189 | #define USB_PRODUCT_ID 0x5041 | 188 | #define USB_PRODUCT_ID 0x5041 |
190 | #define HAVE_USB_HID_MOUSE | 189 | #define HAVE_USB_HID_MOUSE |
diff --git a/firmware/export/config/sansac200.h b/firmware/export/config/sansac200.h index c3fd2d05e0..4e8ea55002 100644 --- a/firmware/export/config/sansac200.h +++ b/firmware/export/config/sansac200.h | |||
@@ -189,7 +189,6 @@ | |||
189 | 189 | ||
190 | /* enable these for the experimental usb stack */ | 190 | /* enable these for the experimental usb stack */ |
191 | #define HAVE_USBSTACK | 191 | #define HAVE_USBSTACK |
192 | #define USE_ROCKBOX_USB | ||
193 | #define USB_VENDOR_ID 0x0781 | 192 | #define USB_VENDOR_ID 0x0781 |
194 | #define USB_PRODUCT_ID 0x7451 | 193 | #define USB_PRODUCT_ID 0x7451 |
195 | #define HAVE_USB_HID_MOUSE | 194 | #define HAVE_USB_HID_MOUSE |
diff --git a/firmware/export/config/sansac200v2.h b/firmware/export/config/sansac200v2.h index 2d611240f2..9e9c8b835f 100644 --- a/firmware/export/config/sansac200v2.h +++ b/firmware/export/config/sansac200v2.h | |||
@@ -184,7 +184,6 @@ | |||
184 | /* enable these for the experimental usb stack */ | 184 | /* enable these for the experimental usb stack */ |
185 | #define HAVE_USBSTACK | 185 | #define HAVE_USBSTACK |
186 | //#define USB_HANDLED_BY_OF | 186 | //#define USB_HANDLED_BY_OF |
187 | #define USE_ROCKBOX_USB | ||
188 | //#define USB_ENABLE_SERIAL | 187 | //#define USB_ENABLE_SERIAL |
189 | #define USB_VENDOR_ID 0x0781 | 188 | #define USB_VENDOR_ID 0x0781 |
190 | #define USB_PRODUCT_ID 0x7452 | 189 | #define USB_PRODUCT_ID 0x7452 |
diff --git a/firmware/export/config/sansaclip.h b/firmware/export/config/sansaclip.h index 6070a6efaa..54500402d7 100644 --- a/firmware/export/config/sansaclip.h +++ b/firmware/export/config/sansaclip.h | |||
@@ -179,7 +179,6 @@ | |||
179 | /* enable these for the experimental usb stack */ | 179 | /* enable these for the experimental usb stack */ |
180 | #define HAVE_USBSTACK | 180 | #define HAVE_USBSTACK |
181 | //#define USB_HANDLED_BY_OF | 181 | //#define USB_HANDLED_BY_OF |
182 | #define USE_ROCKBOX_USB | ||
183 | #define USB_VENDOR_ID 0x0781 | 182 | #define USB_VENDOR_ID 0x0781 |
184 | #define USB_PRODUCT_ID 0x7433 | 183 | #define USB_PRODUCT_ID 0x7433 |
185 | #define HAVE_USB_HID_MOUSE | 184 | #define HAVE_USB_HID_MOUSE |
diff --git a/firmware/export/config/sansaclipplus.h b/firmware/export/config/sansaclipplus.h index 0bdf82dce4..dc9ad90b5b 100644 --- a/firmware/export/config/sansaclipplus.h +++ b/firmware/export/config/sansaclipplus.h | |||
@@ -186,7 +186,6 @@ | |||
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 |
189 | #define USE_ROCKBOX_USB | ||
190 | #define USB_VENDOR_ID 0x0781 | 189 | #define USB_VENDOR_ID 0x0781 |
191 | #define USB_PRODUCT_ID 0x74d1 | 190 | #define USB_PRODUCT_ID 0x74d1 |
192 | 191 | ||
diff --git a/firmware/export/config/sansaclipv2.h b/firmware/export/config/sansaclipv2.h index a8ccebcf7a..a61d5ba18c 100644 --- a/firmware/export/config/sansaclipv2.h +++ b/firmware/export/config/sansaclipv2.h | |||
@@ -182,7 +182,6 @@ | |||
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 |
185 | #define USE_ROCKBOX_USB | ||
186 | #define USB_VENDOR_ID 0x0781 | 185 | #define USB_VENDOR_ID 0x0781 |
187 | #define USB_PRODUCT_ID 0x7435 | 186 | #define USB_PRODUCT_ID 0x7435 |
188 | 187 | ||
diff --git a/firmware/export/config/sansaclipzip.h b/firmware/export/config/sansaclipzip.h index eaf51d961b..50147b9714 100644 --- a/firmware/export/config/sansaclipzip.h +++ b/firmware/export/config/sansaclipzip.h | |||
@@ -185,7 +185,6 @@ | |||
185 | 185 | ||
186 | /* enable these for the experimental usb stack */ | 186 | /* enable these for the experimental usb stack */ |
187 | #define HAVE_USBSTACK | 187 | #define HAVE_USBSTACK |
188 | #define USE_ROCKBOX_USB | ||
189 | #define USB_VENDOR_ID 0x0781 | 188 | #define USB_VENDOR_ID 0x0781 |
190 | #define USB_PRODUCT_ID 0x74e5 | 189 | #define USB_PRODUCT_ID 0x74e5 |
191 | 190 | ||
diff --git a/firmware/export/config/sansae200.h b/firmware/export/config/sansae200.h index 296416a91e..db3ccb1c1c 100644 --- a/firmware/export/config/sansae200.h +++ b/firmware/export/config/sansae200.h | |||
@@ -189,7 +189,6 @@ | |||
189 | 189 | ||
190 | /* enable these for the experimental usb stack */ | 190 | /* enable these for the experimental usb stack */ |
191 | #define HAVE_USBSTACK | 191 | #define HAVE_USBSTACK |
192 | #define USE_ROCKBOX_USB | ||
193 | #define USB_VENDOR_ID 0x0781 | 192 | #define USB_VENDOR_ID 0x0781 |
194 | #define USB_PRODUCT_ID 0x7421 | 193 | #define USB_PRODUCT_ID 0x7421 |
195 | #define HAVE_USB_HID_MOUSE | 194 | #define HAVE_USB_HID_MOUSE |
diff --git a/firmware/export/config/sansae200v2.h b/firmware/export/config/sansae200v2.h index c703439e7f..23bee8c98a 100644 --- a/firmware/export/config/sansae200v2.h +++ b/firmware/export/config/sansae200v2.h | |||
@@ -201,7 +201,6 @@ | |||
201 | /* enable these for the experimental usb stack */ | 201 | /* enable these for the experimental usb stack */ |
202 | #define HAVE_USBSTACK | 202 | #define HAVE_USBSTACK |
203 | //#define USB_HANDLED_BY_OF | 203 | //#define USB_HANDLED_BY_OF |
204 | #define USE_ROCKBOX_USB | ||
205 | #define USB_VENDOR_ID 0x0781 | 204 | #define USB_VENDOR_ID 0x0781 |
206 | #define USB_PRODUCT_ID 0x7423 | 205 | #define USB_PRODUCT_ID 0x7423 |
207 | #define HAVE_USB_HID_MOUSE | 206 | #define HAVE_USB_HID_MOUSE |
diff --git a/firmware/export/config/sansafuze.h b/firmware/export/config/sansafuze.h index c03106e4c3..b2cdf061dd 100644 --- a/firmware/export/config/sansafuze.h +++ b/firmware/export/config/sansafuze.h | |||
@@ -202,7 +202,6 @@ | |||
202 | /* enable these for the experimental usb stack */ | 202 | /* enable these for the experimental usb stack */ |
203 | #define HAVE_USBSTACK | 203 | #define HAVE_USBSTACK |
204 | //#define USB_HANDLED_BY_OF | 204 | //#define USB_HANDLED_BY_OF |
205 | #define USE_ROCKBOX_USB | ||
206 | #define USB_VENDOR_ID 0x0781 | 205 | #define USB_VENDOR_ID 0x0781 |
207 | #define USB_PRODUCT_ID 0x74c1 | 206 | #define USB_PRODUCT_ID 0x74c1 |
208 | #define HAVE_USB_HID_MOUSE | 207 | #define HAVE_USB_HID_MOUSE |
diff --git a/firmware/export/config/sansafuzeplus.h b/firmware/export/config/sansafuzeplus.h index 270060d594..73ac5b9d32 100644 --- a/firmware/export/config/sansafuzeplus.h +++ b/firmware/export/config/sansafuzeplus.h | |||
@@ -185,7 +185,6 @@ | |||
185 | /* enable these for the experimental usb stack */ | 185 | /* enable these for the experimental usb stack */ |
186 | #define HAVE_USBSTACK | 186 | #define HAVE_USBSTACK |
187 | //#define USB_HANDLED_BY_OF | 187 | //#define USB_HANDLED_BY_OF |
188 | #define USE_ROCKBOX_USB | ||
189 | #define USB_VENDOR_ID 0x0781 | 188 | #define USB_VENDOR_ID 0x0781 |
190 | #define USB_PRODUCT_ID 0x74e1 | 189 | #define USB_PRODUCT_ID 0x74e1 |
191 | #define HAVE_USB_HID_MOUSE | 190 | #define HAVE_USB_HID_MOUSE |
diff --git a/firmware/export/config/sansafuzev2.h b/firmware/export/config/sansafuzev2.h index beb18d92c7..a0197bfb41 100644 --- a/firmware/export/config/sansafuzev2.h +++ b/firmware/export/config/sansafuzev2.h | |||
@@ -203,7 +203,6 @@ | |||
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 |
206 | #define USE_ROCKBOX_USB | ||
207 | #define USB_VENDOR_ID 0x0781 | 206 | #define USB_VENDOR_ID 0x0781 |
208 | #define USB_PRODUCT_ID 0x74c3 /* MSC = 0x74c3, MTP = 0x74c2 */ | 207 | #define USB_PRODUCT_ID 0x74c3 /* MSC = 0x74c3, MTP = 0x74c2 */ |
209 | 208 | ||
diff --git a/firmware/export/config/sansam200v4.h b/firmware/export/config/sansam200v4.h index f6b2ebc006..99e84e65e0 100644 --- a/firmware/export/config/sansam200v4.h +++ b/firmware/export/config/sansam200v4.h | |||
@@ -145,7 +145,6 @@ | |||
145 | /* enable these for the experimental usb stack */ | 145 | /* enable these for the experimental usb stack */ |
146 | #define HAVE_USBSTACK | 146 | #define HAVE_USBSTACK |
147 | //#define USB_HANDLED_BY_OF | 147 | //#define USB_HANDLED_BY_OF |
148 | #define USE_ROCKBOX_USB | ||
149 | #define USB_VENDOR_ID 0x0781 | 148 | #define USB_VENDOR_ID 0x0781 |
150 | #define USB_PRODUCT_ID 0x7431 | 149 | #define USB_PRODUCT_ID 0x7431 |
151 | #define HAVE_USB_HID_MOUSE | 150 | #define HAVE_USB_HID_MOUSE |
diff --git a/firmware/export/config/sansaview.h b/firmware/export/config/sansaview.h index 140407453b..21083da7cb 100644 --- a/firmware/export/config/sansaview.h +++ b/firmware/export/config/sansaview.h | |||
@@ -171,7 +171,6 @@ | |||
171 | 171 | ||
172 | /* enable these for the experimental usb stack */ | 172 | /* enable these for the experimental usb stack */ |
173 | #define HAVE_USBSTACK | 173 | #define HAVE_USBSTACK |
174 | #define USE_ROCKBOX_USB | ||
175 | #define USB_VENDOR_ID 0x0781 | 174 | #define USB_VENDOR_ID 0x0781 |
176 | #define USB_PRODUCT_ID 0x74b1 | 175 | #define USB_PRODUCT_ID 0x74b1 |
177 | 176 | ||
diff --git a/firmware/export/config/sim.h b/firmware/export/config/sim.h index 2f819b733e..2dd6a929d3 100644 --- a/firmware/export/config/sim.h +++ b/firmware/export/config/sim.h | |||
@@ -51,7 +51,6 @@ | |||
51 | #undef USB_HANDLED_BY_OF | 51 | #undef USB_HANDLED_BY_OF |
52 | 52 | ||
53 | #undef HAVE_USBSTACK | 53 | #undef HAVE_USBSTACK |
54 | #undef USE_ROCKBOX_USB | ||
55 | #undef USB_VENDOR_ID | 54 | #undef USB_VENDOR_ID |
56 | #undef USB_PRODUCT_ID | 55 | #undef USB_PRODUCT_ID |
57 | #undef USB_NUM_ENDPOINTS | 56 | #undef USB_NUM_ENDPOINTS |
diff --git a/firmware/export/config/sonynwze360.h b/firmware/export/config/sonynwze360.h index 685391d5f9..5f5b1cd597 100644 --- a/firmware/export/config/sonynwze360.h +++ b/firmware/export/config/sonynwze360.h | |||
@@ -167,7 +167,6 @@ | |||
167 | /* enable these for the experimental usb stack */ | 167 | /* enable these for the experimental usb stack */ |
168 | #define HAVE_USBSTACK | 168 | #define HAVE_USBSTACK |
169 | //#define USB_HANDLED_BY_OF | 169 | //#define USB_HANDLED_BY_OF |
170 | #define USE_ROCKBOX_USB | ||
171 | #define USB_VENDOR_ID 0x054c | 170 | #define USB_VENDOR_ID 0x054c |
172 | #define USB_PRODUCT_ID 0x059b | 171 | #define USB_PRODUCT_ID 0x059b |
173 | #define HAVE_USB_HID_MOUSE | 172 | #define HAVE_USB_HID_MOUSE |
diff --git a/firmware/export/config/sonynwze370.h b/firmware/export/config/sonynwze370.h index 053d103f2e..b4c4f16b13 100644 --- a/firmware/export/config/sonynwze370.h +++ b/firmware/export/config/sonynwze370.h | |||
@@ -164,7 +164,6 @@ | |||
164 | /* enable these for the experimental usb stack */ | 164 | /* enable these for the experimental usb stack */ |
165 | #define HAVE_USBSTACK | 165 | #define HAVE_USBSTACK |
166 | //#define USB_HANDLED_BY_OF | 166 | //#define USB_HANDLED_BY_OF |
167 | #define USE_ROCKBOX_USB | ||
168 | #define USB_VENDOR_ID 0x054c | 167 | #define USB_VENDOR_ID 0x054c |
169 | #define USB_PRODUCT_ID 0x068a | 168 | #define USB_PRODUCT_ID 0x068a |
170 | #define HAVE_USB_HID_MOUSE | 169 | #define HAVE_USB_HID_MOUSE |
diff --git a/firmware/export/config/vibe500.h b/firmware/export/config/vibe500.h index 96b5321e66..8e61726434 100644 --- a/firmware/export/config/vibe500.h +++ b/firmware/export/config/vibe500.h | |||
@@ -175,7 +175,6 @@ | |||
175 | 175 | ||
176 | /* enable these for the experimental usb stack */ | 176 | /* enable these for the experimental usb stack */ |
177 | #define HAVE_USBSTACK | 177 | #define HAVE_USBSTACK |
178 | #define USE_ROCKBOX_USB | ||
179 | #define USB_VENDOR_ID 0x0409 | 178 | #define USB_VENDOR_ID 0x0409 |
180 | #define USB_PRODUCT_ID 0x8038 | 179 | #define USB_PRODUCT_ID 0x8038 |
181 | #define HAVE_USB_HID_MOUSE | 180 | #define HAVE_USB_HID_MOUSE |
diff --git a/firmware/export/config/zenvisionm30gb.h b/firmware/export/config/zenvisionm30gb.h index 73d852433b..6ce2876551 100644 --- a/firmware/export/config/zenvisionm30gb.h +++ b/firmware/export/config/zenvisionm30gb.h | |||
@@ -164,7 +164,6 @@ | |||
164 | 164 | ||
165 | #define CONFIG_USBOTG USBOTG_ISP1583 | 165 | #define CONFIG_USBOTG USBOTG_ISP1583 |
166 | #define HAVE_USBSTACK | 166 | #define HAVE_USBSTACK |
167 | #define USE_ROCKBOX_USB | ||
168 | #define USB_VENDOR_ID 0x041e | 167 | #define USB_VENDOR_ID 0x041e |
169 | #define USB_PRODUCT_ID 0x4133 | 168 | #define USB_PRODUCT_ID 0x4133 |
170 | #define USB_NUM_ENDPOINTS 7 | 169 | #define USB_NUM_ENDPOINTS 7 |
diff --git a/firmware/export/config/zenvisionm60gb.h b/firmware/export/config/zenvisionm60gb.h index d1bd91154b..5510e9a338 100644 --- a/firmware/export/config/zenvisionm60gb.h +++ b/firmware/export/config/zenvisionm60gb.h | |||
@@ -164,7 +164,6 @@ | |||
164 | /* #define CONFIG_USBOTG USBOTG_ISP1761 */ | 164 | /* #define CONFIG_USBOTG USBOTG_ISP1761 */ |
165 | #define CONFIG_USBOTG USBOTG_ISP1583 | 165 | #define CONFIG_USBOTG USBOTG_ISP1583 |
166 | #define HAVE_USBSTACK | 166 | #define HAVE_USBSTACK |
167 | #define USE_ROCKBOX_USB | ||
168 | #define USB_VENDOR_ID 0x041e | 167 | #define USB_VENDOR_ID 0x041e |
169 | #define USB_PRODUCT_ID 0x4133 | 168 | #define USB_PRODUCT_ID 0x4133 |
170 | #define USB_NUM_ENDPOINTS 7 | 169 | #define USB_NUM_ENDPOINTS 7 |