From 139f9f28e9179a881c0bdd5c6bed6790591a07cb Mon Sep 17 00:00:00 2001 From: Jonathan Gordon Date: Mon, 30 Oct 2006 08:56:06 +0000 Subject: move the iriver h1x0/h3x0 targets to the target tree git-svn-id: svn://svn.rockbox.org/rockbox/trunk@11392 a1c6a512-1295-4272-9138-f99709370657 --- firmware/export/adc.h | 27 --------------------------- firmware/export/config-h100.h | 9 +++++++++ firmware/export/config-h120.h | 8 ++++++++ firmware/export/config-h300.h | 12 ++++++++++-- 4 files changed, 27 insertions(+), 29 deletions(-) (limited to 'firmware/export') diff --git a/firmware/export/adc.h b/firmware/export/adc.h index 95728d432f..4dced55f09 100644 --- a/firmware/export/adc.h +++ b/firmware/export/adc.h @@ -24,28 +24,6 @@ #ifdef TARGET_TREE #include "adc-target.h" -#elif defined(IRIVER_H100_SERIES) || defined(IRIVER_H300_SERIES) -#define NUM_ADC_CHANNELS 4 - -#define ADC_BUTTONS 0 -#define ADC_REMOTE 1 -#define ADC_BATTERY 2 -#define ADC_REMOTEDETECT 3 -#define ADC_UNREG_POWER ADC_BATTERY /* For compatibility */ - -/* ADC values for different remote control types */ -#ifdef IRIVER_H100_SERIES -#define ADCVAL_H300_LCD_REMOTE 0x5E -#define ADCVAL_H100_LCD_REMOTE 0x96 -#define ADCVAL_H300_LCD_REMOTE_HOLD 0xCC -#define ADCVAL_H100_LCD_REMOTE_HOLD 0xEA -#else /* H300 series */ -#define ADCVAL_H300_LCD_REMOTE 0x35 -#define ADCVAL_H100_LCD_REMOTE 0x54 -#define ADCVAL_H300_LCD_REMOTE_HOLD 0x72 -#define ADCVAL_H100_LCD_REMOTE_HOLD 0x83 -#endif - #elif defined(IRIVER_IFP7XX) #define NUM_ADC_CHANNELS 5 @@ -100,9 +78,4 @@ unsigned short adc_read(int channel); void adc_init(void); -#if defined(IRIVER_H100_SERIES) || defined(IRIVER_H300_SERIES) -/* Force a scan now */ -unsigned short adc_scan(int channel); -#endif - #endif /* _ADC_H_ */ diff --git a/firmware/export/config-h100.h b/firmware/export/config-h100.h index 12f1066d3a..6f74078e1e 100644 --- a/firmware/export/config-h100.h +++ b/firmware/export/config-h100.h @@ -2,6 +2,8 @@ #error "re-run configure this just so wrong" #endif +#define TARGET_TREE /* this target is using the target tree system */ + /* * This config file is for iriver iHP-100, iHP-110, iHP-115 */ @@ -145,6 +147,13 @@ #endif /* !SIMULATOR */ +#define DEFAULT_CONTRAST_SETTING 40 +#define MIN_CONTRAST_SETTING 5 +#define MAX_CONTRAST_SETTING 63 +#define DEFAULT_REMOTE_CONTRAST_SETTING 42 +#define MIN_REMOTE_CONTRAST_SETTING MIN_CONTRAST_SETTING +#define MAX_REMOTE_CONTRAST_SETTING MAX_CONTRAST_SETTING + /* Define this for S/PDIF input available */ #define HAVE_SPDIF_IN diff --git a/firmware/export/config-h120.h b/firmware/export/config-h120.h index 21451dcdac..1476102100 100644 --- a/firmware/export/config-h120.h +++ b/firmware/export/config-h120.h @@ -1,3 +1,4 @@ +#define TARGET_TREE /* this target is using the target tree system */ /* * This config file is for iriver H120 and H140 */ @@ -142,6 +143,13 @@ #endif /* !SIMULATOR */ +#define DEFAULT_CONTRAST_SETTING 40 +#define MIN_CONTRAST_SETTING 5 +#define MAX_CONTRAST_SETTING 63 +#define DEFAULT_REMOTE_CONTRAST_SETTING 42 +#define MIN_REMOTE_CONTRAST_SETTING MIN_CONTRAST_SETTING +#define MAX_REMOTE_CONTRAST_SETTING MAX_CONTRAST_SETTING + /* Define this for S/PDIF input available */ #define HAVE_SPDIF_IN diff --git a/firmware/export/config-h300.h b/firmware/export/config-h300.h index c9aad436f1..31f0f6729f 100644 --- a/firmware/export/config-h300.h +++ b/firmware/export/config-h300.h @@ -1,3 +1,4 @@ +#define TARGET_TREE /* this target is using the target tree system */ /* * This config file is for iriver H320, H340 */ @@ -144,8 +145,15 @@ #define HAVE_EEPROM #endif /* SIMULATOR */ - -#define DEFAULT_REMOTE_CONTRAST_SETTING 42 +/* Main LCD contrast range and defaults */ +#define MIN_CONTRAST_SETTING 5 +#define MAX_CONTRAST_SETTING 63 +#define DEFAULT_CONTRAST_SETTING 40 + +/* Remote LCD contrast range and defaults */ +#define MIN_REMOTE_CONTRAST_SETTING MIN_CONTRAST_SETTING +#define MAX_REMOTE_CONTRAST_SETTING MAX_CONTRAST_SETTING +#define DEFAULT_REMOTE_CONTRAST_SETTING 42 /* Define this for FM radio input available */ #define HAVE_FMRADIO_IN -- cgit v1.2.3