From 23387e2759d1f3043c5a2b5b4bf71995dbe322e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C3=ABl=20Carr=C3=A9?= Date: Fri, 18 Jun 2010 17:39:22 +0000 Subject: [PATCH] as3525*: enable USB stack in bootloader (but not USE_ROCKBOX_USB yet) git-svn-id: svn://svn.rockbox.org/rockbox/trunk@26927 a1c6a512-1295-4272-9138-f99709370657 --- firmware/export/config/sansac200v2.h | 6 ++---- firmware/export/config/sansaclip.h | 8 ++------ firmware/export/config/sansaclipplus.h | 8 ++------ firmware/export/config/sansaclipv2.h | 7 ++----- firmware/export/config/sansae200v2.h | 8 ++------ firmware/export/config/sansafuze.h | 8 ++------ firmware/export/config/sansafuzev2.h | 8 ++------ 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 @@ #define NUM_DRIVES 2 #define HAVE_HOTSWAP -#define USB_HANDLED_BY_OF - #define CONFIG_USBOTG USBOTG_AS3525 /* enable these for the experimental usb stack */ #define HAVE_USBSTACK +#define USB_HANDLED_BY_OF +//#define USE_ROCKBOX_USB #define USB_VENDOR_ID 0x0781 #define USB_PRODUCT_ID 0x7452 -#endif /* BOOTLOADER */ - /* Define this if you have adjustable CPU frequency */ #define HAVE_ADJUSTABLE_CPU_FREQ 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 @@ /* Type of LCD */ #define CONFIG_LCD LCD_SSD1303 -#ifndef BOOTLOADER - -#define USB_HANDLED_BY_OF - #define CONFIG_USBOTG USBOTG_AS3525 /* enable these for the experimental usb stack */ #define HAVE_USBSTACK +#define USB_HANDLED_BY_OF +//#define USE_ROCKBOX_USB #define USB_VENDOR_ID 0x0781 #define USB_PRODUCT_ID 0x7433 -#endif /* BOOTLOADER */ - /* Define this if you have adjustable CPU frequency */ #define HAVE_ADJUSTABLE_CPU_FREQ 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 @@ /* Type of LCD */ #define CONFIG_LCD LCD_SSD1303 -#ifndef BOOTLOADER - -#define USB_HANDLED_BY_OF -//#define USE_ROCKBOX_USB - /* USB On-the-go */ #define CONFIG_USBOTG USBOTG_AS3525v2 /* enable these for the experimental usb stack */ #define HAVE_USBSTACK +#define USB_HANDLED_BY_OF +//#define USE_ROCKBOX_USB #define USB_VENDOR_ID 0x0781 #define USB_PRODUCT_ID 0x74d1 -#endif /* BOOTLOADER */ /* 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 @@ /* Type of LCD */ #define CONFIG_LCD LCD_SSD1303 -#ifndef BOOTLOADER - -#define USB_HANDLED_BY_OF - /* USB On-the-go */ #define CONFIG_USBOTG USBOTG_AS3525v2 /* enable these for the experimental usb stack */ #define HAVE_USBSTACK +#define USB_HANDLED_BY_OF +//#define USE_ROCKBOX_USB #define USB_VENDOR_ID 0x0781 #define USB_PRODUCT_ID 0x7435 -#endif /* BOOTLOADER */ /* Virtual LED (icon) */ #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 @@ #define HAVE_HOTSWAP #endif -#ifndef BOOTLOADER - -#define USB_HANDLED_BY_OF - /* USB On-the-go */ #define CONFIG_USBOTG USBOTG_AS3525 /* enable these for the experimental usb stack */ #define HAVE_USBSTACK +#define USB_HANDLED_BY_OF +//#define USE_ROCKBOX_USB #define USB_VENDOR_ID 0x0781 #define USB_PRODUCT_ID 0x7423 -#endif /* !BOOTLOADER */ - /* Define this if you have adjustable CPU frequency */ #define HAVE_ADJUSTABLE_CPU_FREQ 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 @@ #define HAVE_HOTSWAP #endif -#ifndef BOOTLOADER - -#define USB_HANDLED_BY_OF - /* USB On-the-go */ #define CONFIG_USBOTG USBOTG_AS3525 /* enable these for the experimental usb stack */ #define HAVE_USBSTACK +#define USB_HANDLED_BY_OF +//#define USE_ROCKBOX_USB #define USB_VENDOR_ID 0x0781 #define USB_PRODUCT_ID 0x74c1 -#endif /* !BOOTLOADER */ - /* Define this if you have adjustable CPU frequency */ #define HAVE_ADJUSTABLE_CPU_FREQ 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 @@ #define HAVE_HOTSWAP #endif -#ifndef BOOTLOADER - -#define USB_HANDLED_BY_OF - /* USB On-the-go */ #define CONFIG_USBOTG USBOTG_AS3525v2 /* enable these for the experimental usb stack */ #define HAVE_USBSTACK +#define USB_HANDLED_BY_OF +//#define USE_ROCKBOX_USB #define USB_VENDOR_ID 0x0781 #define USB_PRODUCT_ID 0x74c3 /* MSC = 0x74c3, MTP = 0x74c2 */ -#endif /* !BOOTLOADER */ - /* Define this if you have adjustable CPU frequency */ //#define HAVE_ADJUSTABLE_CPU_FREQ 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 @@ /* Offset ( in the firmware file's header ) to the real data */ #define FIRMWARE_OFFSET_FILE_DATA 8 -#ifndef BOOTLOADER - -#define USB_HANDLED_BY_OF - #define CONFIG_USBOTG USBOTG_AS3525 /* enable these for the experimental usb stack */ #define HAVE_USBSTACK +#define USB_HANDLED_BY_OF +//#define USE_ROCKBOX_USB #define USB_VENDOR_ID 0x0781 #define USB_PRODUCT_ID 0x7431 -#endif /* BOOTLOADER */ - #define CONFIG_LCD LCD_SSD1815 #define BOOTFILE_EXT "sansa"