SSD1289 streaming driver (untested)

X streaming driver (untested)
Nokia6610 fixes
Read pixel streaming support for low level driver.

5 files changed, 198 insertions, 386 deletions

diff --git a/drivers/gdisp/SSD1289/gdisp_lld.c b/drivers/gdisp/SSD1289/gdisp_lld.c
index a55dd467..84ffa6d1 100644
--- a/drivers/gdisp/SSD1289/gdisp_lld.c
+++ b/drivers/gdisp/SSD1289/gdisp_lld.c
@@ -17,8 +17,8 @@
 

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

 

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

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

+#define GDISP_LLD_DECLARATIONS

+#include "gdisp/lld/gdisp_lld.h"

 

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

 /* Driver local definitions.                                                 */

@@ -52,7 +52,7 @@ static inline void set_cursor(coord_t x, coord_t y) {
 	 * Reg 0x004F is 9 bit

 	 * Use a bit mask to make sure they are not set too high

 	 */

-	switch(GDISP.Orientation) {

+	switch(g->g.Orientation) {

 		case GDISP_ROTATE_180:

 			write_reg(0x004e, (GDISP_SCREEN_WIDTH-1-x) & 0x00FF);

 			write_reg(0x004f, (GDISP_SCREEN_HEIGHT-1-y) & 0x01FF);

@@ -85,14 +85,14 @@ static void set_viewport(coord_t x, coord_t y, coord_t cx, coord_t cy) {
 	 * 		0 <= Reg(0x45) <= Reg(0x46) <= 0x13F

 	 */

 

-	switch(GDISP.Orientation) {

+	switch(g->g.Orientation) {

 		case GDISP_ROTATE_0:

 			write_reg(0x44, (((x+cx-1) << 8) & 0xFF00 ) | (x & 0x00FF));

 			write_reg(0x45, y & 0x01FF);

 			write_reg(0x46, (y+cy-1) & 0x01FF);

 			break;

 		case GDISP_ROTATE_270:

-			write_reg(0x44, (((y+cy-1) << 8) & 0xFF00 ) | (y & 0x00FF));

+			write_reg(0x44, (((x+cx-1) << 8) & 0xFF00 ) | (y & 0x00FF));

 			write_reg(0x45, x & 0x01FF);

 			write_reg(0x46, (x+cx-1) & 0x01FF);

 			break;

@@ -112,7 +112,7 @@ static void set_viewport(coord_t x, coord_t y, coord_t cx, coord_t cy) {
 }

 

 static inline void reset_viewport(void) {

-	set_viewport(0, 0, GDISP.Width, GDISP.Height);

+	set_viewport(0, 0, g->g.Width, g->g.Height);

 }

 

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

@@ -123,18 +123,7 @@ static inline void reset_viewport(void) {
 /* Driver exported functions.                                                */

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

 

-/* ---- Required Routines ---- */

-/*

-	The following 2 routines are required.

-	All other routines are optional.

-*/

-

-/**

- * @brief   Low level GDISP driver initialization.

- *

- * @notapi

- */

-bool_t gdisp_lld_init(void) {

+LLDSPEC bool_t gdisp_lld_init(GDISPDriver *g) {

 	/* Initialise your display */

 	init_board();

 

@@ -196,365 +185,103 @@ bool_t gdisp_lld_init(void) {
 	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;

 }

 

-/**

- * @brief   Draws a pixel on the display.

- *

- * @param[in] x        X location of the pixel

- * @param[in] y        Y location of the pixel

- * @param[in] color    The color of the pixel

- *

- * @notapi

- */

-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

-	

-	acquire_bus();

-	set_cursor(x, y);

-	write_reg(0x0022, color);

-	release_bus();

-}

-

-/* ---- Optional Routines ---- */

-/*

-	All the below routines are optional.

-	Defining them will increase speed but everything

-	will work if they are not defined.

-	If you are not using a routine - turn it off using

-	the appropriate GDISP_HARDWARE_XXXX macro.

-	Don't bother coding for obvious similar routines if

-	there is no performance penalty as the emulation software

-	makes a good job of using similar routines.

-		eg. If gfillarea() is defined there is little

-			point in defining clear() unless the

-			performance bonus is significant.

-	For good performance it is suggested to implement

-		fillarea() and blitarea().

-*/

-

-#if GDISP_HARDWARE_CLEARS || defined(__DOXYGEN__)

-	/**

-	 * @brief   Clear the display.

-	 * @note    Optional - The high level driver can emulate using software.

-	 *

-	 * @param[in] color    The color of the pixel

-	 *

-	 * @notapi

-	 */

-	void gdisp_lld_clear(color_t color) {

-		unsigned area;

-

-		area = GDISP_SCREEN_WIDTH * GDISP_SCREEN_HEIGHT;

-

+#if GDISP_HARDWARE_STREAM_WRITE

+	LLDSPEC	void gdisp_lld_write_start(GDISPDriver *g) {

 		acquire_bus();

-		reset_viewport();

-		set_cursor(0, 0);

-

+		set_viewport(g->p.x, g->p.y, g->p.cx, g->p.cy);

 		stream_start();

-

-		#if defined(GDISP_USE_FSMC) && defined(GDISP_USE_DMA) && defined(GDISP_DMA_STREAM)

-            uint8_t i;

-            dmaStreamSetPeripheral(GDISP_DMA_STREAM, &color);

-            dmaStreamSetMode(GDISP_DMA_STREAM, STM32_DMA_CR_PL(0) | STM32_DMA_CR_PSIZE_HWORD | STM32_DMA_CR_MSIZE_HWORD | STM32_DMA_CR_DIR_M2M);

-            for (i = area/65535; i; i--) {

-                dmaStreamSetTransactionSize(GDISP_DMA_STREAM, 65535);

-                dmaStreamEnable(GDISP_DMA_STREAM);

-                dmaWaitCompletion(GDISP_DMA_STREAM);

-            }

-            dmaStreamSetTransactionSize(GDISP_DMA_STREAM, area%65535);

-            dmaStreamEnable(GDISP_DMA_STREAM);

-            dmaWaitCompletion(GDISP_DMA_STREAM);

-        #else

-            uint32_t index;

-            for(index = 0; index < area; index++)

-                write_data(color);

-        #endif  //#ifdef GDISP_USE_DMA

-

+	}

+	LLDSPEC	void gdisp_lld_write_color(GDISPDriver *g) {

+		write_data(color);

+	}

+	LLDSPEC	void gdisp_lld_write_stop(GDISPDriver *g) {

 		stream_stop();

 		release_bus();

 	}

 #endif

 

-#if GDISP_HARDWARE_FILLS || defined(__DOXYGEN__)

-	/**

-	 * @brief   Fill an area with a color.

-	 * @note    Optional - The high level driver can emulate using software.

-	 *

-	 * @param[in] x, y     The start filled area

-	 * @param[in] cx, cy   The width and height to be filled

-	 * @param[in] color    The color of the fill

-	 *

-	 * @notapi

-	 */

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

-		unsigned area;

-

-		#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

-

-		area = cx*cy;

+#if GDISP_HARDWARE_STREAM_READ

+	LLDSPEC	void gdisp_lld_read_start(GDISPDriver *g) {

+		uint16_t	dummy;

 

 		acquire_bus();

-		set_viewport(x, y, cx, cy);

+		set_viewport(g->p.x, g->p.y, g->p.cx, g->p.cy);

 		stream_start();

-

-        #if defined(GDISP_USE_FSMC) && defined(GDISP_USE_DMA) && defined(GDISP_DMA_STREAM)

-            uint8_t i;

-            dmaStreamSetPeripheral(GDISP_DMA_STREAM, &color);

-            dmaStreamSetMode(GDISP_DMA_STREAM, STM32_DMA_CR_PL(0) | STM32_DMA_CR_PSIZE_HWORD | STM32_DMA_CR_MSIZE_HWORD | STM32_DMA_CR_DIR_M2M);

-            for (i = area/65535; i; i--) {

-                dmaStreamSetTransactionSize(GDISP_DMA_STREAM, 65535);

-                dmaStreamEnable(GDISP_DMA_STREAM);

-                dmaWaitCompletion(GDISP_DMA_STREAM);

-            }

-            dmaStreamSetTransactionSize(GDISP_DMA_STREAM, area%65535);

-            dmaStreamEnable(GDISP_DMA_STREAM);

-            dmaWaitCompletion(GDISP_DMA_STREAM);

-        #else

-            uint32_t index;

-            for(index = 0; index < area; index++)

-                write_data(color);

-        #endif  //#ifdef GDISP_USE_DMA

-

+		setreadmode();

+		dummy = read_data();		// dummy read

+	}

+	LLDSPEC	color_t gdisp_lld_read_color(GDISPDriver *g) {

+		return read_data();

+	}

+	LLDSPEC	void gdisp_lld_read_stop(GDISPDriver *g) {

+		setwritemode();

 		stream_stop();

 		release_bus();

 	}

 #endif

 

-#if GDISP_HARDWARE_BITFILLS || defined(__DOXYGEN__)

-	/**

-	 * @brief   Fill an area with a bitmap.

-	 * @note    Optional - The high level driver can emulate using software.

-	 *

-	 * @param[in] x, y     The start filled area

-	 * @param[in] cx, cy   The width and height to be filled

-	 * @param[in] srcx, srcy   The bitmap position to start the fill from

-	 * @param[in] srccx    The width of a line in the bitmap.

-	 * @param[in] buffer   The pixels to use to fill the area.

-	 *

-	 * @notapi

-	 */

-	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) {

-

-		#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

-

-		buffer += srcx + srcy * srccx;

-

+#if GDISP_HARDWARE_FILLS && defined(GDISP_USE_DMA)

+	LLDSPEC void gdisp_lld_fill_area(GDISPDriver *g) {

 		acquire_bus();

-		set_viewport(x, y, cx, cy);

+		set_viewport(g->p.x, g->p.y, g->p.cx, g->p.cy);

 		stream_start();

-

-        #if defined(GDISP_USE_FSMC) && defined(GDISP_USE_DMA) && defined(GDISP_DMA_STREAM)

-            uint32_t area = cx*cy;

-            uint8_t i;

-            dmaStreamSetPeripheral(GDISP_DMA_STREAM, buffer);

-            dmaStreamSetMode(GDISP_DMA_STREAM, STM32_DMA_CR_PL(0) | STM32_DMA_CR_PINC | STM32_DMA_CR_PSIZE_HWORD | STM32_DMA_CR_MSIZE_HWORD | STM32_DMA_CR_DIR_M2M);

-            for (i = area/65535; i; i--) {

-                dmaStreamSetTransactionSize(GDISP_DMA_STREAM, 65535);

-                dmaStreamEnable(GDISP_DMA_STREAM);

-                dmaWaitCompletion(GDISP_DMA_STREAM);

-            }

-            dmaStreamSetTransactionSize(GDISP_DMA_STREAM, area%65535);

-            dmaStreamEnable(GDISP_DMA_STREAM);

-            dmaWaitCompletion(GDISP_DMA_STREAM);

-        #else

-            coord_t endx, endy;

-            uint32_t lg;

-            endx = srcx + cx;

-            endy = y + cy;

-            lg = srccx - cx;

-            for(; y < endy; y++, buffer += lg)

-                for(x=srcx; x < endx; x++)

-                    write_data(*buffer++);

-        #endif  //#ifdef GDISP_USE_DMA

-

+		dma_with_noinc(&color, g->p.cx*g->p.cy)

 		stream_stop();

 		release_bus();

 	}

 #endif

 

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

-	/**

-	 * @brief   Get the color of a particular pixel.

-	 * @note    Optional.

-	 * @note    If x,y is off the screen, the result is undefined.

-	 *

-	 * @param[in] x, y     The pixel to be read

-	 *

-	 * @notapi

-	 */

-	color_t gdisp_lld_get_pixel_color(coord_t x, coord_t y) {

-		color_t color;

+#if GDISP_HARDWARE_BITFILLS && defined(GDISP_USE_DMA)

+	LLDSPEC void gdisp_lld_blit_area(GDISPDriver *g) {

+		pixel_t		*buffer;

+		coord_t		ycnt;

 

-		#if GDISP_NEED_VALIDATION || GDISP_NEED_CLIP

-			if (x < 0 || x >= GDISP.Width || y < 0 || y >= GDISP.Height) return 0;

-		#endif

+		buffer = (pixel_t *)g->p.ptr + g->p.x1 + g->p.y1 * g->p.x2;

 

 		acquire_bus();

-		set_cursor(x, y);

+		set_viewport(g->p.x, g->p.y, g->p.cx, g->p.cy);

 		stream_start();

 

-		/* FSMC timing */

-		FSMC_Bank1->BTCR[FSMC_Bank+1] = FSMC_BTR1_ADDSET_3 | FSMC_BTR1_DATAST_3 | FSMC_BTR1_BUSTURN_0 ;

-

-		color = read_data();			// dummy read

-		color = read_data();

-

-		/* FSMC timing */

-		FSMC_Bank1->BTCR[FSMC_Bank+1] = FSMC_BTR1_ADDSET_0 | FSMC_BTR1_DATAST_2 | FSMC_BTR1_BUSTURN_0 ;

-

-		stream_stop();

-		release_bus();

-

-		return color;

-	}

-#endif

-

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

-	/**

-	 * @brief   Scroll vertically a section of the screen.

-	 * @note    Optional.

-	 * @note    If x,y + cx,cy is off the screen, the result is undefined.

-	 * @note    If lines is >= cy, it is equivelent to a area fill with bgcolor.

-	 *

-	 * @param[in] x, y     The start of the area to be scrolled

-	 * @param[in] cx, cy   The size of the area to be scrolled

-	 * @param[in] lines    The number of lines to scroll (Can be positive or negative)

-	 * @param[in] bgcolor  The color to fill the newly exposed area.

-	 *

-	 * @notapi

-	 */

-	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, j;

-

-		#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;

-

-		acquire_bus();

-		if ((coord_t)abslines >= cy) {

-			abslines = cy;

-			gap = 0;

+		if (g->p.x2 == g->p.cx) {

+			dma_with_inc(buffer, g->p.cx*g->p.cy);

 		} 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*/

-				set_viewport(x, row0, cx, 1);

-				stream_start();

-

-				/* FSMC timing */

-				FSMC_Bank1->BTCR[FSMC_Bank+1] = FSMC_BTR1_ADDSET_3 | FSMC_BTR1_DATAST_3 | FSMC_BTR1_BUSTURN_0 ;

-

-				j = read_data();			// dummy read

-				for (j = 0; (coord_t)j < cx; j++)

-					buf[j] = read_data();

-

-				/* FSMC timing */

-				FSMC_Bank1->BTCR[FSMC_Bank+1] = FSMC_BTR1_ADDSET_0 | FSMC_BTR1_DATAST_2 | FSMC_BTR1_BUSTURN_0 ;

-

-				stream_stop();

-

-				set_viewport(x, row1, cx, 1);

-				stream_start();

-				for (j = 0; (coord_t)j < cx; j++)

-					write_data(buf[j]);

-				stream_stop();

-			}

+			for (ycnt = g->p.cy; ycnt; ycnt--, buffer += g->p.x2)

+				dma_with_inc(buffer, g->p.cy);

 		}

-

-		/* fill the remaining gap */

-		set_viewport(x, lines > 0 ? (y+(coord_t)gap) : y, cx, abslines);

-		stream_start();

-		gap = cx*abslines;

-		for(i = 0; i < gap; i++) write_data(bgcolor);

 		stream_stop();

 		release_bus();

 	}

 #endif

 

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

-	/**

-	 * @brief   Driver Control

-	 * @details	Unsupported control codes are ignored.

-	 * @note	The value parameter should always be typecast to (void *).

-	 * @note	There are some predefined and some specific to the low level driver.

-	 * @note	GDISP_CONTROL_POWER			- Takes a gdisp_powermode_t

-	 * 			GDISP_CONTROL_ORIENTATION	- Takes a gdisp_orientation_t

-	 * 			GDISP_CONTROL_BACKLIGHT -	 Takes an int from 0 to 100. For a driver

-	 * 											that only supports off/on anything other

-	 * 											than zero is on.

-	 * 			GDISP_CONTROL_CONTRAST		- Takes an int from 0 to 100.

-	 * 			GDISP_CONTROL_LLD			- Low level driver control constants start at

-	 * 											this value.

-	 *

-	 * @param[in] what		What to do.

-	 * @param[in] value		The value to use (always cast to a void *).

-	 *

-	 * @notapi

-	 */

-	void gdisp_lld_control(unsigned what, void *value) {

-		switch(what) {

+#if GDISP_NEED_CONTROL && GDISP_HARDWARE_CONTROL

+	LLDSPEC void gdisp_lld_control(GDISPDriver *g) {

+		switch(g->p.x) {

 		case GDISP_CONTROL_POWER:

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

+			if (g->g.Powermode == (powermode_t)g->p.ptr)

 				return;

-			switch((gdisp_powermode_t)value) {

+			switch((powermode_t)g->p.ptr) {

 			case powerOff:

 				acquire_bus();

 				write_reg(0x0010, 0x0000);	// leave sleep mode

 				write_reg(0x0007, 0x0000);	// halt operation

-				write_reg(0x0000, 0x0000);	// turn off oszillator

-				write_reg(0x0010, 0x0001);	// enter sleepmode

+				write_reg(0x0000, 0x0000);	// turn off oscillator

+				write_reg(0x0010, 0x0001);	// enter sleep mode

 				release_bus();

 				break;

 			case powerOn:

 				acquire_bus();

 				write_reg(0x0010, 0x0000);	// leave sleep mode

 				release_bus();

-				if (GDISP.Powermode != powerSleep)

+				if (g->g.Powermode != powerSleep)

 					gdisp_lld_init();

 				break;

 			case powerSleep:

@@ -565,20 +292,20 @@ void gdisp_lld_draw_pixel(coord_t x, coord_t y, color_t color) {
 			default:

 				return;

 			}

-			GDISP.Powermode = (gdisp_powermode_t)value;

+			g->g.Powermode = (powermode_t)g->p.ptr;

 			return;

 		case GDISP_CONTROL_ORIENTATION:

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

+			if (g->g.Orientation == (orientation_t)g->p.ptr)

 				return;

-			switch((gdisp_orientation_t)value) {

+			switch((orientation_t)g->p.ptr) {

 			case GDISP_ROTATE_0:

 				acquire_bus();

 				write_reg(0x0001, 0x2B3F);

 				/* ID = 11 AM = 0 */

 				write_reg(0x0011, 0x6070);

 				release_bus();

-				GDISP.Height = GDISP_SCREEN_HEIGHT;

-				GDISP.Width = GDISP_SCREEN_WIDTH;

+				g->g.Height = GDISP_SCREEN_HEIGHT;

+				g->g.Width = GDISP_SCREEN_WIDTH;

 				break;

 			case GDISP_ROTATE_90:

 				acquire_bus();

@@ -586,8 +313,8 @@ void gdisp_lld_draw_pixel(coord_t x, coord_t y, color_t color) {
 				/* ID = 11 AM = 1 */

 				write_reg(0x0011, 0x6078);

 				release_bus();

-				GDISP.Height = GDISP_SCREEN_WIDTH;

-				GDISP.Width = GDISP_SCREEN_HEIGHT;

+				g->g.Height = GDISP_SCREEN_WIDTH;

+				g->g.Width = GDISP_SCREEN_HEIGHT;

 				break;

 			case GDISP_ROTATE_180:

 				acquire_bus();

@@ -595,8 +322,8 @@ void gdisp_lld_draw_pixel(coord_t x, coord_t y, color_t color) {
 				/* ID = 01 AM = 0 */

 				write_reg(0x0011, 0x6040);

 				release_bus();

-				GDISP.Height = GDISP_SCREEN_HEIGHT;

-				GDISP.Width = GDISP_SCREEN_WIDTH;

+				g->g.Height = GDISP_SCREEN_HEIGHT;

+				g->g.Width = GDISP_SCREEN_WIDTH;

 				break;

 			case GDISP_ROTATE_270:

 				acquire_bus();

@@ -604,31 +331,23 @@ void gdisp_lld_draw_pixel(coord_t x, coord_t y, color_t color) {
 				/* ID = 01 AM = 1 */

 				write_reg(0x0011, 0x6048);

 				release_bus();

-				GDISP.Height = GDISP_SCREEN_WIDTH;

-				GDISP.Width = GDISP_SCREEN_HEIGHT;

+				g->g.Height = GDISP_SCREEN_WIDTH;

+				g->g.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;

+			g->g.Orientation = (orientation_t)value;

 			return;

         case GDISP_CONTROL_BACKLIGHT:

-            if ((unsigned)value > 100)

-            value = (void *)100;

-            set_backlight((unsigned)value);

-            GDISP.Backlight = (unsigned)value;

+            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;

+		//case GDISP_CONTROL_CONTRAST:

         default:

             return;

-/*

-		case GDISP_CONTROL_CONTRAST:

-*/

 		}

 	}

 #endif

diff --git a/drivers/gdisp/SSD1289/gdisp_lld_board_firebullstm32f103.h b/drivers/gdisp/SSD1289/gdisp_lld_board_firebullstm32f103.h
index 38d9e04d..e55e7cd1 100644
--- a/drivers/gdisp/SSD1289/gdisp_lld_board_firebullstm32f103.h
+++ b/drivers/gdisp/SSD1289/gdisp_lld_board_firebullstm32f103.h
@@ -112,7 +112,28 @@ static inline void write_data(uint16_t data) {
 	CLR_WR; SET_WR;

 }

 

-#if GDISP_HARDWARE_READPIXEL || GDISP_HARDWARE_SCROLL || defined(__DOXYGEN__)

+/**
+ * @brief   Set the bus in read mode
+ *
+ * @notapi
+ */
+static inline void setreadmode(void) {
+	// change pin mode to digital input
+	palSetGroupMode(GPIOE, PAL_WHOLE_PORT, 0, PAL_MODE_INPUT);
+	CLR_RD;
+}
+
+/**
+ * @brief   Set the bus back into write mode
+ *
+ * @notapi
+ */
+static inline void setwritemode(void) {
+	// change pin mode back to digital output
+	SET_RD;
+	palSetGroupMode(GPIOE, PAL_WHOLE_PORT, 0, PAL_MODE_OUTPUT_PUSHPULL);
+}
+
 /**

  * @brief   Read data from the lcd.

  *

@@ -123,22 +144,13 @@ static inline void write_data(uint16_t data) {
  * @notapi

  */

 static inline uint16_t read_data(void) {

-	uint16_t	value;

-	

-	// change pin mode to digital input

-	palSetGroupMode(GPIOE, PAL_WHOLE_PORT, 0, PAL_MODE_INPUT);

-

-	CLR_RD;

-	value = palReadPort(GPIOE);

-	value = palReadPort(GPIOE);

-	SET_RD;

-

-	// change pin mode back to digital output

-	palSetGroupMode(GPIOE, PAL_WHOLE_PORT, 0, PAL_MODE_OUTPUT_PUSHPULL);

-	

-	return value;

+	return palReadPort(GPIOE);

 }

 #endif

 

+#if defined(GDISP_USE_DMA)
+	#error "GDISP - SSD1289: The GPIO interface does not support DMA"
+#endif
+
 #endif /* _GDISP_LLD_BOARD_H */

 /** @} */

diff --git a/drivers/gdisp/SSD1289/gdisp_lld_board_st_stm32f4_discovery.h b/drivers/gdisp/SSD1289/gdisp_lld_board_st_stm32f4_discovery.h
index 9d46d64b..7097347b 100644
--- a/drivers/gdisp/SSD1289/gdisp_lld_board_st_stm32f4_discovery.h
+++ b/drivers/gdisp/SSD1289/gdisp_lld_board_st_stm32f4_discovery.h
@@ -18,10 +18,7 @@
 
 #define GDISP_REG              ((volatile uint16_t *) 0x60000000)[0] /* RS = 0 */
 #define GDISP_RAM              ((volatile uint16_t *) 0x60020000)[0] /* RS = 1 */
-
-#define GDISP_USE_FSMC
-#define GDISP_USE_DMA
-#define GDISP_DMA_STREAM STM32_DMA2_STREAM6
+#define GDISP_DMA_STREAM		STM32_DMA2_STREAM6
 
 const unsigned char FSMC_Bank = 0;
 
@@ -55,20 +52,22 @@ static inline void init_board(void) {
 		/* FSMC setup for F1/F3 */
 		rccEnableAHB(RCC_AHBENR_FSMCEN, 0);
 
-		#if defined(GDISP_USE_DMA) && defined(GDISP_DMA_STREAM)
-			#error "DMA not implemented for F1/F3 Devices"
+		#if defined(GDISP_USE_DMA)
+			#error "GDISP: SSD1289 - DMA not implemented for F1/F3 Devices"
 		#endif
 	#elif defined(STM32F4XX) || defined(STM32F2XX)
 		/* STM32F2-F4 FSMC init */
 		rccEnableAHB3(RCC_AHB3ENR_FSMCEN, 0);
 
-		#if defined(GDISP_USE_DMA) && defined(GDISP_DMA_STREAM)
+		#if defined(GDISP_USE_DMA)
 			if (dmaStreamAllocate(GDISP_DMA_STREAM, 0, NULL, NULL)) gfxExit();
 			dmaStreamSetMemory0(GDISP_DMA_STREAM, &GDISP_RAM);
 			dmaStreamSetMode(GDISP_DMA_STREAM, STM32_DMA_CR_PL(0) | STM32_DMA_CR_PSIZE_HWORD | STM32_DMA_CR_MSIZE_HWORD | STM32_DMA_CR_DIR_M2M);
+		#else
+			#warning "GDISP: SSD1289 - DMA is supported for F2/F4 Devices. Define GDISP_USE_DMA in your gfxconf.h to turn this on for better performance."
 		#endif
 	#else
-		#error "FSMC not implemented for this device"
+		#error "GDISP: SSD1289 - FSMC not implemented for this device"
 	#endif
 
 	/* set pins to FSMC mode */
@@ -155,17 +154,61 @@ static inline void write_index(uint16_t index) { GDISP_REG = index; }
  */
 static inline void write_data(uint16_t data) { GDISP_RAM = data; }
 
-#if GDISP_HARDWARE_READPIXEL || GDISP_HARDWARE_SCROLL || defined(__DOXYGEN__)
+/**
+ * @brief   Set the bus in read mode
+ *
+ * @notapi
+ */
+static inline void setreadmode(void) {
+	FSMC_Bank1->BTCR[FSMC_Bank+1] = FSMC_BTR1_ADDSET_3 | FSMC_BTR1_DATAST_3 | FSMC_BTR1_BUSTURN_0;		/* FSMC timing */
+}
+
+/**
+ * @brief   Set the bus back into write mode
+ *
+ * @notapi
+ */
+static inline void setwritemode(void) {
+	FSMC_Bank1->BTCR[FSMC_Bank+1] = FSMC_BTR1_ADDSET_0 | FSMC_BTR1_DATAST_2 | FSMC_BTR1_BUSTURN_0;		/* FSMC timing */
+}
+
 /**
  * @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) { return GDISP_RAM; }
+
+#if defined(GDISP_USE_DMA) || defined(__DOXYGEN__)
+	/**
+	 * @brief	Transfer data using DMA but don't increment the source address
+	 */
+	static inline dma_with_noinc(color_t *buffer, int area) {
+		dmaStreamSetPeripheral(GDISP_DMA_STREAM, buffer);
+		dmaStreamSetMode(GDISP_DMA_STREAM, STM32_DMA_CR_PL(0) | STM32_DMA_CR_PSIZE_HWORD | STM32_DMA_CR_MSIZE_HWORD | STM32_DMA_CR_DIR_M2M);
+		for (; area > 0; area -= 65535) {
+			dmaStreamSetTransactionSize(GDISP_DMA_STREAM, area > 65535 ? 65535 : area);
+			dmaStreamEnable(GDISP_DMA_STREAM);
+			dmaWaitCompletion(GDISP_DMA_STREAM);
+		}
+	}
+
+	/**
+	 * @brief	Transfer data using DMA incrementing the source address
+	 */
+	static inline dma_with_inc(color_t *buffer, int area) {
+        dmaStreamSetPeripheral(GDISP_DMA_STREAM, buffer);
+        dmaStreamSetMode(GDISP_DMA_STREAM, STM32_DMA_CR_PL(0) | STM32_DMA_CR_PINC | STM32_DMA_CR_PSIZE_HWORD | STM32_DMA_CR_MSIZE_HWORD | STM32_DMA_CR_DIR_M2M);
+		for (; area > 0; area -= 65535) {
+			dmaStreamSetTransactionSize(GDISP_DMA_STREAM, area > 65535 ? 65535 : area);
+			dmaStreamEnable(GDISP_DMA_STREAM);
+			dmaWaitCompletion(GDISP_DMA_STREAM);
+		}
+	}
 #endif
 
 #endif /* _GDISP_LLD_BOARD_H */
diff --git a/drivers/gdisp/SSD1289/gdisp_lld_board_template.h b/drivers/gdisp/SSD1289/gdisp_lld_board_template.h
index e5d10355..8b55bed3 100644
--- a/drivers/gdisp/SSD1289/gdisp_lld_board_template.h
+++ b/drivers/gdisp/SSD1289/gdisp_lld_board_template.h
@@ -87,7 +87,24 @@ static inline void write_data(uint16_t data) {
 
 }
 
-#if GDISP_HARDWARE_READPIXEL || GDISP_HARDWARE_SCROLL || defined(__DOXYGEN__)
+/**
+ * @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.
  *
@@ -100,6 +117,24 @@ static inline void write_data(uint16_t data) {
 static inline uint16_t read_data(void) {
 
 }
+
+/**
+ * The below section you can replace with #error if your interface doesn't support DMA
+ */
+#if defined(GDISP_USE_DMA) || defined(__DOXYGEN__)
+	//#error "GDISP - SSD1289: This interface does not support DMA"
+
+	/**
+	 * @brief	Transfer data using DMA but don't increment the source address
+	 */
+	static inline dma_with_noinc(color_t *buffer, int area) {
+	}
+
+	/**
+	 * @brief	Transfer data using DMA incrementing the source address
+	 */
+	static inline dma_with_inc(color_t *buffer, int area) {
+	}
 #endif
 
 #endif /* _GDISP_LLD_BOARD_H */
diff --git a/drivers/gdisp/SSD1289/gdisp_lld_config.h b/drivers/gdisp/SSD1289/gdisp_lld_config.h
index 989cc3af..9c00ce39 100644
--- a/drivers/gdisp/SSD1289/gdisp_lld_config.h
+++ b/drivers/gdisp/SSD1289/gdisp_lld_config.h
@@ -23,13 +23,16 @@
 /*===========================================================================*/

 

 #define GDISP_DRIVER_NAME				"SSD1289"

-

-#define GDISP_HARDWARE_CLEARS			TRUE

-#define GDISP_HARDWARE_FILLS			TRUE

-#define GDISP_HARDWARE_BITFILLS			TRUE

-#define GDISP_HARDWARE_SCROLL			TRUE

-#define GDISP_HARDWARE_PIXELREAD		TRUE

-#define GDISP_HARDWARE_CONTROL			TRUE

+#define GDISP_DRIVER_STRUCT				GDISP_SSD1289
+
+#define GDISP_HARDWARE_STREAM_WRITE		TRUE
+#define GDISP_HARDWARE_STREAM_READ		TRUE
+#define GDISP_HARDWARE_CONTROL			TRUE
+
+#if defined(GDISP_USE_DMA)

+	#define GDISP_HARDWARE_FILLS		TRUE

+	#define GDISP_HARDWARE_BITFILLS		TRUE
+#endif

 

 #define GDISP_PIXELFORMAT				GDISP_PIXELFORMAT_RGB565