Sansa AMS: Force sd_enable(true) when using the Debug View HW info page so we can read the registers immediately.

Because we turn off the clocks to the SD controllers between disk accesses we were unable to read the MCI_CLOCK registers until there was a disk access.  Now we can read them immediately.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23810 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Jack Halpin 2009-12-01 20:12:25 +00:00
parent 2c50f4222e
commit 5bd4ec0c87

View file

@ -30,6 +30,7 @@
#include "pl180.h" #include "pl180.h"
#include "ascodec-target.h" #include "ascodec-target.h"
#include "adc.h" #include "adc.h"
#include "storage.h"
#define ON "Enabled" #define ON "Enabled"
#define OFF "Disabled" #define OFF "Disabled"
@ -289,18 +290,22 @@ bool __dbg_hw_info(void)
lcd_putsf(0, line++, "I2SO: %s %3dMHz", (CGU_AUDIO & (1<<11)) ? lcd_putsf(0, line++, "I2SO: %s %3dMHz", (CGU_AUDIO & (1<<11)) ?
"on " : "off", calc_freq(CLK_I2SO)/1000000); "on " : "off", calc_freq(CLK_I2SO)/1000000);
if(MCI_NAND)
/* Enable SD cards to read the registers */
sd_enable(true);
last_nand = MCI_NAND; last_nand = MCI_NAND;
/* MCLK == PCLK */ #ifdef HAVE_MULTIDRIVE
last_sd = MCI_SD;
#endif
sd_enable(false);
lcd_putsf(0, line++, "SD :%3dMHz %3dMHz", lcd_putsf(0, line++, "SD :%3dMHz %3dMHz",
((last_nand ? (AS3525_PCLK_FREQ/ 1000000): 0) / ((AS3525_PCLK_FREQ/ 1000000) /
((last_nand & MCI_CLOCK_BYPASS)? 1:(((last_nand & 0xff)+1) * 2))), ((last_nand & MCI_CLOCK_BYPASS)? 1:(((last_nand & 0xff)+1) * 2))),
calc_freq(CLK_SD_MCLK_NAND)/1000000); calc_freq(CLK_SD_MCLK_NAND)/1000000);
#ifdef HAVE_MULTIDRIVE #ifdef HAVE_MULTIDRIVE
if(MCI_SD)
last_sd = MCI_SD;
lcd_putsf(0, line++, "uSD :%3dMHz %3dMHz", lcd_putsf(0, line++, "uSD :%3dMHz %3dMHz",
((last_sd ? (AS3525_PCLK_FREQ/ 1000000): 0) / ((AS3525_PCLK_FREQ/ 1000000) /
((last_sd & MCI_CLOCK_BYPASS) ? 1: (((last_sd & 0xff) + 1) * 2))), ((last_sd & MCI_CLOCK_BYPASS) ? 1: (((last_sd & 0xff) + 1) * 2))),
calc_freq(CLK_SD_MCLK_MSD)/1000000); calc_freq(CLK_SD_MCLK_MSD)/1000000);
#endif #endif