summaryrefslogtreecommitdiff
path: root/firmware/export
diff options
context:
space:
mode:
authorBarry Wardell <rockbox@barrywardell.net>2006-08-22 20:17:09 +0000
committerBarry Wardell <rockbox@barrywardell.net>2006-08-22 20:17:09 +0000
commite367b05fca08891b0ae47eab8b4a098253122633 (patch)
tree679c959e59b6646007e835662b1737d679cb8764 /firmware/export
parentb249d9ac2d7ac6f418d427c9e7a40c3d3a7f5ad4 (diff)
downloadrockbox-e367b05fca08891b0ae47eab8b4a098253122633.tar.gz
rockbox-e367b05fca08891b0ae47eab8b4a098253122633.zip
Move X5 ADC code to target tree. Fix power button detection on H10. New ADC
driver for H10. Thanks to Laurent Baum for all his help with this code. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@10701 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware/export')
-rw-r--r--firmware/export/adc.h11
1 files changed, 3 insertions, 8 deletions
diff --git a/firmware/export/adc.h b/firmware/export/adc.h
index 2f14e3cf48..3a438832d6 100644
--- a/firmware/export/adc.h
+++ b/firmware/export/adc.h
@@ -21,13 +21,8 @@
21 21
22#include "config.h" 22#include "config.h"
23 23
24#ifdef IAUDIO_X5 24#ifdef TARGET_TREE
25#define NUM_ADC_CHANNELS 3 25#include "adc-target.h"
26
27#define ADC_BUTTONS 0
28#define ADC_REMOTE 1
29#define ADC_BATTERY 2
30#define ADC_UNREG_POWER ADC_BATTERY /* For compatibility */
31 26
32#elif defined(IPOD_ARCH) 27#elif defined(IPOD_ARCH)
33#define NUM_ADC_CHANNELS 1 28#define NUM_ADC_CHANNELS 1
@@ -112,7 +107,7 @@ unsigned short adc_read(int channel);
112void adc_init(void); 107void adc_init(void);
113 108
114#if defined(IRIVER_H100_SERIES) || defined(IRIVER_H300_SERIES)\ 109#if defined(IRIVER_H100_SERIES) || defined(IRIVER_H300_SERIES)\
115 || defined(IAUDIO_X5) || defined(IPOD_ARCH) 110 || defined(IPOD_ARCH)
116/* Force a scan now */ 111/* Force a scan now */
117unsigned short adc_scan(int channel); 112unsigned short adc_scan(int channel);
118#endif 113#endif