Merge pull request #19 from Tectu/master

Merge Textu Changes

13 files changed, 40 insertions, 40 deletions

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.