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/drivers | |
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/drivers')
-rw-r--r-- | firmware/drivers/lcd-1bit-vert.c | 2 | ||||
-rw-r--r-- | firmware/drivers/lcd-2bit-horz.c | 2 | ||||
-rw-r--r-- | firmware/drivers/lcd-2bit-vert.c | 2 | ||||
-rw-r--r-- | firmware/drivers/lcd-2bit-vi.c | 2 | ||||
-rw-r--r-- | firmware/drivers/lcd-color-common.c | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/firmware/drivers/lcd-1bit-vert.c b/firmware/drivers/lcd-1bit-vert.c index ff95eacdbc..e574d4c191 100644 --- a/firmware/drivers/lcd-1bit-vert.c +++ b/firmware/drivers/lcd-1bit-vert.c | |||
@@ -83,7 +83,7 @@ static void *LCDFN(frameaddress_default)(int x, int y) | |||
83 | { | 83 | { |
84 | /* the default expects a buffer the same size as the screen */ | 84 | /* the default expects a buffer the same size as the screen */ |
85 | struct frame_buffer_t *fb = CURRENT_VP->buffer; | 85 | struct frame_buffer_t *fb = CURRENT_VP->buffer; |
86 | #if defined(LCD_STRIDEFORMAT) && LCD_STRIDEFORMAT == VERTICAL_STRIDE | 86 | #if LCD_STRIDEFORMAT == VERTICAL_STRIDE |
87 | size_t element = (x * LCDM(NATIVE_STRIDE)(fb->stride)) + y; | 87 | size_t element = (x * LCDM(NATIVE_STRIDE)(fb->stride)) + y; |
88 | #else | 88 | #else |
89 | size_t element = (y * LCDM(NATIVE_STRIDE)(fb->stride)) + x; | 89 | size_t element = (y * LCDM(NATIVE_STRIDE)(fb->stride)) + x; |
diff --git a/firmware/drivers/lcd-2bit-horz.c b/firmware/drivers/lcd-2bit-horz.c index 66313d624b..1bc489247c 100644 --- a/firmware/drivers/lcd-2bit-horz.c +++ b/firmware/drivers/lcd-2bit-horz.c | |||
@@ -81,7 +81,7 @@ static void *lcd_frameaddress_default(int x, int y) | |||
81 | /* the default expects a buffer the same size as the screen */ | 81 | /* the default expects a buffer the same size as the screen */ |
82 | struct frame_buffer_t *fb = lcd_current_viewport->buffer; | 82 | struct frame_buffer_t *fb = lcd_current_viewport->buffer; |
83 | 83 | ||
84 | #if defined(LCD_STRIDEFORMAT) && LCD_STRIDEFORMAT == VERTICAL_STRIDE | 84 | #if LCD_STRIDEFORMAT == VERTICAL_STRIDE |
85 | size_t element = (x * LCD_NATIVE_STRIDE(fb->stride)) + y; | 85 | size_t element = (x * LCD_NATIVE_STRIDE(fb->stride)) + y; |
86 | #else | 86 | #else |
87 | size_t element = (y * LCD_NATIVE_STRIDE(fb->stride)) + x; | 87 | size_t element = (y * LCD_NATIVE_STRIDE(fb->stride)) + x; |
diff --git a/firmware/drivers/lcd-2bit-vert.c b/firmware/drivers/lcd-2bit-vert.c index 4ce9960419..b206a2d816 100644 --- a/firmware/drivers/lcd-2bit-vert.c +++ b/firmware/drivers/lcd-2bit-vert.c | |||
@@ -83,7 +83,7 @@ static void *lcd_frameaddress_default(int x, int y) | |||
83 | /* the default expects a buffer the same size as the screen */ | 83 | /* the default expects a buffer the same size as the screen */ |
84 | struct frame_buffer_t *fb = lcd_current_viewport->buffer; | 84 | struct frame_buffer_t *fb = lcd_current_viewport->buffer; |
85 | 85 | ||
86 | #if defined(LCD_STRIDEFORMAT) && LCD_STRIDEFORMAT == VERTICAL_STRIDE | 86 | #if LCD_STRIDEFORMAT == VERTICAL_STRIDE |
87 | size_t element = (x * LCD_NATIVE_STRIDE(fb->stride)) + y; | 87 | size_t element = (x * LCD_NATIVE_STRIDE(fb->stride)) + y; |
88 | #else | 88 | #else |
89 | size_t element = (y * LCD_NATIVE_STRIDE(fb->stride)) + x; | 89 | size_t element = (y * LCD_NATIVE_STRIDE(fb->stride)) + x; |
diff --git a/firmware/drivers/lcd-2bit-vi.c b/firmware/drivers/lcd-2bit-vi.c index b969c93216..0bcf60767e 100644 --- a/firmware/drivers/lcd-2bit-vi.c +++ b/firmware/drivers/lcd-2bit-vi.c | |||
@@ -95,7 +95,7 @@ static void *LCDFN(frameaddress_default)(int x, int y) | |||
95 | { | 95 | { |
96 | /* the default expects a buffer the same size as the screen */ | 96 | /* the default expects a buffer the same size as the screen */ |
97 | struct frame_buffer_t *fb = CURRENT_VP->buffer; | 97 | struct frame_buffer_t *fb = CURRENT_VP->buffer; |
98 | #if defined(LCD_STRIDEFORMAT) && LCD_STRIDEFORMAT == VERTICAL_STRIDE | 98 | #if LCD_STRIDEFORMAT == VERTICAL_STRIDE |
99 | size_t element = (x * LCDM(NATIVE_STRIDE)(fb->stride)) + y; | 99 | size_t element = (x * LCDM(NATIVE_STRIDE)(fb->stride)) + y; |
100 | #else | 100 | #else |
101 | size_t element = (y * LCDM(NATIVE_STRIDE)(fb->stride)) + x; | 101 | size_t element = (y * LCDM(NATIVE_STRIDE)(fb->stride)) + x; |
diff --git a/firmware/drivers/lcd-color-common.c b/firmware/drivers/lcd-color-common.c index 36144b574c..9feba9f894 100644 --- a/firmware/drivers/lcd-color-common.c +++ b/firmware/drivers/lcd-color-common.c | |||
@@ -76,7 +76,7 @@ static void *lcd_frameaddress_default(int x, int y) | |||
76 | /* the default expects a buffer the same size as the screen */ | 76 | /* the default expects a buffer the same size as the screen */ |
77 | struct frame_buffer_t *fb = lcd_current_viewport->buffer; | 77 | struct frame_buffer_t *fb = lcd_current_viewport->buffer; |
78 | 78 | ||
79 | #if defined(LCD_STRIDEFORMAT) && LCD_STRIDEFORMAT == VERTICAL_STRIDE | 79 | #if LCD_STRIDEFORMAT == VERTICAL_STRIDE |
80 | size_t element = (x * LCD_NATIVE_STRIDE(fb->stride)) + y; | 80 | size_t element = (x * LCD_NATIVE_STRIDE(fb->stride)) + y; |
81 | #else | 81 | #else |
82 | size_t element = (y * LCD_NATIVE_STRIDE(fb->stride)) + x; | 82 | size_t element = (y * LCD_NATIVE_STRIDE(fb->stride)) + x; |