diff options
author | Boris Gjenero <dreamlayers@rockbox.org> | 2011-12-14 21:45:25 +0000 |
---|---|---|
committer | Boris Gjenero <dreamlayers@rockbox.org> | 2011-12-14 21:45:25 +0000 |
commit | 8e6030c8223bfb3102048b2daccbf6a6f4e97ba2 (patch) | |
tree | 92f6769d3fbb5936e32d5fb82480b776ea6fbfb9 /firmware | |
parent | 273fbadb5537743829f9830de5247626a11aedca (diff) | |
download | rockbox-8e6030c8223bfb3102048b2daccbf6a6f4e97ba2.tar.gz rockbox-8e6030c8223bfb3102048b2daccbf6a6f4e97ba2.zip |
FS#12378 : Remove various unused code, and comment out some unused code and data for reference or future use.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@31256 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware')
-rw-r--r-- | firmware/enc_base.c | 2 | ||||
-rw-r--r-- | firmware/export/enc_base.h | 2 | ||||
-rw-r--r-- | firmware/export/usb.h | 1 | ||||
-rw-r--r-- | firmware/usbstack/usb_storage.c | 18 |
4 files changed, 4 insertions, 19 deletions
diff --git a/firmware/enc_base.c b/firmware/enc_base.c index 14cc553ae5..d120cdb07d 100644 --- a/firmware/enc_base.c +++ b/firmware/enc_base.c | |||
@@ -25,6 +25,7 @@ | |||
25 | 25 | ||
26 | /** mp3_enc.codec **/ | 26 | /** mp3_enc.codec **/ |
27 | 27 | ||
28 | #if 0 /* Currently unused, left for reference and future use */ | ||
28 | /* These are in descending order rather than in MPEG frequency index | 29 | /* These are in descending order rather than in MPEG frequency index |
29 | order */ | 30 | order */ |
30 | const unsigned long mp3_enc_sampr[MP3_ENC_NUM_SAMPR] = | 31 | const unsigned long mp3_enc_sampr[MP3_ENC_NUM_SAMPR] = |
@@ -35,6 +36,7 @@ const unsigned long mp3_enc_sampr[MP3_ENC_NUM_SAMPR] = | |||
35 | 12000, 11025, 8000, /* MPEG 2.5 */ | 36 | 12000, 11025, 8000, /* MPEG 2.5 */ |
36 | #endif | 37 | #endif |
37 | }; | 38 | }; |
39 | #endif | ||
38 | 40 | ||
39 | /* All bitrates used in the MPA L3 standard */ | 41 | /* All bitrates used in the MPA L3 standard */ |
40 | const unsigned long mp3_enc_bitr[MP3_ENC_NUM_BITR] = | 42 | const unsigned long mp3_enc_bitr[MP3_ENC_NUM_BITR] = |
diff --git a/firmware/export/enc_base.h b/firmware/export/enc_base.h index 321421c6e7..293ecfc1c1 100644 --- a/firmware/export/enc_base.h +++ b/firmware/export/enc_base.h | |||
@@ -97,7 +97,9 @@ struct aiff_enc_config | |||
97 | /* This number is count of full encoder set */ | 97 | /* This number is count of full encoder set */ |
98 | #define MP3_ENC_NUM_SAMPR 6 | 98 | #define MP3_ENC_NUM_SAMPR 6 |
99 | 99 | ||
100 | #if 0 | ||
100 | extern const unsigned long mp3_enc_sampr[MP3_ENC_NUM_SAMPR]; | 101 | extern const unsigned long mp3_enc_sampr[MP3_ENC_NUM_SAMPR]; |
102 | #endif | ||
101 | extern const unsigned long mp3_enc_bitr[MP3_ENC_NUM_BITR]; | 103 | extern const unsigned long mp3_enc_bitr[MP3_ENC_NUM_BITR]; |
102 | 104 | ||
103 | struct mp3_enc_config | 105 | struct mp3_enc_config |
diff --git a/firmware/export/usb.h b/firmware/export/usb.h index 2dac4c75db..d68ac7d910 100644 --- a/firmware/export/usb.h +++ b/firmware/export/usb.h | |||
@@ -132,7 +132,6 @@ void usb_signal_transfer_completion( | |||
132 | struct usb_transfer_completion_event_data *event_data); | 132 | struct usb_transfer_completion_event_data *event_data); |
133 | bool usb_driver_enabled(int driver); | 133 | bool usb_driver_enabled(int driver); |
134 | bool usb_exclusive_storage(void); /* storage is available for usb */ | 134 | bool usb_exclusive_storage(void); /* storage is available for usb */ |
135 | void usb_storage_try_release_storage(void); | ||
136 | #endif | 135 | #endif |
137 | int usb_release_exclusive_storage(void); | 136 | int usb_release_exclusive_storage(void); |
138 | 137 | ||
diff --git a/firmware/usbstack/usb_storage.c b/firmware/usbstack/usb_storage.c index c5fa47fa51..a178f06f87 100644 --- a/firmware/usbstack/usb_storage.c +++ b/firmware/usbstack/usb_storage.c | |||
@@ -364,24 +364,6 @@ static bool check_disk_present(IF_MD_NONVOID(int volume)) | |||
364 | #endif | 364 | #endif |
365 | } | 365 | } |
366 | 366 | ||
367 | void usb_storage_try_release_storage(void) | ||
368 | { | ||
369 | /* Check if there is a connected drive left. If not, | ||
370 | release excusive access */ | ||
371 | bool canrelease=true; | ||
372 | int i; | ||
373 | for(i=0;i<storage_num_drives();i++) { | ||
374 | if(!ejected[i] && locked[i]) { | ||
375 | canrelease=false; | ||
376 | break; | ||
377 | } | ||
378 | } | ||
379 | if(canrelease) { | ||
380 | logf("scsi release ata"); | ||
381 | usb_release_exclusive_storage(); | ||
382 | } | ||
383 | } | ||
384 | |||
385 | #ifdef HAVE_HOTSWAP | 367 | #ifdef HAVE_HOTSWAP |
386 | void usb_storage_notify_hotswap(int volume,bool inserted) | 368 | void usb_storage_notify_hotswap(int volume,bool inserted) |
387 | { | 369 | { |