diff options
| author | Amaury Pouly <amaury.pouly@gmail.com> | 2015-01-08 22:30:22 +0100 |
|---|---|---|
| committer | Amaury Pouly <amaury.pouly@gmail.com> | 2015-01-08 22:30:22 +0100 |
| commit | 761e7987c8dec314800eb6a099aad139a12a12a9 (patch) | |
| tree | 1363a95bc8ef2e972c2fd60becfc9d7a795f37f6 /firmware/export | |
| parent | 246026cfcc1485a29c173fc1b6ed7336f4c00f83 (diff) | |
| download | rockbox-761e7987c8dec314800eb6a099aad139a12a12a9.tar.gz rockbox-761e7987c8dec314800eb6a099aad139a12a12a9.zip | |
usb: finally get rid of USE_ROCKBOX_USB in Sansa bootloader, use bootloader usb
For some reason, the bootloader and config files didn't define
HAVE_BOOTLOADER_USB_MODE, also remove the special cases in usb.c which they
implied.
Change-Id: I68c29be7d03627e64cac4ff7678e0c211e087a8c
Diffstat (limited to 'firmware/export')
| -rw-r--r-- | firmware/export/config/sansac200v2.h | 1 | ||||
| -rw-r--r-- | firmware/export/config/sansaclip.h | 1 | ||||
| -rw-r--r-- | firmware/export/config/sansaclipplus.h | 2 | ||||
| -rw-r--r-- | firmware/export/config/sansaclipv2.h | 1 | ||||
| -rw-r--r-- | firmware/export/config/sansaclipzip.h | 2 | ||||
| -rw-r--r-- | firmware/export/config/sansae200v2.h | 1 | ||||
| -rw-r--r-- | firmware/export/config/sansafuze.h | 1 | ||||
| -rw-r--r-- | firmware/export/config/sansafuzev2.h | 1 | ||||
| -rw-r--r-- | firmware/export/config/sansam200v4.h | 1 |
9 files changed, 9 insertions, 2 deletions
diff --git a/firmware/export/config/sansac200v2.h b/firmware/export/config/sansac200v2.h index 9e9c8b835f..0da8b6a67b 100644 --- a/firmware/export/config/sansac200v2.h +++ b/firmware/export/config/sansac200v2.h | |||
| @@ -187,6 +187,7 @@ | |||
| 187 | //#define USB_ENABLE_SERIAL | 187 | //#define USB_ENABLE_SERIAL |
| 188 | #define USB_VENDOR_ID 0x0781 | 188 | #define USB_VENDOR_ID 0x0781 |
| 189 | #define USB_PRODUCT_ID 0x7452 | 189 | #define USB_PRODUCT_ID 0x7452 |
| 190 | #define HAVE_BOOTLOADER_USB_MODE | ||
| 190 | #define HAVE_USB_HID_MOUSE | 191 | #define HAVE_USB_HID_MOUSE |
| 191 | 192 | ||
| 192 | /* Define this if you have adjustable CPU frequency */ | 193 | /* Define this if you have adjustable CPU frequency */ |
diff --git a/firmware/export/config/sansaclip.h b/firmware/export/config/sansaclip.h index 54500402d7..43a24cb5c4 100644 --- a/firmware/export/config/sansaclip.h +++ b/firmware/export/config/sansaclip.h | |||
| @@ -182,6 +182,7 @@ | |||
| 182 | #define USB_VENDOR_ID 0x0781 | 182 | #define USB_VENDOR_ID 0x0781 |
| 183 | #define USB_PRODUCT_ID 0x7433 | 183 | #define USB_PRODUCT_ID 0x7433 |
| 184 | #define HAVE_USB_HID_MOUSE | 184 | #define HAVE_USB_HID_MOUSE |
| 185 | #define HAVE_BOOTLOADER_USB_MODE | ||
| 185 | 186 | ||
| 186 | /* Define this if you have adjustable CPU frequency */ | 187 | /* Define this if you have adjustable CPU frequency */ |
| 187 | #define HAVE_ADJUSTABLE_CPU_FREQ | 188 | #define HAVE_ADJUSTABLE_CPU_FREQ |
diff --git a/firmware/export/config/sansaclipplus.h b/firmware/export/config/sansaclipplus.h index dc9ad90b5b..a2df3d21c8 100644 --- a/firmware/export/config/sansaclipplus.h +++ b/firmware/export/config/sansaclipplus.h | |||
| @@ -188,7 +188,7 @@ | |||
| 188 | #define HAVE_USBSTACK | 188 | #define HAVE_USBSTACK |
| 189 | #define USB_VENDOR_ID 0x0781 | 189 | #define USB_VENDOR_ID 0x0781 |
| 190 | #define USB_PRODUCT_ID 0x74d1 | 190 | #define USB_PRODUCT_ID 0x74d1 |
| 191 | 191 | #define HAVE_BOOTLOADER_USB_MODE | |
| 192 | 192 | ||
| 193 | /* Virtual LED (icon) */ | 193 | /* Virtual LED (icon) */ |
| 194 | #define CONFIG_LED LED_VIRTUAL | 194 | #define CONFIG_LED LED_VIRTUAL |
diff --git a/firmware/export/config/sansaclipv2.h b/firmware/export/config/sansaclipv2.h index a61d5ba18c..8b0b84c1d0 100644 --- a/firmware/export/config/sansaclipv2.h +++ b/firmware/export/config/sansaclipv2.h | |||
| @@ -184,6 +184,7 @@ | |||
| 184 | #define HAVE_USBSTACK | 184 | #define HAVE_USBSTACK |
| 185 | #define USB_VENDOR_ID 0x0781 | 185 | #define USB_VENDOR_ID 0x0781 |
| 186 | #define USB_PRODUCT_ID 0x7435 | 186 | #define USB_PRODUCT_ID 0x7435 |
| 187 | #define HAVE_BOOTLOADER_USB_MODE | ||
| 187 | 188 | ||
| 188 | /* Virtual LED (icon) */ | 189 | /* Virtual LED (icon) */ |
| 189 | #define CONFIG_LED LED_VIRTUAL | 190 | #define CONFIG_LED LED_VIRTUAL |
diff --git a/firmware/export/config/sansaclipzip.h b/firmware/export/config/sansaclipzip.h index 50147b9714..9743261a52 100644 --- a/firmware/export/config/sansaclipzip.h +++ b/firmware/export/config/sansaclipzip.h | |||
| @@ -187,7 +187,7 @@ | |||
| 187 | #define HAVE_USBSTACK | 187 | #define HAVE_USBSTACK |
| 188 | #define USB_VENDOR_ID 0x0781 | 188 | #define USB_VENDOR_ID 0x0781 |
| 189 | #define USB_PRODUCT_ID 0x74e5 | 189 | #define USB_PRODUCT_ID 0x74e5 |
| 190 | 190 | #define HAVE_BOOTLOADER_USB_MODE | |
| 191 | 191 | ||
| 192 | /* Virtual LED (icon) */ | 192 | /* Virtual LED (icon) */ |
| 193 | #define CONFIG_LED LED_VIRTUAL | 193 | #define CONFIG_LED LED_VIRTUAL |
diff --git a/firmware/export/config/sansae200v2.h b/firmware/export/config/sansae200v2.h index 23bee8c98a..3541e0f107 100644 --- a/firmware/export/config/sansae200v2.h +++ b/firmware/export/config/sansae200v2.h | |||
| @@ -204,6 +204,7 @@ | |||
| 204 | #define USB_VENDOR_ID 0x0781 | 204 | #define USB_VENDOR_ID 0x0781 |
| 205 | #define USB_PRODUCT_ID 0x7423 | 205 | #define USB_PRODUCT_ID 0x7423 |
| 206 | #define HAVE_USB_HID_MOUSE | 206 | #define HAVE_USB_HID_MOUSE |
| 207 | #define HAVE_BOOTLOADER_USB_MODE | ||
| 207 | 208 | ||
| 208 | /* Define this if you have adjustable CPU frequency */ | 209 | /* Define this if you have adjustable CPU frequency */ |
| 209 | #define HAVE_ADJUSTABLE_CPU_FREQ | 210 | #define HAVE_ADJUSTABLE_CPU_FREQ |
diff --git a/firmware/export/config/sansafuze.h b/firmware/export/config/sansafuze.h index b2cdf061dd..f15d424c1b 100644 --- a/firmware/export/config/sansafuze.h +++ b/firmware/export/config/sansafuze.h | |||
| @@ -205,6 +205,7 @@ | |||
| 205 | #define USB_VENDOR_ID 0x0781 | 205 | #define USB_VENDOR_ID 0x0781 |
| 206 | #define USB_PRODUCT_ID 0x74c1 | 206 | #define USB_PRODUCT_ID 0x74c1 |
| 207 | #define HAVE_USB_HID_MOUSE | 207 | #define HAVE_USB_HID_MOUSE |
| 208 | #define HAVE_BOOTLOADER_USB_MODE | ||
| 208 | 209 | ||
| 209 | /* Define this if you have adjustable CPU frequency */ | 210 | /* Define this if you have adjustable CPU frequency */ |
| 210 | #define HAVE_ADJUSTABLE_CPU_FREQ | 211 | #define HAVE_ADJUSTABLE_CPU_FREQ |
diff --git a/firmware/export/config/sansafuzev2.h b/firmware/export/config/sansafuzev2.h index a0197bfb41..f53c287d87 100644 --- a/firmware/export/config/sansafuzev2.h +++ b/firmware/export/config/sansafuzev2.h | |||
| @@ -205,6 +205,7 @@ | |||
| 205 | #define HAVE_USBSTACK | 205 | #define HAVE_USBSTACK |
| 206 | #define USB_VENDOR_ID 0x0781 | 206 | #define USB_VENDOR_ID 0x0781 |
| 207 | #define USB_PRODUCT_ID 0x74c3 /* MSC = 0x74c3, MTP = 0x74c2 */ | 207 | #define USB_PRODUCT_ID 0x74c3 /* MSC = 0x74c3, MTP = 0x74c2 */ |
| 208 | #define HAVE_BOOTLOADER_USB_MODE | ||
| 208 | 209 | ||
| 209 | /* Define this if you have adjustable CPU frequency */ | 210 | /* Define this if you have adjustable CPU frequency */ |
| 210 | //#define HAVE_ADJUSTABLE_CPU_FREQ | 211 | //#define HAVE_ADJUSTABLE_CPU_FREQ |
diff --git a/firmware/export/config/sansam200v4.h b/firmware/export/config/sansam200v4.h index 99e84e65e0..d905d10c95 100644 --- a/firmware/export/config/sansam200v4.h +++ b/firmware/export/config/sansam200v4.h | |||
| @@ -148,6 +148,7 @@ | |||
| 148 | #define USB_VENDOR_ID 0x0781 | 148 | #define USB_VENDOR_ID 0x0781 |
| 149 | #define USB_PRODUCT_ID 0x7431 | 149 | #define USB_PRODUCT_ID 0x7431 |
| 150 | #define HAVE_USB_HID_MOUSE | 150 | #define HAVE_USB_HID_MOUSE |
| 151 | #define HAVE_BOOTLOADER_USB_MODE | ||
| 151 | 152 | ||
| 152 | #define CONFIG_LCD LCD_SSD1815 | 153 | #define CONFIG_LCD LCD_SSD1815 |
| 153 | 154 | ||