From 59462a8bf82aa453f09e85feb607555a582625f4 Mon Sep 17 00:00:00 2001 From: Rafaël Carré Date: Thu, 20 May 2010 23:15:48 +0000 Subject: Clipv1: move buttonlight functions to header GPIO direction needs only to be set at init both functions are now one liners so make them static inline git-svn-id: svn://svn.rockbox.org/rockbox/trunk@26218 a1c6a512-1295-4272-9138-f99709370657 --- firmware/SOURCES | 1 - .../target/arm/as3525/sansa-clip/backlight-clip.c | 35 ---------------------- .../arm/as3525/sansa-clip/backlight-target.h | 19 +++++++++--- 3 files changed, 15 insertions(+), 40 deletions(-) delete mode 100644 firmware/target/arm/as3525/sansa-clip/backlight-clip.c (limited to 'firmware') diff --git a/firmware/SOURCES b/firmware/SOURCES index fe141eb366..61e335c77f 100644 --- a/firmware/SOURCES +++ b/firmware/SOURCES @@ -1274,7 +1274,6 @@ target/arm/as3525/sansa-clipv2/lcd-as-clipv2.S target/arm/as3525/lcd-ssd1303.c target/arm/as3525/sansa-clip/lcd-clip.c target/arm/as3525/sansa-clip/button-clip.c -target/arm/as3525/sansa-clip/backlight-clip.c #ifndef BOOTLOADER target/arm/powermgmt-ascodec.c target/arm/as3525/sansa-clip/powermgmt-clip.c diff --git a/firmware/target/arm/as3525/sansa-clip/backlight-clip.c b/firmware/target/arm/as3525/sansa-clip/backlight-clip.c deleted file mode 100644 index d22b04b34e..0000000000 --- a/firmware/target/arm/as3525/sansa-clip/backlight-clip.c +++ /dev/null @@ -1,35 +0,0 @@ -/*************************************************************************** - * __________ __ ___. - * Open \______ \ ____ ____ | | _\_ |__ _______ ___ - * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / - * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < - * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ - * \/ \/ \/ \/ \/ - * $Id$ - * - * Copyright © 2008 Rafaël Carré - * - * 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 "backlight-target.h" -#include "as3525.h" - -void _buttonlight_on(void) -{ - GPIOD_DIR |= (1<<7); - GPIOD_PIN(7) = (1<<7); /* set pin d7 high */ -} - -void _buttonlight_off(void) -{ - GPIOD_DIR |= (1<<7); - GPIOD_PIN(7) = 0; /* set pin d7 low */ -} diff --git a/firmware/target/arm/as3525/sansa-clip/backlight-target.h b/firmware/target/arm/as3525/sansa-clip/backlight-target.h index 5a6ae34728..f836fb9ab2 100644 --- a/firmware/target/arm/as3525/sansa-clip/backlight-target.h +++ b/firmware/target/arm/as3525/sansa-clip/backlight-target.h @@ -25,8 +25,6 @@ #include "lcd.h" #include "backlight.h" -#define _backlight_init() true - static inline void _backlight_on(void) { lcd_enable(true); @@ -37,7 +35,20 @@ static inline void _backlight_off(void) lcd_enable(false); } -void _buttonlight_on(void); -void _buttonlight_off(void); +static inline bool _backlight_init(void) +{ + GPIOD_DIR |= (1<<7); /* for button light */ + return true; +} + +static inline void _buttonlight_on(void) +{ + GPIOD_PIN(7) = (1<<7); +} + +static inline void _buttonlight_off(void) +{ + GPIOD_PIN(7) = 0; +} #endif -- cgit v1.2.3