Convert ILI9320 driver to new format

9 files changed, 558 insertions, 426 deletions

diff --git a/drivers/gdisp/ILI9320/board_ILI9320_olimex_pic32mx_lcd.h b/drivers/gdisp/ILI9320/board_ILI9320_olimex_pic32mx_lcd.h
new file mode 100644
index 00000000..81d493ed
--- /dev/null
+++ b/drivers/gdisp/ILI9320/board_ILI9320_olimex_pic32mx_lcd.h
@@ -0,0 +1,129 @@
+/*
+ * This file is subject to the terms of the GFX License. If a copy of
+ * the license was not distributed with this file, you can obtain one at:
+ *
+ *              http://ugfx.org/license.html
+ */
+
+/**
+ * @file    drivers/gdisp/ILI9320/board_ILI9320_olimex_pic32mx_lcd.h
+ * @brief   GDISP Graphic Driver subsystem board interface for the ILI9325 display.
+ */
+
+#ifndef GDISP_LLD_BOARD_H
+#define GDISP_LLD_BOARD_H
+
+#ifndef noinline
+#define noinline __attribute__((noinline))
+#endif
+
+static void init_board(GDisplay *g, unsigned display) {
+
+	// As we are not using multiple displays we set g->priv to NULL as we don't use it.
+	g->priv = 0;
+
+	if (display == 0) {
+
+		/**
+		 * Set up for Display 0
+		 */
+
+		// RST
+		palSetPadMode(IOPORTA, 7, PAL_MODE_OUTPUT);
+		palClearPad(IOPORTA, 7);
+
+		// RS
+		palSetPadMode(IOPORTA, 10, PAL_MODE_OUTPUT);
+		palSetPad(IOPORTA, 10);
+
+		// CS
+		palSetPadMode(IOPORTA, 9, PAL_MODE_OUTPUT);
+		palClearPad(IOPORTA, 9);
+
+		// Backlight
+		palSetPadMode(IOPORTD, 3, PAL_MODE_OUTPUT);
+		palSetPad(IOPORTD, 3);
+
+		// PMP setup
+		PMMODE = 0;
+		PMAEN = 0;
+		PMCON = 0;
+		PMMODEbits.MODE = 2;
+		PMMODEbits.WAITB = 0;
+		PMMODEbits.WAITM = 1;
+		PMMODEbits.WAITE = 0;
+		PMCONbits.CSF = 0;
+		PMCONbits.PTRDEN = 1;
+		PMCONbits.PTWREN = 1;
+		PMMODEbits.MODE16 = 1;
+		PMCONbits.PMPEN = 1;
+
+		palClearPad(IOPORTA, 9);
+	}
+}
+
+#define PmpWaitBusy()   do {} while (PMMODEbits.BUSY)
+
+static inline void post_init_board(GDisplay *g) {
+	(void) g;
+}
+
+static noinline void setpin_reset(GDisplay *g, bool_t state) {
+	(void) g;
+	if (state)
+		palClearPad(IOPORTA, 7);
+	else
+		palSetPad(IOPORTA, 7);
+}
+
+static void set_backlight(GDisplay *g, uint8_t percent) {
+	(void) g;
+	if (percentage)
+		palClearPad(IOPORTD, 3);
+	else
+		palSetPad(IOPORTD, 3);
+}
+
+static inline void acquire_bus(GDisplay *g) {
+	(void) g;
+}
+
+static inline void release_bus(GDisplay *g) {
+	(void) g;
+}
+
+static noinline void write_index(GDisplay *g, uint16_t index) {
+	volatile uint16_t dummy;
+	(void) g;
+
+	PmpWaitBusy();
+	palClearPad(IOPORTA, 10);
+	PMDIN = index;
+	PmpWaitBusy();
+	palSetPad(IOPORTA, 10);
+
+	dummy = PMDIN;
+	(void)dummy;
+}
+
+static noinline void write_data(GDisplay *g, uint16_t data) {
+	(void) g;
+	PMDIN = data;
+	PmpWaitBusy();
+}
+
+static inline void setreadmode(GDisplay *g) {
+	(void) g;
+}
+
+static inline void setwritemode(GDisplay *g) {
+	(void) g;
+}
+
+static noinline uint16_t read_data(GDisplay *g) {
+	(void) g;
+	PmpWaitBusy();
+	return PMDIN;
+}
+
+#endif /* GDISP_LLD_BOARD_H */
diff --git a/drivers/gdisp/ILI9320/board_ILI9320_olimex_stm32_lcd.h b/drivers/gdisp/ILI9320/board_ILI9320_olimex_stm32_lcd.h
new file mode 100644
index 00000000..df02a716
--- /dev/null
+++ b/drivers/gdisp/ILI9320/board_ILI9320_olimex_stm32_lcd.h
@@ -0,0 +1,103 @@
+/*
+ * This file is subject to the terms of the GFX License. If a copy of
+ * the license was not distributed with this file, you can obtain one at:
+ *
+ *              http://ugfx.org/license.html
+ */
+
+/**
+ * @file    drivers/gdisp/ILI9320/board_ILI9320_olimex_stm32_lcd.h
+ * @brief   GDISP Graphic Driver subsystem board interface for the ILI9320 display.
+ */
+
+#ifndef GDISP_LLD_BOARD_H
+#define GDISP_LLD_BOARD_H
+
+// For a multiple display configuration we would put all this in a structure and then
+//	set g->priv to that structure.
+#define GDISP_REG              (*((volatile uint16_t *) 0x60000000)) /* RS = 0 */
+#define GDISP_RAM              (*((volatile uint16_t *) 0x60100000)) /* RS = 1 */
+
+static inline void init_board(GDisplay *g, unsigned display) {
+
+	// As we are not using multiple displays we set g->priv to NULL as we don't use it.
+	g->priv = 0;
+
+	if (display == 0) {
+
+		/**
+		 * Set up for Display 0
+		 */
+
+		/* FSMC setup for F1 */
+		rccEnableAHB(RCC_AHBENR_FSMCEN, 0);
+
+		/* set pin modes */
+		IOBus busD = {GPIOD, PAL_WHOLE_PORT, 0};
+		IOBus busE = {GPIOE, PAL_WHOLE_PORT, 0};
+		palSetBusMode(&busD, PAL_MODE_STM32_ALTERNATE_PUSHPULL);
+		palSetBusMode(&busE, PAL_MODE_STM32_ALTERNATE_PUSHPULL);
+		palSetPadMode(GPIOE, GPIOE_TFT_RST, PAL_MODE_OUTPUT_PUSHPULL);
+		palSetPadMode(GPIOD, GPIOD_TFT_LIGHT, PAL_MODE_OUTPUT_PUSHPULL);
+
+		/* FSMC timing */
+		FSMC_Bank1->BTCR[0+1] = (6) | (10 << 8) | (10 << 16);
+
+		/* Bank1 NOR/SRAM control register configuration
+		 * This is actually not needed as already set by default after reset */
+		FSMC_Bank1->BTCR[0] = FSMC_BCR1_MWID_0 | FSMC_BCR1_WREN | FSMC_BCR1_MBKEN;
+	}
+}
+
+static inline void post_init_board(GDisplay *g) {
+	(void) g;
+}
+
+static inline void setpin_reset(GDisplay *g, bool_t state) {
+	(void) g;
+	if(state)
+		palClearPad(GPIOE, GPIOE_TFT_RST);
+	else
+		palSetPad(GPIOE, GPIOE_TFT_RST);
+}
+
+static inline void set_backlight(GDisplay *g, uint8_t percent) {
+	(void) g;
+	if(percent)
+		palClearPad(GPIOD, GPIOD_TFT_LIGHT);
+	else
+		palSetPad(GPIOD, GPIOD_TFT_LIGHT);
+}
+
+static inline void acquire_bus(GDisplay *g) {
+	(void) g;
+}
+
+static inline void release_bus(GDisplay *g) {
+	(void) g;
+}
+
+static inline void write_index(GDisplay *g, uint16_t index) {
+	(void) g;
+	GDISP_REG = index;
+}
+
+static inline void write_data(GDisplay *g, uint16_t data) {
+	(void) g;
+	GDISP_RAM = data;
+}
+
+static inline void setreadmode(GDisplay *g) {
+	(void) g;
+}
+
+static inline void setwritemode(GDisplay *g) {
+	(void) g;
+}
+
+static inline uint16_t read_data(GDisplay *g) {
+	(void) g;
+	return GDISP_RAM;
+}
+
+#endif /* GDISP_LLD_BOARD_H */
diff --git a/drivers/gdisp/ILI9320/board_ILI9320_template.h b/drivers/gdisp/ILI9320/board_ILI9320_template.h
new file mode 100644
index 00000000..ead9aee0
--- /dev/null
+++ b/drivers/gdisp/ILI9320/board_ILI9320_template.h
@@ -0,0 +1,159 @@
+/*
+ * This file is subject to the terms of the GFX License. If a copy of
+ * the license was not distributed with this file, you can obtain one at:
+ *
+ *              http://ugfx.org/license.html
+ */
+
+/**
+ * @file    drivers/gdisp/ILI9320/board_ILI9320_template.h
+ * @brief   GDISP Graphic Driver subsystem board interface for the ILI9320 display.
+ *
+ * @addtogroup GDISP
+ * @{
+ */
+
+#ifndef GDISP_LLD_BOARD_H
+#define GDISP_LLD_BOARD_H
+
+/**
+ * @brief   Initialise the board for the display.
+ *
+ * @param[in] g			The GDisplay structure
+ * @param[in] display	The display number on this controller (0..n)
+ *
+ * @note	Set the g->priv member to whatever is appropriate. For multiple
+ * 			displays this might be a pointer to the appropriate register set.
+ *
+ * @notapi
+ */
+static inline void init_board(GDisplay *g, unsigned display) {
+	(void) g;
+	(void) display;
+}
+
+/**
+ * @brief   After the initialisation.
+ *
+ * @param[in] g			The GDisplay structure
+ *
+ * @notapi
+ */
+static inline void post_init_board(GDisplay *g) {
+	(void) g;
+}
+
+/**
+ * @brief   Set or clear the lcd reset pin.
+ *
+ * @param[in] g			The GDisplay structure
+ * @param[in] state		TRUE = lcd in reset, FALSE = normal operation
+ *
+ * @notapi
+ */
+static inline void setpin_reset(GDisplay *g, bool_t state) {
+	(void) g;
+	(void) state;
+}
+
+/**
+ * @brief   Set the lcd back-light level.
+ *
+ * @param[in] g				The GDisplay structure
+ * @param[in] percent		0 to 100%
+ *
+ * @notapi
+ */
+static inline void set_backlight(GDisplay *g, uint8_t percent) {
+	(void) g;
+	(void) percent;
+}
+
+/**
+ * @brief   Take exclusive control of the bus
+ *
+ * @param[in] g				The GDisplay structure
+ *
+ * @notapi
+ */
+static inline void acquire_bus(GDisplay *g) {
+	(void) g;
+}
+
+/**
+ * @brief   Release exclusive control of the bus
+ *
+ * @param[in] g				The GDisplay structure
+ *
+ * @notapi
+ */
+static inline void release_bus(GDisplay *g) {
+	(void) g;
+}
+
+/**
+ * @brief   Send data to the index register.
+ *
+ * @param[in] g				The GDisplay structure
+ * @param[in] index			The index register to set
+ *
+ * @notapi
+ */
+static inline void write_index(GDisplay *g, uint16_t index) {
+	(void) g;
+	(void) index;
+}
+
+/**
+ * @brief   Send data to the lcd.
+ *
+ * @param[in] g				The GDisplay structure
+ * @param[in] data			The data to send
+ *
+ * @notapi
+ */
+static inline void write_data(GDisplay *g, uint16_t data) {
+	(void) g;
+	(void) data;
+}
+
+/**
+ * @brief   Set the bus in read mode
+ *
+ * @param[in] g				The GDisplay structure
+ *
+ * @notapi
+ */
+static inline void setreadmode(GDisplay *g) {
+	(void) g;
+}
+
+/**
+ * @brief   Set the bus back into write mode
+ *
+ * @param[in] g				The GDisplay structure
+ *
+ * @notapi
+ */
+static inline void setwritemode(GDisplay *g) {
+	(void) g;
+}
+
+/**
+ * @brief   Read data from the lcd.
+ * @return	The data from the lcd
+ *
+ * @param[in] g				The GDisplay structure
+ *
+ * @note	The chip select may need to be asserted/de-asserted
+ * 			around the actual spi read
+ *
+ * @notapi
+ */
+static inline uint16_t read_data(GDisplay *g) {
+	(void) g;
+	return 0;
+}
+
+#endif /* GDISP_LLD_BOARD_H */
+/** @} */
diff --git a/drivers/gdisp/ILI9320/gdisp_lld.c b/drivers/gdisp/ILI9320/gdisp_lld.c
index 68081b96..228cbb09 100644
--- a/drivers/gdisp/ILI9320/gdisp_lld.c
+++ b/drivers/gdisp/ILI9320/gdisp_lld.c
@@ -24,9 +24,11 @@
 	#undef GDISP_SCREEN_WIDTH
 #endif
 
-#define GDISP_LLD_DECLARATIONS
+#define GDISP_DRIVER_VMT			GDISPVMT_SSD1289
+#include "../drivers/gdisp/ILI9320/gdisp_lld_config.h"
 #include "gdisp/lld/gdisp_lld.h"
-#include "gdisp_lld_board.h"
+
+#include "board_ILI9320.h"
 
 /*===========================================================================*/
 /* Driver local definitions.                                                 */
@@ -48,129 +50,137 @@
 /*===========================================================================*/
 /* Driver local variables.                                                   */
 /*===========================================================================*/
-uint32_t DISPLAY_CODE;
 
 /*===========================================================================*/
 /* Driver local functions.                                                   */
 /*===========================================================================*/
 
-#define dummy_read()				{ volatile uint16_t dummy; dummy = read_data(); (void) dummy; }
-#define write_reg(reg, data)		{ write_index(reg); write_data(data); }
+#define dummy_read(g)				{ volatile uint16_t dummy; dummy = read_data(g); (void) dummy; }
+#define write_reg(g, reg, data)		{ write_index(g, reg); write_data(g, data); }
 
-static void set_cursor(GDISPDriver *g) {
+static void set_cursor(GDisplay *g) {
 	switch(g->g.Orientation) {
 		case GDISP_ROTATE_0:
 		case GDISP_ROTATE_180:
-			write_reg(0x0020, g->p.x);
-			write_reg(0x0021, g->p.y);
+			write_reg(g, 0x20, g->p.x);
+			write_reg(g, 0x21, g->p.y);
 			break;
 
 		case GDISP_ROTATE_90:
 		case GDISP_ROTATE_270:
-			write_reg(0x0020, g->p.y);
-			write_reg(0x0021, g->p.x);
+			write_reg(g, 0x20, g->p.y);
+			write_reg(g, 0x21, g->p.x);
 			break;
 	}
-	write_index(0x0022);
+	write_index(g, 0x22);
 }
 
-static void set_viewport(GDISPDriver *g) {
+static void set_viewport(GDisplay *g) {
 	switch(g->g.Orientation) {
 		case GDISP_ROTATE_0:
 		case GDISP_ROTATE_180:
-			write_reg(0x0050, g->p.x);
-			write_reg(0x0051, g->p.x + g->p.cx - 1);
-			write_reg(0x0052, g->p.y);
-			write_reg(0x0053, g->p.y + g->p.cy - 1);
+			write_reg(g, 0x50, g->p.x);
+			write_reg(g, 0x51, g->p.x + g->p.cx - 1);
+			write_reg(g, 0x52, g->p.y);
+			write_reg(g, 0x53, g->p.y + g->p.cy - 1);
 			break;
 
 		case GDISP_ROTATE_90:
 		case GDISP_ROTATE_270:
-			write_reg(0x0050, g->p.y);
-			write_reg(0x0051, g->p.y + g->p.cy - 1);
-			write_reg(0x0052, g->p.x);
-			write_reg(0x0053, g->p.x + g->p.cx - 1);
+			write_reg(g, 0x50, g->p.y);
+			write_reg(g, 0x51, g->p.y + g->p.cy - 1);
+			write_reg(g, 0x52, g->p.x);
+			write_reg(g, 0x53, g->p.x + g->p.cx - 1);
 			break;
 	}
 }
 
-LLDSPEC bool_t gdisp_lld_init(GDISPDriver *g) {
+LLDSPEC bool_t gdisp_lld_init(GDisplay *g, unsigned display) {
+	uint16_t cver;
+
 	/* Initialise your display */
-	init_board();
+	init_board(g, display);
 
 	/* Hardware reset */
-	setpin_reset(TRUE);
+	setpin_reset(g, TRUE);
 	gfxSleepMicroseconds(1000);
-	setpin_reset(FALSE);
+	setpin_reset(g, FALSE);
 	gfxSleepMicroseconds(1000);
 
-	acquire_bus();
-	write_index(0);				// Get controller version
-	dummy_read();
-    DISPLAY_CODE = read_data();
-    write_reg(0x0000, 0x0001); //start Int. osc
+	acquire_bus(g);
+	write_index(g, 0);				// Get controller version
+	setreadmode(g);
+	dummy_read(g);
+    cver = read_data(g);
+	setwritemode(g);
+    write_reg(g, 0x00, 0x0001); //start Int. osc
     gfxSleepMicroseconds(500);
-    write_reg(0x0001, 0x0100); //Set SS bit (shift direction of outputs is from S720 to S1)
-    write_reg(0x0002, 0x0700); //select  the line inversion
-    write_reg(0x0003, 0x1038); //Entry mode(Horizontal : increment,Vertical : increment, AM=1)
-    write_reg(0x0004, 0x0000); //Resize control(No resizing)
-    write_reg(0x0008, 0x0202); //front and back porch 2 lines
-    write_reg(0x0009, 0x0000); //select normal scan
-    write_reg(0x000A, 0x0000); //display control 4
-    write_reg(0x000C, 0x0000); //system interface(2 transfer /pixel), internal sys clock,
-    write_reg(0x000D, 0x0000); //Frame marker position
-    write_reg(0x000F, 0x0000); //selects clk, enable and sync signal polarity,
-    write_reg(0x0010, 0x0000); //
-    write_reg(0x0011, 0x0000); //power control 2 reference voltages = 1:1,
-    write_reg(0x0012, 0x0000); //power control 3 VRH
-    write_reg(0x0013, 0x0000); //power control 4 VCOM amplitude
+    write_reg(g, 0x01, 0x0100); //Set SS bit (shift direction of outputs is from S720 to S1)
+    write_reg(g, 0x02, 0x0700); //select  the line inversion
+    write_reg(g, 0x03, 0x1038); //Entry mode(Horizontal : increment,Vertical : increment, AM=1)
+    write_reg(g, 0x04, 0x0000); //Resize control(No resizing)
+    write_reg(g, 0x08, 0x0202); //front and back porch 2 lines
+    write_reg(g, 0x09, 0x0000); //select normal scan
+    write_reg(g, 0x0A, 0x0000); //display control 4
+    write_reg(g, 0x0C, 0x0000); //system interface(2 transfer /pixel), internal sys clock,
+    write_reg(g, 0x0D, 0x0000); //Frame marker position
+    write_reg(g, 0x0F, 0x0000); //selects clk, enable and sync signal polarity,
+    write_reg(g, 0x10, 0x0000); //
+    write_reg(g, 0x11, 0x0000); //power control 2 reference voltages = 1:1,
+    write_reg(g, 0x12, 0x0000); //power control 3 VRH
+    write_reg(g, 0x13, 0x0000); //power control 4 VCOM amplitude
     gfxSleepMicroseconds(500);
-    write_reg(0x0010, 0x17B0); //power control 1 BT,AP
-    write_reg(0x0011, 0x0137); //power control 2 DC,VC
+    write_reg(g, 0x10, 0x17B0); //power control 1 BT,AP
+    write_reg(g, 0x11, 0x0137); //power control 2 DC,VC
     gfxSleepMicroseconds(500);
-    write_reg(0x0012, 0x0139); //power control 3 VRH
+    write_reg(g, 0x12, 0x0139); //power control 3 VRH
     gfxSleepMicroseconds(500);
-    write_reg(0x0013, 0x1d00); //power control 4 vcom amplitude
-    write_reg(0x0029, 0x0011); //power control 7 VCOMH
+    write_reg(g, 0x13, 0x1d00); //power control 4 vcom amplitude
+    write_reg(g, 0x29, 0x0011); //power control 7 VCOMH
     gfxSleepMicroseconds(500);
-    write_reg(0x0030, 0x0007);
-    write_reg(0x0031, 0x0403);
-    write_reg(0x0032, 0x0404);
-    write_reg(0x0035, 0x0002);
-    write_reg(0x0036, 0x0707);
-    write_reg(0x0037, 0x0606);
-    write_reg(0x0038, 0x0106);
-    write_reg(0x0039, 0x0007);
-    write_reg(0x003c, 0x0700);
-    write_reg(0x003d, 0x0707);
-    write_reg(0x0020, 0x0000); //starting Horizontal GRAM Address
-    write_reg(0x0021, 0x0000); //starting Vertical GRAM Address
-    write_reg(0x0050, 0x0000); //Horizontal GRAM Start Position
-    write_reg(0x0051, 0x00EF); //Horizontal GRAM end Position
-    write_reg(0x0052, 0x0000); //Vertical GRAM Start Position
-    write_reg(0x0053, 0x013F); //Vertical GRAM end Position
-	switch (DISPLAY_CODE) {   
+    write_reg(g, 0x30, 0x0007);
+    write_reg(g, 0x31, 0x0403);
+    write_reg(g, 0x32, 0x0404);
+    write_reg(g, 0x35, 0x0002);
+    write_reg(g, 0x36, 0x0707);
+    write_reg(g, 0x37, 0x0606);
+    write_reg(g, 0x38, 0x0106);
+    write_reg(g, 0x39, 0x0007);
+    write_reg(g, 0x3c, 0x0700);
+    write_reg(g, 0x3d, 0x0707);
+    write_reg(g, 0x20, 0x0000); //starting Horizontal GRAM Address
+    write_reg(g, 0x21, 0x0000); //starting Vertical GRAM Address
+    write_reg(g, 0x50, 0x0000); //Horizontal GRAM Start Position
+    write_reg(g, 0x51, 0x00EF); //Horizontal GRAM end Position
+    write_reg(g, 0x52, 0x0000); //Vertical GRAM Start Position
+    write_reg(g, 0x53, 0x013F); //Vertical GRAM end Position
+	switch (cver) {
 		case 0x9320:
-        	write_reg(0x0060, 0x2700); //starts scanning from G1, and 320 drive lines
+        	write_reg(g, 0x60, 0x2700); //starts scanning from G1, and 320 drive lines
         	break;
       	case 0x9325:
-     		write_reg(0x0060, 0xA700); //starts scanning from G1, and 320 drive lines
+     		write_reg(g, 0x60, 0xA700); //starts scanning from G1, and 320 drive lines
 			break;
 	}
 
-    write_reg(0x0061, 0x0001); //fixed base display
-    write_reg(0x006a, 0x0000); //no scroll
-    write_reg(0x0090, 0x0010); //set Clocks/Line =16, Internal Operation Clock Frequency=fosc/1,
-    write_reg(0x0092, 0x0000); //set gate output non-overlap period=0
-    write_reg(0x0093, 0x0003); //set Source Output Position=3
-    write_reg(0x0095, 0x0110); //RGB interface(Clocks per line period=16 clocks)
-    write_reg(0x0097, 0x0110); //set Gate Non-overlap Period 0 locksc
-    write_reg(0x0098, 0x0110); //
-    write_reg(0x0007, 0x0173); //display On
-    release_bus();
+    write_reg(g, 0x61, 0x0001); //fixed base display
+    write_reg(g, 0x6a, 0x0000); //no scroll
+    write_reg(g, 0x90, 0x0010); //set Clocks/Line =16, Internal Operation Clock Frequency=fosc/1,
+    write_reg(g, 0x92, 0x0000); //set gate output non-overlap period=0
+    write_reg(g, 0x93, 0x0003); //set Source Output Position=3
+    write_reg(g, 0x95, 0x0110); //RGB interface(Clocks per line period=16 clocks)
+    write_reg(g, 0x97, 0x0110); //set Gate Non-overlap Period 0 locksc
+    write_reg(g, 0x98, 0x0110); //
+    write_reg(g, 0x07, 0x0173); //display On
+
+    // Finish Init
+    post_init_board(g);
+
+  	// Release the bus
+ 	release_bus(g);
 
 	// Turn on the backlight
-	set_backlight(GDISP_INITIAL_BACKLIGHT);
+	set_backlight(g, GDISP_INITIAL_BACKLIGHT);
 	
     /* Initialise the GDISP structure */
     g->g.Width = GDISP_SCREEN_WIDTH;
@@ -183,108 +193,105 @@ LLDSPEC bool_t gdisp_lld_init(GDISPDriver *g) {
 }
 
 #if GDISP_HARDWARE_STREAM_WRITE
-	LLDSPEC	void gdisp_lld_write_start(GDISPDriver *g) {
-		acquire_bus();
+	LLDSPEC	void gdisp_lld_write_start(GDisplay *g) {
+		acquire_bus(g);
 		set_viewport(g);
 	}
-	LLDSPEC	void gdisp_lld_write_color(GDISPDriver *g) {
-		write_data(g->p.color);
+	LLDSPEC	void gdisp_lld_write_color(GDisplay *g) {
+		write_data(g, g->p.color);
 	}
-	LLDSPEC	void gdisp_lld_write_stop(GDISPDriver *g) {
-		release_bus();
+	LLDSPEC	void gdisp_lld_write_stop(GDisplay *g) {
+		release_bus(g);
 	}
-	LLDSPEC void gdisp_lld_write_pos(GDISPDriver *g) {
+	LLDSPEC void gdisp_lld_write_pos(GDisplay *g) {
 		set_cursor(g);
 	}
-	#endif
 #endif
 
 #if GDISP_HARDWARE_STREAM_READ
-	LLDSPEC	void gdisp_lld_read_start(GDISPDriver *g) {
-		acquire_bus();
+	LLDSPEC	void gdisp_lld_read_start(GDisplay *g) {
+		acquire_bus(g);
 		set_viewport(g);
 		set_cursor(g);
-		setreadmode();
-		dummy_read();
+		setreadmode(g);
+		dummy_read(g);
 	}
-	LLDSPEC	color_t gdisp_lld_read_color(GDISPDriver *g) {
-		return read_data();
+	LLDSPEC	color_t gdisp_lld_read_color(GDisplay *g) {
+		return read_data(g);
 	}
-	LLDSPEC	void gdisp_lld_read_stop(GDISPDriver *g) {
-		setwritemode();
-		release_bus();
+	LLDSPEC	void gdisp_lld_read_stop(GDisplay *g) {
+		setwritemode(g);
+		release_bus(g);
 	}
 #endif
 
 #if GDISP_NEED_CONTROL && GDISP_HARDWARE_CONTROL
-	LLDSPEC void gdisp_lld_control(GDISPDriver *g) {
+	LLDSPEC void gdisp_lld_control(GDisplay *g) {
 		switch(g->p.x) {
 		case GDISP_CONTROL_POWER:
 			if (g->g.Powermode == (powermode_t)g->p.ptr)
 				return;
 			switch((powermode_t)g->p.ptr) {
 				case powerOff:
-					acquire_bus();
-					write_reg(0x0007, 0x0000);
-					write_reg(0x0010, 0x0000);
-					write_reg(0x0011, 0x0000);
-					write_reg(0x0012, 0x0000);
-					write_reg(0x0013, 0x0000);
-					release_bus();
-
-					set_backlight(0);
+					acquire_bus(g);
+					write_reg(g, 0x07, 0x0000);
+					write_reg(g, 0x10, 0x0000);
+					write_reg(g, 0x11, 0x0000);
+					write_reg(g, 0x12, 0x0000);
+					write_reg(g, 0x13, 0x0000);
+					release_bus(g);
+
+					set_backlight(g, 0);
 					break;
 
 				case powerOn:
 					//*************Power On sequence ******************//
-					acquire_bus();
-					write_reg(0x0010, 0x0000); /* SAP, BT[3:0], AP, DSTB, SLP, STB */
-					write_reg(0x0011, 0x0000); /* DC1[2:0], DC0[2:0], VC[2:0] */
-					write_reg(0x0012, 0x0000); /* VREG1OUT voltage */
-					write_reg(0x0013, 0x0000); /* VDV[4:0] for VCOM amplitude */
+					acquire_bus(g);
+					write_reg(g, 0x10, 0x0000); /* SAP, BT[3:0], AP, DSTB, SLP, STB */
+					write_reg(g, 0x11, 0x0000); /* DC1[2:0], DC0[2:0], VC[2:0] */
+					write_reg(g, 0x12, 0x0000); /* VREG1OUT voltage */
+					write_reg(g, 0x13, 0x0000); /* VDV[4:0] for VCOM amplitude */
 					gfxSleepMicroseconds(2000);            /* Dis-charge capacitor power voltage */
-					write_reg(0x0010, 0x17B0); /* SAP, BT[3:0], AP, DSTB, SLP, STB */
-					write_reg(0x0011, 0x0147); /* DC1[2:0], DC0[2:0], VC[2:0] */
+					write_reg(g, 0x10, 0x17B0); /* SAP, BT[3:0], AP, DSTB, SLP, STB */
+					write_reg(g, 0x11, 0x0147); /* DC1[2:0], DC0[2:0], VC[2:0] */
 					gfxSleepMicroseconds(500);
-					write_reg(0x0012, 0x013C); /* VREG1OUT voltage */
+					write_reg(g, 0x12, 0x013C); /* VREG1OUT voltage */
 					gfxSleepMicroseconds(500);
-					write_reg(0x0013, 0x0E00); /* VDV[4:0] for VCOM amplitude */
-					write_reg(0x0029, 0x0009); /* VCM[4:0] for VCOMH */
+					write_reg(g, 0x13, 0x0E00); /* VDV[4:0] for VCOM amplitude */
+					write_reg(g, 0x29, 0x0009); /* VCM[4:0] for VCOMH */
 					gfxSleepMicroseconds(500);
-					write_reg(0x0007, 0x0173); /* 262K color and display ON */
-					release_bus();
+					write_reg(g, 0x07, 0x0173); /* 262K color and display ON */
+					release_bus(g);
 
-					set_backlight(g->g.Backlight);
-					if(g->g.Powermode != powerSleep || g->g.Powermode != powerDeepSleep)
-						gdisp_lld_init();
+					set_backlight(g, g->g.Backlight);
 					break;
 
 				case powerSleep:
-					acquire_bus();
-					write_reg(0x0007, 0x0000); /* display OFF */
-					write_reg(0x0010, 0x0000); /* SAP, BT[3:0], APE, AP, DSTB, SLP */
-					write_reg(0x0011, 0x0000); /* DC1[2:0], DC0[2:0], VC[2:0] */
-					write_reg(0x0012, 0x0000); /* VREG1OUT voltage */
-					write_reg(0x0013, 0x0000); /* VDV[4:0] for VCOM amplitude */
+					acquire_bus(g);
+					write_reg(g, 0x07, 0x0000); /* display OFF */
+					write_reg(g, 0x10, 0x0000); /* SAP, BT[3:0], APE, AP, DSTB, SLP */
+					write_reg(g, 0x11, 0x0000); /* DC1[2:0], DC0[2:0], VC[2:0] */
+					write_reg(g, 0x12, 0x0000); /* VREG1OUT voltage */
+					write_reg(g, 0x13, 0x0000); /* VDV[4:0] for VCOM amplitude */
 					gfxSleepMicroseconds(2000); /* Dis-charge capacitor power voltage */
-					write_reg(0x0010, 0x0002); /* SAP, BT[3:0], APE, AP, DSTB, SLP */
-					release_bus();
+					write_reg(g, 0x10, 0x0002); /* SAP, BT[3:0], APE, AP, DSTB, SLP */
+					release_bus(g);
 
-					set_backlight(0);
+					set_backlight(g, 0);
 					break;
 
 				case powerDeepSleep:
-					acquire_bus();
-					write_reg(0x0007, 0x0000); /* display OFF */
-					write_reg(0x0010, 0x0000); /* SAP, BT[3:0], APE, AP, DSTB, SLP */
-					write_reg(0x0011, 0x0000); /* DC1[2:0], DC0[2:0], VC[2:0] */
-					write_reg(0x0012, 0x0000); /* VREG1OUT voltage */
-					write_reg(0x0013, 0x0000); /* VDV[4:0] for VCOM amplitude */
+					acquire_bus(g);
+					write_reg(g, 0x07, 0x0000); /* display OFF */
+					write_reg(g, 0x10, 0x0000); /* SAP, BT[3:0], APE, AP, DSTB, SLP */
+					write_reg(g, 0x11, 0x0000); /* DC1[2:0], DC0[2:0], VC[2:0] */
+					write_reg(g, 0x12, 0x0000); /* VREG1OUT voltage */
+					write_reg(g, 0x13, 0x0000); /* VDV[4:0] for VCOM amplitude */
 					gfxSleepMicroseconds(2000); /* Dis-charge capacitor power voltage */
-					write_reg(0x0010, 0x0004); /* SAP, BT[3:0], APE, AP, DSTB, SLP */
-					release_bus();
+					write_reg(g, 0x10, 0x0004); /* SAP, BT[3:0], APE, AP, DSTB, SLP */
+					release_bus(g);
 
-					set_backlight(0);
+					set_backlight(g, 0);
 					break;
 
 				default:
@@ -298,44 +305,44 @@ LLDSPEC bool_t gdisp_lld_init(GDISPDriver *g) {
 					return;
 				switch((orientation_t)g->p.ptr) {
 				case GDISP_ROTATE_0:
-					acquire_bus();
-					write_reg(0x0001, 0x0100);
-					write_reg(0x0003, 0x1038);
-					write_reg(0x0060, 0x2700);
-					release_bus();
+					acquire_bus(g);
+					write_reg(g, 0x01, 0x0100);
+					write_reg(g, 0x03, 0x1038);
+					write_reg(g, 0x60, 0x2700);
+					release_bus(g);
 
 					g->g.Height = GDISP_SCREEN_HEIGHT;
 					g->g.Width = GDISP_SCREEN_WIDTH;
 					break;
 
 				case GDISP_ROTATE_90:
-					acquire_bus();
-					write_reg(0x0001, 0x0100);
-					write_reg(0x0003, 0x1030);
-					write_reg(0x0060, 0x2700);
-					release_bus();
+					acquire_bus(g);
+					write_reg(g, 0x01, 0x0100);
+					write_reg(g, 0x03, 0x1030);
+					write_reg(g, 0x60, 0x2700);
+					release_bus(g);
 
 					g->g.Height = GDISP_SCREEN_WIDTH;
 					g->g.Width = GDISP_SCREEN_HEIGHT;
 					break;
 
 				case GDISP_ROTATE_180:
-					acquire_bus();
-					write_reg(0x0001, 0x0000);
-					write_reg(0x0003, 0x1030);
-					write_reg(0x0060, 0x2700);
-					release_bus();
+					acquire_bus(g);
+					write_reg(g, 0x01, 0x0000);
+					write_reg(g, 0x03, 0x1030);
+					write_reg(g, 0x60, 0x2700);
+					release_bus(g);
 
 					g->g.Height = GDISP_SCREEN_HEIGHT;
 					g->g.Width = GDISP_SCREEN_WIDTH;
 					break;
 
 				case GDISP_ROTATE_270:
-					acquire_bus();
-					write_reg(0x0001, 0x0000);
-					write_reg(0x0003, 0x1038);
-					write_reg(0x0060, 0xA700);
-					release_bus();
+					acquire_bus(g);
+					write_reg(g, 0x01, 0x0000);
+					write_reg(g, 0x03, 0x1038);
+					write_reg(g, 0x60, 0xA700);
+					release_bus(g);
 
 					g->g.Height = GDISP_SCREEN_WIDTH;
 					g->g.Width = GDISP_SCREEN_HEIGHT;
@@ -350,7 +357,7 @@ LLDSPEC bool_t gdisp_lld_init(GDISPDriver *g) {
 	        case GDISP_CONTROL_BACKLIGHT:
 	            if ((unsigned)g->p.ptr > 100)
 	            	g->p.ptr = (void *)100;
-	            set_backlight((unsigned)g->p.ptr);
+	            set_backlight(g, (unsigned)g->p.ptr);
 	            g->g.Backlight = (unsigned)g->p.ptr;
 	            return;
 			default:
diff --git a/drivers/gdisp/ILI9320/gdisp_lld.mk b/drivers/gdisp/ILI9320/gdisp_lld.mk
index bcdd3230..656f5930 100644
--- a/drivers/gdisp/ILI9320/gdisp_lld.mk
+++ b/drivers/gdisp/ILI9320/gdisp_lld.mk
@@ -1,5 +1,2 @@
-# List the required driver.

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

-

-# Required include directories

 GFXINC += $(GFXLIB)/drivers/gdisp/ILI9320

+GFXSRC += $(GFXLIB)/drivers/gdisp/ILI9320/gdisp_lld.c

diff --git a/drivers/gdisp/ILI9320/gdisp_lld_board_olimex_pic32mx_lcd.h b/drivers/gdisp/ILI9320/gdisp_lld_board_olimex_pic32mx_lcd.h
deleted file mode 100644
index faa54a3e..00000000
--- a/drivers/gdisp/ILI9320/gdisp_lld_board_olimex_pic32mx_lcd.h
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
- * This file is subject to the terms of the GFX License. If a copy of
- * the license was not distributed with this file, you can obtain one at:
- *
- *              http://ugfx.org/license.html
- */
-
-/**
- * @file    drivers/gdisp/ILI9320/gdisp_lld_board_olimex_pic32mx_lcd.h
- * @brief   GDISP Graphic Driver subsystem board interface for the ILI9325 display.
- *
- * @addtogroup GDISP
- * @{
- */
-
-#ifndef GDISP_LLD_BOARD_H
-#define GDISP_LLD_BOARD_H
-
-#ifndef noinline
-#define noinline __attribute__((noinline))
-#endif
-
-static void init_board(void) {
-  // RST
-  palSetPadMode(IOPORTA, 7, PAL_MODE_OUTPUT);
-  palClearPad(IOPORTA, 7);
-
-  // RS
-  palSetPadMode(IOPORTA, 10, PAL_MODE_OUTPUT);
-  palSetPad(IOPORTA, 10);
-
-  // CS
-  palSetPadMode(IOPORTA, 9, PAL_MODE_OUTPUT);
-  palClearPad(IOPORTA, 9);
-
-  // Backlight
-  palSetPadMode(IOPORTD, 3, PAL_MODE_OUTPUT);
-  palSetPad(IOPORTD, 3);
-
-  // PMP setup
-  PMMODE = 0;
-  PMAEN = 0;
-  PMCON = 0;
-  PMMODEbits.MODE = 2;
-  PMMODEbits.WAITB = 0;
-  PMMODEbits.WAITM = 1;
-  PMMODEbits.WAITE = 0;
-  PMCONbits.CSF = 0;
-  PMCONbits.PTRDEN = 1;
-  PMCONbits.PTWREN = 1;
-  PMMODEbits.MODE16 = 1;
-  PMCONbits.PMPEN = 1;
-
-  palClearPad(IOPORTA, 9);
-}
-
-#define PmpWaitBusy()   do {} while (PMMODEbits.BUSY)
-
-static noinline void setpin_reset(bool_t state) {
-  if (state)
-    palClearPad(IOPORTA, 7);
-  else
-    palSetPad(IOPORTA, 7);
-}
-
-static noinline void write_index(uint16_t data) {
-  volatile uint16_t dummy;
-
-  PmpWaitBusy();
-  palClearPad(IOPORTA, 10);
-  PMDIN = data;
-  PmpWaitBusy();
-  palSetPad(IOPORTA, 10);
-
-  dummy = PMDIN;
-  (void)dummy;
-}
-
-static noinline void write_data(uint16_t data) {
-  PMDIN = data;
-  PmpWaitBusy();
-}
-
-static inline void setreadmode(void) {
-}
-
-static inline void setwritemode(void) {
-}
-
-static noinline uint16_t read_data(void) {
-  PmpWaitBusy();
-  return PMDIN;
-}
-
-/* if not available, just ignore the argument and return */
-static void set_backlight(uint8_t percentage) {
-  if (percentage)
-    palClearPad(IOPORTD, 3);
-  else
-    palSetPad(IOPORTD, 3);
-}
-
-static inline void acquire_bus(void) {
-  /* Nothing to do here since LCD is the only device on that bus */
-}
-
-static inline void release_bus(void) {
-  /* Nothing to do here since LCD is the only device on that bus */
-}
-
-#endif /* GDISP_LLD_BOARD_H */
-/** @} */
-
diff --git a/drivers/gdisp/ILI9320/gdisp_lld_board_olimex_stm32_lcd.h b/drivers/gdisp/ILI9320/gdisp_lld_board_olimex_stm32_lcd.h
deleted file mode 100644
index 1662385a..00000000
--- a/drivers/gdisp/ILI9320/gdisp_lld_board_olimex_stm32_lcd.h
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * This file is subject to the terms of the GFX License. If a copy of
- * the license was not distributed with this file, you can obtain one at:
- *
- *              http://ugfx.org/license.html
- */
-
-/**
- * @file    drivers/gdisp/ILI9320/gdisp_lld_board_olimex_stm32_lcd.h
- * @brief   GDISP Graphic Driver subsystem board interface for the ILI9320 display.
- *
- * @addtogroup GDISP
- * @{
- */
-
-#ifndef GDISP_LLD_BOARD_H
-#define GDISP_LLD_BOARD_H
-
-#define GDISP_REG              (*((volatile uint16_t *) 0x60000000)) /* RS = 0 */
-#define GDISP_RAM              (*((volatile uint16_t *) 0x60100000)) /* RS = 1 */
-
-static inline void init_board(void) {
-	/* FSMC setup for F1 */
-	rccEnableAHB(RCC_AHBENR_FSMCEN, 0);
-
-    /* set pin modes */
-    IOBus busD = {GPIOD, PAL_WHOLE_PORT, 0}; 
-    IOBus busE = {GPIOE, PAL_WHOLE_PORT, 0}; 
-    palSetBusMode(&busD, PAL_MODE_STM32_ALTERNATE_PUSHPULL);
-    palSetBusMode(&busE, PAL_MODE_STM32_ALTERNATE_PUSHPULL);
-	palSetPadMode(GPIOE, GPIOE_TFT_RST, PAL_MODE_OUTPUT_PUSHPULL);
-	palSetPadMode(GPIOD, GPIOD_TFT_LIGHT, PAL_MODE_OUTPUT_PUSHPULL);
-
-    const unsigned char FSMC_Bank = 0;
-
-    /* FSMC timing */
-    FSMC_Bank1->BTCR[FSMC_Bank+1] = (6) | (10 << 8) | (10 << 16);
-
-    /* Bank1 NOR/SRAM control register configuration
-     * This is actually not needed as already set by default after reset */
-    FSMC_Bank1->BTCR[FSMC_Bank] = FSMC_BCR1_MWID_0 | FSMC_BCR1_WREN | FSMC_BCR1_MBKEN;
-}
-
-static inline void setpin_reset(bool_t state) {
-	if(state)
-		palClearPad(GPIOE, GPIOE_TFT_RST);
-	else
-		palSetPad(GPIOE, GPIOE_TFT_RST);
-}
-
-static inline void acquire_bus(void) {
-			/* Nothing to do here since LCD is the only device on that bus */
-}
-
-static inline void release_bus(void) {
-			/* Nothing to do here since LCD is the only device on that bus */
-}
-
-static inline void write_index(uint16_t reg) {
-	GDISP_REG = reg;
-}
-
-static inline void write_data(uint16_t data) {
-	GDISP_RAM = data;
-}
-
-static inline void setreadmode(void) {
-}
-
-static inline void setwritemode(void) {
-}
-
-static inline uint16_t read_data(void) {
-	return GDISP_RAM;
-}
-
-static inline void set_backlight(uint8_t percent) {
-	if(percent == 100)
-		palClearPad(GPIOD, GPIOD_TFT_LIGHT);
-	else
-		palSetPad(GPIOD, GPIOD_TFT_LIGHT);
-}
-
-#endif /* GDISP_LLD_BOARD_H */
-/** @} */
-
diff --git a/drivers/gdisp/ILI9320/gdisp_lld_board_template.h b/drivers/gdisp/ILI9320/gdisp_lld_board_template.h
deleted file mode 100644
index 201b3630..00000000
--- a/drivers/gdisp/ILI9320/gdisp_lld_board_template.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * This file is subject to the terms of the GFX License. If a copy of
- * the license was not distributed with this file, you can obtain one at:
- *
- *              http://ugfx.org/license.html
- */
-
-/**
- * @file    drivers/gdisp/ILI9320/gdisp_lld_board_template.h
- * @brief   GDISP Graphic Driver subsystem board interface for the ILI9320 display.
- *
- * @addtogroup GDISP
- * @{
- */
-
-#ifndef GDISP_LLD_BOARD_H
-#define GDISP_LLD_BOARD_H
-
-static inline void init_board(void) {
-
-}
-
-static inline void setpin_reset(bool_t state) {
-
-}
-
-static inline void acquire_bus(void) {
-
-}
-
-static inline void release_bus(void) {
-
-}
-
-static inline void write_index(uint16_t data) {
-
-}
-
-static inline void write_data(uint16_t data) {
-
-}
-
-static inline void setreadmode(void) {
-
-}
-
-static inline void setwritemode(void) {
-
-}
-
-static inline uint16_t read_data(void) {
-
-}
-
-static inline uint16_t set_backlight(uint8_t percentage) {
-
-}
-
-#endif /* GDISP_LLD_BOARD_H */
-/** @} */
-
diff --git a/drivers/gdisp/ILI9320/gdisp_lld_config.h b/drivers/gdisp/ILI9320/gdisp_lld_config.h
index 02533e8b..3c5c7484 100644
--- a/drivers/gdisp/ILI9320/gdisp_lld_config.h
+++ b/drivers/gdisp/ILI9320/gdisp_lld_config.h
@@ -22,9 +22,6 @@
 /* Driver hardware support.                                                  */

 /*===========================================================================*/

 

-#define GDISP_DRIVER_NAME				"ILI9320"

-#define GDISP_DRIVER_STRUCT				GDISP_ILI9320
-
 #define GDISP_HARDWARE_STREAM_WRITE		TRUE
 #define GDISP_HARDWARE_STREAM_READ		TRUE
 #define GDISP_HARDWARE_STREAM_POS		TRUE