diff options
| author | Thomas Martitz <kugel@rockbox.org> | 2010-01-19 22:07:28 +0000 |
|---|---|---|
| committer | Thomas Martitz <kugel@rockbox.org> | 2010-01-19 22:07:28 +0000 |
| commit | 6915340f2d211723a79ddbbb7bde55ee00232ae5 (patch) | |
| tree | 1df14359c00b9e1a1dc9eb7173b8d67f5e8ea278 /firmware | |
| parent | 8d29cadaa1b92561862f1514c2cca3962e486d80 (diff) | |
| download | rockbox-6915340f2d211723a79ddbbb7bde55ee00232ae5.zip rockbox-6915340f2d211723a79ddbbb7bde55ee00232ae5.tar.gz rockbox-6915340f2d211723a79ddbbb7bde55ee00232ae5.tar.bz2 rockbox-6915340f2d211723a79ddbbb7bde55ee00232ae5.tar.xz | |
Fix FS#10867 and a few more potential issues by imitate target scrollwheel behavior more (although that behavior is suboptimal imo). Also, default for maximum backlight brightness in the sim and move stuff into sim.h.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24289 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware')
| -rw-r--r-- | firmware/export/config.h | 6 | ||||
| -rw-r--r-- | firmware/export/config/sim.h | 16 |
2 files changed, 18 insertions, 4 deletions
diff --git a/firmware/export/config.h b/firmware/export/config.h index 81e83b0..a4940a0 100644 --- a/firmware/export/config.h +++ b/firmware/export/config.h @@ -567,10 +567,8 @@ Lyre prototype 1 */ #define CONFIG_TUNER_MULTI #endif -/* deactivate fading in bootloader/sim */ -#if defined(BOOTLOADER) || (defined(SIMULATOR) && \ - (CONFIG_BACKLIGHT_FADING == BACKLIGHT_FADING_PWM || \ - CONFIG_BACKLIGHT_FADING == BACKLIGHT_FADING_TARGET)) +/* deactivate fading in bootloader */ +#if defined(BOOTLOADER) #undef CONFIG_BACKLIGHT_FADING #define CONFIG_BACKLIGHT_FADING BACKLIGHT_NO_FADING #endif diff --git a/firmware/export/config/sim.h b/firmware/export/config/sim.h index ec398c8..56c3e18 100644 --- a/firmware/export/config/sim.h +++ b/firmware/export/config/sim.h @@ -79,3 +79,19 @@ #undef HAVE_SPEAKER +#if CONFIG_BACKLIGHT_FADING == BACKLIGHT_FADING_SW_HW_REG +#undef CONFIG_BACKLIGHT_FADING + /* simulate SW_SETTING, as we handle sdl very similary */ +#define CONFIG_BACKLIGHT_FADING BACKLIGHT_FADING_SW_SETTING + +#elif (CONFIG_BACKLIGHT_FADING == BACKLIGHT_FADING_PWM || \ + CONFIG_BACKLIGHT_FADING == BACKLIGHT_FADING_TARGET) + /* we don't simulate that yet */ +#undef CONFIG_BACKLIGHT_FADING +#endif + +#ifdef HAVE_BACKLIGHT_BRIGHTNESS +#undef DEFAULT_BRIGHTNESS_SETTING +/* default for 100% in the sim */ +#define DEFAULT_BRIGHTNESS_SETTING MAX_BRIGHTNESS_SETTING +#endif |