aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ginput/touch
diff options
context:
space:
mode:
authorJoel Bodenmann <joel@unormal.org>2013-03-04 23:50:21 +0100
committerJoel Bodenmann <joel@unormal.org>2013-03-04 23:50:21 +0100
commitb91e61957304aadb5af050740b89bb400f2a3983 (patch)
tree42d946f77f5f71e9de380244f04efc27e00ff593 /drivers/ginput/touch
parentfa2f4b0f1931df80dd4b63a75dffe6a1b46ec2b5 (diff)
downloaduGFX-b91e61957304aadb5af050740b89bb400f2a3983.tar.gz
uGFX-b91e61957304aadb5af050740b89bb400f2a3983.tar.bz2
uGFX-b91e61957304aadb5af050740b89bb400f2a3983.zip
__inline becomes inline because most compilers dont like the prefix
Diffstat (limited to 'drivers/ginput/touch')
-rw-r--r--drivers/ginput/touch/ADS7843/ginput_lld_mouse_board_example.h10
-rw-r--r--drivers/ginput/touch/ADS7843/ginput_lld_mouse_board_firebull_stm32f103.h10
-rw-r--r--drivers/ginput/touch/ADS7843/ginput_lld_mouse_board_olimex_stm32_e407.h10
-rw-r--r--drivers/ginput/touch/MCU/ginput_lld_mouse_board_example.h12
-rw-r--r--drivers/ginput/touch/MCU/ginput_lld_mouse_board_olimex_stm32_lcd.h12
5 files changed, 27 insertions, 27 deletions
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..a902e31e 100644
--- a/drivers/ginput/touch/ADS7843/ginput_lld_mouse_board_example.h
+++ b/drivers/ginput/touch/ADS7843/ginput_lld_mouse_board_example.h
@@ -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..5100c81f 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
@@ -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..fd9cbfea 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
@@ -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/MCU/ginput_lld_mouse_board_example.h b/drivers/ginput/touch/MCU/ginput_lld_mouse_board_example.h
index 913d50c9..6569e4ce 100644
--- a/drivers/ginput/touch/MCU/ginput_lld_mouse_board_example.h
+++ b/drivers/ginput/touch/MCU/ginput_lld_mouse_board_example.h
@@ -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..4b53ecdd 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
@@ -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];