diff options
| author | Thomas Martitz <kugel@rockbox.org> | 2009-03-23 00:05:56 +0000 |
|---|---|---|
| committer | Thomas Martitz <kugel@rockbox.org> | 2009-03-23 00:05:56 +0000 |
| commit | a3cbb57b098e627e6a87a837b2c1c749b7c50121 (patch) | |
| tree | 31da4e33ac2e253e28d715893a50397bd687c3cd | |
| parent | b1814466df04b8f5315cfc0d62949bec4de2007e (diff) | |
| download | rockbox-a3cbb57b098e627e6a87a837b2c1c749b7c50121.tar.gz rockbox-a3cbb57b098e627e6a87a837b2c1c749b7c50121.zip | |
Correct some backlight fading related comments and preprocessor macros.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@20481 a1c6a512-1295-4272-9138-f99709370657
| -rw-r--r-- | firmware/export/config.h | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/firmware/export/config.h b/firmware/export/config.h index 7680a9f9da..d7375ddaac 100644 --- a/firmware/export/config.h +++ b/firmware/export/config.h | |||
| @@ -456,17 +456,18 @@ | |||
| 456 | #define CONFIG_STORAGE_MULTI | 456 | #define CONFIG_STORAGE_MULTI |
| 457 | #endif | 457 | #endif |
| 458 | 458 | ||
| 459 | /* deactive fading in bootloader/sim */ | 459 | /* deactivate fading in bootloader/sim */ |
| 460 | #if defined(BOOTLOADER) || defined(SIMULATOR) | 460 | #if defined(BOOTLOADER) || defined(SIMULATOR) |
| 461 | #undef CONFIG_BACKLIGHT_FADING | 461 | #undef CONFIG_BACKLIGHT_FADING |
| 462 | #define CONFIG_BACKLIGHT_FADING BACKLIGHT_NO_FADING | 462 | #define CONFIG_BACKLIGHT_FADING BACKLIGHT_NO_FADING |
| 463 | #endif | 463 | #endif |
| 464 | 464 | ||
| 465 | /* determine which setting/manual text to use, | 465 | /* determine which setting/manual text to use */ |
| 466 | * possibly overridden in target config */ | ||
| 467 | #if (CONFIG_BACKLIGHT_FADING == BACKLIGHT_FADING_PWM) | 466 | #if (CONFIG_BACKLIGHT_FADING == BACKLIGHT_FADING_PWM) |
| 468 | 467 | ||
| 469 | #ifndef HAVE_BACKLIGHT_FADING_INT_SETTING | 468 | /* possibly overridden in target config */ |
| 469 | #if !defined(HAVE_BACKLIGHT_FADING_BOOL_SETTING) \ | ||
| 470 | && !defined(HAVE_BACKLIGHT_FADING_INT_SETTING) | ||
| 470 | #define HAVE_BACKLIGHT_FADING_INT_SETTING | 471 | #define HAVE_BACKLIGHT_FADING_INT_SETTING |
| 471 | #endif | 472 | #endif |
| 472 | 473 | ||
| @@ -474,7 +475,7 @@ | |||
| 474 | || (CONFIG_BACKLIGHT_FADING == BACKLIGHT_FADING_SW_HW_REG) \ | 475 | || (CONFIG_BACKLIGHT_FADING == BACKLIGHT_FADING_SW_HW_REG) \ |
| 475 | || (CONFIG_BACKLIGHT_FADING == BACKLIGHT_FADING_TARGET) | 476 | || (CONFIG_BACKLIGHT_FADING == BACKLIGHT_FADING_TARGET) |
| 476 | 477 | ||
| 477 | /* BACKLIGHT_FADING_TARGET may the setting to use */ | 478 | /* possibly overridden in target config */ |
| 478 | #if !defined(HAVE_BACKLIGHT_FADING_BOOL_SETTING) \ | 479 | #if !defined(HAVE_BACKLIGHT_FADING_BOOL_SETTING) \ |
| 479 | && !defined(HAVE_BACKLIGHT_FADING_INT_SETTING) | 480 | && !defined(HAVE_BACKLIGHT_FADING_INT_SETTING) |
| 480 | #define HAVE_BACKLIGHT_FADING_BOOL_SETTING | 481 | #define HAVE_BACKLIGHT_FADING_BOOL_SETTING |