diff options
author | Joel Bodenmann <joel@unormal.org> | 2012-09-29 20:56:30 +0200 |
---|---|---|
committer | Joel Bodenmann <joel@unormal.org> | 2012-09-29 20:56:30 +0200 |
commit | 30d03a620ce505fb91c5875d8185cd6d81f27b35 (patch) | |
tree | 01959f06640647d0b38bf131ea4914a21a9f860c /drivers/gdisp/SSD1289 | |
parent | 70a168df5963d6a83f0c1893c707b42d60236f2a (diff) | |
download | uGFX-30d03a620ce505fb91c5875d8185cd6d81f27b35.tar.gz uGFX-30d03a620ce505fb91c5875d8185cd6d81f27b35.tar.bz2 uGFX-30d03a620ce505fb91c5875d8185cd6d81f27b35.zip |
replaced every LCD_XXX macro with GDISP_XXX
Diffstat (limited to 'drivers/gdisp/SSD1289')
-rw-r--r-- | drivers/gdisp/SSD1289/gdisp_lld.c | 2 | ||||
-rw-r--r-- | drivers/gdisp/SSD1289/readme.txt | 6 | ||||
-rw-r--r-- | drivers/gdisp/SSD1289/ssd1289_lld.c.h | 56 |
3 files changed, 32 insertions, 32 deletions
diff --git a/drivers/gdisp/SSD1289/gdisp_lld.c b/drivers/gdisp/SSD1289/gdisp_lld.c index 57e988bf..b8d36ab0 100644 --- a/drivers/gdisp/SSD1289/gdisp_lld.c +++ b/drivers/gdisp/SSD1289/gdisp_lld.c @@ -57,7 +57,7 @@ * @notapi
*/
bool_t GDISP_LLD(init)(void) {
- #ifdef LCD_USE_FSMC
+ #ifdef GDISP_USE_FSMC
/* FSMC setup. TODO: this only works for STM32F1 */
rccEnableAHB(RCC_AHBENR_FSMCEN, 0);
int FSMC_Bank = 0;
diff --git a/drivers/gdisp/SSD1289/readme.txt b/drivers/gdisp/SSD1289/readme.txt index 1b64b46d..4a70e9e2 100644 --- a/drivers/gdisp/SSD1289/readme.txt +++ b/drivers/gdisp/SSD1289/readme.txt @@ -4,9 +4,9 @@ To use this driver: a) #define HAL_USE_GDISP TRUE
b) Any optional high level driver defines (see gdisp.h) eg: GDISP_NEED_MULTITHREAD
c) One (only) of:
- #define LCD_USE_GPIO
- #define LCD_USE_SPI
- #define LCD_USE_FSMC
+ #define GDISP_USE_GPIO
+ #define GDISP_USE_SPI
+ #define GDISP_USE_FSMC
d) All of the following (with appropriate values):
#define SCREEN_WIDTH 320
#define SCREEN_HEIGHT 240
diff --git a/drivers/gdisp/SSD1289/ssd1289_lld.c.h b/drivers/gdisp/SSD1289/ssd1289_lld.c.h index 79134239..e59b388c 100644 --- a/drivers/gdisp/SSD1289/ssd1289_lld.c.h +++ b/drivers/gdisp/SSD1289/ssd1289_lld.c.h @@ -21,15 +21,15 @@ #ifndef SSD1289_H #define SSD1289_H -#if defined(LCD_USE_GPIO) - #define Set_CS palSetPad(LCD_CMD_PORT, LCD_CS); - #define Clr_CS palClearPad(LCD_CMD_PORT, LCD_CS); - #define Set_RS palSetPad(LCD_CMD_PORT, LCD_RS); - #define Clr_RS palClearPad(LCD_CMD_PORT, LCD_RS); - #define Set_WR palSetPad(LCD_CMD_PORT, LCD_WR); - #define Clr_WR palClearPad(LCD_CMD_PORT, LCD_WR); - #define Set_RD palSetPad(LCD_CMD_PORT, LCD_RD); - #define Clr_RD palClearPad(LCD_CMD_PORT, LCD_RD); +#if defined(GDISP_USE_GPIO) + #define Set_CS palSetPad(GDISP_CMD_PORT, GDISP_CS); + #define Clr_CS palClearPad(GDISP_CMD_PORT, GDISP_CS); + #define Set_RS palSetPad(GDISP_CMD_PORT, GDISP_RS); + #define Clr_RS palClearPad(GDISP_CMD_PORT, GDISP_RS); + #define Set_WR palSetPad(GDISP_CMD_PORT, GDISP_WR); + #define Clr_WR palClearPad(GDISP_CMD_PORT, GDISP_WR); + #define Set_RD palSetPad(GDISP_CMD_PORT, GDISP_RD); + #define Clr_RD palClearPad(GDISP_CMD_PORT, GDISP_RD); extern void lld_lcdWriteGPIO(uint16_t data); extern uint16_t lld_lcdReadGPIO(void); @@ -103,7 +103,7 @@ (void)dummy; } -#elif defined(LCD_USE_FSMC) +#elif defined(GDISP_USE_FSMC) /* LCD Registers */ #define R0 0x00 #define R1 0x01 @@ -214,45 +214,45 @@ #define R193 0xC1 #define R229 0xE5 - #define LCD_REG (*((volatile uint16_t *) 0x60000000)) /* RS = 0 */ - #define LCD_RAM (*((volatile uint16_t *) 0x60020000)) /* RS = 1 */ + #define GDISP_REG (*((volatile uint16_t *) 0x60000000)) /* RS = 0 */ + #define GDISP_RAM (*((volatile uint16_t *) 0x60020000)) /* RS = 1 */ - static __inline void lld_lcdWriteIndex(uint16_t index) { LCD_REG = index; } - static __inline void lld_lcdWriteData(uint16_t data) { LCD_RAM = data; } + static __inline void lld_lcdWriteIndex(uint16_t index) { GDISP_REG = index; } + static __inline void lld_lcdWriteData(uint16_t data) { GDISP_RAM = data; } static __inline void lld_lcdWriteReg(uint16_t lcdReg,uint16_t lcdRegValue) { - LCD_REG = lcdReg; - LCD_RAM = lcdRegValue; + GDISP_REG = lcdReg; + GDISP_RAM = lcdRegValue; } - static __inline uint16_t lld_lcdReadData(void) { return (LCD_RAM); } + static __inline uint16_t lld_lcdReadData(void) { return (GDISP_RAM); } static __inline uint16_t lld_lcdReadReg(uint16_t lcdReg) { volatile uint16_t dummy; - LCD_REG = lcdReg; - dummy = LCD_RAM; - return (LCD_RAM); + GDISP_REG = lcdReg; + dummy = GDISP_RAM; + return (GDISP_RAM); } - static __inline void lld_lcdWriteStreamStart(void) { LCD_REG = 0x0022; } + static __inline void lld_lcdWriteStreamStart(void) { GDISP_REG = 0x0022; } static __inline void lld_lcdWriteStreamStop(void) {} static __inline void lld_lcdWriteStream(uint16_t *buffer, uint16_t size) { uint16_t i; - for(i = 0; i < size; i++) LCD_RAM = buffer[i]; + for(i = 0; i < size; i++) GDISP_RAM = buffer[i]; } - static __inline void lld_lcdReadStreamStart(void) { LCD_REG = 0x0022; } + static __inline void lld_lcdReadStreamStart(void) { GDISP_REG = 0x0022; } static __inline void lld_lcdReadStreamStop(void) {} static __inline void lld_lcdReadStream(uint16_t *buffer, size_t size) { uint16_t i; volatile uint16_t dummy; - dummy = LCD_RAM; /* throw away first value read */ - for(i = 0; i < size; i++) buffer[i] = LCD_RAM; + dummy = GDISP_RAM; /* throw away first value read */ + for(i = 0; i < size; i++) buffer[i] = GDISP_RAM; } -#elif defined(LCD_USE_SPI) - #error "gdispSsd1289: LCD_USE_SPI not implemented yet" +#elif defined(GDISP_USE_SPI) + #error "gdispSsd1289: GDISP_USE_SPI not implemented yet" #else - #error "gdispSsd1289: No known LCD_USE_XXX has been defined" + #error "gdispSsd1289: No known GDISP_USE_XXX has been defined" #endif static __inline void lld_lcdDelay(uint16_t us) { |