From b91e61957304aadb5af050740b89bb400f2a3983 Mon Sep 17 00:00:00 2001 From: Joel Bodenmann Date: Mon, 4 Mar 2013 23:50:21 +0100 Subject: __inline becomes inline because most compilers dont like the prefix --- drivers/gdisp/Nokia6610GE8/gdisp_lld.c | 2 +- drivers/gdisp/Nokia6610GE8/gdisp_lld_board_example.h | 16 ++++++++-------- .../gdisp/Nokia6610GE8/gdisp_lld_board_olimexsam7ex256.h | 16 ++++++++-------- 3 files changed, 17 insertions(+), 17 deletions(-) (limited to 'drivers/gdisp/Nokia6610GE8') diff --git a/drivers/gdisp/Nokia6610GE8/gdisp_lld.c b/drivers/gdisp/Nokia6610GE8/gdisp_lld.c index 079900aa..ea076e75 100644 --- a/drivers/gdisp/Nokia6610GE8/gdisp_lld.c +++ b/drivers/gdisp/Nokia6610GE8/gdisp_lld.c @@ -88,7 +88,7 @@ // A very common thing to do. // An inline function has been used here incase the parameters have side effects with the internal calculations. -static __inline void setviewport(coord_t x, coord_t y, coord_t cx, coord_t cy) { +static inline void setviewport(coord_t x, coord_t y, coord_t cx, coord_t cy) { write_cmd2(CASET, x, x+cx-1); // Column address set write_cmd2(PASET, y, y+cy-1); // Page address set } diff --git a/drivers/gdisp/Nokia6610GE8/gdisp_lld_board_example.h b/drivers/gdisp/Nokia6610GE8/gdisp_lld_board_example.h index fd330590..33f8fa44 100644 --- a/drivers/gdisp/Nokia6610GE8/gdisp_lld_board_example.h +++ b/drivers/gdisp/Nokia6610GE8/gdisp_lld_board_example.h @@ -39,7 +39,7 @@ * * @notapi */ -static __inline void init_board(void) { +static inline void init_board(void) { /* Code here */ #error "gdispNokia6610GE8: You must supply a definition for init_board for your board" } @@ -51,7 +51,7 @@ static __inline void init_board(void) { * * @notapi */ -static __inline void setpin_reset(bool_t state) { +static inline void setpin_reset(bool_t state) { /* Code here */ #error "gdispNokia6610GE8: You must supply a definition for setpin_reset for your board" } @@ -66,7 +66,7 @@ static __inline void setpin_reset(bool_t state) { * * @notapi */ -static __inline void set_backlight(uint8_t percent) { +static inline void set_backlight(uint8_t percent) { /* Code here */ #error "gdispNokia6610GE8: You must supply a definition for set_backlight for your board" } @@ -76,7 +76,7 @@ static __inline void set_backlight(uint8_t percent) { * * @notapi */ -static __inline void acquire_bus(void) { +static inline void acquire_bus(void) { /* Code here */ #error "gdispNokia6610GE8: You must supply a definition for acquire_bus for your board" } @@ -86,7 +86,7 @@ static __inline void acquire_bus(void) { * * @notapi */ -static __inline void release_bus(void) { +static inline void release_bus(void) { /* Code here */ #error "gdispNokia6610GE8: You must supply a definition for release_bus for your board" } @@ -98,7 +98,7 @@ static __inline void release_bus(void) { * * @notapi */ -static __inline void write_cmd(uint16_t cmd) { +static inline void write_cmd(uint16_t cmd) { /* Code here */ #error "gdispNokia6610GE8: You must supply a definition for write_cmd for your board" } @@ -110,7 +110,7 @@ static __inline void write_cmd(uint16_t cmd) { * * @notapi */ -static __inline void write_data(uint16_t data) { +static inline void write_data(uint16_t data) { /* Code here */ #error "gdispNokia6610GE8: You must supply a definition for write_data for your board" } @@ -125,7 +125,7 @@ static __inline void write_data(uint16_t data) { * * @notapi */ -static __inline uint16_t read_data(void) { +static inline uint16_t read_data(void) { /* Code here */ #error "gdispNokia6610GE8: You must supply a definition for read_data for your board" } diff --git a/drivers/gdisp/Nokia6610GE8/gdisp_lld_board_olimexsam7ex256.h b/drivers/gdisp/Nokia6610GE8/gdisp_lld_board_olimexsam7ex256.h index c394782d..1d5a86f7 100644 --- a/drivers/gdisp/Nokia6610GE8/gdisp_lld_board_olimexsam7ex256.h +++ b/drivers/gdisp/Nokia6610GE8/gdisp_lld_board_olimexsam7ex256.h @@ -68,7 +68,7 @@ static bool_t pwmRunning = FALSE; * * @notapi */ -static __inline void init_board(void) { +static inline void init_board(void) { // ********************************************************************************************* // InitSpi( ) // @@ -132,7 +132,7 @@ static __inline void init_board(void) { * * @notapi */ -static __inline void setpin_reset(bool_t state) { +static inline void setpin_reset(bool_t state) { if (state) palClearPad(IOPORT1, PIOA_LCD_RESET); else @@ -149,7 +149,7 @@ static __inline void setpin_reset(bool_t state) { * * @notapi */ -static __inline void set_backlight(uint8_t percent) { +static inline void set_backlight(uint8_t percent) { if (percent == 100) { /* Turn the pin on - No PWM */ if (pwmRunning) { @@ -179,7 +179,7 @@ static __inline void set_backlight(uint8_t percent) { * * @notapi */ -static __inline void acquire_bus(void) { +static inline void acquire_bus(void) { /* Nothing to do for this board as the LCD is the only device on the SPI port */ } @@ -188,7 +188,7 @@ static __inline void acquire_bus(void) { * * @notapi */ -static __inline void release_bus(void) { +static inline void release_bus(void) { // Nothing to do for this board as the LCD is the only device on the SPI port } @@ -199,7 +199,7 @@ static __inline void release_bus(void) { * * @notapi */ -static __inline void write_cmd(uint16_t cmd) { +static inline void write_cmd(uint16_t cmd) { // wait for the previous transfer to complete while((pSPI->SPI_SR & AT91C_SPI_TXEMPTY) == 0); // send the command @@ -213,7 +213,7 @@ static __inline void write_cmd(uint16_t cmd) { * * @notapi */ -static __inline void write_data(uint16_t data) { +static inline void write_data(uint16_t data) { // wait for the previous transfer to complete while((pSPI->SPI_SR & AT91C_SPI_TXEMPTY) == 0); // send the data @@ -228,7 +228,7 @@ static __inline void write_data(uint16_t data) { * * @notapi */ -static __inline uint16_t read_data(void) { +static inline uint16_t read_data(void) { #error "gdispNokia6610GE8: GDISP_HARDWARE_READPIXEL and GDISP_HARDWARE_SCROLL are not supported on this board" return 0; } -- cgit v1.2.3