diff options
author | Michael Sevakis <jethead71@rockbox.org> | 2006-09-26 20:46:17 +0000 |
---|---|---|
committer | Michael Sevakis <jethead71@rockbox.org> | 2006-09-26 20:46:17 +0000 |
commit | e63649279186e119614b9ca892bcfa27e6af8337 (patch) | |
tree | 0e70869af41405372a2c229370c3d880719e38c7 /apps/settings.h | |
parent | 9e92d06dd16a337dea5d7e80e747a8983e48891f (diff) | |
download | rockbox-e63649279186e119614b9ca892bcfa27e6af8337.tar.gz rockbox-e63649279186e119614b9ca892bcfa27e6af8337.zip |
Fixed remote contrast settings. Maybe'll get some build errors here.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@11071 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/settings.h')
-rw-r--r-- | apps/settings.h | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/apps/settings.h b/apps/settings.h index 9f8372415a..3e0b8fcd11 100644 --- a/apps/settings.h +++ b/apps/settings.h | |||
@@ -108,7 +108,6 @@ extern unsigned char vp_dummy[VIRT_SIZE]; | |||
108 | simplicity. */ | 108 | simplicity. */ |
109 | #if !defined(HAVE_LCD_COLOR) | 109 | #if !defined(HAVE_LCD_COLOR) |
110 | #define HAVE_LCD_CONTRAST | 110 | #define HAVE_LCD_CONTRAST |
111 | #define DEFAULT_CONTRAST_SETTING 40 | ||
112 | #endif | 111 | #endif |
113 | 112 | ||
114 | struct user_settings | 113 | struct user_settings |
@@ -545,6 +544,11 @@ extern const char rec_base_directory[]; | |||
545 | 544 | ||
546 | /* system defines */ | 545 | /* system defines */ |
547 | #ifndef TARGET_TREE | 546 | #ifndef TARGET_TREE |
547 | |||
548 | #ifndef HAVE_LCD_COLOR | ||
549 | #define DEFAULT_CONTRAST_SETTING 40 | ||
550 | #endif | ||
551 | |||
548 | #if defined HAVE_LCD_CHARCELLS | 552 | #if defined HAVE_LCD_CHARCELLS |
549 | #define MIN_CONTRAST_SETTING 5 | 553 | #define MIN_CONTRAST_SETTING 5 |
550 | #define MAX_CONTRAST_SETTING 31 | 554 | #define MAX_CONTRAST_SETTING 31 |
@@ -552,6 +556,17 @@ extern const char rec_base_directory[]; | |||
552 | #define MIN_CONTRAST_SETTING 5 | 556 | #define MIN_CONTRAST_SETTING 5 |
553 | #define MAX_CONTRAST_SETTING 63 | 557 | #define MAX_CONTRAST_SETTING 63 |
554 | #endif | 558 | #endif |
559 | |||
560 | /* As it was */ | ||
561 | #ifdef HAVE_REMOTE_LCD | ||
562 | #ifndef DEFAULT_REMOTE_CONTRAST_SETTING | ||
563 | /* May be defined in config file if driver code needs the value */ | ||
564 | #define DEFAULT_REMOTE_CONTRAST_SETTING 42 | ||
565 | #endif | ||
566 | #define MIN_REMOTE_CONTRAST_SETTING MIN_CONTRAST_SETTING | ||
567 | #define MAX_REMOTE_CONTRAST_SETTING MAX_CONTRAST_SETTING | ||
568 | #endif | ||
569 | |||
555 | #endif /* !TARGET_TREE */ | 570 | #endif /* !TARGET_TREE */ |
556 | 571 | ||
557 | /* argument bits for settings_load() */ | 572 | /* argument bits for settings_load() */ |