diff options
author | Nils Wallménius <nils@rockbox.org> | 2009-03-21 14:49:35 +0000 |
---|---|---|
committer | Nils Wallménius <nils@rockbox.org> | 2009-03-21 14:49:35 +0000 |
commit | 7aaffa51d6bd36e7be9d6895d9310f0d8fea8dfd (patch) | |
tree | 6a04596e8c64f628b20782519809d1ddd633abc2 /apps | |
parent | 277ce9ae73b6a87221d6fdd9764314b922d90fe7 (diff) | |
download | rockbox-7aaffa51d6bd36e7be9d6895d9310f0d8fea8dfd.tar.gz rockbox-7aaffa51d6bd36e7be9d6895d9310f0d8fea8dfd.zip |
Remove duplicated 'usbstack' feature, sort features.txt, deprecate unused left over strings depending on it
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@20427 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
-rw-r--r-- | apps/features.txt | 30 | ||||
-rw-r--r-- | apps/lang/english.lang | 40 |
2 files changed, 33 insertions, 37 deletions
diff --git a/apps/features.txt b/apps/features.txt index e40273e98b..b510136a33 100644 --- a/apps/features.txt +++ b/apps/features.txt | |||
@@ -4,6 +4,10 @@ | |||
4 | version numbers should be updated. It also means that changing defines in | 4 | version numbers should be updated. It also means that changing defines in |
5 | the various config*.h files could also break back compatibility */ | 5 | the various config*.h files could also break back compatibility */ |
6 | 6 | ||
7 | #if defined(HAVE_ACCESSORY_SUPPLY) | ||
8 | accessory_supply | ||
9 | #endif | ||
10 | |||
7 | #if defined(HAVE_AGC) | 11 | #if defined(HAVE_AGC) |
8 | agc | 12 | agc |
9 | #endif | 13 | #endif |
@@ -143,8 +147,8 @@ rtc | |||
143 | scrollwheel | 147 | scrollwheel |
144 | #endif | 148 | #endif |
145 | 149 | ||
146 | #if defined(HAVE_WHEEL_ACCELERATION) | 150 | #if defined(IPOD_ACCESSORY_PROTOCOL) |
147 | wheel_acceleration | 151 | serial_port |
148 | #endif | 152 | #endif |
149 | 153 | ||
150 | #if defined(ARCHOS_RECORDER) || defined(ARCHOS_PLAYER) | 154 | #if defined(ARCHOS_RECORDER) || defined(ARCHOS_PLAYER) |
@@ -155,6 +159,10 @@ soft_shutdown | |||
155 | spdif_power | 159 | spdif_power |
156 | #endif | 160 | #endif |
157 | 161 | ||
162 | #if defined(HAVE_SPEAKER) | ||
163 | speaker | ||
164 | #endif | ||
165 | |||
158 | #if CONFIG_CODEC == SWCODEC | 166 | #if CONFIG_CODEC == SWCODEC |
159 | swcodec | 167 | swcodec |
160 | #else | 168 | #else |
@@ -176,23 +184,11 @@ usb_charging | |||
176 | #endif | 184 | #endif |
177 | #endif | 185 | #endif |
178 | 186 | ||
179 | #if defined(HAVE_USBSTACK) | 187 | #if defined(HAVE_USBSTACK) && defined(USE_ROCKBOX_USB) |
180 | usbstack | 188 | usbstack |
181 | #endif | 189 | #endif |
182 | 190 | ||
183 | #if defined(HAVE_ACCESSORY_SUPPLY) | 191 | #if defined(HAVE_WHEEL_ACCELERATION) |
184 | accessory_supply | 192 | wheel_acceleration |
185 | #endif | ||
186 | |||
187 | #if defined(IPOD_ACCESSORY_PROTOCOL) | ||
188 | serial_port | ||
189 | #endif | ||
190 | |||
191 | #if defined(HAVE_SPEAKER) | ||
192 | speaker | ||
193 | #endif | ||
194 | |||
195 | #if defined(HAVE_USBSTACK) && defined(USE_ROCKBOX_USB) | ||
196 | usbstack | ||
197 | #endif | 193 | #endif |
198 | 194 | ||
diff --git a/apps/lang/english.lang b/apps/lang/english.lang index 682725737f..8ac60e18c4 100644 --- a/apps/lang/english.lang +++ b/apps/lang/english.lang | |||
@@ -11232,87 +11232,87 @@ | |||
11232 | </phrase> | 11232 | </phrase> |
11233 | <phrase> | 11233 | <phrase> |
11234 | id: LANG_USBSTACK | 11234 | id: LANG_USBSTACK |
11235 | desc: in settings_menu | 11235 | desc: deprecated |
11236 | user: core | 11236 | user: core |
11237 | <source> | 11237 | <source> |
11238 | *: none | 11238 | *: none |
11239 | usbstack: "USB Stack" | 11239 | usbstack: "" |
11240 | </source> | 11240 | </source> |
11241 | <dest> | 11241 | <dest> |
11242 | *: none | 11242 | *: none |
11243 | usbstack: "USB Stack" | 11243 | usbstack: "" |
11244 | </dest> | 11244 | </dest> |
11245 | <voice> | 11245 | <voice> |
11246 | *: none | 11246 | *: none |
11247 | usbstack: "USB Stack" | 11247 | usbstack: "" |
11248 | </voice> | 11248 | </voice> |
11249 | </phrase> | 11249 | </phrase> |
11250 | <phrase> | 11250 | <phrase> |
11251 | id: LANG_USBSTACK_MODE | 11251 | id: LANG_USBSTACK_MODE |
11252 | desc: in usbstack settings | 11252 | desc: deprecated |
11253 | user: core | 11253 | user: core |
11254 | <source> | 11254 | <source> |
11255 | *: none | 11255 | *: none |
11256 | usbstack: "USB Stack Mode" | 11256 | usbstack: "" |
11257 | </source> | 11257 | </source> |
11258 | <dest> | 11258 | <dest> |
11259 | *: none | 11259 | *: none |
11260 | usbstack: "USB Stack Mode" | 11260 | usbstack: "" |
11261 | </dest> | 11261 | </dest> |
11262 | <voice> | 11262 | <voice> |
11263 | *: none | 11263 | *: none |
11264 | usbstack: "USB Stack Mode" | 11264 | usbstack: "" |
11265 | </voice> | 11265 | </voice> |
11266 | </phrase> | 11266 | </phrase> |
11267 | <phrase> | 11267 | <phrase> |
11268 | id: LANG_USBSTACK_DEVICE | 11268 | id: LANG_USBSTACK_DEVICE |
11269 | desc: in usbstack settings | 11269 | desc: deprecated |
11270 | user: core | 11270 | user: core |
11271 | <source> | 11271 | <source> |
11272 | *: none | 11272 | *: none |
11273 | usbstack: "Device" | 11273 | usbstack: "" |
11274 | </source> | 11274 | </source> |
11275 | <dest> | 11275 | <dest> |
11276 | *: none | 11276 | *: none |
11277 | usbstack: "Device" | 11277 | usbstack: "" |
11278 | </dest> | 11278 | </dest> |
11279 | <voice> | 11279 | <voice> |
11280 | *: none | 11280 | *: none |
11281 | usbstack: "Device" | 11281 | usbstack: "" |
11282 | </voice> | 11282 | </voice> |
11283 | </phrase> | 11283 | </phrase> |
11284 | <phrase> | 11284 | <phrase> |
11285 | id: LANG_USBSTACK_HOST | 11285 | id: LANG_USBSTACK_HOST |
11286 | desc: in usbstack settings | 11286 | desc: deprecated |
11287 | user: core | 11287 | user: core |
11288 | <source> | 11288 | <source> |
11289 | *: none | 11289 | *: none |
11290 | usbstack: "Host" | 11290 | usbstack: "" |
11291 | </source> | 11291 | </source> |
11292 | <dest> | 11292 | <dest> |
11293 | *: none | 11293 | *: none |
11294 | usbstack: "Host" | 11294 | usbstack: "" |
11295 | </dest> | 11295 | </dest> |
11296 | <voice> | 11296 | <voice> |
11297 | *: none | 11297 | *: none |
11298 | usbstack: "Host" | 11298 | usbstack: "" |
11299 | </voice> | 11299 | </voice> |
11300 | </phrase> | 11300 | </phrase> |
11301 | <phrase> | 11301 | <phrase> |
11302 | id: LANG_USBSTACK_DEVICE_DRIVER | 11302 | id: LANG_USBSTACK_DEVICE_DRIVER |
11303 | desc: in usbstack settings | 11303 | desc: deprecated |
11304 | user: core | 11304 | user: core |
11305 | <source> | 11305 | <source> |
11306 | *: none | 11306 | *: none |
11307 | usbstack: "Device Driver" | 11307 | usbstack: "" |
11308 | </source> | 11308 | </source> |
11309 | <dest> | 11309 | <dest> |
11310 | *: none | 11310 | *: none |
11311 | usbstack: "Device Driver" | 11311 | usbstack: "" |
11312 | </dest> | 11312 | </dest> |
11313 | <voice> | 11313 | <voice> |
11314 | *: none | 11314 | *: none |
11315 | usbstack: "Device Driver" | 11315 | usbstack: "" |
11316 | </voice> | 11316 | </voice> |
11317 | </phrase> | 11317 | </phrase> |
11318 | <phrase> | 11318 | <phrase> |