From 60b16e86858a12d513292c36f6aa265d8f19033a Mon Sep 17 00:00:00 2001 From: Joel Bodenmann Date: Mon, 11 Feb 2013 10:26:34 +0100 Subject: more GDISP_LLD() cleanup --- drivers/gdisp/ILI9325/gdisp_lld.c | 30 +++++++++++----------- drivers/gdisp/ILI9325/gdisp_lld_board_example.h | 12 ++++----- .../gdisp/ILI9325/gdisp_lld_board_hy_stm32_100p.h | 12 ++++----- drivers/gdisp/ILI9325/gdisp_lld_config.h | 1 - 4 files changed, 27 insertions(+), 28 deletions(-) (limited to 'drivers/gdisp/ILI9325') diff --git a/drivers/gdisp/ILI9325/gdisp_lld.c b/drivers/gdisp/ILI9325/gdisp_lld.c index bc2b6dd5..e9500cc5 100644 --- a/drivers/gdisp/ILI9325/gdisp_lld.c +++ b/drivers/gdisp/ILI9325/gdisp_lld.c @@ -81,28 +81,28 @@ static __inline void lld_lcdDelay(uint16_t us) { } static __inline void lld_lcdWriteIndex(uint16_t index) { - GDISP_LLD(write_index)(index); + lld_gdisp_write_index(index); } static __inline void lld_lcdWriteData(uint16_t data) { - GDISP_LLD(write_data)(data); + lld_gdisp_write_data(data); } static __inline void lld_lcdWriteReg(uint16_t lcdReg, uint16_t lcdRegValue) { - GDISP_LLD(write_index)(lcdReg); - GDISP_LLD(write_data)(lcdRegValue); + lld_gdisp_write_index(lcdReg); + lld_gdisp_write_data(lcdRegValue); } static __inline uint16_t lld_lcdReadData(void) { /* fix this! */ - //return GDISP_LLD(read_data); + //return lld_gdisp_read_data; return GDISP_RAM; } static __inline uint16_t lld_lcdReadReg(uint16_t lcdReg) { volatile uint16_t dummy; - GDISP_LLD(write_index)(lcdReg); + lld_gdisp_write_index(lcdReg); dummy = lld_lcdReadData(); (void)dummy; @@ -145,12 +145,12 @@ static __inline void lld_lcdReadStream(uint16_t *buffer, size_t size) { bool_t lld_gdisp_init(void) { /* Initialise your display */ - GDISP_LLD(init_board)(); + lld_gdisp_init_board(); /* Hardware reset */ - GDISP_LLD(setpin_reset)(TRUE); + lld_gdisp_reset_pin(TRUE); lld_lcdDelay(1000); - GDISP_LLD(setpin_reset)(FALSE); + lld_gdisp_reset_pin(FALSE); lld_lcdDelay(1000); // chinese code starts here @@ -210,7 +210,7 @@ bool_t lld_gdisp_init(void) { // chinese code ends here // Turn on the backlight - GDISP_LLD(set_backlight)(GDISP_INITIAL_BACKLIGHT); + lld_gdisp_backlight(GDISP_INITIAL_BACKLIGHT); /* Initialise the GDISP structure */ GDISP.Width = GDISP_SCREEN_WIDTH; @@ -461,7 +461,7 @@ void lld_gdisp_draw_pixel(coord_t x, coord_t y, color_t color) { lld_lcdWriteReg(0x0011, 0x0000); lld_lcdWriteReg(0x0012, 0x0000); lld_lcdWriteReg(0x0013, 0x0000); - GDISP_LLD(set_backlight)(0); + lld_gdisp_backlight(0); break; case powerOn: @@ -480,7 +480,7 @@ void lld_gdisp_draw_pixel(coord_t x, coord_t y, color_t color) { lld_lcdWriteReg(0x0029, 0x0009); /* VCM[4:0] for VCOMH */ lld_lcdDelay(500); lld_lcdWriteReg(0x0007, 0x0173); /* 262K color and display ON */ - GDISP_LLD(set_backlight)(GDISP.Backlight); + lld_gdisp_backlight(GDISP.Backlight); if(GDISP.Powermode != powerSleep || GDISP.Powermode != powerDeepSleep) lld_gdisp_init(); break; @@ -493,7 +493,7 @@ void lld_gdisp_draw_pixel(coord_t x, coord_t y, color_t color) { lld_lcdWriteReg(0x0013, 0x0000); /* VDV[4:0] for VCOM amplitude */ lld_lcdDelay(2000); /* Dis-charge capacitor power voltage */ lld_lcdWriteReg(0x0010, 0x0002); /* SAP, BT[3:0], APE, AP, DSTB, SLP */ - GDISP_LLD(set_backlight)(0); + lld_gdisp_backlight(0); break; case powerDeepSleep: @@ -504,7 +504,7 @@ void lld_gdisp_draw_pixel(coord_t x, coord_t y, color_t color) { lld_lcdWriteReg(0x0013, 0x0000); /* VDV[4:0] for VCOM amplitude */ lld_lcdDelay(2000); /* Dis-charge capacitor power voltage */ lld_lcdWriteReg(0x0010, 0x0004); /* SAP, BT[3:0], APE, AP, DSTB, SLP */ - GDISP_LLD(set_backlight)(0); + lld_gdisp_backlight(0); break; default: @@ -564,7 +564,7 @@ void lld_gdisp_draw_pixel(coord_t x, coord_t y, color_t color) { case GDISP_CONTROL_BACKLIGHT: if((unsigned)value > 100) value = (void *)100; - GDISP_LLD(set_backlight)((unsigned)value); + lld_gdisp_backlight((unsigned)value); GDISP.Backlight = (unsigned)value; break; diff --git a/drivers/gdisp/ILI9325/gdisp_lld_board_example.h b/drivers/gdisp/ILI9325/gdisp_lld_board_example.h index 7b537dcd..547952ee 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 lld_gdisp_init_board(void) { #error "ILI9325: You must implement the init_board routine for your board" } -static __inline void GDISP_LLD(setpin_reset)(bool_t state) { +static __inline void lld_gdisp_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 lld_gdisp_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 lld_gdisp_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 lld_gdisp_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(set_backlight)(uint8_t percentage) { +static __inline uint16_t lld_gdisp_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 e785ad10..94d418b0 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 lld_gdisp_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(setpin_reset)(bool_t state) { +static __inline void lld_gdisp_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 lld_gdisp_write_index(uint16_t reg) { GDISP_REG = reg; } -static __inline void GDISP_LLD(write_data)(uint16_t data) { +static __inline void lld_gdisp_write_data(uint16_t data) { GDISP_RAM = data; } -static __inline uint16_t GDISP_LLD(read_data)(void) { +static __inline uint16_t lld_gdisp_read_data(void) { return GDISP_RAM; } -static __inline void GDISP_LLD(set_backlight)(uint8_t percent) { +static __inline void lld_gdisp_backlight(uint8_t percent) { percent=percent; // avoid a warning } diff --git a/drivers/gdisp/ILI9325/gdisp_lld_config.h b/drivers/gdisp/ILI9325/gdisp_lld_config.h index 44f8323f..414fc05e 100644 --- a/drivers/gdisp/ILI9325/gdisp_lld_config.h +++ b/drivers/gdisp/ILI9325/gdisp_lld_config.h @@ -36,7 +36,6 @@ /*===========================================================================*/ #define GDISP_DRIVER_NAME "ILI9325" -#define GDISP_LLD(x) gdisp_lld_##x##_ILI9325 #define GDISP_HARDWARE_CLEARS TRUE #define GDISP_HARDWARE_FILLS TRUE -- cgit v1.2.3