diff options
Diffstat (limited to 'drivers/gdisp/S6D1121')
| -rw-r--r-- | drivers/gdisp/S6D1121/gdisp_lld.c | 6 | ||||
| -rw-r--r-- | drivers/gdisp/S6D1121/gdisp_lld_board_example.h | 16 | ||||
| -rw-r--r-- | drivers/gdisp/S6D1121/gdisp_lld_board_olimex_e407.h | 16 |
3 files changed, 19 insertions, 19 deletions
diff --git a/drivers/gdisp/S6D1121/gdisp_lld.c b/drivers/gdisp/S6D1121/gdisp_lld.c index c4523999..49c1dd04 100644 --- a/drivers/gdisp/S6D1121/gdisp_lld.c +++ b/drivers/gdisp/S6D1121/gdisp_lld.c @@ -74,7 +74,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) { /* R20h - 8 bit * R21h - 9 bit */ @@ -99,7 +99,7 @@ static __inline void set_cursor(coord_t x, coord_t y) { } } -static __inline void set_viewport(coord_t x, coord_t y, coord_t cx, coord_t cy) { +static inline void set_viewport(coord_t x, coord_t y, coord_t cx, coord_t cy) { /* HSA / HEA are 8 bit * VSA / VEA are 9 bit * use masks 0x00FF and 0x01FF to enforce this @@ -137,7 +137,7 @@ static __inline 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) { switch(GDISP.Orientation) { case GDISP_ROTATE_0: case GDISP_ROTATE_180: diff --git a/drivers/gdisp/S6D1121/gdisp_lld_board_example.h b/drivers/gdisp/S6D1121/gdisp_lld_board_example.h index 2396b155..22053bd5 100644 --- a/drivers/gdisp/S6D1121/gdisp_lld_board_example.h +++ b/drivers/gdisp/S6D1121/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/S6D1121/gdisp_lld_board_olimex_e407.h b/drivers/gdisp/S6D1121/gdisp_lld_board_olimex_e407.h index 34224425..0d6c6d35 100644 --- a/drivers/gdisp/S6D1121/gdisp_lld_board_olimex_e407.h +++ b/drivers/gdisp/S6D1121/gdisp_lld_board_olimex_e407.h @@ -32,7 +32,7 @@ #define GDISP_REG (*((volatile uint16_t *) 0x60000000)) /* RS = 0 */
#define GDISP_RAM (*((volatile uint16_t *) 0x60020000)) /* RS = 1 */
-static __inline void init_board(void) {
+static inline void init_board(void) {
int FSMC_Bank = 0;
/* STM32F4 FSMC init */
@@ -55,36 +55,36 @@ static __inline void init_board(void) { FSMC_Bank1->BTCR[FSMC_Bank] = FSMC_BCR1_MWID_0 | FSMC_BCR1_WREN | FSMC_BCR1_MBKEN;
}
-static __inline void setpin_reset(bool_t state) {
+static inline void setpin_reset(bool_t state) {
(void)state;
/* Nothing to do here */
}
-static __inline void set_backlight(uint8_t percent) {
+static inline void set_backlight(uint8_t percent) {
(void)percent;
/* Nothing to do here */
}
-static __inline void acquire_bus(void) {
+static inline void acquire_bus(void) {
/* Nothing to do here */
}
-static __inline void release_bus(void) {
+static inline void release_bus(void) {
/* Nothing to do here */
}
-static __inline void write_index(uint16_t index) {
+static inline void write_index(uint16_t index) {
GDISP_REG = index;
}
-static __inline void write_data(uint16_t data) {
+static inline void write_data(uint16_t data) {
GDISP_RAM = data;
}
#if GDISP_HARDWARE_READPIXEL || GDISP_HARDWARE_SCROLL || defined(__DOXYGEN__)
-static __inline uint16_t read_data(void) {
+static inline uint16_t read_data(void) {
return GDISP_RAM;
}
#endif
|