From e4ec0e943270f3c249182e02210f1f78dfa7522b Mon Sep 17 00:00:00 2001 From: trsaunders Date: Wed, 27 Jun 2012 16:45:23 +0100 Subject: [PATCH] use max(height,width) to calculate buffer size --- drivers/lcd/s6d1121_lld.c | 2 ++ drivers/lcd/ssd1289_lld.c | 3 +-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/lcd/s6d1121_lld.c b/drivers/lcd/s6d1121_lld.c index da8878e2..2a591ee2 100644 --- a/drivers/lcd/s6d1121_lld.c +++ b/drivers/lcd/s6d1121_lld.c @@ -2,6 +2,8 @@ #ifdef LCD_USE_S6D1121 +static uint16_t buf[((SCREEN_HEIGHT > SCREEN_WIDTH ) ? SCREEN_HEIGHT : SCREEN_WIDTH)]; + #define LCD_RST_LOW palClearPad(LCD_RST_GPIO, LCD_RST_PIN) #define LCD_RST_HIGH palSetPad(LCD_RST_GPIO, LCD_RST_PIN) diff --git a/drivers/lcd/ssd1289_lld.c b/drivers/lcd/ssd1289_lld.c index ffcbb167..c2dfc1f3 100644 --- a/drivers/lcd/ssd1289_lld.c +++ b/drivers/lcd/ssd1289_lld.c @@ -6,8 +6,7 @@ uint8_t orientation; uint16_t DeviceCode; extern uint16_t lcd_width, lcd_height; -/* TODO: use max(height, width) */ -static uint16_t buf[SCREEN_HEIGHT]; +static uint16_t buf[((SCREEN_HEIGHT > SCREEN_WIDTH ) ? SCREEN_HEIGHT : SCREEN_WIDTH)]; #ifdef LCD_USE_GPIO static __inline void lld_lcdWriteIndex(uint16_t index) {