From 0a5beba8234eafc98d1019addc921bddb26175df Mon Sep 17 00:00:00 2001 From: Thomas Martitz Date: Sun, 26 Apr 2009 02:27:11 +0000 Subject: [PATCH] Move the sim stubs into a seperate file to clean backlight.c up a bit. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@20796 a1c6a512-1295-4272-9138-f99709370657 --- firmware/backlight.c | 44 +------------------ uisimulator/common/backlight-sim.h | 68 ++++++++++++++++++++++++++++++ 2 files changed, 70 insertions(+), 42 deletions(-) create mode 100644 uisimulator/common/backlight-sim.h diff --git a/firmware/backlight.c b/firmware/backlight.c index 98baaec3ca..375da655f7 100644 --- a/firmware/backlight.c +++ b/firmware/backlight.c @@ -42,54 +42,14 @@ #endif #ifndef SIMULATOR #include "backlight-target.h" +#else +#include "backlight-sim.h" #endif #if (CONFIG_BACKLIGHT_FADING == BACKLIGHT_FADING_SW_SETTING) \ || (CONFIG_BACKLIGHT_FADING == BACKLIGHT_FADING_SW_HW_REG) #include "backlight-sw-fading.h" #endif -#ifdef SIMULATOR - -static inline void _backlight_on(void) -{ - sim_backlight(100); -} - -static inline void _backlight_off(void) -{ - sim_backlight(0); -} - -static inline void _backlight_set_brightness(int val) -{ - (void)val; -} - -static inline void _buttonlight_on(void) -{ -} - -static inline void _buttonlight_off(void) -{ -} - -static inline void _buttonlight_set_brightness(int val) -{ - (void)val; -} -#ifdef HAVE_REMOTE_LCD -static inline void _remote_backlight_on(void) -{ - sim_remote_backlight(100); -} - -static inline void _remote_backlight_off(void) -{ - sim_remote_backlight(0); -} -#endif /* HAVE_REMOTE_LCD */ - -#endif /* SIMULATOR */ #if defined(HAVE_BACKLIGHT) && defined(BACKLIGHT_FULL_INIT) diff --git a/uisimulator/common/backlight-sim.h b/uisimulator/common/backlight-sim.h new file mode 100644 index 0000000000..640fc1ac17 --- /dev/null +++ b/uisimulator/common/backlight-sim.h @@ -0,0 +1,68 @@ +/*************************************************************************** + * __________ __ ___. + * Open \______ \ ____ ____ | | _\_ |__ _______ ___ + * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / + * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < + * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ + * \/ \/ \/ \/ \/ + * $Id:$ + * + * Copyright (C) 2002 by Linus Nielsen Feltzing + * Copyright (C) 2009 by Thomas Martitz + * + * 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. + * + ****************************************************************************/ +#ifdef SIMULATOR + +static inline void _backlight_on(void) +{ + sim_backlight(100); +} + +static inline void _backlight_off(void) +{ + sim_backlight(0); +} +#ifdef HAVE_BACKLIGHT_BRIGHTNESS +static inline void _backlight_set_brightness(int val) +{ + (void)val; +} +#endif /* HAVE_BACKLIGHT_BRIGHTNESS */ +#ifdef HAVE_BUTTON_LIGHT +static inline void _buttonlight_on(void) +{ +} + +static inline void _buttonlight_off(void) +{ +} + +#ifdef HAVE_BUTTONLIGHT_BRIGHTNESS +static inline void _buttonlight_set_brightness(int val) +{ + (void)val; +} +#endif /* HAVE_BUTTONLIGHT_BRIGHTNESS */ +#endif /* HAVE_BUTTON_LIGHT */ + +#ifdef HAVE_REMOTE_LCD +static inline void _remote_backlight_on(void) +{ + sim_remote_backlight(100); +} + +static inline void _remote_backlight_off(void) +{ + sim_remote_backlight(0); +} +#endif /* HAVE_REMOTE_LCD */ + +#endif /* SIMULATOR */