Renamed the iriver h120 defines and configs to "h120"! Added initial support

for the h100 series.

Please re-run configure.


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@7062 a1c6a512-1295-4272-9138-f99709370657

1 files changed, 11 insertions, 2 deletions

diff --git a/firmware/export/adc.h b/firmware/export/adc.h
index 40bc3e108a..18b0c3d578 100644
--- a/firmware/export/adc.h
+++ b/firmware/export/adc.h
@@ -21,7 +21,7 @@
 
 #include "config.h"
 
-#ifdef IRIVER_H100
+#ifdef IRIVER_H100_SERIES
 #define NUM_ADC_CHANNELS 4
 
 #define ADC_BUTTONS 0
@@ -30,6 +30,15 @@
 #define ADC_UNREG_POWER ADC_BATTERY /* For compatibility */
 
 #else
+#ifdef IRIVER_H300
+/* TODO: we don't have enough info about the ADC for the H3x0 for now, so this
+   stuff is only added here for now to make things compile. */
+#define ADC_BUTTONS -2
+#define ADC_REMOTE  -3
+unsigned char adc_scan(int channel);
+
+#endif
+
 #define NUM_ADC_CHANNELS 8
 
 #ifdef HAVE_ONDIO_ADC
@@ -73,7 +82,7 @@
 unsigned short adc_read(int channel);
 void adc_init(void);
 
-#ifdef IRIVER_H100
+#ifdef IRIVER_H120
 unsigned char adc_scan(int channel);
 #endif