summaryrefslogtreecommitdiffstats
path: root/firmware/target/arm/ipod
diff options
context:
space:
mode:
authorTorne Wuff <torne@wolfpuppy.org.uk>2009-11-03 20:35:04 +0000
committerTorne Wuff <torne@wolfpuppy.org.uk>2009-11-03 20:35:04 +0000
commit2d0af6f3c7f1a33337ab5d9498364149104fd346 (patch)
tree84109df61eae758cf6368e9b1e4d52a205502541 /firmware/target/arm/ipod
parent9c343fab5dca19e89488170e8076f2b9f255151f (diff)
downloadrockbox-2d0af6f3c7f1a33337ab5d9498364149104fd346.tar.gz
rockbox-2d0af6f3c7f1a33337ab5d9498364149104fd346.zip
FS#9728: Battery current measuring on the Video iPod
Patch by Boris Gjenero. Displays the current flowing into or out of the battery on the ipodvideo. Other ipods do not appear to have this ADC channel connected. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23500 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware/target/arm/ipod')
-rw-r--r--firmware/target/arm/ipod/adc-ipod-pcf.c4
-rw-r--r--firmware/target/arm/ipod/adc-target.h10
2 files changed, 11 insertions, 3 deletions
diff --git a/firmware/target/arm/ipod/adc-ipod-pcf.c b/firmware/target/arm/ipod/adc-ipod-pcf.c
index e4a54e09f8..e60d8ebb8f 100644
--- a/firmware/target/arm/ipod/adc-ipod-pcf.c
+++ b/firmware/target/arm/ipod/adc-ipod-pcf.c
@@ -87,5 +87,9 @@ void adc_init(void)
adc_battery->timeout = 0;
adcdata[ADC_ACCESSORY].channelnum = 4;
adcdata[ADC_ACCESSORY].timeout = 0;
+#ifdef IPOD_VIDEO
+ adcdata[ADC_4066_ISTAT].channelnum = 7;
+ adcdata[ADC_4066_ISTAT].timeout = 0;
+#endif
_adc_read(adc_battery);
}
diff --git a/firmware/target/arm/ipod/adc-target.h b/firmware/target/arm/ipod/adc-target.h
index 14b10e6a2b..708febac9d 100644
--- a/firmware/target/arm/ipod/adc-target.h
+++ b/firmware/target/arm/ipod/adc-target.h
@@ -21,12 +21,16 @@
#ifndef _ADC_TARGET_H_
#define _ADC_TARGET_H_
-#define NUM_ADC_CHANNELS 2
-
#define ADC_BATTERY 0
#define ADC_ACCESSORY 1
#define ADC_UNREG_POWER ADC_BATTERY
-
+#ifdef IPOD_VIDEO
+#define ADC_4066_ISTAT 2
+#define NUM_ADC_CHANNELS 3
+#else
+#define NUM_ADC_CHANNELS 2
+#endif
+
/* Force a scan now */
unsigned short adc_scan(int channel);
#endif