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/arm | |
| 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/arm')
| -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) #ifdef ADC_ACCESSORY lcd_putsf(0, line++, "ACCESSORY: %d", adc_read(ADC_ACCESSORY)); #endif -#ifdef IPOD_VIDEO +#if defined(IPOD_VIDEO) || defined(IPOD_NANO) lcd_putsf(0, line++, "4066_ISTAT: %d", adc_read(ADC_4066_ISTAT)); #endif 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) adc_battery->timeout = 0; adcdata[ADC_ACCESSORY].channelnum = 4; adcdata[ADC_ACCESSORY].timeout = 0; -#ifdef IPOD_VIDEO +#if defined(IPOD_VIDEO) || defined(IPOD_NANO) adcdata[ADC_4066_ISTAT].channelnum = 7; adcdata[ADC_4066_ISTAT].timeout = 0; #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 @@ #define ADC_BATTERY 0 #define ADC_ACCESSORY 1 #define ADC_UNREG_POWER ADC_BATTERY -#ifdef IPOD_VIDEO +#if defined(IPOD_VIDEO) || defined(IPOD_NANO) #define ADC_4066_ISTAT 2 #define NUM_ADC_CHANNELS 3 #else |