Target tree support for Iriver iFP.

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

3 files changed, 2 insertions, 90 deletions

diff --git a/firmware/drivers/adc.c b/firmware/drivers/adc.c
index 388ff66..adeace0 100644
--- a/firmware/drivers/adc.c
+++ b/firmware/drivers/adc.c
@@ -155,38 +155,4 @@ void adc_init(void)
     sleep(2);    /* Ensure valid readings when adc_init returns */
 }
 
-#elif CONFIG_CPU == PNX0101
-
-static unsigned short adcdata[NUM_ADC_CHANNELS];
-
-unsigned short adc_read(int channel)
-{
-    return adcdata[channel];
-}
-
-static void adc_tick(void)
-{
-    if (ADCST & 0x10) {
-        adcdata[0] = ADCCH0 & 0x3ff;
-        adcdata[1] = ADCCH1 & 0x3ff;
-        adcdata[2] = ADCCH2 & 0x3ff;
-        adcdata[3] = ADCCH3 & 0x3ff;
-        adcdata[4] = ADCCH4 & 0x3ff;
-        ADCST = 0xa;
-    }
-}
-
-void adc_init(void)
-{
-    ADCR24 = 0xaaaaa;
-    ADCR28 = 0;
-    ADCST = 2;
-    ADCST = 0xa;
-
-    while (!(ADCST & 0x10));
-    adc_tick();
-  
-    tick_add_task(adc_tick);
-}
-
 #endif
diff --git a/firmware/drivers/button.c b/firmware/drivers/button.c
index 3ae4893..1cdd899 100644
--- a/firmware/drivers/button.c
+++ b/firmware/drivers/button.c
@@ -75,10 +75,7 @@ static bool remote_filter_first_keypress;
 #define REPEAT_INTERVAL_FINISH  5
 
 /* the power-off button and number of repeated keys before shutting off */
-#if (CONFIG_KEYPAD == IRIVER_IFP7XX_PAD)
-#define POWEROFF_BUTTON BUTTON_PLAY
-#define POWEROFF_COUNT 40
-#elif !defined(TARGET_TREE)
+#if !defined(TARGET_TREE)
 #define POWEROFF_BUTTON BUTTON_OFF
 #define POWEROFF_COUNT 10
 #endif
@@ -506,46 +503,6 @@ static int button_read(void)
         || (CONFIG_KEYPAD == IRIVER_H300_PAD)
     btn = button_read_device(); /* temp untill TARGET_TREE is defined */
 
-#elif CONFIG_KEYPAD == IRIVER_IFP7XX_PAD
-    static bool hold_button = false;
-    bool hold_button_old;
-
-    /* normal buttons */
-    hold_button_old = hold_button;
-    hold_button = button_hold();
-
-    if (hold_button != hold_button_old)
-        backlight_hold_changed(hold_button);
-
-    if (!button_hold())
-    {          
-        data = adc_read(ADC_BUTTONS);
-        if (data < 0x35c)
-        {
-            if (data < 0x151)
-                if (data < 0xc7)
-                    if (data < 0x41)
-                        btn = BUTTON_LEFT;
-                    else
-                        btn = BUTTON_RIGHT;
-                else
-                    btn = BUTTON_SELECT;
-            else
-                if (data < 0x268)
-                    if (data < 0x1d7)
-                        btn = BUTTON_UP;
-                    else
-                        btn = BUTTON_DOWN;
-                else
-                    if (data < 0x2f9)
-                        btn = BUTTON_EQ;
-                    else
-                        btn = BUTTON_MODE;
-        }
-
-        if (adc_read(ADC_BUTTON_PLAY) < 0x64)
-            btn |= BUTTON_PLAY;
-    }
 
 #elif CONFIG_KEYPAD == RECORDER_PAD
 #ifndef HAVE_FMADC
@@ -703,12 +660,6 @@ static int button_read(void)
     return retval;
 }
 
-#if CONFIG_KEYPAD == IRIVER_IFP7XX_PAD
-bool button_hold(void)
-{
-    return (GPIO5_READ & 4) ? false : true;
-}
-#endif
 
 int button_status(void)
 {
diff --git a/firmware/drivers/power.c b/firmware/drivers/power.c
index e48993c..e0a5de4 100644
--- a/firmware/drivers/power.c
+++ b/firmware/drivers/power.c
@@ -144,8 +144,6 @@ void ide_power_enable(bool on)
         P1 |= 0x08;
     else
         P1 &= ~0x08;
-#elif CONFIG_CPU == PNX0101
-    /* no ide controller */
 #elif defined(TOSHIBA_GIGABEAT_F)
     /* Gigabeat TODO */
 #else /* SH1 based archos */
@@ -222,10 +220,7 @@ bool ide_powered(void)
 void power_off(void)
 {
     set_irq_level(HIGHEST_IRQ_LEVEL);
-#if CONFIG_CPU == PNX0101
-    GPIO1_CLR = 1 << 16;
-    GPIO2_SET = 1;
-#elif defined(GMINI_ARCH)
+#if defined(GMINI_ARCH)
     P1 &= ~1;
     P1CON &= ~1;
 #elif defined(TOSHIBA_GIGABEAT_F)