summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrank Gevaerts <frank@gevaerts.be>2009-02-21 17:56:31 +0000
committerFrank Gevaerts <frank@gevaerts.be>2009-02-21 17:56:31 +0000
commit9698c3bb5c99176f9e854d1e701423ba44b9f2b4 (patch)
treeb4217f5f03e03133b498c8b3b8abbacc7060d4cf
parent3e7715d2f52797aa5e3aedba3543cb29feb8b776 (diff)
downloadrockbox-9698c3bb5c99176f9e854d1e701423ba44b9f2b4.tar.gz
rockbox-9698c3bb5c99176f9e854d1e701423ba44b9f2b4.zip
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
Diffstat
-rw-r--r--apps/misc.c8
-rw-r--r--apps/misc.h2
-rw-r--r--firmware/export/config-c200.h2
-rw-r--r--firmware/export/config-c200v2.h2
-rw-r--r--firmware/export/config-clip.h3
-rw-r--r--firmware/export/config-e200.h2
-rw-r--r--firmware/export/config-e200v2.h2
-rw-r--r--firmware/export/config-fuze.h2
-rw-r--r--firmware/export/config-h10.h2
-rw-r--r--firmware/export/config-h10_5gb.h2
-rwxr-xr-xfirmware/export/config-hdd1630.h2
-rw-r--r--firmware/export/config-ipod1g2g.h2
-rw-r--r--firmware/export/config-ipod3g.h2
-rw-r--r--firmware/export/config-ipod4g.h2
-rw-r--r--firmware/export/config-ipodcolor.h2
-rw-r--r--firmware/export/config-ipodmini.h2
-rw-r--r--firmware/export/config-ipodmini2g.h2
-rw-r--r--firmware/export/config-ipodnano.h2
-rw-r--r--firmware/export/config-ipodvideo.h2
-rw-r--r--firmware/export/config-mrobe100.h2
-rwxr-xr-xfirmware/export/config-sa9200.h2
-rw-r--r--firmware/export/config-tpj1022.h2
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 @@
85#include "playback.h" 85#include "playback.h"
86 86
87#ifdef BOOTFILE 87#ifdef BOOTFILE
88#if !defined(USB_NONE) && !defined(USB_IPODSTYLE) 88#if !defined(USB_NONE) && !defined(USB_HANDLED_BY_OF)
89#include "rolo.h" 89#include "rolo.h"
90#include "yesno.h" 90#include "yesno.h"
91#endif 91#endif
@@ -569,13 +569,13 @@ long default_event_handler_ex(long event, void (*callback)(void *), void *parame
569 { 569 {
570 system_flush(); 570 system_flush();
571#ifdef BOOTFILE 571#ifdef BOOTFILE
572#if !defined(USB_NONE) && !defined(USB_IPODSTYLE) 572#if !defined(USB_NONE) && !defined(USB_HANDLED_BY_OF)
573 check_bootfile(false); /* gets initial size */ 573 check_bootfile(false); /* gets initial size */
574#endif 574#endif
575#endif 575#endif
576 usb_screen(); 576 usb_screen();
577#ifdef BOOTFILE 577#ifdef BOOTFILE
578#if !defined(USB_NONE) && !defined(USB_IPODSTYLE) 578#if !defined(USB_NONE) && !defined(USB_HANDLED_BY_OF)
579 check_bootfile(true); 579 check_bootfile(true);
580#endif 580#endif
581#endif 581#endif
@@ -691,7 +691,7 @@ int get_replaygain_mode(bool have_track_gain, bool have_album_gain)
691#endif 691#endif
692 692
693#ifdef BOOTFILE 693#ifdef BOOTFILE
694#if !defined(USB_NONE) && !defined(USB_IPODSTYLE) 694#if !defined(USB_NONE) && !defined(USB_HANDLED_BY_OF)
695/* 695/*
696 memorize/compare details about the BOOTFILE 696 memorize/compare details about the BOOTFILE
697 we don't use dircache because it may not be up to date after 697 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);
73int open_utf8(const char* pathname, int flags); 73int open_utf8(const char* pathname, int flags);
74 74
75#ifdef BOOTFILE 75#ifdef BOOTFILE
76#if !defined(USB_NONE) && !defined(USB_IPODSTYLE) 76#if !defined(USB_NONE) && !defined(USB_HANDLED_BY_OF)
77void check_bootfile(bool do_rolo); 77void check_bootfile(bool do_rolo);
78#endif 78#endif
79#endif 79#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 @@
170#define FIRMWARE_OFFSET_FILE_CRC 0x0 170#define FIRMWARE_OFFSET_FILE_CRC 0x0
171#define FIRMWARE_OFFSET_FILE_DATA 0x8 171#define FIRMWARE_OFFSET_FILE_DATA 0x8
172 172
173/* #define USB_IPODSTYLE */
174
175#ifndef BOOTLOADER 173#ifndef BOOTLOADER
176#define HAVE_MULTIVOLUME 174#define HAVE_MULTIVOLUME
177#define HAVE_HOTSWAP 175#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 @@
160#define FIRMWARE_OFFSET_FILE_CRC 0x0 160#define FIRMWARE_OFFSET_FILE_CRC 0x0
161#define FIRMWARE_OFFSET_FILE_DATA 0x8 161#define FIRMWARE_OFFSET_FILE_DATA 0x8
162 162
163/* #define USB_IPODSTYLE */ 163#define USB_HANDLED_BY_OF
164 164
165#ifndef BOOTLOADER 165#ifndef BOOTLOADER
166#define HAVE_MULTIVOLUME 166#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 @@
170 170
171#ifndef BOOTLOADER 171#ifndef BOOTLOADER
172 172
173#define USB_HANDLED_BY_OF
174
173#if 0 /* disabled since there is no USB driver */ 175#if 0 /* disabled since there is no USB driver */
174 176
175/* USB On-the-go */ 177/* USB On-the-go */
@@ -183,6 +185,7 @@
183 185
184#endif 186#endif
185 187
188
186/* Virtual LED (icon) */ 189/* Virtual LED (icon) */
187#define CONFIG_LED LED_VIRTUAL 190#define CONFIG_LED LED_VIRTUAL
188 191
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 @@
167#define HAVE_HOTSWAP 167#define HAVE_HOTSWAP
168#endif 168#endif
169 169
170/* #define USB_IPODSTYLE */
171
172/* USB On-the-go */ 170/* USB On-the-go */
173#define CONFIG_USBOTG USBOTG_ARC 171#define CONFIG_USBOTG USBOTG_ARC
174 172
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 @@
171#define HAVE_HOTSWAP 171#define HAVE_HOTSWAP
172#endif 172#endif
173 173
174/* #define USB_IPODSTYLE */ 174#define USB_HANDLED_BY_OF
175 175
176/* USB On-the-go */ 176/* USB On-the-go */
177#define CONFIG_USBOTG USBOTG_AS3525 177#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 @@
171#define HAVE_HOTSWAP 171#define HAVE_HOTSWAP
172#endif 172#endif
173 173
174/* #define USB_IPODSTYLE */ 174#define USB_HANDLED_BY_OF
175 175
176/* USB On-the-go */ 176/* USB On-the-go */
177#define CONFIG_USBOTG USBOTG_AS3525 177#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 @@
159#define FIRMWARE_OFFSET_FILE_CRC 0x0 159#define FIRMWARE_OFFSET_FILE_CRC 0x0
160#define FIRMWARE_OFFSET_FILE_DATA 0x8 160#define FIRMWARE_OFFSET_FILE_DATA 0x8
161 161
162/* #define USB_IPODSTYLE */
163
164/* USB On-the-go */ 162/* USB On-the-go */
165#define CONFIG_USBOTG USBOTG_ARC 163#define CONFIG_USBOTG USBOTG_ARC
166 164
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 @@
139#define FIRMWARE_OFFSET_FILE_CRC 0x0 139#define FIRMWARE_OFFSET_FILE_CRC 0x0
140#define FIRMWARE_OFFSET_FILE_DATA 0x8 140#define FIRMWARE_OFFSET_FILE_DATA 0x8
141 141
142/* #define USB_IPODSTYLE */
143
144/* USB On-the-go */ 142/* USB On-the-go */
145#define CONFIG_USBOTG USBOTG_ARC 143#define CONFIG_USBOTG USBOTG_ARC
146 144
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 @@
173#define FIRMWARE_OFFSET_FILE_CRC 0x0 173#define FIRMWARE_OFFSET_FILE_CRC 0x0
174#define FIRMWARE_OFFSET_FILE_DATA 0x8 174#define FIRMWARE_OFFSET_FILE_DATA 0x8
175 175
176/* #define USB_IPODSTYLE */
177
178/* USB On-the-go */ 176/* USB On-the-go */
179#define CONFIG_USBOTG USBOTG_ARC 177#define CONFIG_USBOTG USBOTG_ARC
180 178
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 @@
146/* Offset ( in the firmware file's header ) to the real data */ 146/* Offset ( in the firmware file's header ) to the real data */
147#define FIRMWARE_OFFSET_FILE_DATA 8 147#define FIRMWARE_OFFSET_FILE_DATA 8
148 148
149#define USB_IPODSTYLE 149#define USB_HANDLED_BY_OF
150/* actually firewire only, but handled like USB */ 150/* actually firewire only, but handled like USB */
151 151
152/* Virtual LED (icon) */ 152/* 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 @@
150/* Offset ( in the firmware file's header ) to the real data */ 150/* Offset ( in the firmware file's header ) to the real data */
151#define FIRMWARE_OFFSET_FILE_DATA 8 151#define FIRMWARE_OFFSET_FILE_DATA 8
152 152
153#define USB_IPODSTYLE 153#define USB_HANDLED_BY_OF
154/* actually both firewire and USB, USB isn't handled yet */ 154/* actually both firewire and USB, USB isn't handled yet */
155 155
156/* Virtual LED (icon) */ 156/* 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 @@
167/* Offset ( in the firmware file's header ) to the real data */ 167/* Offset ( in the firmware file's header ) to the real data */
168#define FIRMWARE_OFFSET_FILE_DATA 8 168#define FIRMWARE_OFFSET_FILE_DATA 8
169 169
170#define USB_IPODSTYLE
171
172/* USB On-the-go */ 170/* USB On-the-go */
173#define CONFIG_USBOTG USBOTG_ARC 171#define CONFIG_USBOTG USBOTG_ARC
174 172
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 @@
144/* Offset ( in the firmware file's header ) to the real data */ 144/* Offset ( in the firmware file's header ) to the real data */
145#define FIRMWARE_OFFSET_FILE_DATA 8 145#define FIRMWARE_OFFSET_FILE_DATA 8
146 146
147#define USB_IPODSTYLE
148
149/* USB On-the-go */ 147/* USB On-the-go */
150#define CONFIG_USBOTG USBOTG_ARC 148#define CONFIG_USBOTG USBOTG_ARC
151 149
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 @@
163/* Offset ( in the firmware file's header ) to the real data */ 163/* Offset ( in the firmware file's header ) to the real data */
164#define FIRMWARE_OFFSET_FILE_DATA 8 164#define FIRMWARE_OFFSET_FILE_DATA 8
165 165
166#define USB_IPODSTYLE
167
168/* USB On-the-go */ 166/* USB On-the-go */
169#define CONFIG_USBOTG USBOTG_ARC 167#define CONFIG_USBOTG USBOTG_ARC
170 168
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 @@
170/* Offset ( in the firmware file's header ) to the real data */ 170/* Offset ( in the firmware file's header ) to the real data */
171#define FIRMWARE_OFFSET_FILE_DATA 8 171#define FIRMWARE_OFFSET_FILE_DATA 8
172 172
173#define USB_IPODSTYLE
174
175/* USB On-the-go */ 173/* USB On-the-go */
176#define CONFIG_USBOTG USBOTG_ARC 174#define CONFIG_USBOTG USBOTG_ARC
177 175
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 @@
154/* Offset ( in the firmware file's header ) to the real data */ 154/* Offset ( in the firmware file's header ) to the real data */
155#define FIRMWARE_OFFSET_FILE_DATA 8 155#define FIRMWARE_OFFSET_FILE_DATA 8
156 156
157#define USB_IPODSTYLE
158
159/* USB On-the-go */ 157/* USB On-the-go */
160#define CONFIG_USBOTG USBOTG_ARC 158#define CONFIG_USBOTG USBOTG_ARC
161 159
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 @@
168/* Offset ( in the firmware file's header ) to the real data */ 168/* Offset ( in the firmware file's header ) to the real data */
169#define FIRMWARE_OFFSET_FILE_DATA 8 169#define FIRMWARE_OFFSET_FILE_DATA 8
170 170
171#define USB_IPODSTYLE
172
173/* USB On-the-go */ 171/* USB On-the-go */
174#define CONFIG_USBOTG USBOTG_ARC 172#define CONFIG_USBOTG USBOTG_ARC
175 173
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 @@
144/* We're able to shut off power to the HDD */ 144/* We're able to shut off power to the HDD */
145#define HAVE_ATA_POWER_OFF 145#define HAVE_ATA_POWER_OFF
146 146
147/* #define USB_IPODSTYLE */
148
149/* USB On-the-go */ 147/* USB On-the-go */
150#define CONFIG_USBOTG USBOTG_ARC 148#define CONFIG_USBOTG USBOTG_ARC
151 149
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 @@
133/* Type of LCD TODO: hopefully the same as the x5 but check this*/ 133/* Type of LCD TODO: hopefully the same as the x5 but check this*/
134#define CONFIG_LCD LCD_SA9200 134#define CONFIG_LCD LCD_SA9200
135 135
136/* #define USB_IPODSTYLE */
137
138/* USB On-the-go */ 136/* USB On-the-go */
139#define CONFIG_USBOTG USBOTG_ARC 137#define CONFIG_USBOTG USBOTG_ARC
140 138
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 @@
121/* Offset ( in the firmware file's header ) to the real data */ 121/* Offset ( in the firmware file's header ) to the real data */
122#define FIRMWARE_OFFSET_FILE_DATA 8 122#define FIRMWARE_OFFSET_FILE_DATA 8
123 123
124/* #define USB_IPODSTYLE */
125
126/* USB On-the-go */ 124/* USB On-the-go */
127#define CONFIG_USBOTG USBOTG_ARC 125#define CONFIG_USBOTG USBOTG_ARC
128 126
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-02 20:05:01 +0000