len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-12-09 13:15:18 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

usb: finally get rid of USE_ROCKBOX_USB in Sansa bootloader, use bootloader usb

Browse source 
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
This commit is contained in:
Amaury Pouly 2015-01-08 22:30:22 +01:00
parent 246026cfcc
commit 761e7987c8
11 changed files with 18 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

1
firmware/export/config/sansac200v2.h
View file

@ -187,6 +187,7 @@
//#define USB_ENABLE_SERIAL
#define USB_VENDOR_ID 0x0781
#define USB_PRODUCT_ID 0x7452
#define HAVE_BOOTLOADER_USB_MODE
#define HAVE_USB_HID_MOUSE
/* Define this if you have adjustable CPU frequency */

1
firmware/export/config/sansaclip.h
View file

@ -182,6 +182,7 @@
#define USB_VENDOR_ID 0x0781
#define USB_PRODUCT_ID 0x7433
#define HAVE_USB_HID_MOUSE
#define HAVE_BOOTLOADER_USB_MODE
/* Define this if you have adjustable CPU frequency */
#define HAVE_ADJUSTABLE_CPU_FREQ

2
firmware/export/config/sansaclipplus.h
View file

@ -188,7 +188,7 @@
#define HAVE_USBSTACK
#define USB_VENDOR_ID 0x0781
#define USB_PRODUCT_ID 0x74d1
#define HAVE_BOOTLOADER_USB_MODE
/* Virtual LED (icon) */
#define CONFIG_LED LED_VIRTUAL

1
firmware/export/config/sansaclipv2.h
View file

@ -184,6 +184,7 @@
#define HAVE_USBSTACK
#define USB_VENDOR_ID 0x0781
#define USB_PRODUCT_ID 0x7435
#define HAVE_BOOTLOADER_USB_MODE
/* Virtual LED (icon) */
#define CONFIG_LED LED_VIRTUAL

2
firmware/export/config/sansaclipzip.h
View file

@ -187,7 +187,7 @@
#define HAVE_USBSTACK
#define USB_VENDOR_ID 0x0781
#define USB_PRODUCT_ID 0x74e5
#define HAVE_BOOTLOADER_USB_MODE
/* Virtual LED (icon) */
#define CONFIG_LED LED_VIRTUAL

1
firmware/export/config/sansae200v2.h
View file

@ -204,6 +204,7 @@
#define USB_VENDOR_ID 0x0781
#define USB_PRODUCT_ID 0x7423
#define HAVE_USB_HID_MOUSE
#define HAVE_BOOTLOADER_USB_MODE
/* Define this if you have adjustable CPU frequency */
#define HAVE_ADJUSTABLE_CPU_FREQ

1
firmware/export/config/sansafuze.h
View file

@ -205,6 +205,7 @@
#define USB_VENDOR_ID 0x0781
#define USB_PRODUCT_ID 0x74c1
#define HAVE_USB_HID_MOUSE
#define HAVE_BOOTLOADER_USB_MODE
/* Define this if you have adjustable CPU frequency */
#define HAVE_ADJUSTABLE_CPU_FREQ

1
firmware/export/config/sansafuzev2.h
View file

@ -205,6 +205,7 @@
#define HAVE_USBSTACK
#define USB_VENDOR_ID 0x0781
#define USB_PRODUCT_ID 0x74c3 /* MSC = 0x74c3, MTP = 0x74c2 */
#define HAVE_BOOTLOADER_USB_MODE
/* Define this if you have adjustable CPU frequency */
//#define HAVE_ADJUSTABLE_CPU_FREQ

1
firmware/export/config/sansam200v4.h
View file

@ -148,6 +148,7 @@
#define USB_VENDOR_ID 0x0781
#define USB_PRODUCT_ID 0x7431
#define HAVE_USB_HID_MOUSE
#define HAVE_BOOTLOADER_USB_MODE
#define CONFIG_LCD LCD_SSD1815

4
firmware/usb.c
View file

@ -48,10 +48,8 @@
(defined(HAVE_USBSTACK) && defined(HAVE_BOOTLOADER_USB_MODE)) || \
(defined(HAVE_USBSTACK) && (defined(CREATIVE_ZVx))) || \
(defined(HAVE_USBSTACK) && (defined(OLYMPUS_MROBE_500))) || \
(defined(HAVE_USBSTACK) && CONFIG_USBOTG == USBOTG_S3C6400X) || \
defined(CPU_TCC77X) || defined(CPU_TCC780X) || \
(CONFIG_USBOTG == USBOTG_JZ4740) || \
(defined(HAVE_USBSTACK) && CONFIG_USBOTG == USBOTG_AS3525)
(CONFIG_USBOTG == USBOTG_JZ4740)
#define USB_FULL_INIT
#endif