From 47bf6c5a5ad1fd9143ab87328793b285230f74a3 Mon Sep 17 00:00:00 2001 From: Jens Arnold Date: Thu, 12 Apr 2007 22:12:13 +0000 Subject: Moved archos backlight code to target tree. Changed old mutlivalue CONFIG_BACKLIGHT to a simple HAVE_BACKLIGHT. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@13136 a1c6a512-1295-4272-9138-f99709370657 --- firmware/export/backlight.h | 6 +++--- firmware/export/button.h | 2 +- firmware/export/config-e200.h | 3 +-- firmware/export/config-fmrecorder.h | 2 +- firmware/export/config-gigabeat.h | 2 +- firmware/export/config-h10.h | 3 +-- firmware/export/config-h100.h | 2 +- firmware/export/config-h10_5gb.h | 3 +-- firmware/export/config-h120.h | 2 +- firmware/export/config-h300.h | 2 +- firmware/export/config-iaudiom5.h | 2 +- firmware/export/config-iaudiox5.h | 2 +- firmware/export/config-ifp7xx.h | 2 +- firmware/export/config-ipod3g.h | 2 +- firmware/export/config-ipod4g.h | 2 +- firmware/export/config-ipodcolor.h | 2 +- firmware/export/config-ipodmini.h | 2 +- firmware/export/config-ipodmini2g.h | 2 +- firmware/export/config-ipodnano.h | 2 +- firmware/export/config-ipodvideo.h | 2 +- firmware/export/config-ondiofm.h | 2 +- firmware/export/config-ondiosp.h | 2 +- firmware/export/config-player.h | 2 +- firmware/export/config-recorder.h | 2 +- firmware/export/config-recorderv2.h | 2 +- firmware/export/config-tpj1022.h | 3 +-- firmware/export/config.h | 22 ---------------------- 27 files changed, 28 insertions(+), 54 deletions(-) (limited to 'firmware/export') diff --git a/firmware/export/backlight.h b/firmware/export/backlight.h index 2873666dd8..4b164c63d2 100644 --- a/firmware/export/backlight.h +++ b/firmware/export/backlight.h @@ -26,7 +26,7 @@ void backlight_on(void); void backlight_off(void); void backlight_set_timeout(int index); -#if CONFIG_BACKLIGHT +#ifdef HAVE_BACKLIGHT void backlight_init(void); #if defined(IAUDIO_X5) && !defined(SIMULATOR) @@ -54,9 +54,9 @@ void lcd_set_sleep_after_backlight_off(int index); extern const signed char lcd_sleep_timeout_value[]; #endif -#else /* CONFIG_BACKLIGHT == 0 */ +#else /* !HAVE_BACKLIGHT */ #define backlight_init() -#endif /* CONFIG_BACKLIGHT */ +#endif /* !HAVE_BACKLIGHT */ #ifdef HAVE_REMOTE_LCD void remote_backlight_on(void); diff --git a/firmware/export/button.h b/firmware/export/button.h index ea3effcaba..f675824c3d 100644 --- a/firmware/export/button.h +++ b/firmware/export/button.h @@ -33,7 +33,7 @@ void button_clear_queue(void); #ifdef HAVE_LCD_BITMAP void button_set_flip(bool flip); /* turn 180 degrees */ #endif -#if CONFIG_BACKLIGHT +#ifdef HAVE_BACKLIGHT void set_backlight_filter_keypress(bool value); #ifdef HAVE_REMOTE_LCD void set_remote_backlight_filter_keypress(bool value); diff --git a/firmware/export/config-e200.h b/firmware/export/config-e200.h index efcb7ebfd5..ccff38dbf2 100644 --- a/firmware/export/config-e200.h +++ b/firmware/export/config-e200.h @@ -69,8 +69,7 @@ #define CONFIG_TUNER_XTAL 32768 *//* TODO: what is this? */ /* Define this for LCD backlight available */ -#define CONFIG_BACKLIGHT BL_H10 /* TODO: figure this out, probably not necessary - because of 'target' stuff */ +#define HAVE_BACKLIGHT #define BATTERY_CAPACITY_DEFAULT 750 /* default battery capacity */ diff --git a/firmware/export/config-fmrecorder.h b/firmware/export/config-fmrecorder.h index e753808897..211dccb183 100644 --- a/firmware/export/config-fmrecorder.h +++ b/firmware/export/config-fmrecorder.h @@ -52,7 +52,7 @@ #define HAVE_SPDIF_IN /* Define this for LCD backlight available */ -#define CONFIG_BACKLIGHT BL_RTC /* on I2C controlled RTC port */ +#define HAVE_BACKLIGHT #define CONFIG_I2C I2C_PLAYREC diff --git a/firmware/export/config-gigabeat.h b/firmware/export/config-gigabeat.h index 9b56a1a616..ef6d8243b8 100644 --- a/firmware/export/config-gigabeat.h +++ b/firmware/export/config-gigabeat.h @@ -42,7 +42,7 @@ #define CONFIG_RTC RTC_S3C2440 /* Define this for LCD backlight available */ -#define CONFIG_BACKLIGHT BL_GIGABEAT /* port controlled PWM */ +#define HAVE_BACKLIGHT #define HAVE_LCD_ENABLE diff --git a/firmware/export/config-h10.h b/firmware/export/config-h10.h index 2b7f965294..4d372143f8 100644 --- a/firmware/export/config-h10.h +++ b/firmware/export/config-h10.h @@ -78,8 +78,7 @@ #define CONFIG_TUNER_XTAL 32768 *//* TODO: what is this? */ /* Define this for LCD backlight available */ -#define CONFIG_BACKLIGHT BL_H10 /* TODO: figure this out, probably not necessary - because of 'target' stuff */ +#define HAVE_BACKLIGHT #define BATTERY_CAPACITY_DEFAULT 1550 /* default battery capacity */ diff --git a/firmware/export/config-h100.h b/firmware/export/config-h100.h index dbb499f3af..cc2bfd7178 100644 --- a/firmware/export/config-h100.h +++ b/firmware/export/config-h100.h @@ -56,7 +56,7 @@ #define CONFIG_LCD LCD_S1D15E06 /* Define this for LCD backlight available */ -#define CONFIG_BACKLIGHT BL_IRIVER_H100 /* port controlled */ +#define HAVE_BACKLIGHT /* We can fade the backlight by using PWM */ #define HAVE_BACKLIGHT_PWM_FADING diff --git a/firmware/export/config-h10_5gb.h b/firmware/export/config-h10_5gb.h index bbf3f2ffe6..3b3cebb8fb 100644 --- a/firmware/export/config-h10_5gb.h +++ b/firmware/export/config-h10_5gb.h @@ -72,8 +72,7 @@ #define CONFIG_TUNER_XTAL 32768 *//* TODO: what is this? */ /* Define this for LCD backlight available */ -#define CONFIG_BACKLIGHT BL_H10 /* TODO: figure this out, probably not necessary - because of target tree stuff */ +#define HAVE_BACKLIGHT #define BATTERY_CAPACITY_DEFAULT 820 /* default battery capacity */ diff --git a/firmware/export/config-h120.h b/firmware/export/config-h120.h index f957f450d0..a0ad638fa2 100644 --- a/firmware/export/config-h120.h +++ b/firmware/export/config-h120.h @@ -51,7 +51,7 @@ #define CONFIG_LCD LCD_S1D15E06 /* Define this for LCD backlight available */ -#define CONFIG_BACKLIGHT BL_IRIVER_H100 /* port controlled */ +#define HAVE_BACKLIGHT /* We can fade the backlight by using PWM */ #define HAVE_BACKLIGHT_PWM_FADING diff --git a/firmware/export/config-h300.h b/firmware/export/config-h300.h index ad80191885..0b2406bee7 100644 --- a/firmware/export/config-h300.h +++ b/firmware/export/config-h300.h @@ -51,7 +51,7 @@ #define HAVE_REMOTE_LCD /* Define this for LCD backlight available */ -#define CONFIG_BACKLIGHT BL_IRIVER_H300 /* port controlled PWM */ +#define HAVE_BACKLIGHT /* Define this if you have a software controlled poweroff */ #define HAVE_SW_POWEROFF diff --git a/firmware/export/config-iaudiom5.h b/firmware/export/config-iaudiom5.h index bce3c47e5c..bcc843f125 100644 --- a/firmware/export/config-iaudiom5.h +++ b/firmware/export/config-iaudiom5.h @@ -64,7 +64,7 @@ #define CONFIG_LCD LCD_S1D15E06 /* Define this for LCD backlight available */ -#define CONFIG_BACKLIGHT BL_M5 /* PCF50606 I2C */ +#define HAVE_BACKLIGHT /* Define this if you have a software controlled poweroff */ #define HAVE_SW_POWEROFF diff --git a/firmware/export/config-iaudiox5.h b/firmware/export/config-iaudiox5.h index 57f8a68134..43c02a0ee5 100644 --- a/firmware/export/config-iaudiox5.h +++ b/firmware/export/config-iaudiox5.h @@ -66,7 +66,7 @@ #define CONFIG_LCD LCD_X5 /* Define this for LCD backlight available */ -#define CONFIG_BACKLIGHT BL_X5 /* PCF50606 I2C */ +#define HAVE_BACKLIGHT #define HAVE_BACKLIGHT_BRIGHTNESS /* Define this if you have a software controlled poweroff */ diff --git a/firmware/export/config-ifp7xx.h b/firmware/export/config-ifp7xx.h index 1b0ea17984..435b6ef984 100644 --- a/firmware/export/config-ifp7xx.h +++ b/firmware/export/config-ifp7xx.h @@ -77,7 +77,7 @@ #define ROM_START 0x00000000 /* Define this for LCD backlight available */ -#define CONFIG_BACKLIGHT BL_IRIVER_IFP7XX /* port controlled */ +#define HAVE_BACKLIGHT /* Define this to the CPU frequency */ #define CPU_FREQ 48000000 diff --git a/firmware/export/config-ipod3g.h b/firmware/export/config-ipod3g.h index f3877cfdbc..ff91bcff49 100644 --- a/firmware/export/config-ipod3g.h +++ b/firmware/export/config-ipod3g.h @@ -64,7 +64,7 @@ #define HAVE_SW_TONE_CONTROLS /* Define this for LCD backlight available */ -#define CONFIG_BACKLIGHT BL_IPOD3G /* port controlled */ +#define HAVE_BACKLIGHT #define BATTERY_CAPACITY_DEFAULT 630 /* default battery capacity */ diff --git a/firmware/export/config-ipod4g.h b/firmware/export/config-ipod4g.h index ab172afd2e..4a8d4f1bf2 100644 --- a/firmware/export/config-ipod4g.h +++ b/firmware/export/config-ipod4g.h @@ -70,7 +70,7 @@ #define ACTION_WPSAB_SINGLE ACTION_WPS_BROWSE /* Define this for LCD backlight available */ -#define CONFIG_BACKLIGHT BL_IPOD4G /* port controlled */ +#define HAVE_BACKLIGHT #define BATTERY_CAPACITY_DEFAULT 630 /* default battery capacity */ diff --git a/firmware/export/config-ipodcolor.h b/firmware/export/config-ipodcolor.h index 5e3e5c3d62..41277041f1 100644 --- a/firmware/export/config-ipodcolor.h +++ b/firmware/export/config-ipodcolor.h @@ -61,7 +61,7 @@ #define ACTION_WPSAB_SINGLE ACTION_WPS_BROWSE /* Define this for LCD backlight available */ -#define CONFIG_BACKLIGHT BL_IPOD4G /* port controlled */ +#define HAVE_BACKLIGHT #define BATTERY_CAPACITY_DEFAULT 700 /* default battery capacity */ diff --git a/firmware/export/config-ipodmini.h b/firmware/export/config-ipodmini.h index 40987d6b2c..7fba883c9c 100644 --- a/firmware/export/config-ipodmini.h +++ b/firmware/export/config-ipodmini.h @@ -67,7 +67,7 @@ #define ACTION_WPSAB_SINGLE ACTION_WPS_BROWSE /* Define this for LCD backlight available */ -#define CONFIG_BACKLIGHT BL_IPODMINI /* port controlled */ +#define HAVE_BACKLIGHT #define BATTERY_CAPACITY_DEFAULT 400 /* default battery capacity */ diff --git a/firmware/export/config-ipodmini2g.h b/firmware/export/config-ipodmini2g.h index 80e2820339..55831c4cb3 100644 --- a/firmware/export/config-ipodmini2g.h +++ b/firmware/export/config-ipodmini2g.h @@ -67,7 +67,7 @@ #define ACTION_WPSAB_SINGLE ACTION_WPS_BROWSE /* Define this for LCD backlight available */ -#define CONFIG_BACKLIGHT BL_IPODMINI /* port controlled */ +#define HAVE_BACKLIGHT /* We can fade the backlight by using PWM */ #define HAVE_BACKLIGHT_PWM_FADING diff --git a/firmware/export/config-ipodnano.h b/firmware/export/config-ipodnano.h index d32e45d17f..74bfe34d0f 100644 --- a/firmware/export/config-ipodnano.h +++ b/firmware/export/config-ipodnano.h @@ -61,7 +61,7 @@ #define ACTION_WPSAB_SINGLE ACTION_WPS_BROWSE /* Define this for LCD backlight available */ -#define CONFIG_BACKLIGHT BL_IPODNANO /* port controlled */ +#define HAVE_BACKLIGHT /* We can fade the backlight by using PWM */ #define HAVE_BACKLIGHT_PWM_FADING diff --git a/firmware/export/config-ipodvideo.h b/firmware/export/config-ipodvideo.h index f9cc50d520..e10a7f9e55 100644 --- a/firmware/export/config-ipodvideo.h +++ b/firmware/export/config-ipodvideo.h @@ -61,7 +61,7 @@ #define ACTION_WPSAB_SINGLE ACTION_WPS_BROWSE /* Define this for LCD backlight available */ -#define CONFIG_BACKLIGHT BL_IPODNANO /* port controlled */ +#define HAVE_BACKLIGHT /* We can fade the backlight by using PWM */ #define HAVE_BACKLIGHT_PWM_FADING diff --git a/firmware/export/config-ondiofm.h b/firmware/export/config-ondiofm.h index 0e691b70e3..c168ecf588 100644 --- a/firmware/export/config-ondiofm.h +++ b/firmware/export/config-ondiofm.h @@ -40,7 +40,7 @@ #define CONFIG_CODEC MAS3587F /* Enable this if you have done the backlight mod */ -//#define CONFIG_BACKLIGHT BL_PA14_HI +//#define HAVE_BACKLIGHT #define BATTERY_CAPACITY_DEFAULT 1000 /* default battery capacity */ diff --git a/firmware/export/config-ondiosp.h b/firmware/export/config-ondiosp.h index da723413ec..1d3e98ac0a 100644 --- a/firmware/export/config-ondiosp.h +++ b/firmware/export/config-ondiosp.h @@ -33,7 +33,7 @@ #define CONFIG_CODEC MAS3539F /* Enable this if you have done the backlight mod */ -//#define CONFIG_BACKLIGHT BL_PA14_HI +//#define HAVE_BACKLIGHT #define BATTERY_CAPACITY_DEFAULT 1000 /* default battery capacity */ diff --git a/firmware/export/config-player.h b/firmware/export/config-player.h index 580831c861..0256db137f 100644 --- a/firmware/export/config-player.h +++ b/firmware/export/config-player.h @@ -25,7 +25,7 @@ #define HAVE_DAC3550A /* Define this for LCD backlight available */ -#define CONFIG_BACKLIGHT BL_PA14_LO /* port PA14, low active */ +#define HAVE_BACKLIGHT #define BATTERY_CAPACITY_DEFAULT 1500 /* default battery capacity */ diff --git a/firmware/export/config-recorder.h b/firmware/export/config-recorder.h index d8bd0bed2f..3fe7365d3c 100644 --- a/firmware/export/config-recorder.h +++ b/firmware/export/config-recorder.h @@ -46,7 +46,7 @@ #define HAVE_SPDIF_IN /* Define this for LCD backlight available */ -#define CONFIG_BACKLIGHT BL_RTC /* on I2C controlled RTC port */ +#define HAVE_BACKLIGHT #define CONFIG_I2C I2C_PLAYREC diff --git a/firmware/export/config-recorderv2.h b/firmware/export/config-recorderv2.h index 0e6e00c167..8211994275 100644 --- a/firmware/export/config-recorderv2.h +++ b/firmware/export/config-recorderv2.h @@ -49,7 +49,7 @@ #define HAVE_SPDIF_IN /* Define this for LCD backlight available */ -#define CONFIG_BACKLIGHT BL_RTC /* on I2C controlled RTC port */ +#define HAVE_BACKLIGHT #define CONFIG_I2C I2C_PLAYREC diff --git a/firmware/export/config-tpj1022.h b/firmware/export/config-tpj1022.h index 5837b0f01f..02e7319cfe 100644 --- a/firmware/export/config-tpj1022.h +++ b/firmware/export/config-tpj1022.h @@ -55,8 +55,7 @@ #define AB_REPEAT_ENABLE 1 /* Define this for LCD backlight available */ -#define CONFIG_BACKLIGHT BL_TPJ1022 /* TODO: figure this out, probably not necessary - because of 'target' stuff */ +#define HAVE_BACKLIGHT #define BATTERY_CAPACITY_DEFAULT 1550 /* default battery capacity TODO: check this, probably different diff --git a/firmware/export/config.h b/firmware/export/config.h index 2d7b3e131a..0ad94e06b1 100644 --- a/firmware/export/config.h +++ b/firmware/export/config.h @@ -113,24 +113,6 @@ #define RGB565 565 #define RGB565SWAPPED 3553 -/* CONFIG_BACKLIGHT */ -#define BL_PA14_LO 1 /* Player, PA14 low active */ -#define BL_RTC 2 /* Recorder, RTC square wave output */ -#define BL_PA14_HI 3 /* Ondio, PA14 high active */ -#define BL_IRIVER_H100 4 /* IRiver GPIO */ -#define BL_IPOD4G 5 /* Apple iPod 4G */ -#define BL_IPODNANO 6 /* Apple iPod Nano and iPod Video*/ -#define BL_IPOD3G 7 /* Apple iPod 3g with dock */ -#define BL_IRIVER_H300 8 /* IRiver PWM */ -#define BL_IRIVER_IFP7XX 9 /* IRiver GPIO */ -#define BL_IPODMINI 10 /* Apple iPod Mini */ -#define BL_GIGABEAT 11 /* Toshiba Gigabeat */ -#define BL_H10 12 /* iriver H10 */ -#define BL_X5 13 /* iAudio X5 PCF50606 I2C */ -#define BL_H10_5GB 14 /* iriver H10 5/6GB */ -#define BL_TPJ1022 15 /* Tatung Elio TPJ-1022 */ -#define BL_M5 16 /* iAudio M5 PCF50606 I2C */ - /* CONFIG_I2C */ #define I2C_PLAYREC 1 /* Archos Player/Recorder style */ #define I2C_ONDIO 2 /* Ondio style */ @@ -235,10 +217,6 @@ #define CONFIG_LED 0 #endif -#ifndef CONFIG_BACKLIGHT -#define CONFIG_BACKLIGHT 0 -#endif - #ifndef CONFIG_CHARGING #define CONFIG_CHARGING 0 #endif -- cgit v1.2.3