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

2 files changed, 18 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 */
 #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 ec398c8b2d..56c3e18229 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