diff options
Diffstat (limited to 'drivers/gdisp/ILI9325')
-rw-r--r-- | drivers/gdisp/ILI9325/gdisp_lld.c | 26 | ||||
-rw-r--r-- | drivers/gdisp/ILI9325/gdisp_lld_board_example.h | 12 | ||||
-rw-r--r-- | drivers/gdisp/ILI9325/gdisp_lld_board_hy_stm32_100p.h | 12 |
3 files changed, 25 insertions, 25 deletions
diff --git a/drivers/gdisp/ILI9325/gdisp_lld.c b/drivers/gdisp/ILI9325/gdisp_lld.c index 187c54c6..afb88cca 100644 --- a/drivers/gdisp/ILI9325/gdisp_lld.c +++ b/drivers/gdisp/ILI9325/gdisp_lld.c @@ -76,30 +76,30 @@ uint32_t DISPLAY_CODE; /*===========================================================================*/ /* Driver local functions. */ /*===========================================================================*/ -static __inline void lld_lcdDelay(uint16_t us) { +static inline void lld_lcdDelay(uint16_t us) { chThdSleepMicroseconds(us); } -static __inline void lld_lcdWriteIndex(uint16_t index) { +static inline void lld_lcdWriteIndex(uint16_t index) { gdisp_lld_write_index(index); } -static __inline void lld_lcdWriteData(uint16_t data) { +static inline void lld_lcdWriteData(uint16_t data) { gdisp_lld_write_data(data); } -static __inline void lld_lcdWriteReg(uint16_t lcdReg, uint16_t lcdRegValue) { +static inline void lld_lcdWriteReg(uint16_t lcdReg, uint16_t lcdRegValue) { gdisp_lld_write_index(lcdReg); gdisp_lld_write_data(lcdRegValue); } -static __inline uint16_t lld_lcdReadData(void) { +static inline uint16_t lld_lcdReadData(void) { /* fix this! */ //return gdisp_lld_read_data; return GDISP_RAM; } -static __inline uint16_t lld_lcdReadReg(uint16_t lcdReg) { +static inline uint16_t lld_lcdReadReg(uint16_t lcdReg) { volatile uint16_t dummy; gdisp_lld_write_index(lcdReg); @@ -109,30 +109,30 @@ static __inline uint16_t lld_lcdReadReg(uint16_t lcdReg) { return lld_lcdReadData(); } -static __inline void lld_lcdWriteStreamStart(void) { +static inline void lld_lcdWriteStreamStart(void) { lld_lcdWriteIndex(0x0022); } -static __inline void lld_lcdWriteStreamStop(void) { +static inline void lld_lcdWriteStreamStop(void) { } -static __inline void lld_lcdWriteStream(uint16_t *buffer, uint16_t size) { +static inline void lld_lcdWriteStream(uint16_t *buffer, uint16_t size) { uint16_t i; for(i = 0; i < size; i++) lld_lcdWriteData(buffer[i]); } -static __inline void lld_lcdReadStreamStart(void) { +static inline void lld_lcdReadStreamStart(void) { lld_lcdWriteIndex(0x0022); } -static __inline void lld_lcdReadStreamStop(void) { +static inline void lld_lcdReadStreamStop(void) { } -static __inline void lld_lcdReadStream(uint16_t *buffer, size_t size) { +static inline void lld_lcdReadStream(uint16_t *buffer, size_t size) { uint16_t i; volatile uint16_t dummy; @@ -289,7 +289,7 @@ static void lld_lcdSetViewPort(uint16_t x, uint16_t y, uint16_t cx, uint16_t cy) lld_lcdSetCursor(x, y); } -static __inline void lld_lcdResetViewPort(void) { +static inline void lld_lcdResetViewPort(void) { switch(GDISP.Orientation) { case GDISP_ROTATE_0: case GDISP_ROTATE_180: diff --git a/drivers/gdisp/ILI9325/gdisp_lld_board_example.h b/drivers/gdisp/ILI9325/gdisp_lld_board_example.h index 80adf6ab..5ec4460e 100644 --- a/drivers/gdisp/ILI9325/gdisp_lld_board_example.h +++ b/drivers/gdisp/ILI9325/gdisp_lld_board_example.h @@ -29,28 +29,28 @@ #ifndef GDISP_LLD_BOARD_H #define GDISP_LLD_BOARD_H -static __inline void gdisp_lld_init_board(void) { +static inline void gdisp_lld_init_board(void) { #error "ILI9325: You must implement the init_board routine for your board" } -static __inline void gdisp_lld_reset_pin(bool_t state) { +static inline void gdisp_lld_reset_pin(bool_t state) { #error "ILI9325: You must implement setpin_reset routine for your board" } -static __inline void gdisp_lld_write_index(uint16_t data) { +static inline void gdisp_lld_write_index(uint16_t data) { #error "ILI9325: You must implement write_index routine for your board" } -static __inline void gdisp_lld_write_data(uint16_t data) { +static inline void gdisp_lld_write_data(uint16_t data) { #error "ILI9325: You must implement write_data routine for your board" } -static __inline uint16_t gdisp_lld_read_data(void) { +static inline uint16_t gdisp_lld_read_data(void) { #error "ILI9325: You must implement read_data routine for your board" } /* if not available, just ignore the argument and return */ -static __inline uint16_t gdisp_lld_backlight(uint8_t percentage) { +static inline uint16_t gdisp_lld_backlight(uint8_t percentage) { #error "ILI9325: You must implement set_backlight routine for your board" } diff --git a/drivers/gdisp/ILI9325/gdisp_lld_board_hy_stm32_100p.h b/drivers/gdisp/ILI9325/gdisp_lld_board_hy_stm32_100p.h index a9e61dcb..69f9fa69 100644 --- a/drivers/gdisp/ILI9325/gdisp_lld_board_hy_stm32_100p.h +++ b/drivers/gdisp/ILI9325/gdisp_lld_board_hy_stm32_100p.h @@ -45,7 +45,7 @@ #define GDISP_REG (*((volatile uint16_t *) 0x60000000)) /* RS = 0 */ #define GDISP_RAM (*((volatile uint16_t *) 0x60020000)) /* RS = 1 */ -static __inline void gdisp_lld_init_board(void) { +static inline void gdisp_lld_init_board(void) { /* FSMC setup for F1 */ rccEnableAHB(RCC_AHBENR_FSMCEN, 0); @@ -68,26 +68,26 @@ static __inline void gdisp_lld_init_board(void) { } -static __inline void gdisp_lld_reset_pin(bool_t state) { +static inline void gdisp_lld_reset_pin(bool_t state) { if(state) palClearPad(GPIOE, GPIOE_TFT_RST); else palSetPad(GPIOE, GPIOE_TFT_RST); } -static __inline void gdisp_lld_write_index(uint16_t reg) { +static inline void gdisp_lld_write_index(uint16_t reg) { GDISP_REG = reg; } -static __inline void gdisp_lld_write_data(uint16_t data) { +static inline void gdisp_lld_write_data(uint16_t data) { GDISP_RAM = data; } -static __inline uint16_t gdisp_lld_read_data(void) { +static inline uint16_t gdisp_lld_read_data(void) { return GDISP_RAM; } -static __inline void gdisp_lld_backlight(uint8_t percent) { +static inline void gdisp_lld_backlight(uint8_t percent) { percent=percent; // avoid a warning } |