From 9698c3bb5c99176f9e854d1e701423ba44b9f2b4 Mon Sep 17 00:00:00 2001 From: Frank Gevaerts Date: Sat, 21 Feb 2009 17:56:31 +0000 Subject: replace USB_IPODSTYLE by USB_HANDLED_BY_OF as that's what it actually means. Fix various configs to use it correctly. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@20078 a1c6a512-1295-4272-9138-f99709370657 --- apps/misc.c | 8 ++++---- apps/misc.h | 2 +- firmware/export/config-c200.h | 2 -- firmware/export/config-c200v2.h | 2 +- firmware/export/config-clip.h | 3 +++ firmware/export/config-e200.h | 2 -- firmware/export/config-e200v2.h | 2 +- firmware/export/config-fuze.h | 2 +- firmware/export/config-h10.h | 2 -- firmware/export/config-h10_5gb.h | 2 -- firmware/export/config-hdd1630.h | 2 -- firmware/export/config-ipod1g2g.h | 2 +- firmware/export/config-ipod3g.h | 2 +- firmware/export/config-ipod4g.h | 2 -- firmware/export/config-ipodcolor.h | 2 -- firmware/export/config-ipodmini.h | 2 -- firmware/export/config-ipodmini2g.h | 2 -- firmware/export/config-ipodnano.h | 2 -- firmware/export/config-ipodvideo.h | 2 -- firmware/export/config-mrobe100.h | 2 -- firmware/export/config-sa9200.h | 2 -- firmware/export/config-tpj1022.h | 2 -- 22 files changed, 13 insertions(+), 38 deletions(-) diff --git a/apps/misc.c b/apps/misc.c index 872d91592d..7bf9ac01f5 100644 --- a/apps/misc.c +++ b/apps/misc.c @@ -85,7 +85,7 @@ #include "playback.h" #ifdef BOOTFILE -#if !defined(USB_NONE) && !defined(USB_IPODSTYLE) +#if !defined(USB_NONE) && !defined(USB_HANDLED_BY_OF) #include "rolo.h" #include "yesno.h" #endif @@ -569,13 +569,13 @@ long default_event_handler_ex(long event, void (*callback)(void *), void *parame { system_flush(); #ifdef BOOTFILE -#if !defined(USB_NONE) && !defined(USB_IPODSTYLE) +#if !defined(USB_NONE) && !defined(USB_HANDLED_BY_OF) check_bootfile(false); /* gets initial size */ #endif #endif usb_screen(); #ifdef BOOTFILE -#if !defined(USB_NONE) && !defined(USB_IPODSTYLE) +#if !defined(USB_NONE) && !defined(USB_HANDLED_BY_OF) check_bootfile(true); #endif #endif @@ -691,7 +691,7 @@ int get_replaygain_mode(bool have_track_gain, bool have_album_gain) #endif #ifdef BOOTFILE -#if !defined(USB_NONE) && !defined(USB_IPODSTYLE) +#if !defined(USB_NONE) && !defined(USB_HANDLED_BY_OF) /* memorize/compare details about the BOOTFILE we don't use dircache because it may not be up to date after diff --git a/apps/misc.h b/apps/misc.h index 998ee9ea8f..1ac63da773 100644 --- a/apps/misc.h +++ b/apps/misc.h @@ -73,7 +73,7 @@ int get_replaygain_mode(bool have_track_gain, bool have_album_gain); int open_utf8(const char* pathname, int flags); #ifdef BOOTFILE -#if !defined(USB_NONE) && !defined(USB_IPODSTYLE) +#if !defined(USB_NONE) && !defined(USB_HANDLED_BY_OF) void check_bootfile(bool do_rolo); #endif #endif diff --git a/firmware/export/config-c200.h b/firmware/export/config-c200.h index cd9f5867dc..111bc8a26d 100644 --- a/firmware/export/config-c200.h +++ b/firmware/export/config-c200.h @@ -170,8 +170,6 @@ #define FIRMWARE_OFFSET_FILE_CRC 0x0 #define FIRMWARE_OFFSET_FILE_DATA 0x8 -/* #define USB_IPODSTYLE */ - #ifndef BOOTLOADER #define HAVE_MULTIVOLUME #define HAVE_HOTSWAP diff --git a/firmware/export/config-c200v2.h b/firmware/export/config-c200v2.h index f6a386637c..5f8480c9b6 100644 --- a/firmware/export/config-c200v2.h +++ b/firmware/export/config-c200v2.h @@ -160,7 +160,7 @@ #define FIRMWARE_OFFSET_FILE_CRC 0x0 #define FIRMWARE_OFFSET_FILE_DATA 0x8 -/* #define USB_IPODSTYLE */ +#define USB_HANDLED_BY_OF #ifndef BOOTLOADER #define HAVE_MULTIVOLUME diff --git a/firmware/export/config-clip.h b/firmware/export/config-clip.h index 1068440e63..9ebd3ecb30 100644 --- a/firmware/export/config-clip.h +++ b/firmware/export/config-clip.h @@ -170,6 +170,8 @@ #ifndef BOOTLOADER +#define USB_HANDLED_BY_OF + #if 0 /* disabled since there is no USB driver */ /* USB On-the-go */ @@ -183,6 +185,7 @@ #endif + /* Virtual LED (icon) */ #define CONFIG_LED LED_VIRTUAL diff --git a/firmware/export/config-e200.h b/firmware/export/config-e200.h index 7fba79679c..559c55fc83 100644 --- a/firmware/export/config-e200.h +++ b/firmware/export/config-e200.h @@ -167,8 +167,6 @@ #define HAVE_HOTSWAP #endif -/* #define USB_IPODSTYLE */ - /* USB On-the-go */ #define CONFIG_USBOTG USBOTG_ARC diff --git a/firmware/export/config-e200v2.h b/firmware/export/config-e200v2.h index 78246221be..e8bc3db63d 100644 --- a/firmware/export/config-e200v2.h +++ b/firmware/export/config-e200v2.h @@ -171,7 +171,7 @@ #define HAVE_HOTSWAP #endif -/* #define USB_IPODSTYLE */ +#define USB_HANDLED_BY_OF /* USB On-the-go */ #define CONFIG_USBOTG USBOTG_AS3525 diff --git a/firmware/export/config-fuze.h b/firmware/export/config-fuze.h index 0bc2d70bf7..32a7a00bcb 100644 --- a/firmware/export/config-fuze.h +++ b/firmware/export/config-fuze.h @@ -171,7 +171,7 @@ #define HAVE_HOTSWAP #endif -/* #define USB_IPODSTYLE */ +#define USB_HANDLED_BY_OF /* USB On-the-go */ #define CONFIG_USBOTG USBOTG_AS3525 diff --git a/firmware/export/config-h10.h b/firmware/export/config-h10.h index 2056fd4fcf..ca0fb559e7 100644 --- a/firmware/export/config-h10.h +++ b/firmware/export/config-h10.h @@ -159,8 +159,6 @@ #define FIRMWARE_OFFSET_FILE_CRC 0x0 #define FIRMWARE_OFFSET_FILE_DATA 0x8 -/* #define USB_IPODSTYLE */ - /* USB On-the-go */ #define CONFIG_USBOTG USBOTG_ARC diff --git a/firmware/export/config-h10_5gb.h b/firmware/export/config-h10_5gb.h index 40acdc6efe..f9de782375 100644 --- a/firmware/export/config-h10_5gb.h +++ b/firmware/export/config-h10_5gb.h @@ -139,8 +139,6 @@ #define FIRMWARE_OFFSET_FILE_CRC 0x0 #define FIRMWARE_OFFSET_FILE_DATA 0x8 -/* #define USB_IPODSTYLE */ - /* USB On-the-go */ #define CONFIG_USBOTG USBOTG_ARC diff --git a/firmware/export/config-hdd1630.h b/firmware/export/config-hdd1630.h index 2df89ecd5f..e7222b2ffe 100755 --- a/firmware/export/config-hdd1630.h +++ b/firmware/export/config-hdd1630.h @@ -173,8 +173,6 @@ #define FIRMWARE_OFFSET_FILE_CRC 0x0 #define FIRMWARE_OFFSET_FILE_DATA 0x8 -/* #define USB_IPODSTYLE */ - /* USB On-the-go */ #define CONFIG_USBOTG USBOTG_ARC diff --git a/firmware/export/config-ipod1g2g.h b/firmware/export/config-ipod1g2g.h index a06cb65828..1cd9ee2166 100644 --- a/firmware/export/config-ipod1g2g.h +++ b/firmware/export/config-ipod1g2g.h @@ -146,7 +146,7 @@ /* Offset ( in the firmware file's header ) to the real data */ #define FIRMWARE_OFFSET_FILE_DATA 8 -#define USB_IPODSTYLE +#define USB_HANDLED_BY_OF /* actually firewire only, but handled like USB */ /* Virtual LED (icon) */ diff --git a/firmware/export/config-ipod3g.h b/firmware/export/config-ipod3g.h index 0262fbde3f..0a8ae5766b 100644 --- a/firmware/export/config-ipod3g.h +++ b/firmware/export/config-ipod3g.h @@ -150,7 +150,7 @@ /* Offset ( in the firmware file's header ) to the real data */ #define FIRMWARE_OFFSET_FILE_DATA 8 -#define USB_IPODSTYLE +#define USB_HANDLED_BY_OF /* actually both firewire and USB, USB isn't handled yet */ /* Virtual LED (icon) */ diff --git a/firmware/export/config-ipod4g.h b/firmware/export/config-ipod4g.h index 5bc0a18a98..4b604369b1 100644 --- a/firmware/export/config-ipod4g.h +++ b/firmware/export/config-ipod4g.h @@ -167,8 +167,6 @@ /* Offset ( in the firmware file's header ) to the real data */ #define FIRMWARE_OFFSET_FILE_DATA 8 -#define USB_IPODSTYLE - /* USB On-the-go */ #define CONFIG_USBOTG USBOTG_ARC diff --git a/firmware/export/config-ipodcolor.h b/firmware/export/config-ipodcolor.h index e8a048d97f..92d37742c7 100644 --- a/firmware/export/config-ipodcolor.h +++ b/firmware/export/config-ipodcolor.h @@ -144,8 +144,6 @@ /* Offset ( in the firmware file's header ) to the real data */ #define FIRMWARE_OFFSET_FILE_DATA 8 -#define USB_IPODSTYLE - /* USB On-the-go */ #define CONFIG_USBOTG USBOTG_ARC diff --git a/firmware/export/config-ipodmini.h b/firmware/export/config-ipodmini.h index 0e87d02ee8..44a03ea0da 100644 --- a/firmware/export/config-ipodmini.h +++ b/firmware/export/config-ipodmini.h @@ -163,8 +163,6 @@ /* Offset ( in the firmware file's header ) to the real data */ #define FIRMWARE_OFFSET_FILE_DATA 8 -#define USB_IPODSTYLE - /* USB On-the-go */ #define CONFIG_USBOTG USBOTG_ARC diff --git a/firmware/export/config-ipodmini2g.h b/firmware/export/config-ipodmini2g.h index a44087f897..a21e0a82c3 100644 --- a/firmware/export/config-ipodmini2g.h +++ b/firmware/export/config-ipodmini2g.h @@ -170,8 +170,6 @@ /* Offset ( in the firmware file's header ) to the real data */ #define FIRMWARE_OFFSET_FILE_DATA 8 -#define USB_IPODSTYLE - /* USB On-the-go */ #define CONFIG_USBOTG USBOTG_ARC diff --git a/firmware/export/config-ipodnano.h b/firmware/export/config-ipodnano.h index c90deb8e2f..0bb28f2d05 100644 --- a/firmware/export/config-ipodnano.h +++ b/firmware/export/config-ipodnano.h @@ -154,8 +154,6 @@ /* Offset ( in the firmware file's header ) to the real data */ #define FIRMWARE_OFFSET_FILE_DATA 8 -#define USB_IPODSTYLE - /* USB On-the-go */ #define CONFIG_USBOTG USBOTG_ARC diff --git a/firmware/export/config-ipodvideo.h b/firmware/export/config-ipodvideo.h index fb00fd99d1..dc62174351 100644 --- a/firmware/export/config-ipodvideo.h +++ b/firmware/export/config-ipodvideo.h @@ -168,8 +168,6 @@ /* Offset ( in the firmware file's header ) to the real data */ #define FIRMWARE_OFFSET_FILE_DATA 8 -#define USB_IPODSTYLE - /* USB On-the-go */ #define CONFIG_USBOTG USBOTG_ARC diff --git a/firmware/export/config-mrobe100.h b/firmware/export/config-mrobe100.h index 817c7640b2..4069dff0d8 100644 --- a/firmware/export/config-mrobe100.h +++ b/firmware/export/config-mrobe100.h @@ -144,8 +144,6 @@ /* We're able to shut off power to the HDD */ #define HAVE_ATA_POWER_OFF -/* #define USB_IPODSTYLE */ - /* USB On-the-go */ #define CONFIG_USBOTG USBOTG_ARC diff --git a/firmware/export/config-sa9200.h b/firmware/export/config-sa9200.h index 624befcf12..233229c58e 100755 --- a/firmware/export/config-sa9200.h +++ b/firmware/export/config-sa9200.h @@ -133,8 +133,6 @@ /* Type of LCD TODO: hopefully the same as the x5 but check this*/ #define CONFIG_LCD LCD_SA9200 -/* #define USB_IPODSTYLE */ - /* USB On-the-go */ #define CONFIG_USBOTG USBOTG_ARC diff --git a/firmware/export/config-tpj1022.h b/firmware/export/config-tpj1022.h index 6cc85fdfc9..c0df0a34d8 100644 --- a/firmware/export/config-tpj1022.h +++ b/firmware/export/config-tpj1022.h @@ -121,8 +121,6 @@ /* Offset ( in the firmware file's header ) to the real data */ #define FIRMWARE_OFFSET_FILE_DATA 8 -/* #define USB_IPODSTYLE */ - /* USB On-the-go */ #define CONFIG_USBOTG USBOTG_ARC -- cgit v1.2.3