__inline becomes inline because most compilers dont like the prefix

3 files changed, 17 insertions, 17 deletions

diff --git a/drivers/gdisp/Nokia6610GE12/gdisp_lld.c b/drivers/gdisp/Nokia6610GE12/gdisp_lld.c
index ee9a5fc7..5d5aff71 100644
--- a/drivers/gdisp/Nokia6610GE12/gdisp_lld.c
+++ b/drivers/gdisp/Nokia6610GE12/gdisp_lld.c
@@ -89,7 +89,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/Nokia6610GE12/gdisp_lld_board_example.h b/drivers/gdisp/Nokia6610GE12/gdisp_lld_board_example.h
index 1885f07c..cd706cf5 100644
--- a/drivers/gdisp/Nokia6610GE12/gdisp_lld_board_example.h
+++ b/drivers/gdisp/Nokia6610GE12/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 "gdispNokia6610GE12: 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 "gdispNokia6610GE12: 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 "gdispNokia6610GE12: 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 "gdispNokia6610GE12: 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 "gdispNokia6610GE12: 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 "gdispNokia6610GE12: 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 "gdispNokia6610GE12: 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 "gdispNokia6610GE12: You must supply a definition for read_data for your board"

 }

diff --git a/drivers/gdisp/Nokia6610GE12/gdisp_lld_board_olimexsam7ex256.h b/drivers/gdisp/Nokia6610GE12/gdisp_lld_board_olimexsam7ex256.h
index c161a9a3..5b76c093 100644
--- a/drivers/gdisp/Nokia6610GE12/gdisp_lld_board_olimexsam7ex256.h
+++ b/drivers/gdisp/Nokia6610GE12/gdisp_lld_board_olimexsam7ex256.h
@@ -48,7 +48,7 @@ volatile AT91PS_PDC pPDC = AT91C_BASE_PDC_SPI0;
  *

  * @notapi

  */

-static __inline void init_board(void) {

+static inline void init_board(void) {

 	// *********************************************************************************************

 	// InitSpi( )

 	//

@@ -108,7 +108,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

@@ -125,7 +125,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)

 		palSetPad(IOPORT2, PIOB_LCD_BL);

 	else

@@ -137,7 +137,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 */

 }

 

@@ -146,7 +146,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

 }

 

@@ -157,7 +157,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

@@ -171,7 +171,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

@@ -186,7 +186,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 "gdispNokia6610GE12: GDISP_HARDWARE_READPIXEL and GDISP_HARDWARE_SCROLL are not supported on this board"

 	return 0;

 }