10 files changed, 28 insertions, 44 deletions

diff --git a/firmware/export/adc.h b/firmware/export/adc.h
index 3a438832d6..13d2617c00 100644
--- a/firmware/export/adc.h
+++ b/firmware/export/adc.h
@@ -24,12 +24,6 @@
 #ifdef TARGET_TREE
 #include "adc-target.h"
 
-#elif defined(IPOD_ARCH)
-#define NUM_ADC_CHANNELS 1
-
-#define ADC_BATTERY 0
-#define ADC_UNREG_POWER ADC_BATTERY
-
 #elif defined(IRIVER_H100_SERIES) || defined(IRIVER_H300_SERIES)
 #define NUM_ADC_CHANNELS 4
 
@@ -106,8 +100,7 @@
 unsigned short adc_read(int channel);
 void adc_init(void);
 
-#if defined(IRIVER_H100_SERIES) || defined(IRIVER_H300_SERIES)\
- || defined(IPOD_ARCH)
+#if defined(IRIVER_H100_SERIES) || defined(IRIVER_H300_SERIES)
 /* Force a scan now */
 unsigned short adc_scan(int channel);
 #endif
diff --git a/firmware/export/button.h b/firmware/export/button.h
index 4ff04202d5..686fe79937 100644
--- a/firmware/export/button.h
+++ b/firmware/export/button.h
@@ -26,9 +26,7 @@
     (CONFIG_KEYPAD == IRIVER_H300_PAD)
 #define HAS_BUTTON_HOLD
 #define HAS_REMOTE_BUTTON_HOLD
-#elif (CONFIG_KEYPAD == IPOD_4G_PAD) || \
-      (CONFIG_KEYPAD == IPOD_3G_PAD) || \
-      (CONFIG_KEYPAD == IRIVER_IFP7XX_PAD)
+#elif (CONFIG_KEYPAD == IRIVER_IFP7XX_PAD)
 #define HAS_BUTTON_HOLD
 #endif
 extern struct event_queue button_queue;
@@ -222,30 +220,6 @@ void wheel_send_events(bool send);
 
 #define BUTTON_REMOTE 0
 
-#elif ((CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_3G_PAD))
-
-  /* iPod specific button codes */
-
-#define BUTTON_SELECT       0x00000001
-#define BUTTON_MENU         0x00000002
-
-#define BUTTON_LEFT         0x00000004
-#define BUTTON_RIGHT        0x00000008
-#define BUTTON_SCROLL_FWD   0x00000010
-#define BUTTON_SCROLL_BACK  0x00000020
-
-#define BUTTON_PLAY         0x00000040
-
-#define BUTTON_MAIN (BUTTON_SELECT|BUTTON_MENU\
-                |BUTTON_LEFT|BUTTON_RIGHT|BUTTON_SCROLL_FWD\
-                |BUTTON_SCROLL_BACK|BUTTON_PLAY)
-
-#define BUTTON_REMOTE 0
-
-/* This is for later
-#define  BUTTON_SCROLL_TOUCH 0x00000200
-*/
-
 #elif CONFIG_KEYPAD == IRIVER_IFP7XX_PAD
 
 /* iriver IFP7XX specific button codes */
diff --git a/firmware/export/config-ipod3g.h b/firmware/export/config-ipod3g.h
index 94035069a5..e94c3c087c 100644
--- a/firmware/export/config-ipod3g.h
+++ b/firmware/export/config-ipod3g.h
@@ -1,7 +1,7 @@
 /*
  * This config file is for the Apple iPod 3g
  */
-#define IPOD_ARCH 1
+#define TARGET_TREE /* this target is using the target tree system */
 
 /* For Rolo and boot loader */
 #define MODEL_NUMBER 7
@@ -101,6 +101,10 @@
 
 #define USB_NONE
 
+/* LCD contrast */
+#define MIN_CONTRAST_SETTING        5
+#define MAX_CONTRAST_SETTING        63
+#define DEFAULT_CONTRAST_SETTING    40 /* Match boot contrast */
 
 /* Virtual LED (icon) */
 #define CONFIG_LED LED_VIRTUAL
diff --git a/firmware/export/config-ipod4g.h b/firmware/export/config-ipod4g.h
index 2b603987f4..c61ab05b77 100644
--- a/firmware/export/config-ipod4g.h
+++ b/firmware/export/config-ipod4g.h
@@ -1,7 +1,7 @@
 /*
  * This config file is for the Apple iPod Color/Photo
  */
-#define IPOD_ARCH 1
+#define TARGET_TREE /* this target is using the target tree system */
 
 /* For Rolo and boot loader */
 #define MODEL_NUMBER 8
@@ -100,6 +100,11 @@
 
 #define USB_IPODSTYLE
 
+/* LCD contrast */
+#define MIN_CONTRAST_SETTING        5
+#define MAX_CONTRAST_SETTING        63
+#define DEFAULT_CONTRAST_SETTING    40 /* Match boot contrast */
+
 /* define this if the unit can be powered or charged via USB */
 #define HAVE_USB_POWER
 
diff --git a/firmware/export/config-ipodcolor.h b/firmware/export/config-ipodcolor.h
index 0bcb25b56c..0f8a56fe8b 100644
--- a/firmware/export/config-ipodcolor.h
+++ b/firmware/export/config-ipodcolor.h
@@ -1,7 +1,7 @@
 /*
  * This config file is for the Apple iPod Color/Photo
  */
-#define IPOD_ARCH 1
+#define TARGET_TREE /* this target is using the target tree system */
 
 /* For Rolo and boot loader */
 #define MODEL_NUMBER 3
diff --git a/firmware/export/config-ipodmini.h b/firmware/export/config-ipodmini.h
index f2f96946c9..a089ebdd78 100644
--- a/firmware/export/config-ipodmini.h
+++ b/firmware/export/config-ipodmini.h
@@ -1,7 +1,7 @@
 /*
  * This config file is for the Apple iPod Mini (1st Gen)
  */
-#define IPOD_ARCH 1
+#define TARGET_TREE /* this target is using the target tree system */
 
 /* For Rolo and boot loader */
 #define MODEL_NUMBER 9 /* TODO: change to 9 */
@@ -100,6 +100,11 @@
 
 #define USB_IPODSTYLE
 
+/* LCD contrast */
+#define MIN_CONTRAST_SETTING        5
+#define MAX_CONTRAST_SETTING        63
+#define DEFAULT_CONTRAST_SETTING    40 /* Match boot contrast */
+
 /* define this if the unit can be powered or charged via USB */
 #define HAVE_USB_POWER
 
diff --git a/firmware/export/config-ipodmini2g.h b/firmware/export/config-ipodmini2g.h
index bac60e3e72..c37be05400 100755
--- a/firmware/export/config-ipodmini2g.h
+++ b/firmware/export/config-ipodmini2g.h
@@ -1,7 +1,7 @@
 /*
  * This config file is for the Apple iPod Mini 2nd Gen
  */
-#define IPOD_ARCH 1
+#define TARGET_TREE /* this target is using the target tree system */
 
 /* For Rolo and boot loader */
 #define MODEL_NUMBER 11
@@ -103,6 +103,11 @@
 
 #define USB_IPODSTYLE
 
+/* LCD contrast */
+#define MIN_CONTRAST_SETTING        5
+#define MAX_CONTRAST_SETTING        63
+#define DEFAULT_CONTRAST_SETTING    40 /* Match boot contrast */
+
 /* define this if the unit can be powered or charged via USB */
 #define HAVE_USB_POWER
 
diff --git a/firmware/export/config-ipodnano.h b/firmware/export/config-ipodnano.h
index c24aa43e55..258d93bad5 100644
--- a/firmware/export/config-ipodnano.h
+++ b/firmware/export/config-ipodnano.h
@@ -1,7 +1,7 @@
 /*
  * This config file is for the Apple iPod Nano
  */
-#define IPOD_ARCH 1
+#define TARGET_TREE /* this target is using the target tree system */
 
 /* For Rolo and boot loader */
 #define MODEL_NUMBER 4
diff --git a/firmware/export/config-ipodvideo.h b/firmware/export/config-ipodvideo.h
index cd8f1eea11..530417d612 100644
--- a/firmware/export/config-ipodvideo.h
+++ b/firmware/export/config-ipodvideo.h
@@ -1,7 +1,7 @@
 /*
  * This config file is for the Apple iPod Video
  */
-#define IPOD_ARCH 1
+#define TARGET_TREE /* this target is using the target tree system */
 
 /* For Rolo and boot loader */
 #define MODEL_NUMBER 5
diff --git a/firmware/export/pcf50605.h b/firmware/export/pcf50605.h
index eeb09b4612..eb899afc86 100644
--- a/firmware/export/pcf50605.h
+++ b/firmware/export/pcf50605.h
@@ -20,7 +20,6 @@
 #ifndef PCF50605_H
 #define PCF50605_H
 
-#ifdef IPOD_ARCH
 int pcf50605_read(int address);
 int pcf50605_read_multiple(int address, unsigned char* buf, int count);
 int pcf50605_write(int address, unsigned char val);
@@ -29,6 +28,5 @@ int pcf50605_a2d_read(int channel);
 bool pcf50605_charger_inserted(void);
 void pcf50605_standby_mode(void);
 void pcf50605_init(void);
-#endif
 
 #endif