diff options
| author | Aidan MacDonald <amachronic@protonmail.com> | 2022-09-30 10:25:28 +0100 |
|---|---|---|
| committer | Aidan MacDonald <amachronic@protonmail.com> | 2022-09-30 10:42:49 +0100 |
| commit | f373c97c90e816404c00ab48b2e36b18fd5e6c49 (patch) | |
| tree | b268985996c496f9149e4508f9fea950711e1a6c /firmware/export/lcd.h | |
| parent | 9ed36ec22f7ea880b64fa11d2c0d49485287ad03 (diff) | |
| download | rockbox-f373c97c90e816404c00ab48b2e36b18fd5e6c49.tar.gz rockbox-f373c97c90e816404c00ab48b2e36b18fd5e6c49.zip | |
Define LCD_STRIDEFORMAT unconditionally
Instead of putting "#ifdef LCD_STRIDEFORMAT" at every usage of the
macro it's simpler to have config.h define LCD_STRIDEFORMAT to the
default of horizontal stride when the target leaves it unspecified.
Change-Id: Ib187012aad65ac678dbd837b1464a83bad722411
Diffstat (limited to 'firmware/export/lcd.h')
| -rw-r--r-- | firmware/export/lcd.h | 4 |
1 files changed, 2 insertions, 2 deletions
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) |