From be26da8662f19b0c72c98bbe9eeb00b0468af23c Mon Sep 17 00:00:00 2001 From: Mark Arigo Date: Wed, 24 Dec 2008 03:45:32 +0000 Subject: Remove some unused code in the Philips SA9200 port. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@19573 a1c6a512-1295-4272-9138-f99709370657 --- firmware/target/arm/philips/sa9200/adc-target.h | 22 +------- firmware/target/arm/philips/sa9200/power-sa9200.c | 68 ----------------------- 2 files changed, 2 insertions(+), 88 deletions(-) diff --git a/firmware/target/arm/philips/sa9200/adc-target.h b/firmware/target/arm/philips/sa9200/adc-target.h index ab7d5d92ed..007a11af10 100644 --- a/firmware/target/arm/philips/sa9200/adc-target.h +++ b/firmware/target/arm/philips/sa9200/adc-target.h @@ -21,25 +21,7 @@ #ifndef _ADC_TARGET_H_ #define _ADC_TARGET_H_ -/* ADC channels */ -#define NUM_ADC_CHANNELS 13 - -#define ADC_BVDD 0 /* Battery voltage of 4V LiIo accumulator */ -#define ADC_RTCSUP 1 /* RTC backup battery voltage */ -#define ADC_UVDD 2 /* USB host voltage */ -#define ADC_CHG_IN 3 /* Charger input voltage */ -#define ADC_CVDD 4 /* Charger pump output voltage */ -#define ADC_BATTEMP 5 /* Battery charging temperature */ -#define ADC_MICSUP1 6 /* Voltage on MicSup1 for remote control - or external voltage measurement */ -#define ADC_MICSUP2 7 /* Voltage on MicSup1 for remote control - or external voltage measurement */ -#define ADC_VBE1 8 /* Measuring junction temperature @ 2uA */ -#define ADC_VBE2 9 /* Measuring junction temperature @ 1uA */ -#define ADC_I_MICSUP1 10 /* Current of MicSup1 for remote control detection */ -#define ADC_I_MICSUP2 11 /* Current of MicSup2 for remote control detection */ -#define ADC_VBAT 12 /* Single cell battery voltage */ - -#define ADC_UNREG_POWER ADC_BVDD /* For compatibility */ +/* The ADC sources and channels are common to all targets with AS3514 */ +#include "as3514.h" #endif diff --git a/firmware/target/arm/philips/sa9200/power-sa9200.c b/firmware/target/arm/philips/sa9200/power-sa9200.c index 654beee064..2b42379cae 100644 --- a/firmware/target/arm/philips/sa9200/power-sa9200.c +++ b/firmware/target/arm/philips/sa9200/power-sa9200.c @@ -63,71 +63,3 @@ void ide_power_enable(bool on) { (void)on; } - -#if CONFIG_TUNER - -/** Tuner **/ -static bool powered = false; - -bool tuner_power(bool status) -{ - bool old_status; - lv24020lp_lock(); - - old_status = powered; - - if (status != old_status) - { - if (status) - { - /* init mystery amplification device */ -#if defined(SANSA_E200) - GPO32_ENABLE |= 0x1; -#else /* SANSA_C200 */ - DEV_INIT2 &= ~0x800; -#endif - udelay(5); - - /* When power up, host should initialize the 3-wire bus - in host read mode: */ - - /* 1. Set direction of the DATA-line to input-mode. */ - GPIOH_OUTPUT_EN &= ~(1 << 5); - GPIOH_ENABLE |= (1 << 5); - - /* 2. Drive NR_W low */ - GPIOH_OUTPUT_VAL &= ~(1 << 3); - GPIOH_OUTPUT_EN |= (1 << 3); - GPIOH_ENABLE |= (1 << 3); - - /* 3. Drive CLOCK high */ - GPIOH_OUTPUT_VAL |= (1 << 4); - GPIOH_OUTPUT_EN |= (1 << 4); - GPIOH_ENABLE |= (1 << 4); - - lv24020lp_power(true); - } - else - { - lv24020lp_power(false); - - /* set all as inputs */ - GPIOH_OUTPUT_EN &= ~((1 << 5) | (1 << 3) | (1 << 4)); - GPIOH_ENABLE &= ~((1 << 3) | (1 << 4)); - - /* turn off mystery amplification device */ -#if defined (SANSA_E200) - GPO32_ENABLE &= ~0x1; -#else - DEV_INIT2 |= 0x800; -#endif - } - - powered = status; - } - - lv24020lp_unlock(); - return old_status; -} - -#endif /* CONFIG_TUNER */ -- cgit v1.2.3