diff --git a/drivers/gdisp/ILI9320/gdisp_lld.c b/drivers/gdisp/ILI9320/gdisp_lld.c
index 8dc529dd..d8bc411a 100644
--- a/drivers/gdisp/ILI9320/gdisp_lld.c
+++ b/drivers/gdisp/ILI9320/gdisp_lld.c
@@ -14,13 +14,6 @@
 
 #if GFX_USE_GDISP
 
-#define GDISP_LLD_DECLARATIONS
-#include "gdisp/lld/gdisp_lld.h"
-
-/*===========================================================================*/
-/* Driver local definitions.                                                 */
-/*===========================================================================*/
-
 /* This controller is only ever used with a 240 x 320 display */
 #if defined(GDISP_SCREEN_HEIGHT)
 	#warning "GDISP: This low level driver does not support setting a screen size. It is being ignored."
@@ -31,8 +24,14 @@
 	#undef GDISP_SCREEN_WIDTH
 #endif
 
+#define GDISP_LLD_DECLARATIONS
+#include "gdisp/lld/gdisp_lld.h"
 #include "gdisp_lld_board.h"
 
+/*===========================================================================*/
+/* Driver local definitions.                                                 */
+/*===========================================================================*/
+
 #ifndef GDISP_SCREEN_HEIGHT
 	#define GDISP_SCREEN_HEIGHT		320
 #endif
diff --git a/drivers/gdisp/ILI9325/gdisp_lld.c b/drivers/gdisp/ILI9325/gdisp_lld.c
index d47adb3a..a30bea44 100644
--- a/drivers/gdisp/ILI9325/gdisp_lld.c
+++ b/drivers/gdisp/ILI9325/gdisp_lld.c
@@ -17,15 +17,6 @@
 
 #if GFX_USE_GDISP /*|| defined(__DOXYGEN__)*/
 
-/* Include the emulation code for things we don't support */
-#include "gdisp/lld/emulation.c"
-
-#include "gdisp_lld_board.h"
-
-/*===========================================================================*/
-/* Driver local definitions.                                                 */
-/*===========================================================================*/
-
 /* This controller is only ever used with a 240 x 320 display */
 #if defined(GDISP_SCREEN_HEIGHT)
 	#warning "GDISP: This low level driver does not support setting a screen size. It is being ignored."
@@ -36,16 +27,27 @@
 	#undef GDISP_SCREEN_WIDTH
 #endif
 
-#define GDISP_SCREEN_WIDTH		240
-#define GDISP_SCREEN_HEIGHT		320
-
-#define GDISP_INITIAL_CONTRAST	50
-#define GDISP_INITIAL_BACKLIGHT	100
+#define GDISP_LLD_DECLARATIONS
+#include "gdisp/lld/gdisp_lld.h"
+#include "gdisp_lld_board.h"
 
 /*===========================================================================*/
-/* Driver exported variables.                                                */
+/* Driver local definitions.                                                 */
 /*===========================================================================*/
 
+#ifndef GDISP_SCREEN_HEIGHT
+	#define GDISP_SCREEN_HEIGHT		320
+#endif
+#ifndef GDISP_SCREEN_WIDTH
+	#define GDISP_SCREEN_WIDTH		240
+#endif
+#ifndef GDISP_INITIAL_CONTRAST
+	#define GDISP_INITIAL_CONTRAST	50
+#endif
+#ifndef GDISP_INITIAL_BACKLIGHT
+	#define GDISP_INITIAL_BACKLIGHT	100
+#endif
+
 /*===========================================================================*/
 /* Driver local variables.                                                   */
 /*===========================================================================*/
@@ -54,524 +56,281 @@ uint32_t DISPLAY_CODE;
 /*===========================================================================*/
 /* Driver local functions.                                                   */
 /*===========================================================================*/
-static inline void lld_lcdDelay(uint16_t us) {
-	gfxSleepMicroseconds(us);
+
+// Some common routines and macros
+#define dummy_read()				{ volatile uint16_t dummy; dummy = read_data(); (void) dummy; }
+#define write_reg(reg, data)		{ write_index(reg); write_data(data); }
+
+static void set_viewport(GDISPDriver* g) {
+	switch(g->g.Orientation) {
+		case GDISP_ROTATE_0:
+		case GDISP_ROTATE_180:
+			write_reg(0x0050, x);
+			write_reg(0x0051, x + cx - 1);
+			write_reg(0x0052, y);
+			write_reg(0x0053, y + cy - 1);
+			write_reg(0x0020, x);
+			write_reg(0x0021, y);
+			break;
+
+		case GDISP_ROTATE_90:
+		case GDISP_ROTATE_270:
+			write_reg(0x0050, y);
+			write_reg(0x0051, y + cy - 1);
+			write_reg(0x0052, x);
+			write_reg(0x0053, x + cx - 1);
+			write_reg(0x0020, y);
+			write_reg(0x0021, x);
+			break;
+	}
+    write_reg(0x0022, color);
 }
 
-static inline void lld_lcdWriteIndex(uint16_t index) {
-	gdisp_lld_write_index(index);
-}
-
-static inline void lld_lcdWriteData(uint16_t data) {
-	gdisp_lld_write_data(data);
-}
-
-static inline void lld_lcdWriteReg(uint16_t lcdReg, uint16_t lcdRegValue) {
-	gdisp_lld_write_index(lcdReg);
-	gdisp_lld_write_data(lcdRegValue);
-}
-
-static inline uint16_t lld_lcdReadData(void) {
-	return gdisp_lld_read_data();
-}
-
-static inline uint16_t lld_lcdReadReg(uint16_t lcdReg) {
-    volatile uint16_t dummy;
-
-    gdisp_lld_write_index(lcdReg);
-    dummy = lld_lcdReadData();
-    (void)dummy;
-
-    return lld_lcdReadData();
-}
-
-static inline void lld_lcdWriteStreamStart(void) {
-	lld_lcdWriteIndex(0x0022);
-}
-	
-static inline void lld_lcdWriteStreamStop(void) {
-
-}
-
-static inline void lld_lcdWriteStream(uint16_t *buffer, uint16_t size) {
-	uint16_t i;
-
-	for(i = 0; i < size; i++)
-		lld_lcdWriteData(buffer[i]);
-}
-
-static inline void lld_lcdReadStreamStart(void) {
-	lld_lcdWriteIndex(0x0022);
-}
-
-static inline void lld_lcdReadStreamStop(void) {
-
-}
-
-static inline void lld_lcdReadStream(uint16_t *buffer, size_t size) {
-	uint16_t i;
-	volatile uint16_t dummy;
-
-	dummy = lld_lcdReadData();
-	(void)dummy;
-
-	for(i = 0; i < size; i++)
-		buffer[i] = lld_lcdReadData();
-}
-
-bool_t gdisp_lld_init(void) {
+LLDSPEC bool_t gdisp_lld_init(GDISPDriver *g) {
 	/* Initialise your display */
-	gdisp_lld_init_board();
+	init_board();
 
 	/* Hardware reset */
-	gdisp_lld_reset_pin(TRUE);
-	lld_lcdDelay(1000);
-	gdisp_lld_reset_pin(FALSE);
-	lld_lcdDelay(1000);
+	setpin_reset(TRUE);
+	gfxSleepMicroseconds(1000);
+	setpin_reset(FALSE);
+	gfxSleepMicroseconds(1000);
 
-	DISPLAY_CODE = lld_lcdReadReg(0);
+	acquire_bus();
+	write_index(0);				// Get controller version
+	dummy_read();
+    DISPLAY_CODE = read_data();
 
 	// chinese code starts here
-	lld_lcdWriteReg(0x0000,0x0001);
-	lld_lcdDelay(10);
+	write_reg(0x0000,0x0001);
+	gfxSleepMilliseconds(10);
 
-	lld_lcdWriteReg(0x0015,0x0030);
-	lld_lcdWriteReg(0x0011,0x0040);
-	lld_lcdWriteReg(0x0010,0x1628);
-	lld_lcdWriteReg(0x0012,0x0000);
-	lld_lcdWriteReg(0x0013,0x104d);
-	lld_lcdDelay(10);
-	lld_lcdWriteReg(0x0012,0x0010);
-	lld_lcdDelay(10);
-	lld_lcdWriteReg(0x0010,0x2620);
-	lld_lcdWriteReg(0x0013,0x344d); //304d
-	lld_lcdDelay(10);
+	write_reg(0x0015,0x0030);
+	write_reg(0x0011,0x0040);
+	write_reg(0x0010,0x1628);
+	write_reg(0x0012,0x0000);
+	write_reg(0x0013,0x104d);
+	gfxSleepMilliseconds(10);
+	write_reg(0x0012,0x0010);
+	gfxSleepMilliseconds(10);
+	write_reg(0x0010,0x2620);
+	write_reg(0x0013,0x344d); //304d
+	gfxSleepMilliseconds(10);
 
-	lld_lcdWriteReg(0x0001,0x0100);
-	lld_lcdWriteReg(0x0002,0x0300);
-	lld_lcdWriteReg(0x0003,0x1038);//0x1030
-	lld_lcdWriteReg(0x0008,0x0604);
-	lld_lcdWriteReg(0x0009,0x0000);
-	lld_lcdWriteReg(0x000A,0x0008);
+	write_reg(0x0001,0x0100);
+	write_reg(0x0002,0x0300);
+	write_reg(0x0003,0x1038);//0x1030
+	write_reg(0x0008,0x0604);
+	write_reg(0x0009,0x0000);
+	write_reg(0x000A,0x0008);
 
-	lld_lcdWriteReg(0x0041,0x0002);
-	lld_lcdWriteReg(0x0060,0x2700);
-	lld_lcdWriteReg(0x0061,0x0001);
-	lld_lcdWriteReg(0x0090,0x0182);
-	lld_lcdWriteReg(0x0093,0x0001);
-	lld_lcdWriteReg(0x00a3,0x0010);
-	lld_lcdDelay(10);
+	write_reg(0x0041,0x0002);
+	write_reg(0x0060,0x2700);
+	write_reg(0x0061,0x0001);
+	write_reg(0x0090,0x0182);
+	write_reg(0x0093,0x0001);
+	write_reg(0x00a3,0x0010);
+	gfxSleepMilliseconds(10);
 
 	//################# void Gamma_Set(void) ####################//
-	lld_lcdWriteReg(0x30,0x0000);		
-	lld_lcdWriteReg(0x31,0x0502);		
-	lld_lcdWriteReg(0x32,0x0307);		
-	lld_lcdWriteReg(0x33,0x0305);		
-	lld_lcdWriteReg(0x34,0x0004);		
-	lld_lcdWriteReg(0x35,0x0402);		
-	lld_lcdWriteReg(0x36,0x0707);		
-	lld_lcdWriteReg(0x37,0x0503);		
-	lld_lcdWriteReg(0x38,0x1505);		
-	lld_lcdWriteReg(0x39,0x1505);
-	lld_lcdDelay(10);
+	write_reg(0x30,0x0000);
+	write_reg(0x31,0x0502);
+	write_reg(0x32,0x0307);
+	write_reg(0x33,0x0305);
+	write_reg(0x34,0x0004);
+	write_reg(0x35,0x0402);
+	write_reg(0x36,0x0707);
+	write_reg(0x37,0x0503);
+	write_reg(0x38,0x1505);
+	write_reg(0x39,0x1505);
+	gfxSleepMilliseconds(10);
 
 	//################## void Display_ON(void) ####################//
-	lld_lcdWriteReg(0x0007,0x0001);
-	lld_lcdDelay(10);
-	lld_lcdWriteReg(0x0007,0x0021);
-	lld_lcdWriteReg(0x0007,0x0023);
-	lld_lcdDelay(10);
-	lld_lcdWriteReg(0x0007,0x0033);
-	lld_lcdDelay(10);
-	lld_lcdWriteReg(0x0007,0x0133);
+	write_reg(0x0007,0x0001);
+	gfxSleepMilliseconds(10);
+	write_reg(0x0007,0x0021);
+	write_reg(0x0007,0x0023);
+	gfxSleepMilliseconds(10);
+	write_reg(0x0007,0x0033);
+	gfxSleepMilliseconds(10);
+	write_reg(0x0007,0x0133);
 
 	// chinese code ends here
 
 	// Turn on the backlight
-	gdisp_lld_backlight(GDISP_INITIAL_BACKLIGHT);
+	set_backlight(GDISP_INITIAL_BACKLIGHT);
 	
     /* Initialise the GDISP structure */
-    GDISP.Width = GDISP_SCREEN_WIDTH;
-    GDISP.Height = GDISP_SCREEN_HEIGHT;
-    GDISP.Orientation = GDISP_ROTATE_0;
-    GDISP.Powermode = powerOn;
-    GDISP.Backlight = GDISP_INITIAL_BACKLIGHT;
-    GDISP.Contrast = GDISP_INITIAL_CONTRAST;
-    #if GDISP_NEED_VALIDATION || GDISP_NEED_CLIP
-	GDISP.clipx0 = 0;
-	GDISP.clipy0 = 0;
-	GDISP.clipx1 = GDISP.Width;
-	GDISP.clipy1 = GDISP.Height;
-    #endif
+    g->g.Width = GDISP_SCREEN_WIDTH;
+    g->g.Height = GDISP_SCREEN_HEIGHT;
+    g->g.Orientation = GDISP_ROTATE_0;
+    g->g.Powermode = powerOn;
+    g->g.Backlight = GDISP_INITIAL_BACKLIGHT;
+    g->g.Contrast = GDISP_INITIAL_CONTRAST;
 
 	return TRUE;
 }
 
-static void lld_lcdSetCursor(uint16_t x, uint16_t y) {
-
-	switch(GDISP.Orientation) {
-		case GDISP_ROTATE_0:
-			lld_lcdWriteReg(0x0020, x);
-			lld_lcdWriteReg(0x0021, y);
-			break;
-
-		case GDISP_ROTATE_90:
-			lld_lcdWriteReg(0x0020, y);
-			lld_lcdWriteReg(0x0021, x);
-			break;
-
-		case GDISP_ROTATE_180:
-			lld_lcdWriteReg(0x0020, x);
-			lld_lcdWriteReg(0x0021, y);
-			break;
-
-		case GDISP_ROTATE_270:
-			lld_lcdWriteReg(0x0020, y);
-			lld_lcdWriteReg(0x0021, x);
-			break;
+#if GDISP_HARDWARE_STREAM_WRITE
+	LLDSPEC	void gdisp_lld_write_start(GDISPDriver *g) {
+		acquire_bus();
+		set_viewport(g);
 	}
-}
-
-static void lld_lcdSetViewPort(uint16_t x, uint16_t y, uint16_t cx, uint16_t cy) {
-	switch(GDISP.Orientation) {
-		case GDISP_ROTATE_0:
-			lld_lcdWriteReg(0x0050, x);
-			lld_lcdWriteReg(0x0051, x + cx - 1);
-			lld_lcdWriteReg(0x0052, y);
-			lld_lcdWriteReg(0x0053, y + cy - 1);
-			break;
-
-		case GDISP_ROTATE_90:
-			lld_lcdWriteReg(0x0050, y);
-			lld_lcdWriteReg(0x0051, y + cy - 1);
-			lld_lcdWriteReg(0x0052, x);
-			lld_lcdWriteReg(0x0053, x + cx - 1);
-			break;
-
-		case GDISP_ROTATE_180:
-			lld_lcdWriteReg(0x0050, x);
-			lld_lcdWriteReg(0x0051, x + cx - 1);
-			lld_lcdWriteReg(0x0052, y);
-			lld_lcdWriteReg(0x0053, y + cy - 1);
-			break;
-
-		case GDISP_ROTATE_270:
-			lld_lcdWriteReg(0x0050, y);
-			lld_lcdWriteReg(0x0051, y + cy - 1);
-			lld_lcdWriteReg(0x0052, x);
-			lld_lcdWriteReg(0x0053, x + cx - 1);
-			break;
-
+	LLDSPEC	void gdisp_lld_write_color(GDISPDriver *g) {
+		write_data(g->p.color);
 	}
-
-	lld_lcdSetCursor(x, y);
-}
-
-static inline void lld_lcdResetViewPort(void) { 
-    switch(GDISP.Orientation) {
-        case GDISP_ROTATE_0:
-        case GDISP_ROTATE_180:
-            lld_lcdSetViewPort(0, 0, GDISP_SCREEN_WIDTH, GDISP_SCREEN_HEIGHT);
-            break;
-        case GDISP_ROTATE_90:
-        case GDISP_ROTATE_270:
-           	lld_lcdSetViewPort(0, 0, GDISP_SCREEN_HEIGHT, GDISP_SCREEN_WIDTH);
-            break;
-    }
-}
-
-void gdisp_lld_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
-    lld_lcdSetCursor(x, y);
-    lld_lcdWriteReg(0x0022, color);
-}
-
-#if GDISP_HARDWARE_CLEARS || defined(__DOXYGEN__)
-	void gdisp_lld_clear(color_t color) {
-	    unsigned i;
-
-	    lld_lcdSetCursor(0, 0);
-	    lld_lcdWriteStreamStart();
-
-	    for(i = 0; i < GDISP_SCREEN_WIDTH * GDISP_SCREEN_HEIGHT; i++)
-	    	lld_lcdWriteData(color);
-
-	    lld_lcdWriteStreamStop();
+	LLDSPEC	void gdisp_lld_write_stop(GDISPDriver *g) {
+		release_bus();
 	}
 #endif
 
-#if GDISP_HARDWARE_FILLS || defined(__DOXYGEN__)
-	void gdisp_lld_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; }
-			if (cx <= 0 || cy <= 0 || x >= GDISP.clipx1 || y >= GDISP.clipy1) return;
-			if (x+cx > GDISP.clipx1)	cx = GDISP.clipx1 - x;
-			if (y+cy > GDISP.clipy1)	cy = GDISP.clipy1 - y;
-		#endif
-
-		unsigned i, area;
-
-		area = cx*cy;
-		lld_lcdSetViewPort(x, y, cx, cy);
-		lld_lcdWriteStreamStart();
-		for(i = 0; i < area; i++)
-			lld_lcdWriteData(color);
-		lld_lcdWriteStreamStop();
-		lld_lcdResetViewPort();
+#if GDISP_HARDWARE_STREAM_READ
+	LLDSPEC	void gdisp_lld_read_start(GDISPDriver *g) {
+		acquire_bus();
+		set_viewport(g);
+		setreadmode();
+		dummy_read();
+	}
+	LLDSPEC	color_t gdisp_lld_read_color(GDISPDriver *g) {
+		return read_data();
+	}
+	LLDSPEC	void gdisp_lld_read_stop(GDISPDriver *g) {
+		setwritemode();
+		release_bus();
 	}
 #endif
 
-#if GDISP_HARDWARE_BITFILLS || defined(__DOXYGEN__)
-	void gdisp_lld_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;
-
-		#if GDISP_NEED_VALIDATION || GDISP_NEED_CLIP
-			if (x < GDISP.clipx0) { cx -= GDISP.clipx0 - x; srcx += GDISP.clipx0 - x; x = GDISP.clipx0; }
-			if (y < GDISP.clipy0) { cy -= GDISP.clipy0 - y; srcy += GDISP.clipy0 - y; y = GDISP.clipy0; }
-			if (srcx+cx > srccx)		cx = srccx - srcx;
-			if (cx <= 0 || cy <= 0 || x >= GDISP.clipx1 || y >= GDISP.clipy1) return;
-			if (x+cx > GDISP.clipx1)	cx = GDISP.clipx1 - x;
-			if (y+cy > GDISP.clipy1)	cy = GDISP.clipy1 - y;
-		#endif
-
-		lld_lcdSetViewPort(x, y, cx, cy);
-		lld_lcdWriteStreamStart();
-
-		endx = srcx + cx;
-		endy = y + cy;
-		lg = srccx - cx;
-		buffer += srcx + srcy * srccx;
-		for(; y < endy; y++, buffer += lg)
-			for(x=srcx; x < endx; x++)
-				lld_lcdWriteData(*buffer++);
-		lld_lcdWriteStreamStop();
-		lld_lcdResetViewPort();
-	}
-#endif
-
-#if (GDISP_NEED_PIXELREAD && GDISP_HARDWARE_PIXELREAD) || defined(__DOXYGEN__)
-	color_t gdisp_lld_get_pixel_color(coord_t x, coord_t y) {
-		color_t color;
-
-		#if GDISP_NEED_VALIDATION || GDISP_NEED_CLIP
-			if (x < 0 || x >= GDISP.Width || y < 0 || y >= GDISP.Height) return 0;
-		#endif
-
-		lld_lcdSetCursor(x, y);
-		lld_lcdWriteStreamStart();
-
-		color = lld_lcdReadData();
-		color = lld_lcdReadData();
-
-		lld_lcdWriteStreamStop();
-
-		return color;
-	}
-#endif
-
-#if (GDISP_NEED_SCROLL && GDISP_HARDWARE_SCROLL) || defined(__DOXYGEN__)
-	void gdisp_lld_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;
-
-		#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; }
-			if (!lines || cx <= 0 || cy <= 0 || x >= GDISP.clipx1 || y >= GDISP.clipy1) return;
-			if (x+cx > GDISP.clipx1)	cx = GDISP.clipx1 - x;
-			if (y+cy > GDISP.clipy1)	cy = GDISP.clipy1 - y;
-		#endif
-
-		abslines = lines < 0 ? -lines : lines;
-
-		if (abslines >= cy) {
-			abslines = cy;
-			gap = 0;
-		} else {
-			gap = cy - abslines;
-			for(i = 0; i < gap; i++) {
-				if(lines > 0) {
-					row0 = y + i + lines;
-					row1 = y + i;
-				} else {
-					row0 = (y - i - 1) + lines;
-					row1 = (y - i - 1);
-				}
-
-				/* read row0 into the buffer and then write at row1*/
-				lld_lcdSetViewPort(x, row0, cx, 1);
-				lld_lcdReadStreamStart();
-				lld_lcdReadStream(buf, cx);
-				lld_lcdReadStreamStop();
-
-				lld_lcdSetViewPort(x, row1, cx, 1);
-				lld_lcdWriteStreamStart();
-				lld_lcdWriteStream(buf, cx);
-				lld_lcdWriteStreamStop();
-			}
-		}
-
-		/* fill the remaining gap */
-		lld_lcdSetViewPort(x, lines > 0 ? (y+gap) : y, cx, abslines);
-		lld_lcdWriteStreamStart();
-		gap = cx*abslines;
-		for(i = 0; i < gap; i++) lld_lcdWriteData(bgcolor);
-		lld_lcdWriteStreamStop();
-		lld_lcdResetViewPort();
-	}
-#endif
-
-#if (GDISP_NEED_CONTROL && GDISP_HARDWARE_CONTROL) || defined(__DOXYGEN__)
-	void gdisp_lld_control(unsigned what, void *value) {
-		switch(what) {
-			case GDISP_CONTROL_POWER:
-				if(GDISP.Powermode == (gdisp_powermode_t)value)
-					return;
-				switch((gdisp_powermode_t)value) {
-					case powerOff:
-						acquire_bus();
-						lld_lcdWriteReg(0x0007, 0x0000);
-						lld_lcdWriteReg(0x0010, 0x0000);
-						lld_lcdWriteReg(0x0011, 0x0000);
-						lld_lcdWriteReg(0x0012, 0x0000);
-						lld_lcdWriteReg(0x0013, 0x0000);
-						release_bus();
-
-						gdisp_lld_backlight(0);
-						break;
-			
-					case powerOn:
-						//*************Power On sequence ******************//
-						acquire_bus();
-						lld_lcdWriteReg(0x0010, 0x0000); /* SAP, BT[3:0], AP, DSTB, SLP, STB */
-						lld_lcdWriteReg(0x0011, 0x0000); /* DC1[2:0], DC0[2:0], VC[2:0] */
-						lld_lcdWriteReg(0x0012, 0x0000); /* VREG1OUT voltage */
-						lld_lcdWriteReg(0x0013, 0x0000); /* VDV[4:0] for VCOM amplitude */
-						lld_lcdDelay(2000);            /* Dis-charge capacitor power voltage */
-						lld_lcdWriteReg(0x0010, 0x17B0); /* SAP, BT[3:0], AP, DSTB, SLP, STB */
-						lld_lcdWriteReg(0x0011, 0x0147); /* DC1[2:0], DC0[2:0], VC[2:0] */
-						lld_lcdDelay(500);
-						lld_lcdWriteReg(0x0012, 0x013C); /* VREG1OUT voltage */
-						lld_lcdDelay(500);
-						lld_lcdWriteReg(0x0013, 0x0E00); /* VDV[4:0] for VCOM amplitude */
-						lld_lcdWriteReg(0x0029, 0x0009); /* VCM[4:0] for VCOMH */
-						lld_lcdDelay(500);
-						lld_lcdWriteReg(0x0007, 0x0173); /* 262K color and display ON */
-						release_bus();
-
-						gdisp_lld_backlight(GDISP.Backlight);
-						if(GDISP.Powermode != powerSleep || GDISP.Powermode != powerDeepSleep)
-							gdisp_lld_init();
-						break;
-	
-					case powerSleep:
-						acquire_bus();
-	             		lld_lcdWriteReg(0x0007, 0x0000); /* display OFF */
-	                   	lld_lcdWriteReg(0x0010, 0x0000); /* SAP, BT[3:0], APE, AP, DSTB, SLP */
-	                  	lld_lcdWriteReg(0x0011, 0x0000); /* DC1[2:0], DC0[2:0], VC[2:0] */
-	                  	lld_lcdWriteReg(0x0012, 0x0000); /* VREG1OUT voltage */
-	                  	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 */
-	                  	release_bus();
-
-						gdisp_lld_backlight(0);
-						break;
-
-					case powerDeepSleep:
-						acquire_bus();
-					    lld_lcdWriteReg(0x0007, 0x0000); /* display OFF */
-					    lld_lcdWriteReg(0x0010, 0x0000); /* SAP, BT[3:0], APE, AP, DSTB, SLP */
-					    lld_lcdWriteReg(0x0011, 0x0000); /* DC1[2:0], DC0[2:0], VC[2:0] */
-	   					lld_lcdWriteReg(0x0012, 0x0000); /* VREG1OUT voltage */
-	   					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 */
-	  					release_bus();
-
-						gdisp_lld_backlight(0);
-						break;
-
-					default:
-						return;
-				}
-				GDISP.Powermode = (gdisp_powermode_t)value;
+#if GDISP_NEED_CONTROL && GDISP_HARDWARE_CONTROL
+	LLDSPEC void gdisp_lld_control(GDISPDriver *g) {
+		switch(g->p.x) {
+		case GDISP_CONTROL_POWER:
+			if (g->g.Powermode == (powermode_t)g->p.ptr)
 				return;
-
-			case GDISP_CONTROL_ORIENTATION:
-				if(GDISP.Orientation == (gdisp_orientation_t)value)
-					return;
-				switch((gdisp_orientation_t)value) {
-					case GDISP_ROTATE_0:
-						acquire_bus();
-						lld_lcdWriteReg(0x0001, 0x0100);
-						lld_lcdWriteReg(0x0003, 0x1038);
-						lld_lcdWriteReg(0x0060, 0x2700);
-						release_bus();
-
-						GDISP.Height = GDISP_SCREEN_HEIGHT;
-						GDISP.Width = GDISP_SCREEN_WIDTH;
-						break;
-
-					case GDISP_ROTATE_90:
-						acquire_bus();
-						lld_lcdWriteReg(0x0001, 0x0000);
-						lld_lcdWriteReg(0x0003, 0x1030);
-						lld_lcdWriteReg(0x0060, 0x2700);
-						release_bus();
-
-						GDISP.Height = GDISP_SCREEN_WIDTH;
-						GDISP.Width = GDISP_SCREEN_HEIGHT;
-						break;
-			
-					case GDISP_ROTATE_180:
-						acquire_bus();
-						lld_lcdWriteReg(0x0001, 0x0000);
-						lld_lcdWriteReg(0x0003, 0x1038);
-						lld_lcdWriteReg(0x0060, 0xa700);
-						release_bus();
-
-						GDISP.Height = GDISP_SCREEN_HEIGHT;
-						GDISP.Width = GDISP_SCREEN_WIDTH;
-						break;
-		
-					case GDISP_ROTATE_270:
-						acquire_bus();
-						lld_lcdWriteReg(0x0001, 0x0100);
-						lld_lcdWriteReg(0x0003, 0x1030);
-						lld_lcdWriteReg(0x0060, 0xA700);
-						release_bus();
-
-						GDISP.Height = GDISP_SCREEN_WIDTH;
-						GDISP.Width = GDISP_SCREEN_HEIGHT;
-						break;
-			
-					default:
-						return;
-				}
-			
-				#if GDISP_NEED_CLIP || GDISP_NEED_VALIDATION
-				GDISP.clipx0 = 0;
-				GDISP.clipy0 = 0;
-				GDISP.clipx1 = GDISP.Width;
-				GDISP.clipy1 = GDISP.Height;
-				#endif
-				GDISP.Orientation = (gdisp_orientation_t)value;
-				return;
-
-			case GDISP_CONTROL_BACKLIGHT:
-				if((unsigned)value > 100) value = (void *)100;
-				gdisp_lld_backlight((unsigned)value);
-				GDISP.Backlight = (unsigned)value;
+			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);
 				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 */
+				gfxSleepMilliseconds(200);            /* 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] */
+				gfxSleepMilliseconds(50);
+				write_reg(0x0012, 0x013C); /* VREG1OUT voltage */
+				gfxSleepMilliseconds(50);
+				write_reg(0x0013, 0x0E00); /* VDV[4:0] for VCOM amplitude */
+				write_reg(0x0029, 0x0009); /* VCM[4:0] for VCOMH */
+				gfxSleepMilliseconds(50);
+				write_reg(0x0007, 0x0173); /* 262K color and display ON */
+				release_bus();
+				set_backlight(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 */
+				gfxSleepMilliseconds(200); /* Dis-charge capacitor power voltage */
+				write_reg(0x0010, 0x0002); /* SAP, BT[3:0], APE, AP, DSTB, SLP */
+				release_bus();
+				gdisp_lld_backlight(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 */
+				gfxSleepMilliseconds(200); /* Dis-charge capacitor power voltage */
+				write_reg(0x0010, 0x0004); /* SAP, BT[3:0], APE, AP, DSTB, SLP */
+				release_bus();
+				gdisp_lld_backlight(0);
+				break;
+
 			default:
 				return;
+			}
+			g->g.Powermode = (powermode_t)g->p.ptr;
+			return;
+			
+		case GDISP_CONTROL_ORIENTATION:
+			if (g->g.Orientation == (orientation_t)g->p.ptr)
+				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();
+					g->g.Height = GDISP_SCREEN_HEIGHT;
+					g->g.Width = GDISP_SCREEN_WIDTH;
+					break;
+
+				case GDISP_ROTATE_90:
+					acquire_bus();
+					write_reg(0x0001, 0x0000);
+					write_reg(0x0003, 0x1030);
+					write_reg(0x0060, 0x2700);
+					release_bus();
+					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, 0x1038);
+					write_reg(0x0060, 0xa700);
+					release_bus();
+					g->g.Height = GDISP_SCREEN_HEIGHT;
+					g->g.Width = GDISP_SCREEN_WIDTH;
+					break;
+	
+				case GDISP_ROTATE_270:
+					acquire_bus();
+					write_reg(0x0001, 0x0100);
+					write_reg(0x0003, 0x1030);
+					write_reg(0x0060, 0xA700);
+					release_bus();
+					g->g.Height = GDISP_SCREEN_WIDTH;
+					g->g.Width = GDISP_SCREEN_HEIGHT;
+					break;
+
+				default:
+					return;
+			}
+
+			g->g.Orientation = (orientation_t)value;
+			return;
+			
+        case GDISP_CONTROL_BACKLIGHT:
+            if ((unsigned)g->p.ptr > 100)
+            	g->p.ptr = (void *)100;
+            set_backlight((unsigned)g->p.ptr);
+            g->g.Backlight = (unsigned)g->p.ptr;
+            return;
+		
+		default:
+			return;
 		}
 	}
 
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 3c2cc78b..3e2c269b 100644
--- a/drivers/gdisp/ILI9325/gdisp_lld_board_hy_stm32_100p.h
+++ b/drivers/gdisp/ILI9325/gdisp_lld_board_hy_stm32_100p.h
@@ -32,7 +32,7 @@
 #define GDISP_REG              (*((volatile uint16_t *) 0x60000000)) /* RS = 0 */
 #define GDISP_RAM              (*((volatile uint16_t *) 0x60020000)) /* RS = 1 */
 
-static inline void gdisp_lld_init_board(void) {
+static inline void init_board(void) {
 	/* FSMC setup for F1 */
 	rccEnableAHB(RCC_AHBENR_FSMCEN, 0);
 
@@ -55,27 +55,63 @@ static inline void gdisp_lld_init_board(void) {
 	
 }
 
-static inline void gdisp_lld_reset_pin(bool_t state) {
+static inline void setpin_reset(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 write_index(uint16_t reg) {
 	GDISP_REG = reg;
 }
 
-static inline void gdisp_lld_write_data(uint16_t data) {
+static inline void write_data(uint16_t data) {
 	GDISP_RAM = data;
 }
 
-static inline uint16_t gdisp_lld_read_data(void) {
+static inline uint16_t read_data(void) {
 	return GDISP_RAM;
 }
 
-static inline void gdisp_lld_backlight(uint8_t percent) {
-	percent=percent;	// avoid a warning
+static inline void set_backlight(uint8_t percent) {
+	(void)percent;
+}
+
+/**
+ * @brief   Take exclusive control of the bus
+ *
+ * @notapi
+ */
+static inline void acquire_bus(void) {
+
+}
+
+/**
+ * @brief   Release exclusive control of the bus
+ *
+ * @notapi
+ */
+static inline void release_bus(void) {
+
+}
+
+/**
+ * @brief   Set the bus in read mode
+ *
+ * @notapi
+ */
+static inline void setreadmode(void) {
+
+}
+
+/**
+ * @brief   Set the bus back into write mode
+ *
+ * @notapi
+ */
+static inline void setwritemode(void) {
+
 }
 
 #endif /* GDISP_LLD_BOARD_H */
diff --git a/drivers/gdisp/ILI9325/gdisp_lld_board_template.h b/drivers/gdisp/ILI9325/gdisp_lld_board_template.h
index 2dd346a3..c07b4ba1 100644
--- a/drivers/gdisp/ILI9325/gdisp_lld_board_template.h
+++ b/drivers/gdisp/ILI9325/gdisp_lld_board_template.h
@@ -16,27 +16,105 @@
 #ifndef GDISP_LLD_BOARD_H
 #define GDISP_LLD_BOARD_H
 
-static inline void gdisp_lld_init_board(void) {
+/**
+ * @brief   Initialise the board for the display.
+ *
+ * @notapi
+ */
+static inline void init_board(void) {
 
 }
 
-static inline void gdisp_lld_reset_pin(bool_t state) {
+/**
+ * @brief   Set or clear the lcd reset pin.
+ *
+ * @param[in] state		TRUE = lcd in reset, FALSE = normal operation
+ *
+ * @notapi
+ */
+static inline void setpin_reset(bool_t state) {
 
 }
 
-static inline void gdisp_lld_write_index(uint16_t data) {
+/**
+ * @brief   Set the lcd back-light level.
+ *
+ * @param[in] percent		0 to 100%
+ *
+ * @notapi
+ */
+static inline void set_backlight(uint8_t percent) {
 
 }
 
-static inline void gdisp_lld_write_data(uint16_t data) {
+/**
+ * @brief   Take exclusive control of the bus
+ *
+ * @notapi
+ */
+static inline void acquire_bus(void) {
 
 }
 
-static inline uint16_t gdisp_lld_read_data(void) {
+/**
+ * @brief   Release exclusive control of the bus
+ *
+ * @notapi
+ */
+static inline void release_bus(void) {
 
 }
 
-static inline uint16_t gdisp_lld_backlight(uint8_t percentage) {
+/**
+ * @brief   Send data to the index register.
+ *
+ * @param[in] index		The index register to set
+ *
+ * @notapi
+ */
+static inline void write_index(uint16_t index) {
+
+}
+
+/**
+ * @brief   Send data to the lcd.
+ *
+ * @param[in] data		The data to send
+ *
+ * @notapi
+ */
+static inline void write_data(uint16_t data) {
+
+}
+
+/**
+ * @brief   Set the bus in read mode
+ *
+ * @notapi
+ */
+static inline void setreadmode(void) {
+
+}
+
+/**
+ * @brief   Set the bus back into write mode
+ *
+ * @notapi
+ */
+static inline void setwritemode(void) {
+
+}
+
+/**
+ * @brief   Read data from the lcd.
+ *
+ * @return	The data from the lcd
+ * @note	The chip select may need to be asserted/de-asserted
+ * 			around the actual spi read
+ *
+ * @notapi
+ */
+static inline uint16_t read_data(void) {
 
 }
 
diff --git a/drivers/gdisp/ILI9325/gdisp_lld_config.h b/drivers/gdisp/ILI9325/gdisp_lld_config.h
index ac07173c..572b8361 100644
--- a/drivers/gdisp/ILI9325/gdisp_lld_config.h
+++ b/drivers/gdisp/ILI9325/gdisp_lld_config.h
@@ -23,13 +23,11 @@
 /*===========================================================================*/
 
 #define GDISP_DRIVER_NAME				"ILI9325"
-
-#define GDISP_HARDWARE_CLEARS			TRUE
-#define GDISP_HARDWARE_FILLS			TRUE
-#define GDISP_HARDWARE_BITFILLS			FALSE
-#define GDISP_HARDWARE_SCROLL			FALSE
-#define GDISP_HARDWARE_PIXELREAD		TRUE
-#define GDISP_HARDWARE_CONTROL			TRUE
+#define GDISP_DRIVER_STRUCT				GDISP_ILI9325
+
+#define GDISP_HARDWARE_STREAM_WRITE		TRUE
+#define GDISP_HARDWARE_STREAM_READ		TRUE
+#define GDISP_HARDWARE_CONTROL			TRUE
 
 #define GDISP_PIXELFORMAT				GDISP_PIXELFORMAT_RGB565