diff options
Diffstat (limited to 'firmware/export')
-rw-r--r-- | firmware/export/config.h | 8 | ||||
-rw-r--r-- | firmware/export/lcd.h | 4 |
2 files changed, 8 insertions, 4 deletions
diff --git a/firmware/export/config.h b/firmware/export/config.h index 2519b87f0d..e83194e0f4 100644 --- a/firmware/export/config.h +++ b/firmware/export/config.h | |||
@@ -772,6 +772,11 @@ Lyre prototype 1 */ | |||
772 | #define LCD_SPLIT_LINES 0 | 772 | #define LCD_SPLIT_LINES 0 |
773 | #endif | 773 | #endif |
774 | 774 | ||
775 | /* Most displays have a horizontal stride */ | ||
776 | #ifndef LCD_STRIDEFORMAT | ||
777 | # define LCD_STRIDEFORMAT HORIZONTAL_STRIDE | ||
778 | #endif | ||
779 | |||
775 | /* Simulator LCD dimensions. Set to standard dimensions if undefined */ | 780 | /* Simulator LCD dimensions. Set to standard dimensions if undefined */ |
776 | #ifndef SIM_LCD_WIDTH | 781 | #ifndef SIM_LCD_WIDTH |
777 | #define SIM_LCD_WIDTH LCD_WIDTH | 782 | #define SIM_LCD_WIDTH LCD_WIDTH |
@@ -978,8 +983,7 @@ Lyre prototype 1 */ | |||
978 | || defined(CPU_S5L870X) || (CONFIG_CPU == S3C2440) \ | 983 | || defined(CPU_S5L870X) || (CONFIG_CPU == S3C2440) \ |
979 | || defined(APPLICATION) || (CONFIG_CPU == PP5002) \ | 984 | || defined(APPLICATION) || (CONFIG_CPU == PP5002) \ |
980 | || (CONFIG_CPU == RK27XX) || (CONFIG_CPU == IMX233) || \ | 985 | || (CONFIG_CPU == RK27XX) || (CONFIG_CPU == IMX233) || \ |
981 | (defined(HAVE_LCD_COLOR) && \ | 986 | (defined(HAVE_LCD_COLOR) && (LCD_STRIDEFORMAT == HORIZONTAL_STRIDE)) |
982 | (!defined(LCD_STRIDEFORMAT) || (LCD_STRIDEFORMAT != VERTICAL_STRIDE))) | ||
983 | #define HAVE_SEMAPHORE_OBJECTS | 987 | #define HAVE_SEMAPHORE_OBJECTS |
984 | #endif | 988 | #endif |
985 | 989 | ||
diff --git a/firmware/export/lcd.h b/firmware/export/lcd.h index 0edef7b866..67b22190ad 100644 --- a/firmware/export/lcd.h +++ b/firmware/export/lcd.h | |||
@@ -82,7 +82,7 @@ enum screen_type { | |||
82 | 82 | ||
83 | struct scrollinfo; | 83 | struct scrollinfo; |
84 | 84 | ||
85 | #if defined(LCD_STRIDEFORMAT) && LCD_STRIDEFORMAT == VERTICAL_STRIDE | 85 | #if LCD_STRIDEFORMAT == VERTICAL_STRIDE |
86 | #define STRIDE_MAIN(w, h) (h) | 86 | #define STRIDE_MAIN(w, h) (h) |
87 | #else | 87 | #else |
88 | #define STRIDE_MAIN(w, h) (w) | 88 | #define STRIDE_MAIN(w, h) (w) |
@@ -496,7 +496,7 @@ typedef void lcd_blockfunc_type(fb_data *address, unsigned mask, unsigned bits); | |||
496 | #endif | 496 | #endif |
497 | 497 | ||
498 | #ifndef LCD_NBELEMS | 498 | #ifndef LCD_NBELEMS |
499 | #if defined(LCD_STRIDEFORMAT) && LCD_STRIDEFORMAT == VERTICAL_STRIDE | 499 | #if LCD_STRIDEFORMAT == VERTICAL_STRIDE |
500 | #define LCD_NBELEMS(w, h) (((w-1)*STRIDE_MAIN(w, h)) + h) | 500 | #define LCD_NBELEMS(w, h) (((w-1)*STRIDE_MAIN(w, h)) + h) |
501 | #else | 501 | #else |
502 | #define LCD_NBELEMS(w, h) (((h-1)*STRIDE_MAIN(w, h)) + w) | 502 | #define LCD_NBELEMS(w, h) (((h-1)*STRIDE_MAIN(w, h)) + w) |