summaryrefslogtreecommitdiffstats
path: root/firmware
diff options
context:
space:
mode:
authorLinus Nielsen Feltzing <linus@haxx.se>2006-02-23 16:40:41 +0000
committerLinus Nielsen Feltzing <linus@haxx.se>2006-02-23 16:40:41 +0000
commit01ece88198e4cc4168e69ac1c495ab83a2f677ed (patch)
tree8e52fd733d5e2b32d5bb039fe986a1d83c963330 /firmware
parent8e8e9c3990bd07b0ac50391af5eea6dee3990ce6 (diff)
downloadrockbox-01ece88198e4cc4168e69ac1c495ab83a2f677ed.tar.gz
rockbox-01ece88198e4cc4168e69ac1c495ab83a2f677ed.tar.bz2
rockbox-01ece88198e4cc4168e69ac1c495ab83a2f677ed.zip
ADC driver for iAudio X5
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@8811 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware')
-rw-r--r--firmware/drivers/adc.c16
-rw-r--r--firmware/export/adc.h10
-rwxr-xr-xfirmware/target/coldfire/iaudio/x5/adc-x5.c68
3 files changed, 77 insertions, 17 deletions
diff --git a/firmware/drivers/adc.c b/firmware/drivers/adc.c
index b71583ca05..e565372fac 100644
--- a/firmware/drivers/adc.c
+++ b/firmware/drivers/adc.c
@@ -332,19 +332,3 @@ void adc_init(void)
}
#endif
-#ifdef IAUDIO_X5
-unsigned char adc_scan(int channel)
-{
- return 0;
-}
-
-unsigned short adc_read(int channel)
-{
- return 0;
-}
-
-void adc_init(void)
-{
-}
-
-#endif
diff --git a/firmware/export/adc.h b/firmware/export/adc.h
index 4082e4b39b..027c7154f0 100644
--- a/firmware/export/adc.h
+++ b/firmware/export/adc.h
@@ -21,7 +21,15 @@
#include "config.h"
-#if defined(IRIVER_H100_SERIES) || defined(IRIVER_H300_SERIES)
+#ifdef IAUDIO_X5
+#define NUM_ADC_CHANNELS 3
+
+#define ADC_BUTTONS 0
+#define ADC_REMOTE 1
+#define ADC_BATTERY 2
+#define ADC_UNREG_POWER ADC_BATTERY /* For compatibility */
+
+#elif defined(IRIVER_H100_SERIES) || defined(IRIVER_H300_SERIES)
#define NUM_ADC_CHANNELS 4
#define ADC_BUTTONS 0
diff --git a/firmware/target/coldfire/iaudio/x5/adc-x5.c b/firmware/target/coldfire/iaudio/x5/adc-x5.c
new file mode 100755
index 0000000000..c67b8b5c98
--- /dev/null
+++ b/firmware/target/coldfire/iaudio/x5/adc-x5.c
@@ -0,0 +1,68 @@
+/***************************************************************************
+ * __________ __ ___.
+ * Open \______ \ ____ ____ | | _\_ |__ _______ ___
+ * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ /
+ * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < <
+ * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \
+ * \/ \/ \/ \/ \/
+ * $Id$
+ *
+ * Copyright (C) 2006 by Linus Nielsen Feltzing
+ *
+ * All files in this archive are subject to the GNU General Public License.
+ * See the file COPYING in the source tree root for full license agreement.
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * KIND, either express or implied.
+ *
+ ****************************************************************************/
+#include "config.h"
+#include "cpu.h"
+#include "system.h"
+#include "kernel.h"
+#include "thread.h"
+#include "adc.h"
+#include "pcf50606.h"
+
+static unsigned char adcdata[NUM_ADC_CHANNELS];
+
+static int channelnum[] =
+{
+ 5, /* ADC_BUTTONS (ADCIN2) */
+ 6, /* ADC_REMOTE (ADCIN3) */
+ 0, /* ADC_BATTERY (BATVOLT, resistive divider) */
+};
+
+unsigned char adc_scan(int channel)
+{
+ unsigned char data;
+
+ pcf50606_write(0x2f, 0x80 | (channelnum[channel] << 1) | 1);
+ data = pcf50606_read(0x30);
+
+ adcdata[channel] = data;
+
+ return data;
+}
+
+unsigned short adc_read(int channel)
+{
+ return adcdata[channel];
+}
+
+static int adc_counter;
+
+static void adc_tick(void)
+{
+ if(++adc_counter == HZ)
+ {
+ adc_counter = 0;
+ adc_scan(ADC_BATTERY);
+ }
+}
+
+void adc_init(void)
+{
+ adc_scan(ADC_BATTERY);
+ tick_add_task(adc_tick);
+}