Merge branch 'master' into SSD2119

27 files changed, 125 insertions, 609 deletions

diff --git a/drivers/gdisp/ILI9320/gdisp_lld.c b/drivers/gdisp/ILI9320/gdisp_lld.c
index 202f06dd..6a324cd4 100644
--- a/drivers/gdisp/ILI9320/gdisp_lld.c
+++ b/drivers/gdisp/ILI9320/gdisp_lld.c
@@ -81,28 +81,28 @@ static __inline void lld_lcdDelay(uint16_t us) {
 }

 

 static __inline void lld_lcdWriteIndex(uint16_t index) {

-	GDISP_LLD(write_index)(index);

+	lld_gdisp_write_index(index);

 }

 

 static __inline void lld_lcdWriteData(uint16_t data) {

-	GDISP_LLD(write_data)(data);

+	lld_gdisp_write_data(data);

 }

 

 static __inline void lld_lcdWriteReg(uint16_t lcdReg, uint16_t lcdRegValue) {

-	GDISP_LLD(write_index)(lcdReg);

-	GDISP_LLD(write_data)(lcdRegValue);

+	lld_gdisp_write_index(lcdReg);

+	lld_gdisp_write_data(lcdRegValue);

 }

 

 static __inline uint16_t lld_lcdReadData(void) {

 	/* fix this! */

-	//return GDISP_LLD(read_data);

+	//return lld_gdisp_read_data;

 	return GDISP_RAM;

 }

 

 static __inline uint16_t lld_lcdReadReg(uint16_t lcdReg) {

     volatile uint16_t dummy;

 

-    GDISP_LLD(write_index)(lcdReg);

+    lld_gdisp_write_index(lcdReg);

     dummy = lld_lcdReadData();

     (void)dummy;

 

@@ -143,14 +143,14 @@ static __inline void lld_lcdReadStream(uint16_t *buffer, size_t size) {
 		buffer[i] = lld_lcdReadData();

 }

 

-bool_t GDISP_LLD(init)(void) {

+bool_t lld_gdisp_init(void) {

 	/* Initialise your display */

-	GDISP_LLD(init_board)();

+	lld_gdisp_init_board();

 

 	/* Hardware reset */

-	GDISP_LLD(setpin_reset)(TRUE);

+	lld_gdisp_reset_pin(TRUE);

 	lld_lcdDelay(1000);

-	GDISP_LLD(setpin_reset)(FALSE);

+	lld_gdisp_reset_pin(FALSE);

 	lld_lcdDelay(1000);

 

     DISPLAY_CODE = lld_lcdReadReg(0);

@@ -215,7 +215,7 @@ bool_t GDISP_LLD(init)(void) {
     lld_lcdWriteReg(0x0007, 0x0173); //display On

 

 	// Turn on the backlight

-	GDISP_LLD(set_backlight)(GDISP_INITIAL_BACKLIGHT);

+	lld_gdisp_backlight(GDISP_INITIAL_BACKLIGHT);

 	

     /* Initialise the GDISP structure */

     GDISP.Width = GDISP_SCREEN_WIDTH;

@@ -298,7 +298,7 @@ static __inline void lld_lcdResetViewPort(void) {
     }

 }

 

-void GDISP_LLD(drawpixel)(coord_t x, coord_t y, color_t color) {

+void lld_gdisp_draw_pixel(coord_t x, coord_t y, color_t color) {

     #if GDISP_NEED_VALIDATION || GDISP_NEED_CLIP

         if (x < GDISP.clipx0 || y < GDISP.clipy0 || x >= GDISP.clipx1 || y >= GDISP.clipy1) return;

     #endif

@@ -307,7 +307,7 @@ void GDISP_LLD(drawpixel)(coord_t x, coord_t y, color_t color) {
 }

 

 #if GDISP_HARDWARE_CLEARS || defined(__DOXYGEN__)

-	void GDISP_LLD(clear)(color_t color) {

+	void lld_gdisp_clear(color_t color) {

 	    unsigned i;

 

 	    lld_lcdSetCursor(0, 0);

@@ -321,7 +321,7 @@ void GDISP_LLD(drawpixel)(coord_t x, coord_t y, color_t color) {
 #endif

 

 #if GDISP_HARDWARE_FILLS || defined(__DOXYGEN__)

-	void GDISP_LLD(fillarea)(coord_t x, coord_t y, coord_t cx, coord_t cy, color_t color) {

+	void lld_gdisp_fill_area(coord_t x, coord_t y, coord_t cx, coord_t cy, color_t color) {

 		#if GDISP_NEED_VALIDATION || GDISP_NEED_CLIP

 			if (x < GDISP.clipx0) { cx -= GDISP.clipx0 - x; x = GDISP.clipx0; }

 			if (y < GDISP.clipy0) { cy -= GDISP.clipy0 - y; y = GDISP.clipy0; }

@@ -343,7 +343,7 @@ void GDISP_LLD(drawpixel)(coord_t x, coord_t y, color_t color) {
 #endif

 

 #if GDISP_HARDWARE_BITFILLS || defined(__DOXYGEN__)

-	void GDISP_LLD(blitareaex)(coord_t x, coord_t y, coord_t cx, coord_t cy, coord_t srcx, coord_t srcy, coord_t srccx, const pixel_t *buffer) {

+	void lld_gdisp_blit_area_ex(coord_t x, coord_t y, coord_t cx, coord_t cy, coord_t srcx, coord_t srcy, coord_t srccx, const pixel_t *buffer) {

 		coord_t endx, endy;

 		unsigned lg;

 

@@ -372,7 +372,7 @@ void GDISP_LLD(drawpixel)(coord_t x, coord_t y, color_t color) {
 #endif

 

 #if (GDISP_NEED_PIXELREAD && GDISP_HARDWARE_PIXELREAD) || defined(__DOXYGEN__)

-	color_t GDISP_LLD(getpixelcolor)(coord_t x, coord_t y) {

+	color_t lld_gdisp_get_pixel_color(coord_t x, coord_t y) {

 		color_t color;

 

 		#if GDISP_NEED_VALIDATION || GDISP_NEED_CLIP

@@ -392,7 +392,7 @@ void GDISP_LLD(drawpixel)(coord_t x, coord_t y, color_t color) {
 #endif

 

 #if (GDISP_NEED_SCROLL && GDISP_HARDWARE_SCROLL) || defined(__DOXYGEN__)

-	void GDISP_LLD(verticalscroll)(coord_t x, coord_t y, coord_t cx, coord_t cy, int lines, color_t bgcolor) {

+	void lld_gdisp_vertical_scroll(coord_t x, coord_t y, coord_t cx, coord_t cy, int lines, color_t bgcolor) {

 		static color_t buf[((GDISP_SCREEN_HEIGHT > GDISP_SCREEN_WIDTH ) ? GDISP_SCREEN_HEIGHT : GDISP_SCREEN_WIDTH)];

 		coord_t row0, row1;

 		unsigned i, gap, abslines;

@@ -445,7 +445,7 @@ void GDISP_LLD(drawpixel)(coord_t x, coord_t y, color_t color) {
 #endif

 

 #if (GDISP_NEED_CONTROL && GDISP_HARDWARE_CONTROL) || defined(__DOXYGEN__)

-	void GDISP_LLD(control)(unsigned what, void *value) {

+	void lld_gdisp_control(unsigned what, void *value) {

 		switch(what) {

 			case GDISP_CONTROL_POWER:

 				if(GDISP.Powermode == (gdisp_powermode_t)value)

@@ -457,7 +457,7 @@ void GDISP_LLD(drawpixel)(coord_t x, coord_t y, color_t color) {
 						lld_lcdWriteReg(0x0011, 0x0000);

 						lld_lcdWriteReg(0x0012, 0x0000);

 						lld_lcdWriteReg(0x0013, 0x0000);

-						GDISP_LLD(set_backlight)(0);

+						lld_gdisp_backlight(0);

 						break;

 			

 					case powerOn:

@@ -476,9 +476,9 @@ void GDISP_LLD(drawpixel)(coord_t x, coord_t y, color_t color) {
 						lld_lcdWriteReg(0x0029, 0x0009); /* VCM[4:0] for VCOMH */

 						lld_lcdDelay(500);

 						lld_lcdWriteReg(0x0007, 0x0173); /* 262K color and display ON */	

-						GDISP_LLD(set_backlight)(GDISP.Backlight);

+						lld_gdisp_backlight(GDISP.Backlight);

 						if(GDISP.Powermode != powerSleep || GDISP.Powermode != powerDeepSleep)

-							GDISP_LLD(init)();

+							lld_gdisp_init();

 						break;

 	

 					case powerSleep:

@@ -489,7 +489,7 @@ void GDISP_LLD(drawpixel)(coord_t x, coord_t y, color_t color) {
 	                  	lld_lcdWriteReg(0x0013, 0x0000); /* VDV[4:0] for VCOM amplitude */

 	                  	lld_lcdDelay(2000); /* Dis-charge capacitor power voltage */

 	                   	lld_lcdWriteReg(0x0010, 0x0002); /* SAP, BT[3:0], APE, AP, DSTB, SLP */				

-						GDISP_LLD(set_backlight)(0);

+						lld_gdisp_backlight(0);

 						break;

 

 					case powerDeepSleep:

@@ -500,7 +500,7 @@ void GDISP_LLD(drawpixel)(coord_t x, coord_t y, color_t color) {
 	   					lld_lcdWriteReg(0x0013, 0x0000); /* VDV[4:0] for VCOM amplitude */

 	   					lld_lcdDelay(2000); /* Dis-charge capacitor power voltage */

 	  					lld_lcdWriteReg(0x0010, 0x0004); /* SAP, BT[3:0], APE, AP, DSTB, SLP */

-						GDISP_LLD(set_backlight)(0);

+						lld_gdisp_backlight(0);

 						break;

 

 					default:

@@ -554,7 +554,7 @@ void GDISP_LLD(drawpixel)(coord_t x, coord_t y, color_t color) {
 

 			case GDISP_CONTROL_BACKLIGHT:

 				if((unsigned)value > 100) value = (void *)100;

-				GDISP_LLD(set_backlight)((unsigned)value);

+				lld_gdisp_backlight((unsigned)value);

 				GDISP.Backlight = (unsigned)value;

 				break;

 			

diff --git a/drivers/gdisp/ILI9320/gdisp_lld_board_example.h b/drivers/gdisp/ILI9320/gdisp_lld_board_example.h
index a79e557b..f07b34c6 100644
--- a/drivers/gdisp/ILI9320/gdisp_lld_board_example.h
+++ b/drivers/gdisp/ILI9320/gdisp_lld_board_example.h
@@ -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 lld_gdisp_init_board(void) {

 	#error "ILI9320: You must implement the init_board routine for your board"

 }

 

-static __inline void GDISP_LLD(setpin_reset)(bool_t state) {

+static __inline void lld_gdisp_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 lld_gdisp_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 lld_gdisp_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 lld_gdisp_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(set_backlight)(uint8_t percentage) {

+static __inline uint16_t lld_gdisp_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 a6d9d631..d2d54ce9 100644
--- a/drivers/gdisp/ILI9320/gdisp_lld_board_olimex_stm32_lcd.h
+++ b/drivers/gdisp/ILI9320/gdisp_lld_board_olimex_stm32_lcd.h
@@ -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 lld_gdisp_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(setpin_reset)(bool_t state) {

+static __inline void lld_gdisp_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 lld_gdisp_write_index(uint16_t reg) {

 	GDISP_REG = reg;

 }

 

-static __inline void GDISP_LLD(write_data)(uint16_t data) {

+static __inline void lld_gdisp_write_data(uint16_t data) {

 	GDISP_RAM = data;

 }

 

-static __inline uint16_t GDISP_LLD(read_data)(void) {

+static __inline uint16_t lld_gdisp_read_data(void) {

 	return GDISP_RAM;

 }

 

-static __inline void GDISP_LLD(set_backlight)(uint8_t percent) {

+static __inline void lld_gdisp_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 d55f2115..1606ce95 100644
--- a/drivers/gdisp/ILI9320/gdisp_lld_config.h
+++ b/drivers/gdisp/ILI9320/gdisp_lld_config.h
@@ -36,7 +36,6 @@
 /*===========================================================================*/

 

 #define GDISP_DRIVER_NAME				"ILI9320"

-#define GDISP_LLD(x)					gdisp_lld_##x##_ILI9320

 

 #define GDISP_HARDWARE_CLEARS			TRUE

 #define GDISP_HARDWARE_FILLS			TRUE

diff --git a/drivers/gdisp/ILI9325/gdisp_lld.c b/drivers/gdisp/ILI9325/gdisp_lld.c
index 42b03d74..e9500cc5 100644
--- a/drivers/gdisp/ILI9325/gdisp_lld.c
+++ b/drivers/gdisp/ILI9325/gdisp_lld.c
@@ -81,28 +81,28 @@ static __inline void lld_lcdDelay(uint16_t us) {
 }

 

 static __inline void lld_lcdWriteIndex(uint16_t index) {

-	GDISP_LLD(write_index)(index);

+	lld_gdisp_write_index(index);

 }

 

 static __inline void lld_lcdWriteData(uint16_t data) {

-	GDISP_LLD(write_data)(data);

+	lld_gdisp_write_data(data);

 }

 

 static __inline void lld_lcdWriteReg(uint16_t lcdReg, uint16_t lcdRegValue) {

-	GDISP_LLD(write_index)(lcdReg);

-	GDISP_LLD(write_data)(lcdRegValue);

+	lld_gdisp_write_index(lcdReg);

+	lld_gdisp_write_data(lcdRegValue);

 }

 

 static __inline uint16_t lld_lcdReadData(void) {

 	/* fix this! */

-	//return GDISP_LLD(read_data);

+	//return lld_gdisp_read_data;

 	return GDISP_RAM;

 }

 

 static __inline uint16_t lld_lcdReadReg(uint16_t lcdReg) {

     volatile uint16_t dummy;

 

-    GDISP_LLD(write_index)(lcdReg);

+    lld_gdisp_write_index(lcdReg);

     dummy = lld_lcdReadData();

     (void)dummy;

 

@@ -143,14 +143,14 @@ static __inline void lld_lcdReadStream(uint16_t *buffer, size_t size) {
 		buffer[i] = lld_lcdReadData();

 }

 

-bool_t GDISP_LLD(init)(void) {

+bool_t lld_gdisp_init(void) {

 	/* Initialise your display */

-	GDISP_LLD(init_board)();

+	lld_gdisp_init_board();

 

 	/* Hardware reset */

-	GDISP_LLD(setpin_reset)(TRUE);

+	lld_gdisp_reset_pin(TRUE);

 	lld_lcdDelay(1000);

-	GDISP_LLD(setpin_reset)(FALSE);

+	lld_gdisp_reset_pin(FALSE);

 	lld_lcdDelay(1000);

 

 	// chinese code starts here

@@ -210,7 +210,7 @@ bool_t GDISP_LLD(init)(void) {
 	// chinese code ends here

 

 	// Turn on the backlight

-	GDISP_LLD(set_backlight)(GDISP_INITIAL_BACKLIGHT);

+	lld_gdisp_backlight(GDISP_INITIAL_BACKLIGHT);

 	

     /* Initialise the GDISP structure */

     GDISP.Width = GDISP_SCREEN_WIDTH;

@@ -302,7 +302,7 @@ static __inline void lld_lcdResetViewPort(void) {
     }

 }

 

-void GDISP_LLD(drawpixel)(coord_t x, coord_t y, color_t color) {

+void lld_gdisp_draw_pixel(coord_t x, coord_t y, color_t color) {

     #if GDISP_NEED_VALIDATION || GDISP_NEED_CLIP

         if (x < GDISP.clipx0 || y < GDISP.clipy0 || x >= GDISP.clipx1 || y >= GDISP.clipy1) return;

     #endif

@@ -311,7 +311,7 @@ void GDISP_LLD(drawpixel)(coord_t x, coord_t y, color_t color) {
 }

 

 #if GDISP_HARDWARE_CLEARS || defined(__DOXYGEN__)

-	void GDISP_LLD(clear)(color_t color) {

+	void lld_gdisp_clear(color_t color) {

 	    unsigned i;

 

 	    lld_lcdSetCursor(0, 0);

@@ -325,7 +325,7 @@ void GDISP_LLD(drawpixel)(coord_t x, coord_t y, color_t color) {
 #endif

 

 #if GDISP_HARDWARE_FILLS || defined(__DOXYGEN__)

-	void GDISP_LLD(fillarea)(coord_t x, coord_t y, coord_t cx, coord_t cy, color_t color) {

+	void lld_gdisp_fill_area(coord_t x, coord_t y, coord_t cx, coord_t cy, color_t color) {

 		#if GDISP_NEED_VALIDATION || GDISP_NEED_CLIP

 			if (x < GDISP.clipx0) { cx -= GDISP.clipx0 - x; x = GDISP.clipx0; }

 			if (y < GDISP.clipy0) { cy -= GDISP.clipy0 - y; y = GDISP.clipy0; }

@@ -347,7 +347,7 @@ void GDISP_LLD(drawpixel)(coord_t x, coord_t y, color_t color) {
 #endif

 

 #if GDISP_HARDWARE_BITFILLS || defined(__DOXYGEN__)

-	void GDISP_LLD(blitareaex)(coord_t x, coord_t y, coord_t cx, coord_t cy, coord_t srcx, coord_t srcy, coord_t srccx, const pixel_t *buffer) {

+	void lld_gdisp_blit_area_ex(coord_t x, coord_t y, coord_t cx, coord_t cy, coord_t srcx, coord_t srcy, coord_t srccx, const pixel_t *buffer) {

 		coord_t endx, endy;

 		unsigned lg;

 

@@ -376,7 +376,7 @@ void GDISP_LLD(drawpixel)(coord_t x, coord_t y, color_t color) {
 #endif

 

 #if (GDISP_NEED_PIXELREAD && GDISP_HARDWARE_PIXELREAD) || defined(__DOXYGEN__)

-	color_t GDISP_LLD(getpixelcolor)(coord_t x, coord_t y) {

+	color_t lld_gdisp_get_pixel_color(coord_t x, coord_t y) {

 		color_t color;

 

 		#if GDISP_NEED_VALIDATION || GDISP_NEED_CLIP

@@ -396,7 +396,7 @@ void GDISP_LLD(drawpixel)(coord_t x, coord_t y, color_t color) {
 #endif

 

 #if (GDISP_NEED_SCROLL && GDISP_HARDWARE_SCROLL) || defined(__DOXYGEN__)

-	void GDISP_LLD(verticalscroll)(coord_t x, coord_t y, coord_t cx, coord_t cy, int lines, color_t bgcolor) {

+	void lld_gdisp_vertical_scroll(coord_t x, coord_t y, coord_t cx, coord_t cy, int lines, color_t bgcolor) {

 		static color_t buf[((GDISP_SCREEN_HEIGHT > GDISP_SCREEN_WIDTH ) ? GDISP_SCREEN_HEIGHT : GDISP_SCREEN_WIDTH)];

 		coord_t row0, row1;

 		unsigned i, gap, abslines;

@@ -449,7 +449,7 @@ void GDISP_LLD(drawpixel)(coord_t x, coord_t y, color_t color) {
 #endif

 

 #if (GDISP_NEED_CONTROL && GDISP_HARDWARE_CONTROL) || defined(__DOXYGEN__)

-	void GDISP_LLD(control)(unsigned what, void *value) {

+	void lld_gdisp_control(unsigned what, void *value) {

 		switch(what) {

 			case GDISP_CONTROL_POWER:

 				if(GDISP.Powermode == (gdisp_powermode_t)value)

@@ -461,7 +461,7 @@ void GDISP_LLD(drawpixel)(coord_t x, coord_t y, color_t color) {
 						lld_lcdWriteReg(0x0011, 0x0000);

 						lld_lcdWriteReg(0x0012, 0x0000);

 						lld_lcdWriteReg(0x0013, 0x0000);

-						GDISP_LLD(set_backlight)(0);

+						lld_gdisp_backlight(0);

 						break;

 			

 					case powerOn:

@@ -480,9 +480,9 @@ void GDISP_LLD(drawpixel)(coord_t x, coord_t y, color_t color) {
 						lld_lcdWriteReg(0x0029, 0x0009); /* VCM[4:0] for VCOMH */

 						lld_lcdDelay(500);

 						lld_lcdWriteReg(0x0007, 0x0173); /* 262K color and display ON */	

-						GDISP_LLD(set_backlight)(GDISP.Backlight);

+						lld_gdisp_backlight(GDISP.Backlight);

 						if(GDISP.Powermode != powerSleep || GDISP.Powermode != powerDeepSleep)

-							GDISP_LLD(init)();

+							lld_gdisp_init();

 						break;

 	

 					case powerSleep:

@@ -493,7 +493,7 @@ void GDISP_LLD(drawpixel)(coord_t x, coord_t y, color_t color) {
 	                  	lld_lcdWriteReg(0x0013, 0x0000); /* VDV[4:0] for VCOM amplitude */

 	                  	lld_lcdDelay(2000); /* Dis-charge capacitor power voltage */

 	                   	lld_lcdWriteReg(0x0010, 0x0002); /* SAP, BT[3:0], APE, AP, DSTB, SLP */				

-						GDISP_LLD(set_backlight)(0);

+						lld_gdisp_backlight(0);

 						break;

 

 					case powerDeepSleep:

@@ -504,7 +504,7 @@ void GDISP_LLD(drawpixel)(coord_t x, coord_t y, color_t color) {
 	   					lld_lcdWriteReg(0x0013, 0x0000); /* VDV[4:0] for VCOM amplitude */

 	   					lld_lcdDelay(2000); /* Dis-charge capacitor power voltage */

 	  					lld_lcdWriteReg(0x0010, 0x0004); /* SAP, BT[3:0], APE, AP, DSTB, SLP */

-						GDISP_LLD(set_backlight)(0);

+						lld_gdisp_backlight(0);

 						break;

 

 					default:

@@ -564,7 +564,7 @@ void GDISP_LLD(drawpixel)(coord_t x, coord_t y, color_t color) {
 

 			case GDISP_CONTROL_BACKLIGHT:

 				if((unsigned)value > 100) value = (void *)100;

-				GDISP_LLD(set_backlight)((unsigned)value);

+				lld_gdisp_backlight((unsigned)value);

 				GDISP.Backlight = (unsigned)value;

 				break;

 			

diff --git a/drivers/gdisp/ILI9325/gdisp_lld_board_example.h b/drivers/gdisp/ILI9325/gdisp_lld_board_example.h
index 7b537dcd..547952ee 100644
--- a/drivers/gdisp/ILI9325/gdisp_lld_board_example.h
+++ b/drivers/gdisp/ILI9325/gdisp_lld_board_example.h
@@ -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 lld_gdisp_init_board(void) {

 	#error "ILI9325: You must implement the init_board routine for your board"

 }

 

-static __inline void GDISP_LLD(setpin_reset)(bool_t state) {

+static __inline void lld_gdisp_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 lld_gdisp_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 lld_gdisp_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 lld_gdisp_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(set_backlight)(uint8_t percentage) {

+static __inline uint16_t lld_gdisp_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 e785ad10..94d418b0 100644
--- a/drivers/gdisp/ILI9325/gdisp_lld_board_hy_stm32_100p.h
+++ b/drivers/gdisp/ILI9325/gdisp_lld_board_hy_stm32_100p.h
@@ -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 lld_gdisp_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(setpin_reset)(bool_t state) {

+static __inline void lld_gdisp_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 lld_gdisp_write_index(uint16_t reg) {

 	GDISP_REG = reg;

 }

 

-static __inline void GDISP_LLD(write_data)(uint16_t data) {

+static __inline void lld_gdisp_write_data(uint16_t data) {

 	GDISP_RAM = data;

 }

 

-static __inline uint16_t GDISP_LLD(read_data)(void) {

+static __inline uint16_t lld_gdisp_read_data(void) {

 	return GDISP_RAM;

 }

 

-static __inline void GDISP_LLD(set_backlight)(uint8_t percent) {

+static __inline void lld_gdisp_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 44f8323f..414fc05e 100644
--- a/drivers/gdisp/ILI9325/gdisp_lld_config.h
+++ b/drivers/gdisp/ILI9325/gdisp_lld_config.h
@@ -36,7 +36,6 @@
 /*===========================================================================*/

 

 #define GDISP_DRIVER_NAME				"ILI9325"

-#define GDISP_LLD(x)					gdisp_lld_##x##_ILI9325

 

 #define GDISP_HARDWARE_CLEARS			TRUE

 #define GDISP_HARDWARE_FILLS			TRUE

diff --git a/drivers/gdisp/Nokia6610GE12/gdisp_lld.c b/drivers/gdisp/Nokia6610GE12/gdisp_lld.c
index 7e5e1215..6ce7b581 100644
--- a/drivers/gdisp/Nokia6610GE12/gdisp_lld.c
+++ b/drivers/gdisp/Nokia6610GE12/gdisp_lld.c
@@ -113,7 +113,7 @@ static __inline void setviewport(coord_t x, coord_t y, coord_t cx, coord_t cy) {
  *

  * @notapi

  */

-bool_t GDISP_LLD(init)(void) {

+bool_t lld_gdisp_init(void) {

 	/* Initialise your display */

 	init_board();

 

@@ -219,7 +219,7 @@ bool_t GDISP_LLD(init)(void) {
  *

  * @notapi

  */

-void GDISP_LLD(drawpixel)(coord_t x, coord_t y, color_t color) {

+void lld_gdisp_draw_pixel(coord_t x, coord_t y, color_t color) {

 	#if GDISP_NEED_VALIDATION || GDISP_NEED_CLIP

 		if (x < GDISP.clipx0 || y < GDISP.clipy0 || x >= GDISP.clipx1 || y >= GDISP.clipy1) return;

 	#endif

@@ -241,7 +241,7 @@ void GDISP_LLD(drawpixel)(coord_t x, coord_t y, color_t color) {
 	 *

 	 * @notapi

 	 */

-	void GDISP_LLD(fillarea)(coord_t x, coord_t y, coord_t cx, coord_t cy, color_t color) {

+	void lld_gdisp_fill_area(coord_t x, coord_t y, coord_t cx, coord_t cy, color_t color) {

 		unsigned i, tuples;

 

 		#if GDISP_NEED_VALIDATION || GDISP_NEED_CLIP

@@ -276,7 +276,7 @@ void GDISP_LLD(drawpixel)(coord_t x, coord_t y, color_t color) {
 	 *

 	 * @notapi

 	 */

-	void GDISP_LLD(blitareaex)(coord_t x, coord_t y, coord_t cx, coord_t cy, coord_t srcx, coord_t srcy, coord_t srccx, const pixel_t *buffer) {

+	void lld_gdisp_blit_area_ex(coord_t x, coord_t y, coord_t cx, coord_t cy, coord_t srcx, coord_t srcy, coord_t srccx, const pixel_t *buffer) {

 		coord_t endx, endy, lg;

 		color_t	c1, c2;

 		#if GDISP_PACKED_PIXELS

@@ -386,7 +386,7 @@ void GDISP_LLD(drawpixel)(coord_t x, coord_t y, color_t color) {
 	 *

 	 * @notapi

 	 */

-	color_t GDISP_LLD(getpixelcolor)(coord_t x, coord_t y) {

+	color_t lld_gdisp_get_pixel_color(coord_t x, coord_t y) {

 		/* NOT IMPLEMENTED */

 		/* Some board hardware might support this in the future.

 		 * The Olimex board doesn't.

@@ -407,7 +407,7 @@ void GDISP_LLD(drawpixel)(coord_t x, coord_t y, color_t color) {
 	 *

 	 * @notapi

 	 */

-	void GDISP_LLD(verticalscroll)(coord_t x, coord_t y, coord_t cx, coord_t cy, int lines, color_t bgcolor) {

+	void lld_gdisp_vertical_scroll(coord_t x, coord_t y, coord_t cx, coord_t cy, int lines, color_t bgcolor) {

 		/* NOT IMPLEMENTED */

 		/* The hardware seems capable of doing this.

 		 * It is just really complex so we leave it out for now.

@@ -435,7 +435,7 @@ void GDISP_LLD(drawpixel)(coord_t x, coord_t y, color_t color) {
 	 *

 	 * @notapi

 	 */

-	void GDISP_LLD(control)(unsigned what, void *value) {

+	void lld_gdisp_control(unsigned what, void *value) {

 		/* The hardware is capable of supporting...

 		 * 	GDISP_CONTROL_POWER				- not implemented yet

 		 * 	GDISP_CONTROL_ORIENTATION		- not implemented yet

@@ -456,7 +456,7 @@ void GDISP_LLD(drawpixel)(coord_t x, coord_t y, color_t color) {
 					// 	Code here

 					/* You may need this ---

 					 *	if (GDISP.Powermode != powerSleep)

-					 *		GDISP_LLD(init)();

+					 *		lld_gdisp_init();

 					 */

 					break;

 				case powerSleep:

diff --git a/drivers/gdisp/Nokia6610GE12/gdisp_lld_config.h b/drivers/gdisp/Nokia6610GE12/gdisp_lld_config.h
index ab9d35e7..9db24e26 100644
--- a/drivers/gdisp/Nokia6610GE12/gdisp_lld_config.h
+++ b/drivers/gdisp/Nokia6610GE12/gdisp_lld_config.h
@@ -36,7 +36,6 @@
 /*===========================================================================*/

 

 #define GDISP_DRIVER_NAME				"Nokia6610GE12"

-#define GDISP_LLD(x)					gdisp_lld_##x##_Nokia6610GE12

 

 #define GDISP_HARDWARE_FILLS			TRUE

 #define GDISP_HARDWARE_BITFILLS			TRUE

diff --git a/drivers/gdisp/Nokia6610GE8/gdisp_lld.c b/drivers/gdisp/Nokia6610GE8/gdisp_lld.c
index beba41a9..006c964b 100644
--- a/drivers/gdisp/Nokia6610GE8/gdisp_lld.c
+++ b/drivers/gdisp/Nokia6610GE8/gdisp_lld.c
@@ -112,7 +112,7 @@ static __inline void setviewport(coord_t x, coord_t y, coord_t cx, coord_t cy) {
  *

  * @notapi

  */

-bool_t GDISP_LLD(init)(void) {

+bool_t lld_gdisp_init(void) {

 	/* Initialise your display */

 	init_board();

 

@@ -174,7 +174,7 @@ bool_t GDISP_LLD(init)(void) {
  *

  * @notapi

  */

-void GDISP_LLD(drawpixel)(coord_t x, coord_t y, color_t color) {

+void lld_gdisp_draw_pixel(coord_t x, coord_t y, color_t color) {

 	#if GDISP_NEED_VALIDATION || GDISP_NEED_CLIP

 		if (x < GDISP.clipx0 || y < GDISP.clipy0 || x >= GDISP.clipx1 || y >= GDISP.clipy1) return;

 	#endif

@@ -196,7 +196,7 @@ void GDISP_LLD(drawpixel)(coord_t x, coord_t y, color_t color) {
 	 *

 	 * @notapi

 	 */

-	void GDISP_LLD(fillarea)(coord_t x, coord_t y, coord_t cx, coord_t cy, color_t color) {

+	void lld_gdisp_fill_area(coord_t x, coord_t y, coord_t cx, coord_t cy, color_t color) {

 		unsigned i, tuples;

 

 		#if GDISP_NEED_VALIDATION || GDISP_NEED_CLIP

@@ -231,7 +231,7 @@ void GDISP_LLD(drawpixel)(coord_t x, coord_t y, color_t color) {
 	 *

 	 * @notapi

 	 */

-	void GDISP_LLD(blitareaex)(coord_t x, coord_t y, coord_t cx, coord_t cy, coord_t srcx, coord_t srcy, coord_t srccx, const pixel_t *buffer) {

+	void lld_gdisp_blit_area_ex(coord_t x, coord_t y, coord_t cx, coord_t cy, coord_t srcx, coord_t srcy, coord_t srccx, const pixel_t *buffer) {

 		coord_t endx, endy, lg;

 		color_t	c1, c2;

 		#if GDISP_PACKED_PIXELS

@@ -341,7 +341,7 @@ void GDISP_LLD(drawpixel)(coord_t x, coord_t y, color_t color) {
 	 *

 	 * @notapi

 	 */

-	color_t GDISP_LLD(getpixelcolor)(coord_t x, coord_t y) {

+	color_t lld_gdisp_get_pixel_color(coord_t x, coord_t y) {

 		/* NOT IMPLEMENTED */

 		/* Some board hardware might support this in the future.

 		 * The Olimex board doesn't.

@@ -362,7 +362,7 @@ void GDISP_LLD(drawpixel)(coord_t x, coord_t y, color_t color) {
 	 *

 	 * @notapi

 	 */

-	void GDISP_LLD(verticalscroll)(coord_t x, coord_t y, coord_t cx, coord_t cy, int lines, color_t bgcolor) {

+	void lld_gdisp_vertical_scroll(coord_t x, coord_t y, coord_t cx, coord_t cy, int lines, color_t bgcolor) {

 		/* NOT IMPLEMENTED */

 		/* The hardware seems capable of doing this.

 		 * It is just really complex so we leave it out for now.

@@ -390,7 +390,7 @@ void GDISP_LLD(drawpixel)(coord_t x, coord_t y, color_t color) {
 	 *

 	 * @notapi

 	 */

-	void GDISP_LLD(control)(unsigned what, void *value) {

+	void lld_gdisp_control(unsigned what, void *value) {

 		/* The hardware is capable of supporting...

 		 * 	GDISP_CONTROL_POWER				- not implemented yet

 		 * 	GDISP_CONTROL_ORIENTATION		- not implemented yet

@@ -411,7 +411,7 @@ void GDISP_LLD(drawpixel)(coord_t x, coord_t y, color_t color) {
 					// 	Code here

 					/* You may need this ---

 					 *	if (GDISP.Powermode != powerSleep)

-					 *		GDISP_LLD(init)();

+					 *		lld_gdisp_init();

 					 */

 					break;

 				case powerSleep:

diff --git a/drivers/gdisp/Nokia6610GE8/gdisp_lld_config.h b/drivers/gdisp/Nokia6610GE8/gdisp_lld_config.h
index 87bdb824..c50e26f1 100644
--- a/drivers/gdisp/Nokia6610GE8/gdisp_lld_config.h
+++ b/drivers/gdisp/Nokia6610GE8/gdisp_lld_config.h
@@ -36,7 +36,6 @@
 /*===========================================================================*/

 

 #define GDISP_DRIVER_NAME				"Nokia6610GE8"

-#define GDISP_LLD(x)					gdisp_lld_##x##_Nokia6610GE8

 

 #define GDISP_HARDWARE_FILLS			TRUE

 #define GDISP_HARDWARE_BITFILLS			TRUE

diff --git a/drivers/gdisp/S6D1121/gdisp_lld.c b/drivers/gdisp/S6D1121/gdisp_lld.c
index e690456a..863e5e46 100644
--- a/drivers/gdisp/S6D1121/gdisp_lld.c
+++ b/drivers/gdisp/S6D1121/gdisp_lld.c
@@ -150,7 +150,7 @@ static __inline void reset_viewport(void) {
 	}

 }

 

-bool_t GDISP_LLD(init)(void) {

+bool_t lld_gdisp_init(void) {

 	/* initialize the hardware */

 	init_board();

 

@@ -255,7 +255,7 @@ bool_t GDISP_LLD(init)(void) {
  *

  * @notapi

  */

-void GDISP_LLD(drawpixel)(coord_t x, coord_t y, color_t color) {

+void lld_gdisp_draw_pixel(coord_t x, coord_t y, color_t color) {

 	#if GDISP_NEED_VALIDATION || GDISP_NEED_CLIP

 		if (x < GDISP.clipx0 || y < GDISP.clipy0 || x >= GDISP.clipx1 || y >= GDISP.clipy1) return;

 	#endif

@@ -277,7 +277,7 @@ void GDISP_LLD(drawpixel)(coord_t x, coord_t y, color_t color) {
 	 *

 	 * @notapi

 	 */

-	void GDISP_LLD(clear)(color_t color) {

+	void lld_gdisp_clear(color_t color) {

 	    unsigned i;

 

 		acquire_bus();

@@ -303,7 +303,7 @@ void GDISP_LLD(drawpixel)(coord_t x, coord_t y, color_t color) {
 	 *

 	 * @notapi

 	 */

-	void GDISP_LLD(fillarea)(coord_t x, coord_t y, coord_t cx, coord_t cy, color_t color) {

+	void lld_gdisp_fill_area(coord_t x, coord_t y, coord_t cx, coord_t cy, color_t color) {

 		unsigned i, area;

 

 		#if GDISP_NEED_VALIDATION || GDISP_NEED_CLIP

@@ -339,7 +339,7 @@ void GDISP_LLD(drawpixel)(coord_t x, coord_t y, color_t color) {
 	 *

 	 * @notapi

 	 */

-	void GDISP_LLD(blitareaex)(coord_t x, coord_t y, coord_t cx, coord_t cy, coord_t srcx, coord_t srcy, coord_t srccx, const pixel_t *buffer) {

+	void lld_gdisp_blit_area_ex(coord_t x, coord_t y, coord_t cx, coord_t cy, coord_t srcx, coord_t srcy, coord_t srccx, const pixel_t *buffer) {

 		coord_t endx, endy;

 		unsigned lg;

 

@@ -379,7 +379,7 @@ void GDISP_LLD(drawpixel)(coord_t x, coord_t y, color_t color) {
 	 *

 	 * @notapi

 	 */

-	color_t GDISP_LLD(getpixelcolor)(coord_t x, coord_t y) {

+	color_t lld_gdisp_get_pixel_color(coord_t x, coord_t y) {

 		/* This routine is marked "DO NOT USE" in the original

 		 *  GLCD driver. We just keep our GDISP_HARDWARE_READPIXEL

 		 *  turned off for now.

@@ -418,7 +418,7 @@ void GDISP_LLD(drawpixel)(coord_t x, coord_t y, color_t color) {
 	 *

 	 * @notapi

 	 */

-	void GDISP_LLD(verticalscroll)(coord_t x, coord_t y, coord_t cx, coord_t cy, int lines, color_t bgcolor) {

+	void lld_gdisp_vertical_scroll(coord_t x, coord_t y, coord_t cx, coord_t cy, int lines, color_t bgcolor) {

 		/* This is marked as "TODO: Test this" in the original GLCD driver.

 		 * For now we just leave the GDISP_HARDWARE_SCROLL off.

 		 */

@@ -495,7 +495,7 @@ void GDISP_LLD(drawpixel)(coord_t x, coord_t y, color_t color) {
 	 *

 	 * @notapi

 	 */

-	void GDISP_LLD(control)(unsigned what, void *value) {

+	void lld_gdisp_control(unsigned what, void *value) {

 		switch(what) {

 		case GDISP_CONTROL_POWER:

 			if (GDISP.Powermode == (gdisp_powermode_t)value)

@@ -508,7 +508,7 @@ void GDISP_LLD(drawpixel)(coord_t x, coord_t y, color_t color) {
 					/* 	Code here */

 					/* You may need this ---

 						if (GDISP.Powermode != powerSleep)

-							GDISP_LLD(init();

+							lld_gdisp_init();

 					*/

 					/* break; */

 				case powerSleep:

diff --git a/drivers/gdisp/S6D1121/gdisp_lld_config.h b/drivers/gdisp/S6D1121/gdisp_lld_config.h
index c662d0e7..00c01da2 100644
--- a/drivers/gdisp/S6D1121/gdisp_lld_config.h
+++ b/drivers/gdisp/S6D1121/gdisp_lld_config.h
@@ -36,7 +36,6 @@
 /*===========================================================================*/

 

 #define GDISP_DRIVER_NAME				"S6D1121"

-#define GDISP_LLD(x)					gdisp_lld_##x##_S6D1121

 

 #define GDISP_HARDWARE_CLEARS			TRUE

 #define GDISP_HARDWARE_FILLS			TRUE

diff --git a/drivers/gdisp/SSD1289/gdisp_lld.c b/drivers/gdisp/SSD1289/gdisp_lld.c
index d8d185cd..96fb94e6 100644
--- a/drivers/gdisp/SSD1289/gdisp_lld.c
+++ b/drivers/gdisp/SSD1289/gdisp_lld.c
@@ -157,7 +157,7 @@ static __inline void reset_viewport(void) {
  *

  * @notapi

  */

-bool_t GDISP_LLD(init)(void) {

+bool_t lld_gdisp_init(void) {

 	/* Initialise your display */

 	init_board();

 

@@ -243,7 +243,7 @@ bool_t GDISP_LLD(init)(void) {
  *

  * @notapi

  */

-void GDISP_LLD(drawpixel)(coord_t x, coord_t y, color_t color) {

+void lld_gdisp_draw_pixel(coord_t x, coord_t y, color_t color) {

 	#if GDISP_NEED_VALIDATION || GDISP_NEED_CLIP

 		if (x < GDISP.clipx0 || y < GDISP.clipy0 || x >= GDISP.clipx1 || y >= GDISP.clipy1) return;

 	#endif

@@ -280,7 +280,7 @@ void GDISP_LLD(drawpixel)(coord_t x, coord_t y, color_t color) {
 	 *

 	 * @notapi

 	 */

-	void GDISP_LLD(clear)(color_t color) {

+	void lld_gdisp_clear(color_t color) {

 		unsigned i;

 

 		acquire_bus();

@@ -305,7 +305,7 @@ void GDISP_LLD(drawpixel)(coord_t x, coord_t y, color_t color) {
 	 *

 	 * @notapi

 	 */

-	void GDISP_LLD(fillarea)(coord_t x, coord_t y, coord_t cx, coord_t cy, color_t color) {

+	void lld_gdisp_fill_area(coord_t x, coord_t y, coord_t cx, coord_t cy, color_t color) {

 		unsigned i, area;

 

 		#if GDISP_NEED_VALIDATION || GDISP_NEED_CLIP

@@ -341,7 +341,7 @@ void GDISP_LLD(drawpixel)(coord_t x, coord_t y, color_t color) {
 	 *

 	 * @notapi

 	 */

-	void GDISP_LLD(blitareaex)(coord_t x, coord_t y, coord_t cx, coord_t cy, coord_t srcx, coord_t srcy, coord_t srccx, const pixel_t *buffer) {

+	void lld_gdisp_blit_area_ex(coord_t x, coord_t y, coord_t cx, coord_t cy, coord_t srcx, coord_t srcy, coord_t srccx, const pixel_t *buffer) {

 		coord_t endx, endy;

 		unsigned lg;

 

@@ -380,7 +380,7 @@ void GDISP_LLD(drawpixel)(coord_t x, coord_t y, color_t color) {
 	 *

 	 * @notapi

 	 */

-	color_t GDISP_LLD(getpixelcolor)(coord_t x, coord_t y) {

+	color_t lld_gdisp_get_pixel_color(coord_t x, coord_t y) {

 		color_t color;

 

 		#if GDISP_NEED_VALIDATION || GDISP_NEED_CLIP

@@ -413,7 +413,7 @@ void GDISP_LLD(drawpixel)(coord_t x, coord_t y, color_t color) {
 	 *

 	 * @notapi

 	 */

-	void GDISP_LLD(verticalscroll)(coord_t x, coord_t y, coord_t cx, coord_t cy, int lines, color_t bgcolor) {

+	void lld_gdisp_vertical_scroll(coord_t x, coord_t y, coord_t cx, coord_t cy, int lines, color_t bgcolor) {

 		static color_t buf[((GDISP_SCREEN_HEIGHT > GDISP_SCREEN_WIDTH ) ? GDISP_SCREEN_HEIGHT : GDISP_SCREEN_WIDTH)];

 		coord_t row0, row1;

 		unsigned i, gap, abslines, j;

@@ -489,7 +489,7 @@ void GDISP_LLD(drawpixel)(coord_t x, coord_t y, color_t color) {
 	 *

 	 * @notapi

 	 */

-	void GDISP_LLD(control)(unsigned what, void *value) {

+	void lld_gdisp_control(unsigned what, void *value) {

 		switch(what) {

 		case GDISP_CONTROL_POWER:

 			if (GDISP.Powermode == (gdisp_powermode_t)value)

@@ -508,7 +508,7 @@ void GDISP_LLD(drawpixel)(coord_t x, coord_t y, color_t color) {
 				write_reg(0x0010, 0x0000);	// leave sleep mode

 				release_bus();

 				if (GDISP.Powermode != powerSleep)

-					GDISP_LLD(init)();

+					lld_gdisp_init();

 				break;

 			case powerSleep:

 				acquire_bus();

diff --git a/drivers/gdisp/SSD1289/gdisp_lld_config.h b/drivers/gdisp/SSD1289/gdisp_lld_config.h
index dafbc90f..62b3c7b9 100644
--- a/drivers/gdisp/SSD1289/gdisp_lld_config.h
+++ b/drivers/gdisp/SSD1289/gdisp_lld_config.h
@@ -36,7 +36,6 @@
 /*===========================================================================*/

 

 #define GDISP_DRIVER_NAME				"SSD1289"

-#define GDISP_LLD(x)					gdisp_lld_##x##_SSD1289

 

 #define GDISP_HARDWARE_CLEARS			TRUE

 #define GDISP_HARDWARE_FILLS			TRUE

diff --git a/drivers/gdisp/SSD1963/gdisp_lld.c b/drivers/gdisp/SSD1963/gdisp_lld.c
index 41cbd969..0b676ebc 100644
--- a/drivers/gdisp/SSD1963/gdisp_lld.c
+++ b/drivers/gdisp/SSD1963/gdisp_lld.c
@@ -187,7 +187,7 @@ __inline void GDISP_LLD(readstream)(uint16_t *buffer, size_t size) {
  *

  * @notapi

  */

-bool_t GDISP_LLD(init)(void) {

+bool_t lld_gdisp_init(void) {

 	/* Initialise the display */

 

 #if defined(GDISP_USE_FSMC)

@@ -358,7 +358,7 @@ void GDISP_LLD(setwindow)(coord_t x0, coord_t y0, coord_t x1, coord_t y1) {
  *

  * @notapi

  */

-void GDISP_LLD(drawpixel)(coord_t x, coord_t y, color_t color) {

+void lld_gdisp_draw_pixel(coord_t x, coord_t y, color_t color) {

 	#if GDISP_NEED_VALIDATION || GDISP_NEED_CLIP

 	if (x < GDISP.clipx0 || y < GDISP.clipy0 || x >= GDISP.clipx1 || y >= GDISP.clipy1) return;

 	#endif

@@ -381,7 +381,7 @@ void GDISP_LLD(drawpixel)(coord_t x, coord_t y, color_t color) {
 	 *

 	 * @notapi

 	 */

-	void GDISP_LLD(fillarea)(coord_t x, coord_t y, coord_t cx, coord_t cy, color_t color) {

+	void lld_gdisp_fill_area(coord_t x, coord_t y, coord_t cx, coord_t cy, color_t color) {

     

 		#if GDISP_NEED_VALIDATION || GDISP_NEED_CLIP

 			if (x < GDISP.clipx0) { cx -= GDISP.clipx0 - x; x = GDISP.clipx0; }

@@ -430,7 +430,7 @@ void GDISP_LLD(drawpixel)(coord_t x, coord_t y, color_t color) {
 	 *

 	 * @notapi

 	 */

-	void GDISP_LLD(blitareaex)(coord_t x, coord_t y, coord_t cx, coord_t cy, coord_t srcx, coord_t srcy, coord_t srccx, const pixel_t *buffer) {

+	void lld_gdisp_blit_area_ex(coord_t x, coord_t y, coord_t cx, coord_t cy, coord_t srcx, coord_t srcy, coord_t srccx, const pixel_t *buffer) {

 

 		#if GDISP_NEED_VALIDATION || GDISP_NEED_CLIP

 			if (x < GDISP.clipx0) { cx -= GDISP.clipx0 - x; srcx += GDISP.clipx0 - x; x = GDISP.clipx0; }

@@ -486,7 +486,7 @@ void GDISP_LLD(drawpixel)(coord_t x, coord_t y, color_t color) {
 	 *

 	 * @notapi

 	 */

-	void GDISP_LLD(verticalscroll)(coord_t x, coord_t y, coord_t cx, coord_t cy, int lines, color_t bgcolor) {

+	void lld_gdisp_vertical_scroll(coord_t x, coord_t y, coord_t cx, coord_t cy, int lines, color_t bgcolor) {

 		#if GDISP_NEED_VALIDATION || GDISP_NEED_CLIP

 			if (x < GDISP.clipx0) { cx -= GDISP.clipx0 - x; x = GDISP.clipx0; }

 			if (y < GDISP.clipy0) { cy -= GDISP.clipy0 - y; y = GDISP.clipy0; }

@@ -535,7 +535,7 @@ void GDISP_LLD(drawpixel)(coord_t x, coord_t y, color_t color) {
 	 *

 	 * @notapi

 	 */

-	void GDISP_LLD(control)(unsigned what, void *value) {

+	void lld_gdisp_control(unsigned what, void *value) {

 		/* NOT IMPLEMENTED YET */

 		switch(what) {

 			case GDISP_CONTROL_POWER:

@@ -552,7 +552,7 @@ void GDISP_LLD(drawpixel)(coord_t x, coord_t y, color_t color) {
 					GDISP_LLD(readreg)(0x0000); chThdSleepMicroseconds(5000); // 2x Dummy reads to wake up from deep sleep

 					GDISP_LLD(readreg)(0x0000); chThdSleepMicroseconds(5000);

 					if (GDISP.Powermode != powerSleep)

-						GDISP_LLD(init)();

+						lld_gdisp_init();

 					GDISP_LLD(writeindex)(SSD1963_SET_DISPLAY_ON);

 

 					break;

diff --git a/drivers/gdisp/TestStub/gdisp_lld.c b/drivers/gdisp/TestStub/gdisp_lld.c
index 83049aa2..be323912 100644
--- a/drivers/gdisp/TestStub/gdisp_lld.c
+++ b/drivers/gdisp/TestStub/gdisp_lld.c
@@ -53,7 +53,7 @@
  *

  * @notapi

  */

-bool_t GDISP_LLD(init)(void) {

+bool_t lld_gdisp_init(void) {

 	/* Initialise the GDISP structure */

 	GDISP.Width = GDISP_SCREEN_WIDTH;

 	GDISP.Height = GDISP_SCREEN_HEIGHT;

@@ -79,7 +79,7 @@ bool_t GDISP_LLD(init)(void) {
  *

  * @notapi

  */

-void GDISP_LLD(drawpixel)(coord_t x, coord_t y, color_t color) {

+void lld_gdisp_draw_pixel(coord_t x, coord_t y, color_t color) {

 	(void)x;

 	(void)y;

 	(void)color;

@@ -97,7 +97,7 @@ void GDISP_LLD(drawpixel)(coord_t x, coord_t y, color_t color) {
 	 *

 	 * @notapi

 	 */

-	color_t GDISP_LLD(getpixelcolor)(coord_t x, coord_t y) {

+	color_t lld_gdisp_get_pixel_color(coord_t x, coord_t y) {

 		(void)x;

 		(void)y;

 

@@ -119,7 +119,7 @@ void GDISP_LLD(drawpixel)(coord_t x, coord_t y, color_t color) {
 	 *

 	 * @notapi

 	 */

-	void GDISP_LLD(verticalscroll)(coord_t x, coord_t y, coord_t cx, coord_t cy, int lines, color_t bgcolor) {

+	void lld_gdisp_vertical_scroll(coord_t x, coord_t y, coord_t cx, coord_t cy, int lines, color_t bgcolor) {

 		(void)x;

 		(void)y;

 		(void)cx;

diff --git a/drivers/gdisp/TestStub/gdisp_lld_config.h b/drivers/gdisp/TestStub/gdisp_lld_config.h
index 18c2de59..8ae82ff4 100644
--- a/drivers/gdisp/TestStub/gdisp_lld_config.h
+++ b/drivers/gdisp/TestStub/gdisp_lld_config.h
@@ -36,7 +36,6 @@
 /*===========================================================================*/

 

 #define GDISP_DRIVER_NAME				"TestStub"

-#define GDISP_LLD(x)					gdisp_lld_##x##_TestStub

 

 #define GDISP_HARDWARE_SCROLL			GDISP_NEED_SCROLL

 #define GDISP_HARDWARE_PIXELREAD		GDISP_NEED_PIXELREAD

diff --git a/drivers/gdisp/VMT/gdisp_lld.c b/drivers/gdisp/VMT/gdisp_lld.c
deleted file mode 100644
index 9d9c7382..00000000
--- a/drivers/gdisp/VMT/gdisp_lld.c
+++ /dev/null
@@ -1,271 +0,0 @@
-/*

-    ChibiOS/GFX - Copyright (C) 2012

-                 Joel Bodenmann aka Tectu <joel@unormal.org>

-

-    This file is part of ChibiOS/GFX.

-

-    ChibiOS/GFX is free software; you can redistribute it and/or modify

-    it under the terms of the GNU General Public License as published by

-    the Free Software Foundation; either version 3 of the License, or

-    (at your option) any later version.

-

-    ChibiOS/GFX is distributed in the hope that it will be useful,

-    but WITHOUT ANY WARRANTY; without even the implied warranty of

-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

-    GNU General Public License for more details.

-

-    You should have received a copy of the GNU General Public License

-    along with this program.  If not, see <http://www.gnu.org/licenses/>.

-*/

-

-/**

- * @file    drivers/gdisp/VMT/gdisp_lld.c

- * @brief   GDISP Graphics Driver subsystem low level driver source for VMT.

- *

- * @addtogroup GDISP

- * @{

- */

-

-#include "ch.h"

-#include "hal.h"

-#include "gfx.h"

-

-#if GFX_USE_GDISP /*|| defined(__DOXYGEN__)*/

-

-#define GDISP_LLD_NO_STRUCT

-

-/* Include the emulation code for things we don't support */

-#include "gdisp/lld/emulation.c"

-

-/*===========================================================================*/

-/* Driver local definitions.                                                 */

-/*===========================================================================*/

-

-#define GDISP_LLD1(x)	GDISP_VMT_NAME1(gdisp_lld_##x##_)

-#define GDISP_LLD2(x)	GDISP_VMT_NAME2(gdisp_lld_##x##_)

-

-/* Prototypes for lld driver functions */

-bool_t GDISP_LLD1(init)(void);

-void *GDISP_LLD1(query)(unsigned what);

-void GDISP_LLD1(clear)(color_t color);

-void GDISP_LLD1(drawpixel)(coord_t x, coord_t y, color_t color);

-void GDISP_LLD1(fillarea)(coord_t x, coord_t y, coord_t cx, coord_t cy, color_t color);

-void GDISP_LLD1(blitareaex)(coord_t x, coord_t y, coord_t cx, coord_t cy, coord_t srcx, coord_t srcy, coord_t srccx, const pixel_t *buffer);

-void GDISP_LLD1(drawline)(coord_t x0, coord_t y0, coord_t x1, coord_t y1, color_t color);

-#if GDISP_NEED_CLIP

-	void GDISP_LLD1(setclip)(coord_t x, coord_t y, coord_t cx, coord_t cy);

-#endif

-#if GDISP_NEED_CIRCLE

-	void GDISP_LLD1(drawcircle)(coord_t x, coord_t y, coord_t radius, color_t color);

-	void GDISP_LLD1(fillcircle)(coord_t x, coord_t y, coord_t radius, color_t color);

-#endif

-#if GDISP_NEED_ELLIPSE

-	void GDISP_LLD1(drawellipse)(coord_t x, coord_t y, coord_t a, coord_t b, color_t color);

-	void GDISP_LLD1(fillellipse)(coord_t x, coord_t y, coord_t a, coord_t b, color_t color);

-#endif

-#if GDISP_NEED_ARC

-	void GDISP_LLD1(drawarc)(coord_t x, coord_t y, coord_t radius, coord_t startangle, coord_t endangle, color_t color);

-	void GDISP_LLD1(fillarc)(coord_t x, coord_t y, coord_t radius, coord_t startangle, coord_t endangle, color_t color);

-#endif

-#if GDISP_NEED_TEXT

-	void GDISP_LLD1(drawchar)(coord_t x, coord_t y, char c, font_t font, color_t color);

-	void GDISP_LLD1(fillchar)(coord_t x, coord_t y, char c, font_t font, color_t color, color_t bgcolor);

-#endif

-#if GDISP_NEED_PIXELREAD

-	color_t GDISP_LLD1(getpixelcolor)(coord_t x, coord_t y);

-#endif

-#if GDISP_NEED_SCROLL

-	void GDISP_LLD1(verticalscroll)(coord_t x, coord_t y, coord_t cx, coord_t cy, int lines, color_t bgcolor);

-#endif

-#if GDISP_NEED_CONTROL

-	void GDISP_LLD1(control)(unsigned what, void *value);

-#endif

-

-bool_t GDISP_LLD2(init)(void);

-void *GDISP_LLD2(query)(unsigned what);

-void GDISP_LLD2(clear)(color_t color);

-void GDISP_LLD2(drawpixel)(coord_t x, coord_t y, color_t color);

-void GDISP_LLD2(fillarea)(coord_t x, coord_t y, coord_t cx, coord_t cy, color_t color);

-void GDISP_LLD2(blitareaex)(coord_t x, coord_t y, coord_t cx, coord_t cy, coord_t srcx, coord_t srcy, coord_t srccx, const pixel_t *buffer);

-void GDISP_LLD2(drawline)(coord_t x0, coord_t y0, coord_t x1, coord_t y1, color_t color);

-#if GDISP_NEED_CLIP

-	void GDISP_LLD2(setclip)(coord_t x, coord_t y, coord_t cx, coord_t cy);

-#endif

-#if GDISP_NEED_CIRCLE

-	void GDISP_LLD2(drawcircle)(coord_t x, coord_t y, coord_t radius, color_t color);

-	void GDISP_LLD2(fillcircle)(coord_t x, coord_t y, coord_t radius, color_t color);

-#endif

-#if GDISP_NEED_ELLIPSE

-	void GDISP_LLD2(drawellipse)(coord_t x, coord_t y, coord_t a, coord_t b, color_t color);

-	void GDISP_LLD2(fillellipse)(coord_t x, coord_t y, coord_t a, coord_t b, color_t color);

-#endif

-#if GDISP_NEED_ARC

-	void GDISP_LLD2(drawarc)(coord_t x, coord_t y, coord_t radius, coord_t startangle, coord_t endangle, color_t color);

-	void GDISP_LLD2(fillarc)(coord_t x, coord_t y, coord_t radius, coord_t startangle, coord_t endangle, color_t color);

-#endif

-#if GDISP_NEED_TEXT

-	void GDISP_LLD2(drawchar)(coord_t x, coord_t y, char c, font_t font, color_t color);

-	void GDISP_LLD2(fillchar)(coord_t x, coord_t y, char c, font_t font, color_t color, color_t bgcolor);

-#endif

-#if GDISP_NEED_PIXELREAD

-	color_t GDISP_LLD2(getpixelcolor)(coord_t x, coord_t y);

-#endif

-#if GDISP_NEED_SCROLL

-	void GDISP_LLD2(verticalscroll)(coord_t x, coord_t y, coord_t cx, coord_t cy, int lines, color_t bgcolor);

-#endif

-#if GDISP_NEED_CONTROL

-	void GDISP_LLD2(control)(unsigned what, void *value);

-#endif

-

-/*===========================================================================*/

-/* Driver exported variables.                                                */

-/*===========================================================================*/

-

-/* Our VMT table variables */

-void *GDISP_LLD_VMT(query)(unsigned what);

-void GDISP_LLD_VMT(clear)(color_t color);

-void GDISP_LLD_VMT(drawpixel)(coord_t x, coord_t y, color_t color);

-void GDISP_LLD_VMT(fillarea)(coord_t x, coord_t y, coord_t cx, coord_t cy, color_t color);

-void GDISP_LLD_VMT(blitareaex)(coord_t x, coord_t y, coord_t cx, coord_t cy, coord_t srcx, coord_t srcy, coord_t srccx, const pixel_t *buffer);

-void GDISP_LLD_VMT(drawline)(coord_t x0, coord_t y0, coord_t x1, coord_t y1, color_t color);

-

-#if GDISP_NEED_CIRCLE

-void GDISP_LLD_VMT(drawcircle)(coord_t x, coord_t y, coord_t radius, color_t color);

-void GDISP_LLD_VMT(fillcircle)(coord_t x, coord_t y, coord_t radius, color_t color);

-#endif

-

-#if GDISP_NEED_ELLIPSE

-void GDISP_LLD_VMT(drawellipse)(coord_t x, coord_t y, coord_t a, coord_t b, color_t color);

-void GDISP_LLD_VMT(fillellipse)(coord_t x, coord_t y, coord_t a, coord_t b, color_t color);

-#endif

-

-/* Text Rendering Functions */

-#if GDISP_NEED_TEXT

-void GDISP_LLD_VMT(drawchar)(coord_t x, coord_t y, char c, font_t font, color_t color);

-void GDISP_LLD_VMT(fillchar)(coord_t x, coord_t y, char c, font_t font, color_t color, color_t bgcolor);

-#endif

-

-/* Pixel readback */

-#if GDISP_NEED_PIXELREAD

-color_t GDISP_LLD_VMT(getpixelcolor)(coord_t x, coord_t y);

-#endif

-

-/* Scrolling Function - clears the area scrolled out */

-#if GDISP_NEED_SCROLL

-void GDISP_LLD_VMT(verticalscroll)(coord_t x, coord_t y, coord_t cx, coord_t cy, int lines, color_t bgcolor);

-#endif

-

-/* Set driver specific control */

-#if GDISP_NEED_CONTROL

-void GDISP_LLD_VMT(control)(unsigned what, void *value);

-#endif

-/* Clipping Functions */

-#if GDISP_NEED_CLIP

-void GDISP_LLD_VMT(setclip)(coord_t x, coord_t y, coord_t cx, coord_t cy);

-#endif

-

-

-/*===========================================================================*/

-/* Driver local variables.                                                   */

-/*===========================================================================*/

-

-/*===========================================================================*/

-/* Driver local functions.                                                   */

-/*===========================================================================*/

-

-/*===========================================================================*/

-/* Driver interrupt handlers.                                                */

-/*===========================================================================*/

-

-/*===========================================================================*/

-/* Driver exported functions.                                                */

-/*===========================================================================*/

-

-/*===========================================================================*/

-/* Driver exported functions.                                                */

-/*===========================================================================*/

-

-bool_t	gdisp_lld_init_VMT(void) {

-	if (GDISP_VMT_NAME1(gdisp_lld_init_)()) {

-		gdisp_lld_query_VMT					= GDISP_VMT_NAME1(gdisp_lld_query_);

-		gdisp_lld_clear_VMT					= GDISP_VMT_NAME1(gdisp_lld_clear_);

-		gdisp_lld_drawpixel_VMT				= GDISP_VMT_NAME1(gdisp_lld_drawpixel_);

-		gdisp_lld_fillarea_VMT				= GDISP_VMT_NAME1(gdisp_lld_fillarea_);

-		gdisp_lld_blitareaex_VMT			= GDISP_VMT_NAME1(gdisp_lld_blitareaex_);

-		gdisp_lld_drawline_VMT				= GDISP_VMT_NAME1(gdisp_lld_drawline_);

-		#if GDISP_NEED_CIRCLE

-			gdisp_lld_drawcircle_VMT		= GDISP_VMT_NAME1(gdisp_lld_drawcircle_);

-			gdisp_lld_fillcircle_VMT		= GDISP_VMT_NAME1(gdisp_lld_fillcircle_);

-		#endif

-		#if GDISP_NEED_ELLIPSE

-			gdisp_lld_drawellipse_VMT		= GDISP_VMT_NAME1(gdisp_lld_drawellipse_);

-			gdisp_lld_fillellipse_VMT		= GDISP_VMT_NAME1(gdisp_lld_fillellipse_);

-		#endif

-		#if GDISP_NEED_ARC

-			gdisp_lld_drawarc_VMT			= GDISP_VMT_NAME1(gdisp_lld_drawarc_);

-			gdisp_lld_fillarc_VMT			= GDISP_VMT_NAME1(gdisp_lld_fillarc_);

-		#endif

-		#if GDISP_NEED_TEXT

-			gdisp_lld_drawchar_VMT			= GDISP_VMT_NAME1(gdisp_lld_drawchar_);

-			gdisp_lld_fillchar_VMT			= GDISP_VMT_NAME1(gdisp_lld_fillchar_);

-		#endif

-		#if GDISP_NEED_PIXELREAD

-			gdisp_lld_getpixelcolor_VMT		= GDISP_VMT_NAME1(gdisp_lld_pixelread_);

-		#endif

-		#if GDISP_NEED_SCROLL

-			gdisp_lld_verticalscroll_VMT	= GDISP_VMT_NAME1(gdisp_lld_scroll_);

-		#endif

-		#if GDISP_NEED_CONTROL

-			gdisp_lld_control_VMT			= GDISP_VMT_NAME1(gdisp_lld_control_);

-		#endif

-		#if GDISP_NEED_CLIP

-			gdisp_lld_setclip_VMT			= GDISP_VMT_NAME1(gdisp_lld_setclip_);

-		#endif

-

-		return TRUE;

-	}

-

-	if (GDISP_VMT_NAME2(gdisp_lld_init_)()) {

-		gdisp_lld_query_VMT					= GDISP_VMT_NAME2(gdisp_lld_query_);

-		gdisp_lld_clear_VMT					= GDISP_VMT_NAME2(gdisp_lld_clear_);

-		gdisp_lld_drawpixel_VMT				= GDISP_VMT_NAME2(gdisp_lld_drawpixel_);

-		gdisp_lld_fillarea_VMT				= GDISP_VMT_NAME2(gdisp_lld_fillarea_);

-		gdisp_lld_blitareaex_VMT			= GDISP_VMT_NAME2(gdisp_lld_blitareaex_);

-		gdisp_lld_drawline_VMT				= GDISP_VMT_NAME2(gdisp_lld_drawline_);

-		#if GDISP_NEED_CIRCLE

-			gdisp_lld_drawcircle_VMT		= GDISP_VMT_NAME2(gdisp_lld_drawcircle_);

-			gdisp_lld_fillcircle_VMT		= GDISP_VMT_NAME2(gdisp_lld_fillcircle_);

-		#endif

-		#if GDISP_NEED_ELLIPSE

-			gdisp_lld_drawellipse_VMT		= GDISP_VMT_NAME2(gdisp_lld_drawellipse_);

-			gdisp_lld_fillellipse_VMT		= GDISP_VMT_NAME2(gdisp_lld_fillellipse_);

-		#endif

-		#if GDISP_NEED_ARC

-			gdisp_lld_drawarc_VMT			= GDISP_VMT_NAME2(gdisp_lld_drawarc_);

-			gdisp_lld_fillarc_VMT			= GDISP_VMT_NAME2(gdisp_lld_fillarc_);

-		#endif

-		#if GDISP_NEED_TEXT

-			gdisp_lld_drawchar_VMT			= GDISP_VMT_NAME2(gdisp_lld_drawchar_);

-			gdisp_lld_fillchar_VMT			= GDISP_VMT_NAME2(gdisp_lld_fillchar_);

-		#endif

-		#if GDISP_NEED_PIXELREAD

-			gdisp_lld_getpixelcolor_VMT		= GDISP_VMT_NAME2(gdisp_lld_pixelread_);

-		#endif

-		#if GDISP_NEED_SCROLL

-			gdisp_lld_verticalscroll_VMT	= GDISP_VMT_NAME2(gdisp_lld_scroll_);

-		#endif

-		#if GDISP_NEED_CONTROL

-			gdisp_lld_control_VMT			= GDISP_VMT_NAME2(gdisp_lld_control_);

-		#endif

-		#if GDISP_NEED_CLIP

-			gdisp_lld_setclip_VMT			= GDISP_VMT_NAME2(gdisp_lld_setclip_);

-		#endif

-

-		return TRUE;

-	}

-	return FALSE;

-}

-

-#endif /* GFX_USE_GDISP */

-/** @} */

-

diff --git a/drivers/gdisp/VMT/gdisp_lld.mk b/drivers/gdisp/VMT/gdisp_lld.mk
deleted file mode 100644
index 96918f8a..00000000
--- a/drivers/gdisp/VMT/gdisp_lld.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-# List the required driver.

-GFXSRC += 	$(GFXLIB)/drivers/gdisp/VMT/gdisp_lld.c \

-			$(GFXLIB)/drivers/gdisp/VMT/gdisp_lld_driver1.c \

-			$(GFXLIB)//drivers/gdisp/VMT/gdisp_lld_driver2.c

-

-# Required include directories

-GFXINC += 	$(GFXLIB)/drivers/gdisp/VMT

diff --git a/drivers/gdisp/VMT/gdisp_lld_config.h b/drivers/gdisp/VMT/gdisp_lld_config.h
deleted file mode 100644
index 8c7bfc9c..00000000
--- a/drivers/gdisp/VMT/gdisp_lld_config.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/*

-    ChibiOS/GFX - Copyright (C) 2012

-                 Joel Bodenmann aka Tectu <joel@unormal.org>

-

-    This file is part of ChibiOS/GFX.

-

-    ChibiOS/GFX is free software; you can redistribute it and/or modify

-    it under the terms of the GNU General Public License as published by

-    the Free Software Foundation; either version 3 of the License, or

-    (at your option) any later version.

-

-    ChibiOS/GFX is distributed in the hope that it will be useful,

-    but WITHOUT ANY WARRANTY; without even the implied warranty of

-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

-    GNU General Public License for more details.

-

-    You should have received a copy of the GNU General Public License

-    along with this program.  If not, see <http://www.gnu.org/licenses/>.

-*/

-

-/**

- * @file    drivers/gdisp/VMT/gdisp_lld_config.h

- * @brief   GDISP Graphic Driver subsystem low level driver header template.

- *

- * @addtogroup GDISP

- * @{

- */

-

-#ifndef _GDISP_LLD_CONFIG_H

-#define _GDISP_LLD_CONFIG_H

-

-#if GFX_USE_GDISP

-

-/*===========================================================================*/

-/* Driver hardware support.                                                  */

-/*===========================================================================*/

-

-#define GDISP_DRIVER_NAME				"VMT"

-#define GDISP_LLD(x)					gdisp_lld_##x##_VMT

-#define GDISP_LLD_VMT(x)				(*GDISP_LLD(x))

-

-#define GDISP_HARDWARE_LINES			TRUE

-#define GDISP_HARDWARE_CLEARS			TRUE

-#define GDISP_HARDWARE_FILLS			TRUE

-#define GDISP_HARDWARE_BITFILLS			TRUE

-#define GDISP_HARDWARE_CIRCLES			TRUE

-#define GDISP_HARDWARE_CIRCLEFILLS		TRUE

-#define GDISP_HARDWARE_ELLIPSES			TRUE

-#define GDISP_HARDWARE_ELLIPSEFILLS		TRUE

-#define GDISP_HARDWARE_ARCS				TRUE

-#define GDISP_HARDWARE_ARCFILLS			TRUE

-#define GDISP_HARDWARE_TEXT				TRUE

-#define GDISP_HARDWARE_TEXTFILLS		TRUE

-#define GDISP_HARDWARE_SCROLL			TRUE

-#define GDISP_HARDWARE_PIXELREAD		TRUE

-#define GDISP_HARDWARE_CONTROL			TRUE

-#define GDISP_HARDWARE_QUERY			TRUE

-#define GDISP_HARDWARE_CLIP				TRUE

-

-#define GDISP_SOFTWARE_TEXTFILLDRAW		FALSE

-#define GDISP_SOFTWARE_TEXTBLITCOLUMN	FALSE

-

-#define GDISP_PIXELFORMAT				GDISP_PIXELFORMAT_RGB565

-#define GDISP_PACKED_PIXELS				FALSE

-#define GDISP_PACKED_LINES				FALSE

-

-#endif	/* GFX_USE_GDISP */

-

-#endif	/* _GDISP_LLD_CONFIG_H */

-/** @} */

-

diff --git a/drivers/gdisp/VMT/gdisp_lld_driver1.c b/drivers/gdisp/VMT/gdisp_lld_driver1.c
deleted file mode 100644
index 01fd4cf0..00000000
--- a/drivers/gdisp/VMT/gdisp_lld_driver1.c
+++ /dev/null
@@ -1,52 +0,0 @@
-/*

-    ChibiOS/GFX - Copyright (C) 2012

-                 Joel Bodenmann aka Tectu <joel@unormal.org>

-

-    This file is part of ChibiOS/GFX.

-

-    ChibiOS/GFX is free software; you can redistribute it and/or modify

-    it under the terms of the GNU General Public License as published by

-    the Free Software Foundation; either version 3 of the License, or

-    (at your option) any later version.

-

-    ChibiOS/GFX is distributed in the hope that it will be useful,

-    but WITHOUT ANY WARRANTY; without even the implied warranty of

-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

-    GNU General Public License for more details.

-

-    You should have received a copy of the GNU General Public License

-    along with this program.  If not, see <http://www.gnu.org/licenses/>.

-*/

-

-/**

- * @file    drivers/gdisp/VMT/gdisp_lld_driver1.c

- * @brief   GDISP Graphics Driver subsystem low level driver source for VMT.

- *

- * @addtogroup GDISP

- * @{

- */

-

-#include "ch.h"

-#include "hal.h"

-

-#if GFX_USE_GDISP /*|| defined(__DOXYGEN__)*/

-

-#define CONFIGFILE()	<../GDISP_VMT_NAME1()/gdisp_lld_config.h>

-#define DRIVERFILE()	<../GDISP_VMT_NAME1()/gdisp_lld.c>

-

-/* We don't need these in our VMT referenced driver */

-#undef GDISP_NEED_MSGAPI

-#define GDISP_NEED_MSGAPI	FALSE

-

-/* Include the specific config file we want */

-#include CONFIGFILE()

-

-/* Bring in our API */

-#include "gfx.h"

-

-/* Add the low level driver */

-#include DRIVERFILE()

-

-#endif /* GFX_USE_GDISP */

-/** @} */

-

diff --git a/drivers/gdisp/VMT/gdisp_lld_driver2.c b/drivers/gdisp/VMT/gdisp_lld_driver2.c
deleted file mode 100644
index ed0e8555..00000000
--- a/drivers/gdisp/VMT/gdisp_lld_driver2.c
+++ /dev/null
@@ -1,52 +0,0 @@
-/*

-    ChibiOS/GFX - Copyright (C) 2012

-                 Joel Bodenmann aka Tectu <joel@unormal.org>

-

-    This file is part of ChibiOS/GFX.

-

-    ChibiOS/GFX is free software; you can redistribute it and/or modify

-    it under the terms of the GNU General Public License as published by

-    the Free Software Foundation; either version 3 of the License, or

-    (at your option) any later version.

-

-    ChibiOS/GFX is distributed in the hope that it will be useful,

-    but WITHOUT ANY WARRANTY; without even the implied warranty of

-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

-    GNU General Public License for more details.

-

-    You should have received a copy of the GNU General Public License

-    along with this program.  If not, see <http://www.gnu.org/licenses/>.

-*/

-

-/**

- * @file    drivers/gdisp/VMT/gdisp_lld_driver2.c

- * @brief   GDISP Graphics Driver subsystem low level driver source for VMT.

- *

- * @addtogroup GDISP

- * @{

- */

-

-#include "ch.h"

-#include "hal.h"

-

-#if GFX_USE_GDISP /*|| defined(__DOXYGEN__)*/

-

-#define CONFIGFILE()	<../GDISP_VMT_NAME2()/gdisp_lld_config.h>

-#define DRIVERFILE()	<../GDISP_VMT_NAME2()/gdisp_lld.c>

-

-/* We don't need these in our VMT referenced driver */

-#undef GDISP_NEED_MSGAPI

-#define GDISP_NEED_MSGAPI	FALSE

-

-/* Include the specific config file we want */

-#include CONFIGFILE()

-

-/* Bring in our API */

-#include "gfx.h"

-

-/* Add the low level driver */

-#include DRIVERFILE()

-

-#endif /* GFX_USE_GDISP */

-/** @} */

-

diff --git a/drivers/gdisp/VMT/readme.txt b/drivers/gdisp/VMT/readme.txt
deleted file mode 100644
index d6b71e0e..00000000
--- a/drivers/gdisp/VMT/readme.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-This driver enables you to have two underlying drivers handling different hardware.

-A choice is made at run-time of which driver to call based on which driver succeeds

-to initialise first (init returns TRUE).

-

-To use this driver:

-

-1. Add in your halconf.h:

-	a) #define GFX_USE_GDISP	TRUE

-	b) Any optional high level driver defines (see gdisp.h) eg: GDISP_NEED_MULTITHREAD

-	c) Define these:

-		#define GDISP_VMT_NAME1(x)	x##YourDriver1

-		#define GDISP_VMT_NAME2(x)	x##YourDriver2

-		Note YourDriver1 & 2 are the basenames of the directories containing the driver.

-		Note that both drivers must be the same pixel format which is

-			GDISP_PIXELFORMAT_RGB565 by default. Alter gdispVMT/gdisp_lld_config.h if your

-			pixel format is different on both drivers.

-	d) Any driver specific defines. If both drivers use the same defines then they must

-		accept the same values for the define.

-

-2. To your makefile add the following lines:

-	include $(CHIBIOS)/os/halext/halext.mk

-	include $(CHIBIOS)/os/halext/drivers/gdispVMT/gdisp_lld.mk

-	
diff --git a/drivers/multiple/Win32/gdisp_lld.c b/drivers/multiple/Win32/gdisp_lld.c
index d44bbfad..8a46abc9 100644
--- a/drivers/multiple/Win32/gdisp_lld.c
+++ b/drivers/multiple/Win32/gdisp_lld.c
@@ -314,7 +314,7 @@ static DWORD WINAPI WindowThread(LPVOID lpParameter) {
  *

  * @notapi

  */

-bool_t GDISP_LLD(init)(void) {

+bool_t lld_gdisp_init(void) {

 	RECT rect;

 

 	/* Set the window dimensions */

@@ -356,7 +356,7 @@ bool_t GDISP_LLD(init)(void) {
  *

  * @notapi

  */

-void GDISP_LLD(drawpixel)(coord_t x, coord_t y, color_t color) {

+void lld_gdisp_draw_pixel(coord_t x, coord_t y, color_t color) {

 	HDC dc;

 	#if WIN32_USE_MSG_REDRAW

 		RECT	rect;

@@ -422,7 +422,7 @@ void GDISP_LLD(drawpixel)(coord_t x, coord_t y, color_t color) {
 	 *

 	 * @notapi

 	 */

-	void GDISP_LLD(drawline)(coord_t x0, coord_t y0, coord_t x1, coord_t y1, color_t color) {

+	void lld_gdisp_draw_line(coord_t x0, coord_t y0, coord_t x1, coord_t y1, color_t color) {

 		POINT p;

 		HPEN pen;

 		HDC dc;

@@ -550,7 +550,7 @@ void GDISP_LLD(drawpixel)(coord_t x, coord_t y, color_t color) {
 	 *

 	 * @notapi

 	 */

-	void GDISP_LLD(fillarea)(coord_t x, coord_t y, coord_t cx, coord_t cy, color_t color) {

+	void lld_gdisp_fill_area(coord_t x, coord_t y, coord_t cx, coord_t cy, color_t color) {

 		HDC dc;

 		RECT rect;

 		HBRUSH hbr;

@@ -681,7 +681,7 @@ void GDISP_LLD(drawpixel)(coord_t x, coord_t y, color_t color) {
 	 *

 	 * @notapi

 	 */

-	void GDISP_LLD(blitareaex)(coord_t x, coord_t y, coord_t cx, coord_t cy, coord_t srcx, coord_t srcy, coord_t srccx, const pixel_t *buffer) {

+	void lld_gdisp_blit_area_ex(coord_t x, coord_t y, coord_t cx, coord_t cy, coord_t srcx, coord_t srcy, coord_t srccx, const pixel_t *buffer) {

 		BITMAPV4HEADER bmpInfo;

 		RECT	rect;

 		#if GDISP_NEED_CONTROL

@@ -788,7 +788,7 @@ void GDISP_LLD(drawpixel)(coord_t x, coord_t y, color_t color) {
 	 *

 	 * @notapi

 	 */

-	color_t GDISP_LLD(getpixelcolor)(coord_t x, coord_t y) {

+	color_t lld_gdisp_get_pixel_color(coord_t x, coord_t y) {

 		color_t color;

 

 		#if GDISP_NEED_VALIDATION || GDISP_NEED_CLIP

@@ -834,7 +834,7 @@ void GDISP_LLD(drawpixel)(coord_t x, coord_t y, color_t color) {
 	 *

 	 * @notapi

 	 */

-	void GDISP_LLD(verticalscroll)(coord_t x, coord_t y, coord_t cx, coord_t cy, int lines, color_t bgcolor) {

+	void lld_gdisp_vertical_scroll(coord_t x, coord_t y, coord_t cx, coord_t cy, int lines, color_t bgcolor) {

 		RECT	rect, frect, srect;

 		HBRUSH	hbr;

 		

@@ -958,7 +958,7 @@ void GDISP_LLD(drawpixel)(coord_t x, coord_t y, color_t color) {
 	 *

 	 * @notapi

 	 */

-	void GDISP_LLD(control)(unsigned what, void *value) {

+	void lld_gdisp_control(unsigned what, void *value) {

 		switch(what) {

 		case GDISP_CONTROL_ORIENTATION:

 			if (GDISP.Orientation == (gdisp_orientation_t)value)

diff --git a/drivers/multiple/Win32/gdisp_lld_config.h b/drivers/multiple/Win32/gdisp_lld_config.h
index bebd76b9..f62b0fdb 100644
--- a/drivers/multiple/Win32/gdisp_lld_config.h
+++ b/drivers/multiple/Win32/gdisp_lld_config.h
@@ -36,7 +36,6 @@
 /*===========================================================================*/

 

 #define GDISP_DRIVER_NAME				"Win32"

-#define GDISP_LLD(x)					gdisp_lld_##x##_Win32

 

 #define GDISP_HARDWARE_LINES			TRUE

 #define GDISP_HARDWARE_FILLS			TRUE