diff options
author | Bertrik Sikken <bertrik@sikken.nl> | 2011-07-24 17:32:50 +0000 |
---|---|---|
committer | Bertrik Sikken <bertrik@sikken.nl> | 2011-07-24 17:32:50 +0000 |
commit | 0157c624180a27c8109c93d182ed360920d43909 (patch) | |
tree | 769756b734e5bd386d64049134dea53981fa6149 /firmware/target | |
parent | 10a1e8a609d5c8ffdb74cdc75fada47acb998bc9 (diff) | |
download | rockbox-0157c624180a27c8109c93d182ed360920d43909.tar.gz rockbox-0157c624180a27c8109c93d182ed360920d43909.zip |
ipod nano 1g: enable readout of battery current through ADC channel 4066_ISTAT
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@30204 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware/target')
-rw-r--r-- | firmware/target/arm/debug-pp.c | 2 | ||||
-rw-r--r-- | firmware/target/arm/ipod/adc-ipod-pcf.c | 2 | ||||
-rw-r--r-- | firmware/target/arm/ipod/adc-target.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/firmware/target/arm/debug-pp.c b/firmware/target/arm/debug-pp.c index 7872db714d..5f252db417 100644 --- a/firmware/target/arm/debug-pp.c +++ b/firmware/target/arm/debug-pp.c | |||
@@ -124,7 +124,7 @@ bool dbg_ports(void) | |||
124 | #ifdef ADC_ACCESSORY | 124 | #ifdef ADC_ACCESSORY |
125 | lcd_putsf(0, line++, "ACCESSORY: %d", adc_read(ADC_ACCESSORY)); | 125 | lcd_putsf(0, line++, "ACCESSORY: %d", adc_read(ADC_ACCESSORY)); |
126 | #endif | 126 | #endif |
127 | #ifdef IPOD_VIDEO | 127 | #if defined(IPOD_VIDEO) || defined(IPOD_NANO) |
128 | lcd_putsf(0, line++, "4066_ISTAT: %d", adc_read(ADC_4066_ISTAT)); | 128 | lcd_putsf(0, line++, "4066_ISTAT: %d", adc_read(ADC_4066_ISTAT)); |
129 | #endif | 129 | #endif |
130 | 130 | ||
diff --git a/firmware/target/arm/ipod/adc-ipod-pcf.c b/firmware/target/arm/ipod/adc-ipod-pcf.c index e60d8ebb8f..5040e21fd8 100644 --- a/firmware/target/arm/ipod/adc-ipod-pcf.c +++ b/firmware/target/arm/ipod/adc-ipod-pcf.c | |||
@@ -87,7 +87,7 @@ void adc_init(void) | |||
87 | adc_battery->timeout = 0; | 87 | adc_battery->timeout = 0; |
88 | adcdata[ADC_ACCESSORY].channelnum = 4; | 88 | adcdata[ADC_ACCESSORY].channelnum = 4; |
89 | adcdata[ADC_ACCESSORY].timeout = 0; | 89 | adcdata[ADC_ACCESSORY].timeout = 0; |
90 | #ifdef IPOD_VIDEO | 90 | #if defined(IPOD_VIDEO) || defined(IPOD_NANO) |
91 | adcdata[ADC_4066_ISTAT].channelnum = 7; | 91 | adcdata[ADC_4066_ISTAT].channelnum = 7; |
92 | adcdata[ADC_4066_ISTAT].timeout = 0; | 92 | adcdata[ADC_4066_ISTAT].timeout = 0; |
93 | #endif | 93 | #endif |
diff --git a/firmware/target/arm/ipod/adc-target.h b/firmware/target/arm/ipod/adc-target.h index 708febac9d..6fa887708e 100644 --- a/firmware/target/arm/ipod/adc-target.h +++ b/firmware/target/arm/ipod/adc-target.h | |||
@@ -24,7 +24,7 @@ | |||
24 | #define ADC_BATTERY 0 | 24 | #define ADC_BATTERY 0 |
25 | #define ADC_ACCESSORY 1 | 25 | #define ADC_ACCESSORY 1 |
26 | #define ADC_UNREG_POWER ADC_BATTERY | 26 | #define ADC_UNREG_POWER ADC_BATTERY |
27 | #ifdef IPOD_VIDEO | 27 | #if defined(IPOD_VIDEO) || defined(IPOD_NANO) |
28 | #define ADC_4066_ISTAT 2 | 28 | #define ADC_4066_ISTAT 2 |
29 | #define NUM_ADC_CHANNELS 3 | 29 | #define NUM_ADC_CHANNELS 3 |
30 | #else | 30 | #else |