aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorAndrew Hannam <andrewh@inmarket.com.au>2013-03-07 06:18:45 -0800
committerAndrew Hannam <andrewh@inmarket.com.au>2013-03-07 06:18:45 -0800
commit828959d89a641a9f633cc20e4488ec021eb9808c (patch)
treeceee3ce1b7a8c3313c4cafbc708782628cf3c4b5 /drivers
parent8aaf96d379df2f70abf96b03c863b6e6d12a09bf (diff)
parente315480c713cb6889c8329788d3dd69c9fbc6cf4 (diff)
downloaduGFX-828959d89a641a9f633cc20e4488ec021eb9808c.tar.gz
uGFX-828959d89a641a9f633cc20e4488ec021eb9808c.tar.bz2
uGFX-828959d89a641a9f633cc20e4488ec021eb9808c.zip
Merge pull request #19 from Tectu/master
Merge Textu Changes
Diffstat (limited to 'drivers')
-rw-r--r--drivers/gadc/AT91SAM7/gadc_lld.c2
-rw-r--r--drivers/gadc/AT91SAM7/gadc_lld_board_olimexsam7ex256.h2
-rw-r--r--drivers/gadc/AT91SAM7/gadc_lld_config.h2
-rw-r--r--drivers/gaudin/gadc/gaudin_lld.c2
-rw-r--r--drivers/gaudin/gadc/gaudin_lld_board_olimexsam7ex256.h2
-rw-r--r--drivers/gaudin/gadc/gaudin_lld_config.h2
-rw-r--r--drivers/gdisp/ILI9320/gdisp_lld.c28
-rw-r--r--drivers/gdisp/ILI9320/gdisp_lld_board_example.h14
-rw-r--r--drivers/gdisp/ILI9320/gdisp_lld_board_olimex_stm32_lcd.h14
-rw-r--r--drivers/gdisp/ILI9320/gdisp_lld_config.h2
-rw-r--r--drivers/gdisp/ILI9325/gdisp_lld.c28
-rw-r--r--drivers/gdisp/ILI9325/gdisp_lld_board_example.h14
-rw-r--r--drivers/gdisp/ILI9325/gdisp_lld_board_hy_stm32_100p.h14
-rw-r--r--drivers/gdisp/ILI9325/gdisp_lld_config.h2
-rw-r--r--drivers/gdisp/Nokia6610GE12/GE12.h2
-rw-r--r--drivers/gdisp/Nokia6610GE12/gdisp_lld.c4
-rw-r--r--drivers/gdisp/Nokia6610GE12/gdisp_lld_board_example.h18
-rw-r--r--drivers/gdisp/Nokia6610GE12/gdisp_lld_board_olimexsam7ex256.h18
-rw-r--r--drivers/gdisp/Nokia6610GE12/gdisp_lld_config.h2
-rw-r--r--drivers/gdisp/Nokia6610GE8/GE8.h2
-rw-r--r--drivers/gdisp/Nokia6610GE8/gdisp_lld.c4
-rw-r--r--drivers/gdisp/Nokia6610GE8/gdisp_lld_board_example.h18
-rw-r--r--drivers/gdisp/Nokia6610GE8/gdisp_lld_board_olimexsam7ex256.h18
-rw-r--r--drivers/gdisp/Nokia6610GE8/gdisp_lld_config.h2
-rw-r--r--drivers/gdisp/S6D1121/gdisp_lld.c8
-rw-r--r--drivers/gdisp/S6D1121/gdisp_lld_board_example.h18
-rw-r--r--drivers/gdisp/S6D1121/gdisp_lld_board_olimex_e407.h18
-rw-r--r--drivers/gdisp/S6D1121/gdisp_lld_config.h2
-rw-r--r--drivers/gdisp/SSD1289/gdisp_lld.c6
-rw-r--r--drivers/gdisp/SSD1289/gdisp_lld_board_example.h18
-rw-r--r--drivers/gdisp/SSD1289/gdisp_lld_board_example_fsmc.h18
-rw-r--r--drivers/gdisp/SSD1289/gdisp_lld_board_firebullstm32f103.h18
-rw-r--r--drivers/gdisp/SSD1289/gdisp_lld_config.h2
-rw-r--r--drivers/gdisp/SSD1963/gdisp_lld.c38
-rw-r--r--drivers/gdisp/SSD1963/ssd1963.h2
-rw-r--r--drivers/gdisp/SSD2119/gdisp_lld.c6
-rw-r--r--drivers/gdisp/SSD2119/gdisp_lld_board_embest_dmstf4bb_fsmc.h18
-rw-r--r--drivers/gdisp/SSD2119/gdisp_lld_config.h2
-rw-r--r--drivers/gdisp/SSD2119/ssd2119.h2
-rw-r--r--drivers/gdisp/TestStub/gdisp_lld.c2
-rw-r--r--drivers/gdisp/TestStub/gdisp_lld_config.h2
-rw-r--r--drivers/ginput/toggle/Pal/ginput_lld_toggle.c2
-rw-r--r--drivers/ginput/toggle/Pal/ginput_lld_toggle_board_example.h2
-rw-r--r--drivers/ginput/toggle/Pal/ginput_lld_toggle_board_olimexsam7ex256.h2
-rw-r--r--drivers/ginput/toggle/Pal/ginput_lld_toggle_config.h2
-rw-r--r--drivers/ginput/touch/ADS7843/ginput_lld_mouse.c2
-rw-r--r--drivers/ginput/touch/ADS7843/ginput_lld_mouse_board_example.h12
-rw-r--r--drivers/ginput/touch/ADS7843/ginput_lld_mouse_board_firebull_stm32f103.h12
-rw-r--r--drivers/ginput/touch/ADS7843/ginput_lld_mouse_board_olimex_stm32_e407.h12
-rw-r--r--drivers/ginput/touch/ADS7843/ginput_lld_mouse_config.h2
-rw-r--r--drivers/ginput/touch/MCU/ginput_lld_mouse.c2
-rw-r--r--drivers/ginput/touch/MCU/ginput_lld_mouse_board_example.h14
-rw-r--r--drivers/ginput/touch/MCU/ginput_lld_mouse_board_olimex_stm32_lcd.h14
-rw-r--r--drivers/ginput/touch/MCU/ginput_lld_mouse_config.h2
-rw-r--r--drivers/multiple/Win32/gdisp_lld.c2
-rw-r--r--drivers/multiple/Win32/gdisp_lld_config.h2
-rw-r--r--drivers/multiple/Win32/ginput_lld_mouse_config.h2
-rw-r--r--drivers/multiple/Win32/ginput_lld_toggle_config.h2
-rw-r--r--drivers/tdisp/HD44780/tdisp_lld.c2
-rw-r--r--drivers/tdisp/HD44780/tdisp_lld_board_example.h2
-rw-r--r--drivers/tdisp/HD44780/tdisp_lld_board_olimex_e407.h2
-rw-r--r--drivers/tdisp/HD44780/tdisp_lld_board_st_stm32f4_discovery.h2
62 files changed, 246 insertions, 246 deletions
diff --git a/drivers/gadc/AT91SAM7/gadc_lld.c b/drivers/gadc/AT91SAM7/gadc_lld.c
index 4b3c6cae..c8e1705b 100644
--- a/drivers/gadc/AT91SAM7/gadc_lld.c
+++ b/drivers/gadc/AT91SAM7/gadc_lld.c
@@ -1,5 +1,5 @@
/*
- ChibiOS/GFX - Copyright (C) 2012, 2013
+ ChibiOS/GFX - Copyright (C) 2012, 2013, 2013
Joel Bodenmann aka Tectu <joel@unormal.org>
This file is part of ChibiOS/GFX.
diff --git a/drivers/gadc/AT91SAM7/gadc_lld_board_olimexsam7ex256.h b/drivers/gadc/AT91SAM7/gadc_lld_board_olimexsam7ex256.h
index 6f23db17..a117c691 100644
--- a/drivers/gadc/AT91SAM7/gadc_lld_board_olimexsam7ex256.h
+++ b/drivers/gadc/AT91SAM7/gadc_lld_board_olimexsam7ex256.h
@@ -1,5 +1,5 @@
/*
- ChibiOS/GFX - Copyright (C) 2012, 2013
+ ChibiOS/GFX - Copyright (C) 2012, 2013, 2013
Joel Bodenmann aka Tectu <joel@unormal.org>
This file is part of ChibiOS/GFX.
diff --git a/drivers/gadc/AT91SAM7/gadc_lld_config.h b/drivers/gadc/AT91SAM7/gadc_lld_config.h
index 8ba71f20..83557ed9 100644
--- a/drivers/gadc/AT91SAM7/gadc_lld_config.h
+++ b/drivers/gadc/AT91SAM7/gadc_lld_config.h
@@ -1,5 +1,5 @@
/*
- ChibiOS/GFX - Copyright (C) 2012, 2013
+ ChibiOS/GFX - Copyright (C) 2012, 2013, 2013
Joel Bodenmann aka Tectu <joel@unormal.org>
This file is part of ChibiOS/GFX.
diff --git a/drivers/gaudin/gadc/gaudin_lld.c b/drivers/gaudin/gadc/gaudin_lld.c
index 12e6aced..1025c4ca 100644
--- a/drivers/gaudin/gadc/gaudin_lld.c
+++ b/drivers/gaudin/gadc/gaudin_lld.c
@@ -1,5 +1,5 @@
/*
- ChibiOS/GFX - Copyright (C) 2012, 2013
+ ChibiOS/GFX - Copyright (C) 2012, 2013, 2013
Joel Bodenmann aka Tectu <joel@unormal.org>
This file is part of ChibiOS/GFX.
diff --git a/drivers/gaudin/gadc/gaudin_lld_board_olimexsam7ex256.h b/drivers/gaudin/gadc/gaudin_lld_board_olimexsam7ex256.h
index 283a2914..f3bc2831 100644
--- a/drivers/gaudin/gadc/gaudin_lld_board_olimexsam7ex256.h
+++ b/drivers/gaudin/gadc/gaudin_lld_board_olimexsam7ex256.h
@@ -1,5 +1,5 @@
/*
- ChibiOS/GFX - Copyright (C) 2012, 2013
+ ChibiOS/GFX - Copyright (C) 2012, 2013, 2013
Joel Bodenmann aka Tectu <joel@unormal.org>
This file is part of ChibiOS/GFX.
diff --git a/drivers/gaudin/gadc/gaudin_lld_config.h b/drivers/gaudin/gadc/gaudin_lld_config.h
index 402e4180..98abb061 100644
--- a/drivers/gaudin/gadc/gaudin_lld_config.h
+++ b/drivers/gaudin/gadc/gaudin_lld_config.h
@@ -1,5 +1,5 @@
/*
- ChibiOS/GFX - Copyright (C) 2012, 2013
+ ChibiOS/GFX - Copyright (C) 2012, 2013, 2013
Joel Bodenmann aka Tectu <joel@unormal.org>
This file is part of ChibiOS/GFX.
diff --git a/drivers/gdisp/ILI9320/gdisp_lld.c b/drivers/gdisp/ILI9320/gdisp_lld.c
index 9784d956..0cb5542f 100644
--- a/drivers/gdisp/ILI9320/gdisp_lld.c
+++ b/drivers/gdisp/ILI9320/gdisp_lld.c
@@ -1,5 +1,5 @@
/*
- ChibiOS/GFX - Copyright (C) 2012
+ ChibiOS/GFX - Copyright (C) 2012, 2013
Joel Bodenmann aka Tectu <joel@unormal.org>
This file is part of ChibiOS/GFX.
@@ -76,30 +76,30 @@ uint32_t DISPLAY_CODE;
/*===========================================================================*/
/* Driver local functions. */
/*===========================================================================*/
-static __inline void lld_lcdDelay(uint16_t us) {
+static inline void lld_lcdDelay(uint16_t us) {
chThdSleepMicroseconds(us);
}
-static __inline void lld_lcdWriteIndex(uint16_t index) {
+static inline void lld_lcdWriteIndex(uint16_t index) {
gdisp_lld_write_index(index);
}
-static __inline void lld_lcdWriteData(uint16_t data) {
+static inline void lld_lcdWriteData(uint16_t data) {
gdisp_lld_write_data(data);
}
-static __inline void lld_lcdWriteReg(uint16_t lcdReg, uint16_t lcdRegValue) {
+static inline void lld_lcdWriteReg(uint16_t lcdReg, uint16_t lcdRegValue) {
gdisp_lld_write_index(lcdReg);
gdisp_lld_write_data(lcdRegValue);
}
-static __inline uint16_t lld_lcdReadData(void) {
+static inline uint16_t lld_lcdReadData(void) {
/* fix this! */
//return gdisp_lld_read_data;
return GDISP_RAM;
}
-static __inline uint16_t lld_lcdReadReg(uint16_t lcdReg) {
+static inline uint16_t lld_lcdReadReg(uint16_t lcdReg) {
volatile uint16_t dummy;
gdisp_lld_write_index(lcdReg);
@@ -109,30 +109,30 @@ static __inline uint16_t lld_lcdReadReg(uint16_t lcdReg) {
return lld_lcdReadData();
}
-static __inline void lld_lcdWriteStreamStart(void) {
+static inline void lld_lcdWriteStreamStart(void) {
lld_lcdWriteIndex(0x0022);
}
-static __inline void lld_lcdWriteStreamStop(void) {
+static inline void lld_lcdWriteStreamStop(void) {
}
-static __inline void lld_lcdWriteStream(uint16_t *buffer, uint16_t size) {
+static inline void lld_lcdWriteStream(uint16_t *buffer, uint16_t size) {
uint16_t i;
for(i = 0; i < size; i++)
lld_lcdWriteData(buffer[i]);
}
-static __inline void lld_lcdReadStreamStart(void) {
+static inline void lld_lcdReadStreamStart(void) {
lld_lcdWriteIndex(0x0022);
}
-static __inline void lld_lcdReadStreamStop(void) {
+static inline void lld_lcdReadStreamStop(void) {
}
-static __inline void lld_lcdReadStream(uint16_t *buffer, size_t size) {
+static inline void lld_lcdReadStream(uint16_t *buffer, size_t size) {
uint16_t i;
volatile uint16_t dummy;
@@ -293,7 +293,7 @@ static void lld_lcdSetViewPort(uint16_t x, uint16_t y, uint16_t cx, uint16_t cy)
lld_lcdSetCursor(x, y);
}
-static __inline void lld_lcdResetViewPort(void) {
+static inline void lld_lcdResetViewPort(void) {
switch(GDISP.Orientation) {
case GDISP_ROTATE_0:
case GDISP_ROTATE_180:
diff --git a/drivers/gdisp/ILI9320/gdisp_lld_board_example.h b/drivers/gdisp/ILI9320/gdisp_lld_board_example.h
index 0f4def57..3571e2b4 100644
--- a/drivers/gdisp/ILI9320/gdisp_lld_board_example.h
+++ b/drivers/gdisp/ILI9320/gdisp_lld_board_example.h
@@ -1,5 +1,5 @@
/*
- ChibiOS/GFX - Copyright (C) 2012
+ ChibiOS/GFX - Copyright (C) 2012, 2013
Joel Bodenmann aka Tectu <joel@unormal.org>
This file is part of ChibiOS/GFX.
@@ -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 gdisp_lld_init_board(void) {
#error "ILI9320: You must implement the init_board routine for your board"
}
-static __inline void gdisp_lld_reset_pin(bool_t state) {
+static inline void gdisp_lld_reset_pin(bool_t state) {
#error "ILI9320: You must implement setpin_reset routine for your board"
}
-static __inline void gdisp_lld_write_index(uint16_t data) {
+static inline void gdisp_lld_write_index(uint16_t data) {
#error "ILI9320: You must implement write_index routine for your board"
}
-static __inline void gdisp_lld_write_data(uint16_t data) {
+static inline void gdisp_lld_write_data(uint16_t data) {
#error "ILI9320: You must implement write_data routine for your board"
}
-static __inline uint16_t gdisp_lld_read_data(void) {
+static inline uint16_t gdisp_lld_read_data(void) {
#error "ILI9320: You must implement read_data routine for your board"
}
/* if not available, just ignore the argument and return */
-static __inline uint16_t gdisp_lld_backlight(uint8_t percentage) {
+static inline uint16_t gdisp_lld_backlight(uint8_t percentage) {
#error "ILI9320: You must implement set_backlight routine for your board"
}
diff --git a/drivers/gdisp/ILI9320/gdisp_lld_board_olimex_stm32_lcd.h b/drivers/gdisp/ILI9320/gdisp_lld_board_olimex_stm32_lcd.h
index 2bdf367a..c8a518c3 100644
--- a/drivers/gdisp/ILI9320/gdisp_lld_board_olimex_stm32_lcd.h
+++ b/drivers/gdisp/ILI9320/gdisp_lld_board_olimex_stm32_lcd.h
@@ -1,5 +1,5 @@
/*
- ChibiOS/GFX - Copyright (C) 2012
+ ChibiOS/GFX - Copyright (C) 2012, 2013
Joel Bodenmann aka Tectu <joel@unormal.org>
This file is part of ChibiOS/GFX.
@@ -32,7 +32,7 @@
#define GDISP_REG (*((volatile uint16_t *) 0x60000000)) /* RS = 0 */
#define GDISP_RAM (*((volatile uint16_t *) 0x60100000)) /* RS = 1 */
-static __inline void gdisp_lld_init_board(void) {
+static inline void gdisp_lld_init_board(void) {
/* FSMC setup for F1 */
rccEnableAHB(RCC_AHBENR_FSMCEN, 0);
@@ -54,26 +54,26 @@ static __inline void gdisp_lld_init_board(void) {
FSMC_Bank1->BTCR[FSMC_Bank] = FSMC_BCR1_MWID_0 | FSMC_BCR1_WREN | FSMC_BCR1_MBKEN;
}
-static __inline void gdisp_lld_reset_pin(bool_t state) {
+static inline void gdisp_lld_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 gdisp_lld_write_index(uint16_t reg) {
GDISP_REG = reg;
}
-static __inline void gdisp_lld_write_data(uint16_t data) {
+static inline void gdisp_lld_write_data(uint16_t data) {
GDISP_RAM = data;
}
-static __inline uint16_t gdisp_lld_read_data(void) {
+static inline uint16_t gdisp_lld_read_data(void) {
return GDISP_RAM;
}
-static __inline void gdisp_lld_backlight(uint8_t percent) {
+static inline void gdisp_lld_backlight(uint8_t percent) {
if(percent == 100)
palClearPad(GPIOD, GPIOD_TFT_LIGHT);
else
diff --git a/drivers/gdisp/ILI9320/gdisp_lld_config.h b/drivers/gdisp/ILI9320/gdisp_lld_config.h
index 1606ce95..a2a0a66b 100644
--- a/drivers/gdisp/ILI9320/gdisp_lld_config.h
+++ b/drivers/gdisp/ILI9320/gdisp_lld_config.h
@@ -1,5 +1,5 @@
/*
- ChibiOS/GFX - Copyright (C) 2012
+ ChibiOS/GFX - Copyright (C) 2012, 2013
Joel Bodenmann aka Tectu <joel@unormal.org>
This file is part of ChibiOS/GFX.
diff --git a/drivers/gdisp/ILI9325/gdisp_lld.c b/drivers/gdisp/ILI9325/gdisp_lld.c
index 187c54c6..62508d87 100644
--- a/drivers/gdisp/ILI9325/gdisp_lld.c
+++ b/drivers/gdisp/ILI9325/gdisp_lld.c
@@ -1,5 +1,5 @@
/*
- ChibiOS/GFX - Copyright (C) 2012
+ ChibiOS/GFX - Copyright (C) 2012, 2013
Joel Bodenmann aka Tectu <joel@unormal.org>
This file is part of ChibiOS/GFX.
@@ -76,30 +76,30 @@ uint32_t DISPLAY_CODE;
/*===========================================================================*/
/* Driver local functions. */
/*===========================================================================*/
-static __inline void lld_lcdDelay(uint16_t us) {
+static inline void lld_lcdDelay(uint16_t us) {
chThdSleepMicroseconds(us);
}
-static __inline void lld_lcdWriteIndex(uint16_t index) {
+static inline void lld_lcdWriteIndex(uint16_t index) {
gdisp_lld_write_index(index);
}
-static __inline void lld_lcdWriteData(uint16_t data) {
+static inline void lld_lcdWriteData(uint16_t data) {
gdisp_lld_write_data(data);
}
-static __inline void lld_lcdWriteReg(uint16_t lcdReg, uint16_t lcdRegValue) {
+static inline void lld_lcdWriteReg(uint16_t lcdReg, uint16_t lcdRegValue) {
gdisp_lld_write_index(lcdReg);
gdisp_lld_write_data(lcdRegValue);
}
-static __inline uint16_t lld_lcdReadData(void) {
+static inline uint16_t lld_lcdReadData(void) {
/* fix this! */
//return gdisp_lld_read_data;
return GDISP_RAM;
}
-static __inline uint16_t lld_lcdReadReg(uint16_t lcdReg) {
+static inline uint16_t lld_lcdReadReg(uint16_t lcdReg) {
volatile uint16_t dummy;
gdisp_lld_write_index(lcdReg);
@@ -109,30 +109,30 @@ static __inline uint16_t lld_lcdReadReg(uint16_t lcdReg) {
return lld_lcdReadData();
}
-static __inline void lld_lcdWriteStreamStart(void) {
+static inline void lld_lcdWriteStreamStart(void) {
lld_lcdWriteIndex(0x0022);
}
-static __inline void lld_lcdWriteStreamStop(void) {
+static inline void lld_lcdWriteStreamStop(void) {
}
-static __inline void lld_lcdWriteStream(uint16_t *buffer, uint16_t size) {
+static inline void lld_lcdWriteStream(uint16_t *buffer, uint16_t size) {
uint16_t i;
for(i = 0; i < size; i++)
lld_lcdWriteData(buffer[i]);
}
-static __inline void lld_lcdReadStreamStart(void) {
+static inline void lld_lcdReadStreamStart(void) {
lld_lcdWriteIndex(0x0022);
}
-static __inline void lld_lcdReadStreamStop(void) {
+static inline void lld_lcdReadStreamStop(void) {
}
-static __inline void lld_lcdReadStream(uint16_t *buffer, size_t size) {
+static inline void lld_lcdReadStream(uint16_t *buffer, size_t size) {
uint16_t i;
volatile uint16_t dummy;
@@ -289,7 +289,7 @@ static void lld_lcdSetViewPort(uint16_t x, uint16_t y, uint16_t cx, uint16_t cy)
lld_lcdSetCursor(x, y);
}
-static __inline void lld_lcdResetViewPort(void) {
+static inline void lld_lcdResetViewPort(void) {
switch(GDISP.Orientation) {
case GDISP_ROTATE_0:
case GDISP_ROTATE_180:
diff --git a/drivers/gdisp/ILI9325/gdisp_lld_board_example.h b/drivers/gdisp/ILI9325/gdisp_lld_board_example.h
index 80adf6ab..16de9924 100644
--- a/drivers/gdisp/ILI9325/gdisp_lld_board_example.h
+++ b/drivers/gdisp/ILI9325/gdisp_lld_board_example.h
@@ -1,5 +1,5 @@
/*
- ChibiOS/GFX - Copyright (C) 2012
+ ChibiOS/GFX - Copyright (C) 2012, 2013
Joel Bodenmann aka Tectu <joel@unormal.org>
This file is part of ChibiOS/GFX.
@@ -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 gdisp_lld_init_board(void) {
#error "ILI9325: You must implement the init_board routine for your board"
}
-static __inline void gdisp_lld_reset_pin(bool_t state) {
+static inline void gdisp_lld_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 gdisp_lld_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 gdisp_lld_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 gdisp_lld_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_backlight(uint8_t percentage) {
+static inline uint16_t gdisp_lld_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 a9e61dcb..1915f1cc 100644
--- a/drivers/gdisp/ILI9325/gdisp_lld_board_hy_stm32_100p.h
+++ b/drivers/gdisp/ILI9325/gdisp_lld_board_hy_stm32_100p.h
@@ -1,5 +1,5 @@
/*
- ChibiOS/GFX - Copyright (C) 2012
+ ChibiOS/GFX - Copyright (C) 2012, 2013
Joel Bodenmann aka Tectu <joel@unormal.org>
This file is part of ChibiOS/GFX.
@@ -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 gdisp_lld_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_reset_pin(bool_t state) {
+static inline void gdisp_lld_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 gdisp_lld_write_index(uint16_t reg) {
GDISP_REG = reg;
}
-static __inline void gdisp_lld_write_data(uint16_t data) {
+static inline void gdisp_lld_write_data(uint16_t data) {
GDISP_RAM = data;
}
-static __inline uint16_t gdisp_lld_read_data(void) {
+static inline uint16_t gdisp_lld_read_data(void) {
return GDISP_RAM;
}
-static __inline void gdisp_lld_backlight(uint8_t percent) {
+static inline void gdisp_lld_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 414fc05e..03ef5f05 100644
--- a/drivers/gdisp/ILI9325/gdisp_lld_config.h
+++ b/drivers/gdisp/ILI9325/gdisp_lld_config.h
@@ -1,5 +1,5 @@
/*
- ChibiOS/GFX - Copyright (C) 2012
+ ChibiOS/GFX - Copyright (C) 2012, 2013
Joel Bodenmann aka Tectu <joel@unormal.org>
This file is part of ChibiOS/GFX.
diff --git a/drivers/gdisp/Nokia6610GE12/GE12.h b/drivers/gdisp/Nokia6610GE12/GE12.h
index 6c980e2e..388e1147 100644
--- a/drivers/gdisp/Nokia6610GE12/GE12.h
+++ b/drivers/gdisp/Nokia6610GE12/GE12.h
@@ -1,5 +1,5 @@
/*
- ChibiOS/GFX - Copyright (C) 2012
+ ChibiOS/GFX - Copyright (C) 2012, 2013
Joel Bodenmann aka Tectu <joel@unormal.org>
This file is part of ChibiOS/GFX.
diff --git a/drivers/gdisp/Nokia6610GE12/gdisp_lld.c b/drivers/gdisp/Nokia6610GE12/gdisp_lld.c
index ee9a5fc7..0f46e267 100644
--- a/drivers/gdisp/Nokia6610GE12/gdisp_lld.c
+++ b/drivers/gdisp/Nokia6610GE12/gdisp_lld.c
@@ -1,5 +1,5 @@
/*
- ChibiOS/GFX - Copyright (C) 2012
+ ChibiOS/GFX - Copyright (C) 2012, 2013
Joel Bodenmann aka Tectu <joel@unormal.org>
This file is part of ChibiOS/GFX.
@@ -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..53a7fad7 100644
--- a/drivers/gdisp/Nokia6610GE12/gdisp_lld_board_example.h
+++ b/drivers/gdisp/Nokia6610GE12/gdisp_lld_board_example.h
@@ -1,5 +1,5 @@
/*
- ChibiOS/GFX - Copyright (C) 2012
+ ChibiOS/GFX - Copyright (C) 2012, 2013
Joel Bodenmann aka Tectu <joel@unormal.org>
This file is part of ChibiOS/GFX.
@@ -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..3fede6d7 100644
--- a/drivers/gdisp/Nokia6610GE12/gdisp_lld_board_olimexsam7ex256.h
+++ b/drivers/gdisp/Nokia6610GE12/gdisp_lld_board_olimexsam7ex256.h
@@ -1,5 +1,5 @@
/*
- ChibiOS/GFX - Copyright (C) 2012
+ ChibiOS/GFX - Copyright (C) 2012, 2013
Joel Bodenmann aka Tectu <joel@unormal.org>
This file is part of ChibiOS/GFX.
@@ -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;
}
diff --git a/drivers/gdisp/Nokia6610GE12/gdisp_lld_config.h b/drivers/gdisp/Nokia6610GE12/gdisp_lld_config.h
index 9db24e26..cca96c0e 100644
--- a/drivers/gdisp/Nokia6610GE12/gdisp_lld_config.h
+++ b/drivers/gdisp/Nokia6610GE12/gdisp_lld_config.h
@@ -1,5 +1,5 @@
/*
- ChibiOS/GFX - Copyright (C) 2012
+ ChibiOS/GFX - Copyright (C) 2012, 2013
Joel Bodenmann aka Tectu <joel@unormal.org>
This file is part of ChibiOS/GFX.
diff --git a/drivers/gdisp/Nokia6610GE8/GE8.h b/drivers/gdisp/Nokia6610GE8/GE8.h
index 789308a9..18c2ffcb 100644
--- a/drivers/gdisp/Nokia6610GE8/GE8.h
+++ b/drivers/gdisp/Nokia6610GE8/GE8.h
@@ -1,5 +1,5 @@
/*
- ChibiOS/GFX - Copyright (C) 2012
+ ChibiOS/GFX - Copyright (C) 2012, 2013
Joel Bodenmann aka Tectu <joel@unormal.org>
This file is part of ChibiOS/GFX.
diff --git a/drivers/gdisp/Nokia6610GE8/gdisp_lld.c b/drivers/gdisp/Nokia6610GE8/gdisp_lld.c
index 079900aa..ed6861e8 100644
--- a/drivers/gdisp/Nokia6610GE8/gdisp_lld.c
+++ b/drivers/gdisp/Nokia6610GE8/gdisp_lld.c
@@ -1,5 +1,5 @@
/*
- ChibiOS/GFX - Copyright (C) 2012
+ ChibiOS/GFX - Copyright (C) 2012, 2013
Joel Bodenmann aka Tectu <joel@unormal.org>
This file is part of ChibiOS/GFX.
@@ -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..2dc589b7 100644
--- a/drivers/gdisp/Nokia6610GE8/gdisp_lld_board_example.h
+++ b/drivers/gdisp/Nokia6610GE8/gdisp_lld_board_example.h
@@ -1,5 +1,5 @@
/*
- ChibiOS/GFX - Copyright (C) 2012
+ ChibiOS/GFX - Copyright (C) 2012, 2013
Joel Bodenmann aka Tectu <joel@unormal.org>
This file is part of ChibiOS/GFX.
@@ -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..b3b88b7c 100644
--- a/drivers/gdisp/Nokia6610GE8/gdisp_lld_board_olimexsam7ex256.h
+++ b/drivers/gdisp/Nokia6610GE8/gdisp_lld_board_olimexsam7ex256.h
@@ -1,5 +1,5 @@
/*
- ChibiOS/GFX - Copyright (C) 2012
+ ChibiOS/GFX - Copyright (C) 2012, 2013
Joel Bodenmann aka Tectu <joel@unormal.org>
This file is part of ChibiOS/GFX.
@@ -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;
}
diff --git a/drivers/gdisp/Nokia6610GE8/gdisp_lld_config.h b/drivers/gdisp/Nokia6610GE8/gdisp_lld_config.h
index c50e26f1..9893b8a4 100644
--- a/drivers/gdisp/Nokia6610GE8/gdisp_lld_config.h
+++ b/drivers/gdisp/Nokia6610GE8/gdisp_lld_config.h
@@ -1,5 +1,5 @@
/*
- ChibiOS/GFX - Copyright (C) 2012
+ ChibiOS/GFX - Copyright (C) 2012, 2013
Joel Bodenmann aka Tectu <joel@unormal.org>
This file is part of ChibiOS/GFX.
diff --git a/drivers/gdisp/S6D1121/gdisp_lld.c b/drivers/gdisp/S6D1121/gdisp_lld.c
index c4523999..982e788b 100644
--- a/drivers/gdisp/S6D1121/gdisp_lld.c
+++ b/drivers/gdisp/S6D1121/gdisp_lld.c
@@ -1,5 +1,5 @@
/*
- ChibiOS/GFX - Copyright (C) 2012
+ ChibiOS/GFX - Copyright (C) 2012, 2013
Joel Bodenmann aka Tectu <joel@unormal.org>
This file is part of ChibiOS/GFX.
@@ -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..782c5918 100644
--- a/drivers/gdisp/S6D1121/gdisp_lld_board_example.h
+++ b/drivers/gdisp/S6D1121/gdisp_lld_board_example.h
@@ -1,5 +1,5 @@
/*
- ChibiOS/GFX - Copyright (C) 2012
+ ChibiOS/GFX - Copyright (C) 2012, 2013
Joel Bodenmann aka Tectu <joel@unormal.org>
This file is part of ChibiOS/GFX.
@@ -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..ee4759b2 100644
--- a/drivers/gdisp/S6D1121/gdisp_lld_board_olimex_e407.h
+++ b/drivers/gdisp/S6D1121/gdisp_lld_board_olimex_e407.h
@@ -1,5 +1,5 @@
/*
- ChibiOS/GFX - Copyright (C) 2012
+ ChibiOS/GFX - Copyright (C) 2012, 2013
Joel Bodenmann aka Tectu <joel@unormal.org>
This file is part of ChibiOS/GFX.
@@ -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
diff --git a/drivers/gdisp/S6D1121/gdisp_lld_config.h b/drivers/gdisp/S6D1121/gdisp_lld_config.h
index 00c01da2..0ae68848 100644
--- a/drivers/gdisp/S6D1121/gdisp_lld_config.h
+++ b/drivers/gdisp/S6D1121/gdisp_lld_config.h
@@ -1,5 +1,5 @@
/*
- ChibiOS/GFX - Copyright (C) 2012
+ ChibiOS/GFX - Copyright (C) 2012, 2013
Joel Bodenmann aka Tectu <joel@unormal.org>
This file is part of ChibiOS/GFX.
diff --git a/drivers/gdisp/SSD1289/gdisp_lld.c b/drivers/gdisp/SSD1289/gdisp_lld.c
index de6edfe8..e2dd79e0 100644
--- a/drivers/gdisp/SSD1289/gdisp_lld.c
+++ b/drivers/gdisp/SSD1289/gdisp_lld.c
@@ -1,5 +1,5 @@
/*
- ChibiOS/GFX - Copyright (C) 2012
+ ChibiOS/GFX - Copyright (C) 2012, 2013
Joel Bodenmann aka Tectu <joel@unormal.org>
This file is part of ChibiOS/GFX.
@@ -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..7e8389d7 100644
--- a/drivers/gdisp/SSD1289/gdisp_lld_board_example.h
+++ b/drivers/gdisp/SSD1289/gdisp_lld_board_example.h
@@ -1,5 +1,5 @@
/*
- ChibiOS/GFX - Copyright (C) 2012
+ ChibiOS/GFX - Copyright (C) 2012, 2013
Joel Bodenmann aka Tectu <joel@unormal.org>
This file is part of ChibiOS/GFX.
@@ -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..b0451747 100644
--- a/drivers/gdisp/SSD1289/gdisp_lld_board_example_fsmc.h
+++ b/drivers/gdisp/SSD1289/gdisp_lld_board_example_fsmc.h
@@ -1,5 +1,5 @@
/*
- ChibiOS/GFX - Copyright (C) 2012
+ ChibiOS/GFX - Copyright (C) 2012, 2013
Joel Bodenmann aka Tectu <joel@unormal.org>
This file is part of ChibiOS/GFX.
@@ -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..19f1108c 100644
--- a/drivers/gdisp/SSD1289/gdisp_lld_board_firebullstm32f103.h
+++ b/drivers/gdisp/SSD1289/gdisp_lld_board_firebullstm32f103.h
@@ -1,5 +1,5 @@
/*
- ChibiOS/GFX - Copyright (C) 2012
+ ChibiOS/GFX - Copyright (C) 2012, 2013
Joel Bodenmann aka Tectu <joel@unormal.org>
This file is part of ChibiOS/GFX.
@@ -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
diff --git a/drivers/gdisp/SSD1289/gdisp_lld_config.h b/drivers/gdisp/SSD1289/gdisp_lld_config.h
index 62b3c7b9..8b26e489 100644
--- a/drivers/gdisp/SSD1289/gdisp_lld_config.h
+++ b/drivers/gdisp/SSD1289/gdisp_lld_config.h
@@ -1,5 +1,5 @@
/*
- ChibiOS/GFX - Copyright (C) 2012
+ ChibiOS/GFX - Copyright (C) 2012, 2013
Joel Bodenmann aka Tectu <joel@unormal.org>
This file is part of ChibiOS/GFX.
diff --git a/drivers/gdisp/SSD1963/gdisp_lld.c b/drivers/gdisp/SSD1963/gdisp_lld.c
index 4044d8d0..4de00b6d 100644
--- a/drivers/gdisp/SSD1963/gdisp_lld.c
+++ b/drivers/gdisp/SSD1963/gdisp_lld.c
@@ -1,5 +1,5 @@
/*
- ChibiOS/GFX - Copyright (C) 2012
+ ChibiOS/GFX - Copyright (C) 2012, 2013
Joel Bodenmann aka Tectu <joel@unormal.org>
This file is part of ChibiOS/GFX.
@@ -64,43 +64,43 @@
#if defined(GDISP_USE_FSMC)
-__inline void GDISP_LLD(writeindex)(uint8_t cmd) {
+inline void GDISP_LLD(writeindex)(uint8_t cmd) {
GDISP_REG = cmd;
}
-__inline void GDISP_LLD(writereg)(uint16_t lcdReg,uint16_t lcdRegValue) {
+inline void GDISP_LLD(writereg)(uint16_t lcdReg,uint16_t lcdRegValue) {
GDISP_REG = lcdReg;
GDISP_RAM = lcdRegValue;
}
-__inline void GDISP_LLD(writedata)(uint16_t data) {
+inline void GDISP_LLD(writedata)(uint16_t data) {
GDISP_RAM = data;
}
-__inline uint16_t GDISP_LLD(readdata)(void) {
+inline uint16_t GDISP_LLD(readdata)(void) {
return (GDISP_RAM);
}
-__inline uint8_t GDISP_LLD(readreg)(uint8_t lcdReg) {
+inline uint8_t GDISP_LLD(readreg)(uint8_t lcdReg) {
GDISP_REG = lcdReg;
return (GDISP_RAM);
}
-__inline void GDISP_LLD(writestreamstart)(void) {
+inline void GDISP_LLD(writestreamstart)(void) {
GDISP_LLD(writeindex)(SSD1963_WRITE_MEMORY_START);
}
-__inline void GDISP_LLD(readstreamstart)(void) {
+inline void GDISP_LLD(readstreamstart)(void) {
GDISP_LLD(writeindex)(SSD1963_READ_MEMORY_START);
}
-__inline void GDISP_LLD(writestream)(uint16_t *buffer, uint16_t size) {
+inline void GDISP_LLD(writestream)(uint16_t *buffer, uint16_t size) {
uint16_t i;
for(i = 0; i < size; i++)
GDISP_RAM = buffer[i];
}
-__inline void GDISP_LLD(readstream)(uint16_t *buffer, size_t size) {
+inline void GDISP_LLD(readstream)(uint16_t *buffer, size_t size) {
uint16_t i;
for(i = 0; i < size; i++) {
@@ -110,33 +110,33 @@ __inline void GDISP_LLD(readstream)(uint16_t *buffer, size_t size) {
#elif defined(GDISP_USE_GPIO)
-__inline void GDISP_LLD(writeindex)(uint8_t cmd) {
+inline void GDISP_LLD(writeindex)(uint8_t cmd) {
Set_CS; Set_RS; Set_WR; Clr_RD;
palWritePort(GDISP_DATA_PORT, cmd);
Clr_CS;
}
-__inline void GDISP_LLD(writereg)(uint16_t lcdReg,uint16_t lcdRegValue) {
+inline void GDISP_LLD(writereg)(uint16_t lcdReg,uint16_t lcdRegValue) {
Set_CS; Set_RS; Set_WR; Clr_RD;
palWritePort(GDISP_DATA_PORT, lcdReg);
Clr_RS;
palWritePort(GDISP_DATA_PORT, lcdRegValue);
Clr_CS;
}
-__inline void GDISP_LLD(writedata)(uint16_t data) {
+inline void GDISP_LLD(writedata)(uint16_t data) {
Set_CS; Clr_RS; Set_WR; Clr_RD;
palWritePort(GDISP_DATA_PORT, data);
Clr_CS;
}
-__inline uint16_t GDISP_LLD(readdata)(void) {
+inline uint16_t GDISP_LLD(readdata)(void) {
Set_CS; Clr_RS; Clr_WR; Set_RD;
uint16_t data = palReadPort(GDISP_DATA_PORT);
Clr_CS;
return data;
}
-__inline uint8_t GDISP_LLD(readreg)(uint8_t lcdReg) {
+inline uint8_t GDISP_LLD(readreg)(uint8_t lcdReg) {
Set_CS; Set_RS; Clr_WR; Set_RD;
palWritePort(GDISP_DATA_PORT, lcdReg);
Clr_RS;
@@ -145,15 +145,15 @@ __inline uint8_t GDISP_LLD(readreg)(uint8_t lcdReg) {
return data;
}
-__inline void GDISP_LLD(writestreamstart)(void) {
+inline void GDISP_LLD(writestreamstart)(void) {
GDISP_LLD(writeindex)(SSD1963_WRITE_MEMORY_START);
}
-__inline void GDISP_LLD(readstreamstart)(void) {
+inline void GDISP_LLD(readstreamstart)(void) {
GDISP_LLD(writeindex)(SSD1963_READ_MEMORY_START);
}
-__inline void GDISP_LLD(writestream)(uint16_t *buffer, uint16_t size) {
+inline void GDISP_LLD(writestream)(uint16_t *buffer, uint16_t size) {
uint16_t i;
Set_CS; Clr_RS; Set_WR; Clr_RD;
for(i = 0; i < size; i++) {
@@ -164,7 +164,7 @@ __inline void GDISP_LLD(writestream)(uint16_t *buffer, uint16_t size) {
Clr_CS;
}
-__inline void GDISP_LLD(readstream)(uint16_t *buffer, size_t size) {
+inline void GDISP_LLD(readstream)(uint16_t *buffer, size_t size) {
uint16_t i;
Set_CS; Clr_RS; Clr_WR; Set_RD;
for(i = 0; i < size; i++) {
diff --git a/drivers/gdisp/SSD1963/ssd1963.h b/drivers/gdisp/SSD1963/ssd1963.h
index 1aa28382..a80c7998 100644
--- a/drivers/gdisp/SSD1963/ssd1963.h
+++ b/drivers/gdisp/SSD1963/ssd1963.h
@@ -1,5 +1,5 @@
/*
- ChibiOS/GFX - Copyright (C) 2012
+ ChibiOS/GFX - Copyright (C) 2012, 2013
Joel Bodenmann aka Tectu <joel@unormal.org>
This file is part of ChibiOS/GFX.
diff --git a/drivers/gdisp/SSD2119/gdisp_lld.c b/drivers/gdisp/SSD2119/gdisp_lld.c
index b478c6d8..b7550794 100644
--- a/drivers/gdisp/SSD2119/gdisp_lld.c
+++ b/drivers/gdisp/SSD2119/gdisp_lld.c
@@ -1,5 +1,5 @@
/*
- ChibiOS/GFX - Copyright (C) 2012
+ ChibiOS/GFX - Copyright (C) 2012, 2013
Joel Bodenmann aka Tectu <joel@unormal.org>
This file is part of ChibiOS/GFX.
@@ -72,7 +72,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 SSD2119_REG_X_RAM_ADDR is 9 bit value
* Reg SSD2119_REG_Y_RAM_ADDR is an 8 bit
* Use a bit mask to make sure they are not set too high
@@ -136,7 +136,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/SSD2119/gdisp_lld_board_embest_dmstf4bb_fsmc.h b/drivers/gdisp/SSD2119/gdisp_lld_board_embest_dmstf4bb_fsmc.h
index c6e11493..bf7b3890 100644
--- a/drivers/gdisp/SSD2119/gdisp_lld_board_embest_dmstf4bb_fsmc.h
+++ b/drivers/gdisp/SSD2119/gdisp_lld_board_embest_dmstf4bb_fsmc.h
@@ -1,5 +1,5 @@
/*
- ChibiOS/GFX - Copyright (C) 2012
+ ChibiOS/GFX - Copyright (C) 2012, 2013
Joel Bodenmann aka Tectu <joel@unormal.org>
This file is part of ChibiOS/GFX.
@@ -56,7 +56,7 @@ static const PWMConfig pwmcfg = {
*
* @notapi
*/
-static __inline void init_board(void) {
+static inline void init_board(void) {
unsigned char FSMC_Bank;
/* STM32F4 FSMC init */
@@ -98,7 +98,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) {
CLR_RST;
} else {
@@ -113,7 +113,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) {
pwmEnableChannel(&PWMD4, 1, percent);
}
@@ -123,7 +123,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 */
}
@@ -133,7 +133,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 */
}
@@ -144,7 +144,7 @@ static __inline void release_bus(void) {
*
* @notapi
*/
-static __inline void write_index(uint16_t index) {
+static inline void write_index(uint16_t index) {
GDISP_REG = index;
}
@@ -155,7 +155,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) {
GDISP_RAM = data;
}
@@ -169,7 +169,7 @@ static __inline void write_data(uint16_t data) {
*
* @notapi
*/
-static __inline uint16_t read_data(void) {
+static inline uint16_t read_data(void) {
return GDISP_RAM;
}
#endif
diff --git a/drivers/gdisp/SSD2119/gdisp_lld_config.h b/drivers/gdisp/SSD2119/gdisp_lld_config.h
index 05c007b0..b5af495c 100644
--- a/drivers/gdisp/SSD2119/gdisp_lld_config.h
+++ b/drivers/gdisp/SSD2119/gdisp_lld_config.h
@@ -1,5 +1,5 @@
/*
- ChibiOS/GFX - Copyright (C) 2012
+ ChibiOS/GFX - Copyright (C) 2012, 2013
Joel Bodenmann aka Tectu <joel@unormal.org>
This file is part of ChibiOS/GFX.
diff --git a/drivers/gdisp/SSD2119/ssd2119.h b/drivers/gdisp/SSD2119/ssd2119.h
index a907fcbb..c3ffa00f 100644
--- a/drivers/gdisp/SSD2119/ssd2119.h
+++ b/drivers/gdisp/SSD2119/ssd2119.h
@@ -1,5 +1,5 @@
/*
- ChibiOS/GFX - Copyright (C) 2012
+ ChibiOS/GFX - Copyright (C) 2012, 2013
Joel Bodenmann aka Tectu <joel@unormal.org>
This file is part of ChibiOS/GFX.
diff --git a/drivers/gdisp/TestStub/gdisp_lld.c b/drivers/gdisp/TestStub/gdisp_lld.c
index a1f3de3e..19ce5b3c 100644
--- a/drivers/gdisp/TestStub/gdisp_lld.c
+++ b/drivers/gdisp/TestStub/gdisp_lld.c
@@ -1,5 +1,5 @@
/*
- ChibiOS/GFX - Copyright (C) 2012
+ ChibiOS/GFX - Copyright (C) 2012, 2013
Joel Bodenmann aka Tectu <joel@unormal.org>
This file is part of ChibiOS/GFX.
diff --git a/drivers/gdisp/TestStub/gdisp_lld_config.h b/drivers/gdisp/TestStub/gdisp_lld_config.h
index 8ae82ff4..c0fa6a65 100644
--- a/drivers/gdisp/TestStub/gdisp_lld_config.h
+++ b/drivers/gdisp/TestStub/gdisp_lld_config.h
@@ -1,5 +1,5 @@
/*
- ChibiOS/GFX - Copyright (C) 2012
+ ChibiOS/GFX - Copyright (C) 2012, 2013
Joel Bodenmann aka Tectu <joel@unormal.org>
This file is part of ChibiOS/GFX.
diff --git a/drivers/ginput/toggle/Pal/ginput_lld_toggle.c b/drivers/ginput/toggle/Pal/ginput_lld_toggle.c
index e2ecc116..04805d04 100644
--- a/drivers/ginput/toggle/Pal/ginput_lld_toggle.c
+++ b/drivers/ginput/toggle/Pal/ginput_lld_toggle.c
@@ -1,5 +1,5 @@
/*
- ChibiOS/GFX - Copyright (C) 2012
+ ChibiOS/GFX - Copyright (C) 2012, 2013
Joel Bodenmann aka Tectu <joel@unormal.org>
This file is part of ChibiOS/GFX.
diff --git a/drivers/ginput/toggle/Pal/ginput_lld_toggle_board_example.h b/drivers/ginput/toggle/Pal/ginput_lld_toggle_board_example.h
index 20fc44b5..34d9cdaa 100644
--- a/drivers/ginput/toggle/Pal/ginput_lld_toggle_board_example.h
+++ b/drivers/ginput/toggle/Pal/ginput_lld_toggle_board_example.h
@@ -1,5 +1,5 @@
/*
- ChibiOS/GFX - Copyright (C) 2012
+ ChibiOS/GFX - Copyright (C) 2012, 2013
Joel Bodenmann aka Tectu <joel@unormal.org>
This file is part of ChibiOS/GFX.
diff --git a/drivers/ginput/toggle/Pal/ginput_lld_toggle_board_olimexsam7ex256.h b/drivers/ginput/toggle/Pal/ginput_lld_toggle_board_olimexsam7ex256.h
index 4f3d6800..6a3c47f7 100644
--- a/drivers/ginput/toggle/Pal/ginput_lld_toggle_board_olimexsam7ex256.h
+++ b/drivers/ginput/toggle/Pal/ginput_lld_toggle_board_olimexsam7ex256.h
@@ -1,5 +1,5 @@
/*
- ChibiOS/GFX - Copyright (C) 2012
+ ChibiOS/GFX - Copyright (C) 2012, 2013
Joel Bodenmann aka Tectu <joel@unormal.org>
This file is part of ChibiOS/GFX.
diff --git a/drivers/ginput/toggle/Pal/ginput_lld_toggle_config.h b/drivers/ginput/toggle/Pal/ginput_lld_toggle_config.h
index 162d35df..a0402777 100644
--- a/drivers/ginput/toggle/Pal/ginput_lld_toggle_config.h
+++ b/drivers/ginput/toggle/Pal/ginput_lld_toggle_config.h
@@ -1,5 +1,5 @@
/*
- ChibiOS/GFX - Copyright (C) 2012
+ ChibiOS/GFX - Copyright (C) 2012, 2013
Joel Bodenmann aka Tectu <joel@unormal.org>
This file is part of ChibiOS/GFX.
diff --git a/drivers/ginput/touch/ADS7843/ginput_lld_mouse.c b/drivers/ginput/touch/ADS7843/ginput_lld_mouse.c
index 65065176..11193442 100644
--- a/drivers/ginput/touch/ADS7843/ginput_lld_mouse.c
+++ b/drivers/ginput/touch/ADS7843/ginput_lld_mouse.c
@@ -1,5 +1,5 @@
/*
- ChibiOS/GFX - Copyright (C) 2012
+ ChibiOS/GFX - Copyright (C) 2012, 2013
Joel Bodenmann aka Tectu <joel@unormal.org>
This file is part of ChibiOS/GFX.
diff --git a/drivers/ginput/touch/ADS7843/ginput_lld_mouse_board_example.h b/drivers/ginput/touch/ADS7843/ginput_lld_mouse_board_example.h
index 9f4f2dc1..2e3f3245 100644
--- a/drivers/ginput/touch/ADS7843/ginput_lld_mouse_board_example.h
+++ b/drivers/ginput/touch/ADS7843/ginput_lld_mouse_board_example.h
@@ -1,5 +1,5 @@
/*
- ChibiOS/GFX - Copyright (C) 2012
+ ChibiOS/GFX - Copyright (C) 2012, 2013
Joel Bodenmann aka Tectu <joel@unormal.org>
This file is part of ChibiOS/GFX.
@@ -35,7 +35,7 @@
*
* @notapi
*/
-static __inline void init_board(void) {
+static inline void init_board(void) {
/* Code here */
#error "ginputADS7843: You must supply a definition for init_board for your board"
}
@@ -46,7 +46,7 @@ static __inline void init_board(void) {
*
* @notapi
*/
-static __inline bool_t getpin_pressed(void) {
+static inline bool_t getpin_pressed(void) {
/* Code here */
#error "ginputADS7843: You must supply a definition for getpin_pressed for your board"
}
@@ -56,7 +56,7 @@ static __inline bool_t getpin_pressed(void) {
*
* @notapi
*/
-static __inline void aquire_bus(void) {
+static inline void aquire_bus(void) {
/* Code here */
#error "ginputADS7843: You must supply a definition for aquire_bus for your board"
}
@@ -66,7 +66,7 @@ static __inline void aquire_bus(void) {
*
* @notapi
*/
-static __inline void release_bus(void) {
+static inline void release_bus(void) {
/* Code here */
#error "ginputADS7843: You must supply a definition for release_bus for your board"
}
@@ -79,7 +79,7 @@ static __inline void release_bus(void) {
*
* @notapi
*/
-static __inline uint16_t read_value(uint16_t port) {
+static inline uint16_t read_value(uint16_t port) {
/* Code here */
#error "ginputADS7843: You must supply a definition for read_value for your board"
}
diff --git a/drivers/ginput/touch/ADS7843/ginput_lld_mouse_board_firebull_stm32f103.h b/drivers/ginput/touch/ADS7843/ginput_lld_mouse_board_firebull_stm32f103.h
index bc018b89..7758166b 100644
--- a/drivers/ginput/touch/ADS7843/ginput_lld_mouse_board_firebull_stm32f103.h
+++ b/drivers/ginput/touch/ADS7843/ginput_lld_mouse_board_firebull_stm32f103.h
@@ -1,5 +1,5 @@
/*
- ChibiOS/GFX - Copyright (C) 2012
+ ChibiOS/GFX - Copyright (C) 2012, 2013
Joel Bodenmann aka Tectu <joel@unormal.org>
This file is part of ChibiOS/GFX.
@@ -42,7 +42,7 @@ static const SPIConfig spicfg = {
*
* @notapi
*/
-static __inline void init_board(void) {
+static inline void init_board(void) {
spiStart(&SPID1, &spicfg);
}
@@ -52,7 +52,7 @@ static __inline void init_board(void) {
*
* @notapi
*/
-static __inline bool_t getpin_pressed(void) {
+static inline bool_t getpin_pressed(void) {
return (!palReadPad(GPIOC, 4));
}
/**
@@ -60,7 +60,7 @@ static __inline bool_t getpin_pressed(void) {
*
* @notapi
*/
-static __inline void aquire_bus(void) {
+static inline void aquire_bus(void) {
spiAcquireBus(&SPID1);
//TOUCHSCREEN_SPI_PROLOGUE();
palClearPad(GPIOC, 6);
@@ -71,7 +71,7 @@ static __inline void aquire_bus(void) {
*
* @notapi
*/
-static __inline void release_bus(void) {
+static inline void release_bus(void) {
palSetPad(GPIOC, 6);
spiReleaseBus(&SPID1);
//TOUCHSCREEN_SPI_EPILOGUE();
@@ -85,7 +85,7 @@ static __inline void release_bus(void) {
*
* @notapi
*/
-static __inline uint16_t read_value(uint16_t port) {
+static inline uint16_t read_value(uint16_t port) {
static uint8_t txbuf[3] = {0};
static uint8_t rxbuf[3] = {0};
uint16_t ret;
diff --git a/drivers/ginput/touch/ADS7843/ginput_lld_mouse_board_olimex_stm32_e407.h b/drivers/ginput/touch/ADS7843/ginput_lld_mouse_board_olimex_stm32_e407.h
index 6c5f7e37..21ba5294 100644
--- a/drivers/ginput/touch/ADS7843/ginput_lld_mouse_board_olimex_stm32_e407.h
+++ b/drivers/ginput/touch/ADS7843/ginput_lld_mouse_board_olimex_stm32_e407.h
@@ -1,5 +1,5 @@
/*
- ChibiOS/GFX - Copyright (C) 2012
+ ChibiOS/GFX - Copyright (C) 2012, 2013
Joel Bodenmann aka Tectu <joel@unormal.org>
This file is part of ChibiOS/GFX.
@@ -42,7 +42,7 @@ static const SPIConfig spicfg = {
*
* @notapi
*/
-static __inline void init_board(void) {
+static inline void init_board(void) {
spiStart(&SPID2, &spicfg);
}
@@ -52,7 +52,7 @@ static __inline void init_board(void) {
*
* @notapi
*/
-static __inline bool_t getpin_pressed(void) {
+static inline bool_t getpin_pressed(void) {
return (!palReadPad(GPIOG, 0));
}
/**
@@ -60,7 +60,7 @@ static __inline bool_t getpin_pressed(void) {
*
* @notapi
*/
-static __inline void aquire_bus(void) {
+static inline void aquire_bus(void) {
spiAcquireBus(&SPID2);
//TOUCHSCREEN_SPI_PROLOGUE();
palClearPad(GPIOG, 10);
@@ -71,7 +71,7 @@ static __inline void aquire_bus(void) {
*
* @notapi
*/
-static __inline void release_bus(void) {
+static inline void release_bus(void) {
palSetPad(GPIOG, 10);
spiReleaseBus(&SPID2);
//TOUCHSCREEN_SPI_EPILOGUE();
@@ -85,7 +85,7 @@ static __inline void release_bus(void) {
*
* @notapi
*/
-static __inline uint16_t read_value(uint16_t port) {
+static inline uint16_t read_value(uint16_t port) {
static uint8_t txbuf[3] = {0};
static uint8_t rxbuf[3] = {0};
uint16_t ret;
diff --git a/drivers/ginput/touch/ADS7843/ginput_lld_mouse_config.h b/drivers/ginput/touch/ADS7843/ginput_lld_mouse_config.h
index 30a13841..6b8579e3 100644
--- a/drivers/ginput/touch/ADS7843/ginput_lld_mouse_config.h
+++ b/drivers/ginput/touch/ADS7843/ginput_lld_mouse_config.h
@@ -1,5 +1,5 @@
/*
- ChibiOS/GFX - Copyright (C) 2012
+ ChibiOS/GFX - Copyright (C) 2012, 2013
Joel Bodenmann aka Tectu <joel@unormal.org>
This file is part of ChibiOS/GFX.
diff --git a/drivers/ginput/touch/MCU/ginput_lld_mouse.c b/drivers/ginput/touch/MCU/ginput_lld_mouse.c
index b43a14e7..2a5b6944 100644
--- a/drivers/ginput/touch/MCU/ginput_lld_mouse.c
+++ b/drivers/ginput/touch/MCU/ginput_lld_mouse.c
@@ -1,5 +1,5 @@
/*
- ChibiOS/GFX - Copyright (C) 2012
+ ChibiOS/GFX - Copyright (C) 2012, 2013
Joel Bodenmann aka Tectu <joel@unormal.org>
This file is part of ChibiOS/GFX.
diff --git a/drivers/ginput/touch/MCU/ginput_lld_mouse_board_example.h b/drivers/ginput/touch/MCU/ginput_lld_mouse_board_example.h
index 913d50c9..1c6aa970 100644
--- a/drivers/ginput/touch/MCU/ginput_lld_mouse_board_example.h
+++ b/drivers/ginput/touch/MCU/ginput_lld_mouse_board_example.h
@@ -1,5 +1,5 @@
/*
- ChibiOS/GFX - Copyright (C) 2012
+ ChibiOS/GFX - Copyright (C) 2012, 2013
Joel Bodenmann aka Tectu <joel@unormal.org>
This file is part of ChibiOS/GFX.
@@ -36,7 +36,7 @@
*
* @notapi
*/
-static __inline void init_board(void) {
+static inline void init_board(void) {
/* Code here */
#error "ginputMCU: You must supply a definition for init_board for your board"
}
@@ -47,7 +47,7 @@ static __inline void init_board(void) {
*
* @notapi
*/
-static __inline bool_t getpin_pressed(void) {
+static inline bool_t getpin_pressed(void) {
/* Code here */
#error "ginputMCU: You must supply a definition for getpin_pressed for your board"
}
@@ -57,7 +57,7 @@ static __inline bool_t getpin_pressed(void) {
*
* @notapi
*/
-static __inline void aquire_bus(void) {
+static inline void aquire_bus(void) {
/* Code here */
#error "ginputMCU: You must supply a definition for aquire_bus for your board"
}
@@ -67,7 +67,7 @@ static __inline void aquire_bus(void) {
*
* @notapi
*/
-static __inline void release_bus(void) {
+static inline void release_bus(void) {
/* Code here */
#error "ginputMCU: You must supply a definition for release_bus for your board"
}
@@ -78,7 +78,7 @@ static __inline void release_bus(void) {
*
* @notapi
*/
-static __inline uint16_t read_x_value(void) {
+static inline uint16_t read_x_value(void) {
/* Code here */
#error "ginputMCU: You must supply a definition for read_x_value for your board"
}
@@ -89,7 +89,7 @@ static __inline uint16_t read_x_value(void) {
*
* @notapi
*/
-static __inline uint16_t read_y_value(void) {
+static inline uint16_t read_y_value(void) {
/* Code here */
#error "ginputMCU: You must supply a definition for read_y_value for your board"
}
diff --git a/drivers/ginput/touch/MCU/ginput_lld_mouse_board_olimex_stm32_lcd.h b/drivers/ginput/touch/MCU/ginput_lld_mouse_board_olimex_stm32_lcd.h
index 510e8e81..0309b655 100644
--- a/drivers/ginput/touch/MCU/ginput_lld_mouse_board_olimex_stm32_lcd.h
+++ b/drivers/ginput/touch/MCU/ginput_lld_mouse_board_olimex_stm32_lcd.h
@@ -1,5 +1,5 @@
/*
- ChibiOS/GFX - Copyright (C) 2012
+ ChibiOS/GFX - Copyright (C) 2012, 2013
Joel Bodenmann aka Tectu <joel@unormal.org>
This file is part of ChibiOS/GFX.
@@ -63,7 +63,7 @@ static const ADCConversionGroup adc_x_config = {
*
* @notapi
*/
-static __inline void init_board(void) {
+static inline void init_board(void) {
adcStart(&ADCD1, NULL);
}
@@ -73,7 +73,7 @@ static __inline void init_board(void) {
*
* @notapi
*/
-static __inline bool_t getpin_pressed(void) {
+static inline bool_t getpin_pressed(void) {
palSetPadMode(GPIOC, 0, PAL_MODE_INPUT_PULLDOWN);
palSetPadMode(GPIOC, 1, PAL_MODE_INPUT);
palSetPadMode(GPIOC, 2, PAL_MODE_INPUT);
@@ -88,7 +88,7 @@ static __inline bool_t getpin_pressed(void) {
*
* @notapi
*/
-static __inline void aquire_bus(void) {
+static inline void aquire_bus(void) {
}
@@ -97,7 +97,7 @@ static __inline void aquire_bus(void) {
*
* @notapi
*/
-static __inline void release_bus(void) {
+static inline void release_bus(void) {
}
@@ -107,7 +107,7 @@ static __inline void release_bus(void) {
*
* @notapi
*/
-static __inline uint16_t read_x_value(void) {
+static inline uint16_t read_x_value(void) {
uint16_t val1, val2;
adcsample_t samples[ADC_NUM_CHANNELS * ADC_BUF_DEPTH];
@@ -137,7 +137,7 @@ static __inline uint16_t read_x_value(void) {
*
* @notapi
*/
-static __inline uint16_t read_y_value(void) {
+static inline uint16_t read_y_value(void) {
uint16_t val1, val2;
adcsample_t samples[ADC_NUM_CHANNELS * ADC_BUF_DEPTH];
diff --git a/drivers/ginput/touch/MCU/ginput_lld_mouse_config.h b/drivers/ginput/touch/MCU/ginput_lld_mouse_config.h
index 1b5c7b6b..4515517f 100644
--- a/drivers/ginput/touch/MCU/ginput_lld_mouse_config.h
+++ b/drivers/ginput/touch/MCU/ginput_lld_mouse_config.h
@@ -1,5 +1,5 @@
/*
- ChibiOS/GFX - Copyright (C) 2012
+ ChibiOS/GFX - Copyright (C) 2012, 2013
Joel Bodenmann aka Tectu <joel@unormal.org>
This file is part of ChibiOS/GFX.
diff --git a/drivers/multiple/Win32/gdisp_lld.c b/drivers/multiple/Win32/gdisp_lld.c
index 220776d2..7311a5af 100644
--- a/drivers/multiple/Win32/gdisp_lld.c
+++ b/drivers/multiple/Win32/gdisp_lld.c
@@ -1,5 +1,5 @@
/*
- ChibiOS/GFX - Copyright (C) 2012
+ ChibiOS/GFX - Copyright (C) 2012, 2013
Joel Bodenmann aka Tectu <joel@unormal.org>
This file is part of ChibiOS/GFX.
diff --git a/drivers/multiple/Win32/gdisp_lld_config.h b/drivers/multiple/Win32/gdisp_lld_config.h
index f62b0fdb..cef06744 100644
--- a/drivers/multiple/Win32/gdisp_lld_config.h
+++ b/drivers/multiple/Win32/gdisp_lld_config.h
@@ -1,5 +1,5 @@
/*
- ChibiOS/GFX - Copyright (C) 2012
+ ChibiOS/GFX - Copyright (C) 2012, 2013
Joel Bodenmann aka Tectu <joel@unormal.org>
This file is part of ChibiOS/GFX.
diff --git a/drivers/multiple/Win32/ginput_lld_mouse_config.h b/drivers/multiple/Win32/ginput_lld_mouse_config.h
index ceeedcb9..caef69fe 100644
--- a/drivers/multiple/Win32/ginput_lld_mouse_config.h
+++ b/drivers/multiple/Win32/ginput_lld_mouse_config.h
@@ -1,5 +1,5 @@
/*
- ChibiOS/GFX - Copyright (C) 2012
+ ChibiOS/GFX - Copyright (C) 2012, 2013
Joel Bodenmann aka Tectu <joel@unormal.org>
This file is part of ChibiOS/GFX.
diff --git a/drivers/multiple/Win32/ginput_lld_toggle_config.h b/drivers/multiple/Win32/ginput_lld_toggle_config.h
index 84ebaaa2..ac348c73 100644
--- a/drivers/multiple/Win32/ginput_lld_toggle_config.h
+++ b/drivers/multiple/Win32/ginput_lld_toggle_config.h
@@ -1,5 +1,5 @@
/*
- ChibiOS/GFX - Copyright (C) 2012
+ ChibiOS/GFX - Copyright (C) 2012, 2013
Joel Bodenmann aka Tectu <joel@unormal.org>
This file is part of ChibiOS/GFX.
diff --git a/drivers/tdisp/HD44780/tdisp_lld.c b/drivers/tdisp/HD44780/tdisp_lld.c
index 6325e740..76557d1d 100644
--- a/drivers/tdisp/HD44780/tdisp_lld.c
+++ b/drivers/tdisp/HD44780/tdisp_lld.c
@@ -1,5 +1,5 @@
/*
- ChibiOS/GFX - Copyright (C) 2012
+ ChibiOS/GFX - Copyright (C) 2012, 2013
Joel Bodenmann aka Tectu <joel@unormal.org>
This file is part of ChibiOS/GFX.
diff --git a/drivers/tdisp/HD44780/tdisp_lld_board_example.h b/drivers/tdisp/HD44780/tdisp_lld_board_example.h
index ec4aa8e2..fbf3f172 100644
--- a/drivers/tdisp/HD44780/tdisp_lld_board_example.h
+++ b/drivers/tdisp/HD44780/tdisp_lld_board_example.h
@@ -1,5 +1,5 @@
/*
- ChibiOS/GFX - Copyright (C) 2012
+ ChibiOS/GFX - Copyright (C) 2012, 2013
Joel Bodenmann aka Tectu <joel@unormal.org>
This file is part of ChibiOS/GFX.
diff --git a/drivers/tdisp/HD44780/tdisp_lld_board_olimex_e407.h b/drivers/tdisp/HD44780/tdisp_lld_board_olimex_e407.h
index 311d8d9f..5c8f068c 100644
--- a/drivers/tdisp/HD44780/tdisp_lld_board_olimex_e407.h
+++ b/drivers/tdisp/HD44780/tdisp_lld_board_olimex_e407.h
@@ -1,5 +1,5 @@
/*
- ChibiOS/GFX - Copyright (C) 2012
+ ChibiOS/GFX - Copyright (C) 2012, 2013
Joel Bodenmann aka Tectu <joel@unormal.org>
This file is part of ChibiOS/GFX.
diff --git a/drivers/tdisp/HD44780/tdisp_lld_board_st_stm32f4_discovery.h b/drivers/tdisp/HD44780/tdisp_lld_board_st_stm32f4_discovery.h
index 311d8d9f..5c8f068c 100644
--- a/drivers/tdisp/HD44780/tdisp_lld_board_st_stm32f4_discovery.h
+++ b/drivers/tdisp/HD44780/tdisp_lld_board_st_stm32f4_discovery.h
@@ -1,5 +1,5 @@
/*
- ChibiOS/GFX - Copyright (C) 2012
+ ChibiOS/GFX - Copyright (C) 2012, 2013
Joel Bodenmann aka Tectu <joel@unormal.org>
This file is part of ChibiOS/GFX.