__inline becomes inline because most compilers dont like the prefix

4 files changed, 26 insertions, 26 deletions

diff --git a/drivers/gdisp/SSD1289/gdisp_lld.c b/drivers/gdisp/SSD1289/gdisp_lld.c
index de6edfe8..5b06e175 100644
--- a/drivers/gdisp/SSD1289/gdisp_lld.c
+++ b/drivers/gdisp/SSD1289/gdisp_lld.c
@@ -70,7 +70,7 @@
 #define delay(us)					chThdSleepMicroseconds(us)
 #define delayms(ms)					chThdSleepMilliseconds(ms)
 
-static __inline void set_cursor(coord_t x, coord_t y) {
+static inline void set_cursor(coord_t x, coord_t y) {
 	/* Reg 0x004E is an 8 bit value
 	 * Reg 0x004F is 9 bit
 	 * Use a bit mask to make sure they are not set too high
@@ -134,7 +134,7 @@ static void set_viewport(coord_t x, coord_t y, coord_t cx, coord_t cy) {
 	set_cursor(x, y);
 }
 
-static __inline void reset_viewport(void) {
+static inline void reset_viewport(void) {
 	set_viewport(0, 0, GDISP.Width, GDISP.Height);
 }
 
diff --git a/drivers/gdisp/SSD1289/gdisp_lld_board_example.h b/drivers/gdisp/SSD1289/gdisp_lld_board_example.h
index 00c4b869..cd8d3d63 100644
--- a/drivers/gdisp/SSD1289/gdisp_lld_board_example.h
+++ b/drivers/gdisp/SSD1289/gdisp_lld_board_example.h
@@ -34,7 +34,7 @@
  *

  * @notapi

  */

-static __inline void init_board(void) {

+static inline void init_board(void) {

 	/* Code here */

 #error "SSD1289: You must supply a definition for init_board for your board"

 }

@@ -46,7 +46,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 "SSD1289: You must supply a definition for setpin_reset for your board"

 }

@@ -58,7 +58,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 "SSD1289: You must supply a definition for set_backlight for your board"

 }

@@ -68,7 +68,7 @@ static __inline void set_backlight(uint8_t percent) {
  *

  * @notapi

  */

-static __inline void acquire_bus(void) {

+static inline void acquire_bus(void) {

 #error "SSD1289: You must supply a definition for acquire_bus for your board"

 }

 

@@ -77,7 +77,7 @@ static __inline void acquire_bus(void) {
  *

  * @notapi

  */

-static __inline void release_bus(void) {

+static inline void release_bus(void) {

 #error "SSD1289: You must supply a definition for release_bus for your board"

 }

 

@@ -88,7 +88,7 @@ static __inline void release_bus(void) {
  *

  * @notapi

  */

-static __inline void write_index(uint16_t index) {

+static inline void write_index(uint16_t index) {

 	/* Code here */

 #error "SSD1289: You must supply a definition for write_index for your board"

 }

@@ -100,7 +100,7 @@ static __inline void write_index(uint16_t index) {
  * 

  * @notapi

  */

-static __inline void write_data(uint16_t data) {

+static inline void write_data(uint16_t data) {

 	/* Code here */

 #error "SSD1289: You must supply a definition for write_data for your board"

 }

@@ -115,7 +115,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 "SSD1289: You must supply a definition for read_data for your board"

 }

diff --git a/drivers/gdisp/SSD1289/gdisp_lld_board_example_fsmc.h b/drivers/gdisp/SSD1289/gdisp_lld_board_example_fsmc.h
index 76a5c04c..c0bdf053 100644
--- a/drivers/gdisp/SSD1289/gdisp_lld_board_example_fsmc.h
+++ b/drivers/gdisp/SSD1289/gdisp_lld_board_example_fsmc.h
@@ -42,7 +42,7 @@
  *

  * @notapi

  */

-static __inline void init_board(void) {

+static inline void init_board(void) {

 	const unsigned char FSMC_Bank;

 	

 	#if defined(STM32F1XX) || defined(STM32F3XX)

@@ -94,7 +94,7 @@ static __inline void init_board(void) {
  * 

  * @notapi

  */

-static __inline void setpin_reset(bool_t state) {

+static inline void setpin_reset(bool_t state) {

 	(void) state;

 	/* Nothing to do here */

 }

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

 	(void) percent;

 	/* Nothing to do here */

 }

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

 }

 

@@ -125,7 +125,7 @@ static __inline void acquire_bus(void) {
  *

  * @notapi

  */

-static __inline void release_bus(void) {

+static inline void release_bus(void) {

 	/* Nothing to do here */

 }

 

@@ -136,7 +136,7 @@ static __inline void release_bus(void) {
  *

  * @notapi

  */

-static __inline void write_index(uint16_t index) { GDISP_REG = index; }

+static inline void write_index(uint16_t index) { GDISP_REG = index; }

 

 /**

  * @brief   Send data to the lcd.

@@ -145,7 +145,7 @@ static __inline void write_index(uint16_t index) { GDISP_REG = index; }
  * 

  * @notapi

  */

-static __inline void write_data(uint16_t data) { GDISP_RAM = data; }

+static inline void write_data(uint16_t data) { GDISP_RAM = data; }

 

 #if GDISP_HARDWARE_READPIXEL || GDISP_HARDWARE_SCROLL || defined(__DOXYGEN__)

 /**

@@ -157,7 +157,7 @@ static __inline void write_data(uint16_t data) { GDISP_RAM = data; }
  * 

  * @notapi

  */

-static __inline uint16_t read_data(void) { return GDISP_RAM; }

+static inline uint16_t read_data(void) { return GDISP_RAM; }

 #endif

 

 #endif /* _GDISP_LLD_BOARD_H */

diff --git a/drivers/gdisp/SSD1289/gdisp_lld_board_firebullstm32f103.h b/drivers/gdisp/SSD1289/gdisp_lld_board_firebullstm32f103.h
index 9cff5a19..4d2efdd1 100644
--- a/drivers/gdisp/SSD1289/gdisp_lld_board_firebullstm32f103.h
+++ b/drivers/gdisp/SSD1289/gdisp_lld_board_firebullstm32f103.h
@@ -44,7 +44,7 @@
  *

  * @notapi

  */

-static __inline void init_board(void) {

+static inline void init_board(void) {

 	palSetGroupMode(GPIOE, PAL_WHOLE_PORT, 0, PAL_MODE_OUTPUT_PUSHPULL);

 	palSetPadMode(GPIOD, 12, PAL_MODE_OUTPUT_PUSHPULL);

 	palSetPadMode(GPIOD, 13, PAL_MODE_OUTPUT_PUSHPULL);

@@ -66,7 +66,7 @@ static __inline void init_board(void) {
  * 

  * @notapi

  */

-static __inline void setpin_reset(bool_t state) {

+static inline void setpin_reset(bool_t state) {

 	(void) state;

 	/* Nothing to do here - reset pin tied to Vcc */

 }

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

 	(void) percent;

 	/* Nothing to do here - Backlight always on */

 }

@@ -88,7 +88,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 here since LCD is the only device on that bus */

 }

 

@@ -97,7 +97,7 @@ static __inline void acquire_bus(void) {
  *

  * @notapi

  */

-static __inline void release_bus(void) {

+static inline void release_bus(void) {

 	/* Nothing to do here since LCD is the only device on that bus */

 }

 

@@ -108,7 +108,7 @@ static __inline void release_bus(void) {
  *

  * @notapi

  */

-static __inline void write_index(uint16_t index) {

+static inline void write_index(uint16_t index) {

 	palWritePort(GPIOE, index);

 	CLR_RS; CLR_WR; SET_WR; SET_RS;

 }

@@ -120,7 +120,7 @@ static __inline void write_index(uint16_t index) {
  * 

  * @notapi

  */

-static __inline void write_data(uint16_t data) {

+static inline void write_data(uint16_t data) {

 	palWritePort(GPIOE, data);

 	CLR_WR; SET_WR;

 }

@@ -135,7 +135,7 @@ static __inline void write_data(uint16_t data) {
  * 

  * @notapi

  */

-static __inline uint16_t read_data(void) {

+static inline uint16_t read_data(void) {

 	uint16_t	value;

 	

 	// change pin mode to digital input