summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJack Halpin <jack.halpin@gmail.com>2009-07-12 14:12:45 +0000
committerJack Halpin <jack.halpin@gmail.com>2009-07-12 14:12:45 +0000
commitf9e7a5ad39e73d189a7aa927c46d826490d20a2d (patch)
treeaaf25da9faaa4a2999aa52c4a9a23efefe308366
parent02c031709c931da6f1ee9db0c6aadda2b37ae0aa (diff)
downloadrockbox-f9e7a5ad39e73d189a7aa927c46d826490d20a2d.tar.gz
rockbox-f9e7a5ad39e73d189a7aa927c46d826490d20a2d.zip
AMSSansa: Use single adc_read instead of multiple ascodec_reads to read voltage for display in View HW info.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@21804 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--firmware/target/arm/as3525/debug-as3525.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/firmware/target/arm/as3525/debug-as3525.c b/firmware/target/arm/as3525/debug-as3525.c
index aade54ca38..b0ee8efc62 100644
--- a/firmware/target/arm/as3525/debug-as3525.c
+++ b/firmware/target/arm/as3525/debug-as3525.c
@@ -29,6 +29,7 @@
29#include "cpu.h" 29#include "cpu.h"
30#include "pl180.h" 30#include "pl180.h"
31#include "ascodec-target.h" 31#include "ascodec-target.h"
32#include "adc.h"
32 33
33#define _DEBUG_PRINTF(a,varargs...) do { \ 34#define _DEBUG_PRINTF(a,varargs...) do { \
34 snprintf(buf, sizeof(buf), (a), ##varargs); lcd_puts(0,line++,buf); \ 35 snprintf(buf, sizeof(buf), (a), ##varargs); lcd_puts(0,line++,buf); \
@@ -281,10 +282,8 @@ bool __dbg_hw_info(void)
281 _DEBUG_PRINTF("SD :%3dkHz %3dkHz", AS3525_SD_IDENT_FREQ/1000,calc_freq(CLK_SD_IDENT_NAND)/1000); 282 _DEBUG_PRINTF("SD :%3dkHz %3dkHz", AS3525_SD_IDENT_FREQ/1000,calc_freq(CLK_SD_IDENT_NAND)/1000);
282 _DEBUG_PRINTF("MSD :%3dkHz %3dkHz", AS3525_SD_IDENT_FREQ/1000,calc_freq(CLK_SD_IDENT_MSD)/1000); 283 _DEBUG_PRINTF("MSD :%3dkHz %3dkHz", AS3525_SD_IDENT_FREQ/1000,calc_freq(CLK_SD_IDENT_MSD)/1000);
283 _DEBUG_PRINTF("USB: %3dMHz", calc_freq(CLK_USB)/1000000); 284 _DEBUG_PRINTF("USB: %3dMHz", calc_freq(CLK_USB)/1000000);
284 ascodec_write(AS3514_ADC_0, 4<<4); /* ADC Source = CVDD */
285 _DEBUG_PRINTF("MMU: %s CVDDP:%4d", (read_cp15() & CP15_MMU) ? " op" : "nop", 285 _DEBUG_PRINTF("MMU: %s CVDDP:%4d", (read_cp15() & CP15_MMU) ? " op" : "nop",
286 ((ascodec_read(AS3514_ADC_1) | 286 adc_read(ADC_CVDD) * 25);
287 ((ascodec_read(AS3514_ADC_0) & 3)<<8)) * 25));
288 _DEBUG_PRINTF("Icache:%s Dcache:%s",(read_cp15() & CP15_IC) ? " op" : "nop", 287 _DEBUG_PRINTF("Icache:%s Dcache:%s",(read_cp15() & CP15_IC) ? " op" : "nop",
289 (read_cp15() & CP15_DC) ? " op" : "nop"); 288 (read_cp15() & CP15_DC) ? " op" : "nop");
290 289