summaryrefslogtreecommitdiff
path: root/firmware/export/config.h
diff options
context:
space:
mode:
authorThomas Martitz <kugel@rockbox.org>2010-01-19 22:07:28 +0000
committerThomas Martitz <kugel@rockbox.org>2010-01-19 22:07:28 +0000
commit6915340f2d211723a79ddbbb7bde55ee00232ae5 (patch)
tree1df14359c00b9e1a1dc9eb7173b8d67f5e8ea278 /firmware/export/config.h
parent8d29cadaa1b92561862f1514c2cca3962e486d80 (diff)
downloadrockbox-6915340f2d211723a79ddbbb7bde55ee00232ae5.tar.gz
rockbox-6915340f2d211723a79ddbbb7bde55ee00232ae5.zip
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/export/config.h')
-rw-r--r--firmware/export/config.h6
1 files changed, 2 insertions, 4 deletions
diff --git a/firmware/export/config.h b/firmware/export/config.h
index 81e83b09f4..a4940a068f 100644
--- a/firmware/export/config.h
+++ b/firmware/export/config.h
@@ -567,10 +567,8 @@ Lyre prototype 1 */
567#define CONFIG_TUNER_MULTI 567#define CONFIG_TUNER_MULTI
568#endif 568#endif
569 569
570/* deactivate fading in bootloader/sim */ 570/* deactivate fading in bootloader */
571#if defined(BOOTLOADER) || (defined(SIMULATOR) && \ 571#if defined(BOOTLOADER)
572 (CONFIG_BACKLIGHT_FADING == BACKLIGHT_FADING_PWM || \
573 CONFIG_BACKLIGHT_FADING == BACKLIGHT_FADING_TARGET))
574#undef CONFIG_BACKLIGHT_FADING 572#undef CONFIG_BACKLIGHT_FADING
575#define CONFIG_BACKLIGHT_FADING BACKLIGHT_NO_FADING 573#define CONFIG_BACKLIGHT_FADING BACKLIGHT_NO_FADING
576#endif 574#endif