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

4 files changed, 4 insertions, 19 deletions

diff --git a/firmware/enc_base.c b/firmware/enc_base.c
index 14cc553..d120cdb 100644
--- a/firmware/enc_base.c
+++ b/firmware/enc_base.c
@@ -25,6 +25,7 @@
 
 /** mp3_enc.codec **/
 
+#if 0 /* Currently unused, left for reference and future use */
 /* These are in descending order rather than in MPEG frequency index
    order */
 const unsigned long mp3_enc_sampr[MP3_ENC_NUM_SAMPR] =
@@ -35,6 +36,7 @@ const unsigned long mp3_enc_sampr[MP3_ENC_NUM_SAMPR] =
     12000, 11025,  8000, /* MPEG 2.5 */
 #endif
 };
+#endif
 
 /* All bitrates used in the MPA L3 standard */
 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 321421c..293ecfc 100644
--- a/firmware/export/enc_base.h
+++ b/firmware/export/enc_base.h
@@ -97,7 +97,9 @@ struct aiff_enc_config
 /* This number is count of full encoder set */
 #define MP3_ENC_NUM_SAMPR       6
 
+#if 0
 extern const unsigned long mp3_enc_sampr[MP3_ENC_NUM_SAMPR];
+#endif
 extern const unsigned long mp3_enc_bitr[MP3_ENC_NUM_BITR];
 
 struct mp3_enc_config
diff --git a/firmware/export/usb.h b/firmware/export/usb.h
index 2dac4c7..d68ac7d 100644
--- a/firmware/export/usb.h
+++ b/firmware/export/usb.h
@@ -132,7 +132,6 @@ void usb_signal_transfer_completion(
     struct usb_transfer_completion_event_data *event_data);
 bool usb_driver_enabled(int driver);
 bool usb_exclusive_storage(void); /* storage is available for usb */
-void usb_storage_try_release_storage(void);
 #endif
 int usb_release_exclusive_storage(void);
 
diff --git a/firmware/usbstack/usb_storage.c b/firmware/usbstack/usb_storage.c
index c5fa47f..a178f06 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))
 #endif
 }
 
-void usb_storage_try_release_storage(void)
-{
-    /* Check if there is a connected drive left. If not,
-       release excusive access */
-    bool canrelease=true;
-    int i;
-    for(i=0;i<storage_num_drives();i++) {
-        if(!ejected[i] && locked[i]) {
-            canrelease=false;
-            break;
-        }
-    }
-    if(canrelease) {
-        logf("scsi release ata");
-        usb_release_exclusive_storage();
-    }
-}
-
 #ifdef HAVE_HOTSWAP
 void usb_storage_notify_hotswap(int volume,bool inserted)
 {