diff options
author | Michael Sevakis <jethead71@rockbox.org> | 2017-10-30 16:29:51 -0400 |
---|---|---|
committer | William Wilgus <me.theuser@yahoo.com> | 2018-07-04 15:20:47 +0200 |
commit | 19b2964d78b2ad6624a0e7cddd0ac6a49082cca4 (patch) | |
tree | 54f00fe62f23ca6fc387b6f8702cf6737f795032 /firmware/target/arm/as3525/sd-as3525v2.c | |
parent | ab1b67f37b4d415ba096aed3bc5d9700e0a7923f (diff) | |
download | rockbox-19b2964d78b2ad6624a0e7cddd0ac6a49082cca4.tar.gz rockbox-19b2964d78b2ad6624a0e7cddd0ac6a49082cca4.zip |
AMS v1/v2: Remove sd_enabled as an externally-visible variable.
Also removes the sd_enable() function call. It was only used in
the debug screen on AMSv1 and not used at all on AMS v2.
For v1,obtain debug info in a struture passed to a dedicated
debug info function so that enabling and disabling the controller
isn't racy.
Change-Id: I7c44693bc2df5a1f16168b05b3abfe622f9584ce
Diffstat (limited to 'firmware/target/arm/as3525/sd-as3525v2.c')
-rw-r--r-- | firmware/target/arm/as3525/sd-as3525v2.c | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/firmware/target/arm/as3525/sd-as3525v2.c b/firmware/target/arm/as3525/sd-as3525v2.c index f78345577c..b512cc2ea4 100644 --- a/firmware/target/arm/as3525/sd-as3525v2.c +++ b/firmware/target/arm/as3525/sd-as3525v2.c | |||
@@ -323,9 +323,6 @@ static int sd_first_drive = 0; | |||
323 | /* for compatibility */ | 323 | /* for compatibility */ |
324 | static long last_disk_activity = -1; | 324 | static long last_disk_activity = -1; |
325 | static struct mutex sd_mtx SHAREDBSS_ATTR; | 325 | static struct mutex sd_mtx SHAREDBSS_ATTR; |
326 | #ifndef BOOTLOADER | ||
327 | bool sd_enabled = false; | ||
328 | #endif | ||
329 | 326 | ||
330 | static struct semaphore transfer_completion_signal; | 327 | static struct semaphore transfer_completion_signal; |
331 | static struct semaphore command_completion_signal; | 328 | static struct semaphore command_completion_signal; |
@@ -675,7 +672,6 @@ int sd_init(void) | |||
675 | return ret; | 672 | return ret; |
676 | 673 | ||
677 | #ifndef BOOTLOADER | 674 | #ifndef BOOTLOADER |
678 | sd_enabled = true; | ||
679 | enable_controller(false); | 675 | enable_controller(false); |
680 | #endif | 676 | #endif |
681 | return 0; | 677 | return 0; |
@@ -879,13 +875,6 @@ long sd_last_disk_activity(void) | |||
879 | { | 875 | { |
880 | return last_disk_activity; | 876 | return last_disk_activity; |
881 | } | 877 | } |
882 | |||
883 | void sd_enable(bool on) | ||
884 | { | ||
885 | mutex_lock(&sd_mtx); | ||
886 | enable_controller(on); | ||
887 | mutex_unlock(&sd_mtx); | ||
888 | } | ||
889 | #endif /* BOOTLOADER */ | 878 | #endif /* BOOTLOADER */ |
890 | 879 | ||
891 | tCardInfo *card_get_info_target(int card_no) | 880 | tCardInfo *card_get_info_target(int card_no) |