diff options
-rw-r--r-- | firmware/export/config/sansac200v2.h | 6 | ||||
-rw-r--r-- | firmware/export/config/sansaclip.h | 8 | ||||
-rw-r--r-- | firmware/export/config/sansaclipplus.h | 8 | ||||
-rw-r--r-- | firmware/export/config/sansaclipv2.h | 7 | ||||
-rw-r--r-- | firmware/export/config/sansae200v2.h | 8 | ||||
-rw-r--r-- | firmware/export/config/sansafuze.h | 8 | ||||
-rw-r--r-- | firmware/export/config/sansafuzev2.h | 8 | ||||
-rw-r--r-- | firmware/export/config/sansam200v4.h | 8 |
8 files changed, 16 insertions, 45 deletions
diff --git a/firmware/export/config/sansac200v2.h b/firmware/export/config/sansac200v2.h index f8ef590b01..0125442058 100644 --- a/firmware/export/config/sansac200v2.h +++ b/firmware/export/config/sansac200v2.h | |||
@@ -168,17 +168,15 @@ | |||
168 | #define NUM_DRIVES 2 | 168 | #define NUM_DRIVES 2 |
169 | #define HAVE_HOTSWAP | 169 | #define HAVE_HOTSWAP |
170 | 170 | ||
171 | #define USB_HANDLED_BY_OF | ||
172 | |||
173 | #define CONFIG_USBOTG USBOTG_AS3525 | 171 | #define CONFIG_USBOTG USBOTG_AS3525 |
174 | 172 | ||
175 | /* enable these for the experimental usb stack */ | 173 | /* enable these for the experimental usb stack */ |
176 | #define HAVE_USBSTACK | 174 | #define HAVE_USBSTACK |
175 | #define USB_HANDLED_BY_OF | ||
176 | //#define USE_ROCKBOX_USB | ||
177 | #define USB_VENDOR_ID 0x0781 | 177 | #define USB_VENDOR_ID 0x0781 |
178 | #define USB_PRODUCT_ID 0x7452 | 178 | #define USB_PRODUCT_ID 0x7452 |
179 | 179 | ||
180 | #endif /* BOOTLOADER */ | ||
181 | |||
182 | /* Define this if you have adjustable CPU frequency */ | 180 | /* Define this if you have adjustable CPU frequency */ |
183 | #define HAVE_ADJUSTABLE_CPU_FREQ | 181 | #define HAVE_ADJUSTABLE_CPU_FREQ |
184 | 182 | ||
diff --git a/firmware/export/config/sansaclip.h b/firmware/export/config/sansaclip.h index 602994d186..54d1f8a042 100644 --- a/firmware/export/config/sansaclip.h +++ b/firmware/export/config/sansaclip.h | |||
@@ -164,19 +164,15 @@ | |||
164 | /* Type of LCD */ | 164 | /* Type of LCD */ |
165 | #define CONFIG_LCD LCD_SSD1303 | 165 | #define CONFIG_LCD LCD_SSD1303 |
166 | 166 | ||
167 | #ifndef BOOTLOADER | ||
168 | |||
169 | #define USB_HANDLED_BY_OF | ||
170 | |||
171 | #define CONFIG_USBOTG USBOTG_AS3525 | 167 | #define CONFIG_USBOTG USBOTG_AS3525 |
172 | 168 | ||
173 | /* enable these for the experimental usb stack */ | 169 | /* enable these for the experimental usb stack */ |
174 | #define HAVE_USBSTACK | 170 | #define HAVE_USBSTACK |
171 | #define USB_HANDLED_BY_OF | ||
172 | //#define USE_ROCKBOX_USB | ||
175 | #define USB_VENDOR_ID 0x0781 | 173 | #define USB_VENDOR_ID 0x0781 |
176 | #define USB_PRODUCT_ID 0x7433 | 174 | #define USB_PRODUCT_ID 0x7433 |
177 | 175 | ||
178 | #endif /* BOOTLOADER */ | ||
179 | |||
180 | /* Define this if you have adjustable CPU frequency */ | 176 | /* Define this if you have adjustable CPU frequency */ |
181 | #define HAVE_ADJUSTABLE_CPU_FREQ | 177 | #define HAVE_ADJUSTABLE_CPU_FREQ |
182 | 178 | ||
diff --git a/firmware/export/config/sansaclipplus.h b/firmware/export/config/sansaclipplus.h index df9fad74c9..c52d803402 100644 --- a/firmware/export/config/sansaclipplus.h +++ b/firmware/export/config/sansaclipplus.h | |||
@@ -172,19 +172,15 @@ | |||
172 | /* Type of LCD */ | 172 | /* Type of LCD */ |
173 | #define CONFIG_LCD LCD_SSD1303 | 173 | #define CONFIG_LCD LCD_SSD1303 |
174 | 174 | ||
175 | #ifndef BOOTLOADER | ||
176 | |||
177 | #define USB_HANDLED_BY_OF | ||
178 | //#define USE_ROCKBOX_USB | ||
179 | |||
180 | /* USB On-the-go */ | 175 | /* USB On-the-go */ |
181 | #define CONFIG_USBOTG USBOTG_AS3525v2 | 176 | #define CONFIG_USBOTG USBOTG_AS3525v2 |
182 | 177 | ||
183 | /* enable these for the experimental usb stack */ | 178 | /* enable these for the experimental usb stack */ |
184 | #define HAVE_USBSTACK | 179 | #define HAVE_USBSTACK |
180 | #define USB_HANDLED_BY_OF | ||
181 | //#define USE_ROCKBOX_USB | ||
185 | #define USB_VENDOR_ID 0x0781 | 182 | #define USB_VENDOR_ID 0x0781 |
186 | #define USB_PRODUCT_ID 0x74d1 | 183 | #define USB_PRODUCT_ID 0x74d1 |
187 | #endif /* BOOTLOADER */ | ||
188 | 184 | ||
189 | 185 | ||
190 | /* Virtual LED (icon) */ | 186 | /* Virtual LED (icon) */ |
diff --git a/firmware/export/config/sansaclipv2.h b/firmware/export/config/sansaclipv2.h index 85c1276367..eb6fb6c737 100644 --- a/firmware/export/config/sansaclipv2.h +++ b/firmware/export/config/sansaclipv2.h | |||
@@ -167,18 +167,15 @@ | |||
167 | /* Type of LCD */ | 167 | /* Type of LCD */ |
168 | #define CONFIG_LCD LCD_SSD1303 | 168 | #define CONFIG_LCD LCD_SSD1303 |
169 | 169 | ||
170 | #ifndef BOOTLOADER | ||
171 | |||
172 | #define USB_HANDLED_BY_OF | ||
173 | |||
174 | /* USB On-the-go */ | 170 | /* USB On-the-go */ |
175 | #define CONFIG_USBOTG USBOTG_AS3525v2 | 171 | #define CONFIG_USBOTG USBOTG_AS3525v2 |
176 | 172 | ||
177 | /* enable these for the experimental usb stack */ | 173 | /* enable these for the experimental usb stack */ |
178 | #define HAVE_USBSTACK | 174 | #define HAVE_USBSTACK |
175 | #define USB_HANDLED_BY_OF | ||
176 | //#define USE_ROCKBOX_USB | ||
179 | #define USB_VENDOR_ID 0x0781 | 177 | #define USB_VENDOR_ID 0x0781 |
180 | #define USB_PRODUCT_ID 0x7435 | 178 | #define USB_PRODUCT_ID 0x7435 |
181 | #endif /* BOOTLOADER */ | ||
182 | 179 | ||
183 | /* Virtual LED (icon) */ | 180 | /* Virtual LED (icon) */ |
184 | #define CONFIG_LED LED_VIRTUAL | 181 | #define CONFIG_LED LED_VIRTUAL |
diff --git a/firmware/export/config/sansae200v2.h b/firmware/export/config/sansae200v2.h index 5694f0b9e2..dd235ee1a8 100644 --- a/firmware/export/config/sansae200v2.h +++ b/firmware/export/config/sansae200v2.h | |||
@@ -182,20 +182,16 @@ | |||
182 | #define HAVE_HOTSWAP | 182 | #define HAVE_HOTSWAP |
183 | #endif | 183 | #endif |
184 | 184 | ||
185 | #ifndef BOOTLOADER | ||
186 | |||
187 | #define USB_HANDLED_BY_OF | ||
188 | |||
189 | /* USB On-the-go */ | 185 | /* USB On-the-go */ |
190 | #define CONFIG_USBOTG USBOTG_AS3525 | 186 | #define CONFIG_USBOTG USBOTG_AS3525 |
191 | 187 | ||
192 | /* enable these for the experimental usb stack */ | 188 | /* enable these for the experimental usb stack */ |
193 | #define HAVE_USBSTACK | 189 | #define HAVE_USBSTACK |
190 | #define USB_HANDLED_BY_OF | ||
191 | //#define USE_ROCKBOX_USB | ||
194 | #define USB_VENDOR_ID 0x0781 | 192 | #define USB_VENDOR_ID 0x0781 |
195 | #define USB_PRODUCT_ID 0x7423 | 193 | #define USB_PRODUCT_ID 0x7423 |
196 | 194 | ||
197 | #endif /* !BOOTLOADER */ | ||
198 | |||
199 | /* Define this if you have adjustable CPU frequency */ | 195 | /* Define this if you have adjustable CPU frequency */ |
200 | #define HAVE_ADJUSTABLE_CPU_FREQ | 196 | #define HAVE_ADJUSTABLE_CPU_FREQ |
201 | 197 | ||
diff --git a/firmware/export/config/sansafuze.h b/firmware/export/config/sansafuze.h index 6c8ba82bc9..24676ed6bf 100644 --- a/firmware/export/config/sansafuze.h +++ b/firmware/export/config/sansafuze.h | |||
@@ -185,20 +185,16 @@ | |||
185 | #define HAVE_HOTSWAP | 185 | #define HAVE_HOTSWAP |
186 | #endif | 186 | #endif |
187 | 187 | ||
188 | #ifndef BOOTLOADER | ||
189 | |||
190 | #define USB_HANDLED_BY_OF | ||
191 | |||
192 | /* USB On-the-go */ | 188 | /* USB On-the-go */ |
193 | #define CONFIG_USBOTG USBOTG_AS3525 | 189 | #define CONFIG_USBOTG USBOTG_AS3525 |
194 | 190 | ||
195 | /* enable these for the experimental usb stack */ | 191 | /* enable these for the experimental usb stack */ |
196 | #define HAVE_USBSTACK | 192 | #define HAVE_USBSTACK |
193 | #define USB_HANDLED_BY_OF | ||
194 | //#define USE_ROCKBOX_USB | ||
197 | #define USB_VENDOR_ID 0x0781 | 195 | #define USB_VENDOR_ID 0x0781 |
198 | #define USB_PRODUCT_ID 0x74c1 | 196 | #define USB_PRODUCT_ID 0x74c1 |
199 | 197 | ||
200 | #endif /* !BOOTLOADER */ | ||
201 | |||
202 | /* Define this if you have adjustable CPU frequency */ | 198 | /* Define this if you have adjustable CPU frequency */ |
203 | #define HAVE_ADJUSTABLE_CPU_FREQ | 199 | #define HAVE_ADJUSTABLE_CPU_FREQ |
204 | 200 | ||
diff --git a/firmware/export/config/sansafuzev2.h b/firmware/export/config/sansafuzev2.h index de980c6ab3..b56c8a57e1 100644 --- a/firmware/export/config/sansafuzev2.h +++ b/firmware/export/config/sansafuzev2.h | |||
@@ -185,20 +185,16 @@ | |||
185 | #define HAVE_HOTSWAP | 185 | #define HAVE_HOTSWAP |
186 | #endif | 186 | #endif |
187 | 187 | ||
188 | #ifndef BOOTLOADER | ||
189 | |||
190 | #define USB_HANDLED_BY_OF | ||
191 | |||
192 | /* USB On-the-go */ | 188 | /* USB On-the-go */ |
193 | #define CONFIG_USBOTG USBOTG_AS3525v2 | 189 | #define CONFIG_USBOTG USBOTG_AS3525v2 |
194 | 190 | ||
195 | /* enable these for the experimental usb stack */ | 191 | /* enable these for the experimental usb stack */ |
196 | #define HAVE_USBSTACK | 192 | #define HAVE_USBSTACK |
193 | #define USB_HANDLED_BY_OF | ||
194 | //#define USE_ROCKBOX_USB | ||
197 | #define USB_VENDOR_ID 0x0781 | 195 | #define USB_VENDOR_ID 0x0781 |
198 | #define USB_PRODUCT_ID 0x74c3 /* MSC = 0x74c3, MTP = 0x74c2 */ | 196 | #define USB_PRODUCT_ID 0x74c3 /* MSC = 0x74c3, MTP = 0x74c2 */ |
199 | 197 | ||
200 | #endif /* !BOOTLOADER */ | ||
201 | |||
202 | /* Define this if you have adjustable CPU frequency */ | 198 | /* Define this if you have adjustable CPU frequency */ |
203 | //#define HAVE_ADJUSTABLE_CPU_FREQ | 199 | //#define HAVE_ADJUSTABLE_CPU_FREQ |
204 | 200 | ||
diff --git a/firmware/export/config/sansam200v4.h b/firmware/export/config/sansam200v4.h index 02950ad218..6c18adbe62 100644 --- a/firmware/export/config/sansam200v4.h +++ b/firmware/export/config/sansam200v4.h | |||
@@ -132,19 +132,15 @@ | |||
132 | /* Offset ( in the firmware file's header ) to the real data */ | 132 | /* Offset ( in the firmware file's header ) to the real data */ |
133 | #define FIRMWARE_OFFSET_FILE_DATA 8 | 133 | #define FIRMWARE_OFFSET_FILE_DATA 8 |
134 | 134 | ||
135 | #ifndef BOOTLOADER | ||
136 | |||
137 | #define USB_HANDLED_BY_OF | ||
138 | |||
139 | #define CONFIG_USBOTG USBOTG_AS3525 | 135 | #define CONFIG_USBOTG USBOTG_AS3525 |
140 | 136 | ||
141 | /* enable these for the experimental usb stack */ | 137 | /* enable these for the experimental usb stack */ |
142 | #define HAVE_USBSTACK | 138 | #define HAVE_USBSTACK |
139 | #define USB_HANDLED_BY_OF | ||
140 | //#define USE_ROCKBOX_USB | ||
143 | #define USB_VENDOR_ID 0x0781 | 141 | #define USB_VENDOR_ID 0x0781 |
144 | #define USB_PRODUCT_ID 0x7431 | 142 | #define USB_PRODUCT_ID 0x7431 |
145 | 143 | ||
146 | #endif /* BOOTLOADER */ | ||
147 | |||
148 | #define CONFIG_LCD LCD_SSD1815 | 144 | #define CONFIG_LCD LCD_SSD1815 |
149 | 145 | ||
150 | #define BOOTFILE_EXT "sansa" | 146 | #define BOOTFILE_EXT "sansa" |