From 2a5d49148028ab653b72d07897ada68bfde7b55f Mon Sep 17 00:00:00 2001 From: Dave Chapman Date: Sat, 1 Nov 2008 22:05:35 +0000 Subject: [PATCH] Unify the e200v2 and Fuze backlight/buttonlight code - it is identical. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@18966 a1c6a512-1295-4272-9138-f99709370657 --- firmware/SOURCES | 4 +- ...light-e200v2.c => backlight-e200v2-fuze.c} | 0 .../arm/as3525/sansa-fuze/backlight-fuze.c | 73 ------------------- 3 files changed, 2 insertions(+), 75 deletions(-) rename firmware/target/arm/as3525/{sansa-e200v2/backlight-e200v2.c => backlight-e200v2-fuze.c} (100%) delete mode 100644 firmware/target/arm/as3525/sansa-fuze/backlight-fuze.c diff --git a/firmware/SOURCES b/firmware/SOURCES index 3bdf089585..03a5224d93 100644 --- a/firmware/SOURCES +++ b/firmware/SOURCES @@ -1055,7 +1055,7 @@ target/arm/as3525/as3525-codec.c #ifndef SIMULATOR target/arm/as3525/sansa-e200v2/lcd-e200v2.c target/arm/as3525/sansa-e200v2/button-e200v2.c -target/arm/as3525/sansa-e200v2/backlight-e200v2.c +target/arm/as3525/backlight-e200v2-fuze.c target/arm/as3525/as3525-codec.c #endif /* !SIMULATOR */ #endif /* SANSA_E200V2 */ @@ -1072,7 +1072,7 @@ target/arm/as3525/as3525-codec.c #ifndef SIMULATOR target/arm/as3525/sansa-fuze/button-fuze.c target/arm/as3525/sansa-fuze/lcd-fuze.c -target/arm/as3525/sansa-e200v2/backlight-e200v2.c +target/arm/as3525/backlight-e200v2-fuze.c target/arm/as3525/as3525-codec.c #endif /* !SIMULATOR */ #endif /* SANSA_FUZE */ diff --git a/firmware/target/arm/as3525/sansa-e200v2/backlight-e200v2.c b/firmware/target/arm/as3525/backlight-e200v2-fuze.c similarity index 100% rename from firmware/target/arm/as3525/sansa-e200v2/backlight-e200v2.c rename to firmware/target/arm/as3525/backlight-e200v2-fuze.c diff --git a/firmware/target/arm/as3525/sansa-fuze/backlight-fuze.c b/firmware/target/arm/as3525/sansa-fuze/backlight-fuze.c deleted file mode 100644 index 735b85667d..0000000000 --- a/firmware/target/arm/as3525/sansa-fuze/backlight-fuze.c +++ /dev/null @@ -1,73 +0,0 @@ -/*************************************************************************** - * __________ __ ___. - * Open \______ \ ____ ____ | | _\_ |__ _______ ___ - * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / - * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < - * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ - * \/ \/ \/ \/ \/ - * $Id$ - * - * Copyright (C) 2006 by Barry Wardell - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY - * KIND, either express or implied. - * - ****************************************************************************/ -#include "config.h" -#include "backlight-target.h" -#include "system.h" -#include "lcd.h" -#include "backlight.h" -#include "as3525-codec.h" -#include "as3514.h" - -static unsigned short backlight_brightness = DEFAULT_BRIGHTNESS_SETTING; - -void _backlight_set_brightness(int brightness) -{ - backlight_brightness = brightness; - - if (brightness > 0) - _backlight_on(); - else - _backlight_off(); -} - -void _backlight_on(void) -{ -#ifdef HAVE_LCD_SLEEP - backlight_lcd_sleep_countdown(false); /* stop counter */ -#endif -#ifdef HAVE_LCD_ENABLE - lcd_enable(true); /* power on lcd + visible display */ -#endif - as3525_codec_write(AS3514_DCDC15, backlight_brightness); -} - -void _backlight_off(void) -{ - as3525_codec_write(AS3514_DCDC15, 0x0); -#ifdef HAVE_LCD_ENABLE - lcd_enable(false); /* power off visible display */ -#endif -#ifdef HAVE_LCD_SLEEP - backlight_lcd_sleep_countdown(true); /* start countdown */ -#endif -} - -void _buttonlight_on(void) -{ - GPIOD_PIN(7) = (1<<7); - GPIOD_DIR |= (1<<7); -} - -void _buttonlight_off(void) -{ - GPIOD_PIN(7) = 0; - GPIOD_DIR |= (1<<7); -}