summaryrefslogtreecommitdiff
path: root/firmware/target/arm/as3525/debug-as3525.c
diff options
context:
space:
mode:
authorJack Halpin <jack.halpin@gmail.com>2009-10-26 07:06:37 +0000
committerJack Halpin <jack.halpin@gmail.com>2009-10-26 07:06:37 +0000
commit03986d4ec73a5d1a03f35f250212420866f309a4 (patch)
tree5418a00e187b53118dac52e648916c12a02491b9 /firmware/target/arm/as3525/debug-as3525.c
parent17d7f023b724d1ddb8f5e3388318ea6a1c98d707 (diff)
downloadrockbox-03986d4ec73a5d1a03f35f250212420866f309a4.tar.gz
rockbox-03986d4ec73a5d1a03f35f250212420866f309a4.zip
Revert r23350 "AMS Sansa: Assume IDECLK is MCLK for the internal SD Disk."
More information makes this assumption seem incorrect. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23356 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware/target/arm/as3525/debug-as3525.c')
-rw-r--r--firmware/target/arm/as3525/debug-as3525.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/firmware/target/arm/as3525/debug-as3525.c b/firmware/target/arm/as3525/debug-as3525.c
index 4775278102..d8d3e013e2 100644
--- a/firmware/target/arm/as3525/debug-as3525.c
+++ b/firmware/target/arm/as3525/debug-as3525.c
@@ -183,9 +183,9 @@ int calc_freq(int clk)
183 if(!(MCI_NAND & (1<<8))) 183 if(!(MCI_NAND & (1<<8)))
184 return 0; 184 return 0;
185 else if(MCI_NAND & (1<<10)) 185 else if(MCI_NAND & (1<<10))
186 return calc_freq(CLK_IDE); 186 return calc_freq(CLK_PCLK);
187 else 187 else
188 return calc_freq(CLK_IDE)/(((MCI_NAND & 0xff)+1)*2); 188 return calc_freq(CLK_PCLK)/(((MCI_NAND & 0xff)+1)*2);
189 case CLK_SD_MCLK_MSD: 189 case CLK_SD_MCLK_MSD:
190 if(!(MCI_SD & (1<<8))) 190 if(!(MCI_SD & (1<<8)))
191 return 0; 191 return 0;
@@ -222,7 +222,7 @@ bool __dbg_hw_info(void)
222{ 222{
223 int line; 223 int line;
224 int last_nand = 0; 224 int last_nand = 0;
225#ifdef HAVE_MULTIDRIVE 225#if defined(SANSA_E200V2) || defined(SANSA_FUZE) || defined(SANSA_C200V2)
226 int last_sd = 0; 226 int last_sd = 0;
227#endif 227#endif
228 228
@@ -293,10 +293,10 @@ bool __dbg_hw_info(void)
293 last_nand = MCI_NAND; 293 last_nand = MCI_NAND;
294 /* MCLK == PCLK */ 294 /* MCLK == PCLK */
295 lcd_putsf(0, line++, "SD :%3dMHz %3dMHz", 295 lcd_putsf(0, line++, "SD :%3dMHz %3dMHz",
296 ((last_nand ? (AS3525_IDE_FREQ/ 1000000): 0) / 296 ((last_nand ? (AS3525_PCLK_FREQ/ 1000000): 0) /
297 ((last_nand & MCI_CLOCK_BYPASS)? 1:(((last_nand & 0xff)+1) * 2))), 297 ((last_nand & MCI_CLOCK_BYPASS)? 1:(((last_nand & 0xff)+1) * 2))),
298 calc_freq(CLK_SD_MCLK_NAND)/1000000); 298 calc_freq(CLK_SD_MCLK_NAND)/1000000);
299#ifdef HAVE_MULTIDRIVE 299#if defined(SANSA_E200V2) || defined(SANSA_FUZE) || defined(SANSA_C200V2)
300 if(MCI_SD) 300 if(MCI_SD)
301 last_sd = MCI_SD; 301 last_sd = MCI_SD;
302 lcd_putsf(0, line++, "uSD :%3dMHz %3dMHz", 302 lcd_putsf(0, line++, "uSD :%3dMHz %3dMHz",