Changes to Console, VMT, BitBlt, Clip & Drivers

Console - Fix compile, add GDISP_NEED_CONSOLE for compilation
VMT - Fix after directory structure changes
BitBlt - Update API to allow a source bitmap position.
Clip - Add clipping support into gdisp
Arc - Allow hardware accelleration of Arc routines
Nokia6610 - Fixes to BitBlt.

2 files changed, 54 insertions, 252 deletions

diff --git a/drivers/gdisp/S6D1121/gdisp_lld.c b/drivers/gdisp/S6D1121/gdisp_lld.c
index 5811a6ed..f6e8166a 100644
--- a/drivers/gdisp/S6D1121/gdisp_lld.c
+++ b/drivers/gdisp/S6D1121/gdisp_lld.c
@@ -35,22 +35,6 @@
 /* Include the emulation code for things we don't support */

 #include "gdisp_emulation.c"

 

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

-/* Driver local definitions.                                                 */

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

-

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

-/* Driver exported variables.                                                */

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

-

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

-/* Driver local variables.                                                   */

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

-

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

-/* Driver local functions.                                                   */

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

-

 #include "s6d1121_lld.c.h"

 

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

@@ -200,6 +184,12 @@ bool_t GDISP_LLD(init)(void) {
 	GDISP.Powermode = powerOn;

 	GDISP.Backlight = 100;

 	GDISP.Contrast = 50;

+	#if GDISP_NEED_VALIDATION || GDISP_NEED_CLIP

+		GDISP.clipx0 = 0;

+		GDISP.clipy0 = 0;

+		GDISP.clipx1 = GDISP.Width-1;

+		GDISP.clipy1 = GDISP.Height-1;

+	#endif

 	return TRUE;

 }

 

@@ -213,29 +203,14 @@ bool_t GDISP_LLD(init)(void) {
  * @notapi

  */

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

-	#if GDISP_NEED_VALIDATION

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

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

 }

 

 /* ---- 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 fillarea() 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__)

 	/**

@@ -259,25 +234,6 @@ void GDISP_LLD(drawpixel)(coord_t x, coord_t y, color_t color) {
 	}

 #endif

 

-#if GDISP_HARDWARE_LINES || defined(__DOXYGEN__)

-	/**

-	 * @brief   Draw a line.

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

-	 *

-	 * @param[in] x0, y0   The start of the line

-	 * @param[in] x1, y1   The end of the line

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

-	 *

-	 * @notapi

-	 */

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

-		#if GDISP_NEED_VALIDATION

-			/* Need to clip to screen */

-		#endif

-		/* Code here */

-	}

-#endif

-

 #if GDISP_HARDWARE_FILLS || defined(__DOXYGEN__)

 	/**

 	 * @brief   Fill an area with a color.

@@ -290,14 +246,16 @@ void GDISP_LLD(drawpixel)(coord_t x, coord_t y, color_t color) {
 	 * @notapi

 	 */

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

-		#if GDISP_NEED_VALIDATION

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

-			if (x+cx > GDISP.Width)	cx = GDISP.Width - x;

-			if (y+cy > GDISP.Height)	cy = GDISP.Height - y;

-		#endif

-

 		unsigned i, 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;

 		lld_lcdSetViewPort(x, y, cx, cy);

 		lld_lcdWriteStreamStart();

@@ -315,157 +273,40 @@ void GDISP_LLD(drawpixel)(coord_t x, coord_t y, color_t color) {
 	 *

 	 * @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(blitarea)(coord_t x, coord_t y, coord_t cx, coord_t cy, const pixel_t *buffer) {

-		unsigned i, area;

-

-		#if GDISP_NEED_VALIDATION

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

-			if (x+cx > GDISP.Width) return;

-			if (y+cy > GDISP.Height)	cy = GDISP.Height - y;

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

+		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

 

-		area = cx*cy;

 		lld_lcdSetViewPort(x, y, cx, cy);

 		lld_lcdWriteStreamStart();

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

-			lld_lcdWriteData(*buffer++);

+

+		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

 

-/* Circular Drawing Functions */

-#if (GDISP_NEED_CIRCLE && GDISP_HARDWARE_CIRCLES) || defined(__DOXYGEN__)

-	/**

-	 * @brief   Draw a circle.

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

-	 * @note    If GDISP_NEED_CLIPPING is defined this routine MUST behave

-	 *          correctly if the circle is over the edges of the screen.

-	 *

-	 * @param[in] x, y     The centre of the circle

-	 * @param[in] radius   The radius of the circle

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

-	 *

-	 * @notapi

-	 */

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

-		#if GDISP_NEED_VALIDATION

-			/* Code here */

-		#endif

-		/* Code here */

-	}

-#endif

-

-#if (GDISP_NEED_CIRCLE && GDISP_HARDWARE_CIRCLEFILLS) || defined(__DOXYGEN__)

-	/**

-	 * @brief   Create a filled circle.

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

-	 * @note    If GDISP_NEED_CLIPPING is defined this routine MUST behave

-	 *          correctly if the circle is over the edges of the screen.

-	 *

-	 * @param[in] x, y     The centre of the circle

-	 * @param[in] radius   The radius of the circle

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

-	 *

-	 * @notapi

-	 */

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

-		#if GDISP_NEED_VALIDATION

-			/* Code here */

-		#endif

-		/* Code here */

-	}

-#endif

-

-#if (GDISP_NEED_ELLIPSE && GDISP_HARDWARE_ELLIPSES) || defined(__DOXYGEN__)

-	/**

-	 * @brief   Draw an ellipse.

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

-	 * @note    If GDISP_NEED_CLIPPING is defined this routine MUST behave

-	 *          correctly if the ellipse is over the edges of the screen.

-	 *

-	 * @param[in] x, y     The centre of the ellipse

-	 * @param[in] a, b     The dimensions of the ellipse

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

-	 *

-	 * @notapi

-	 */

-	void GDISP_LLD(drawellipse)(coord_t x, coord_t y, coord_t a, coord_t b, color_t color) {

-		#if GDISP_NEED_VALIDATION

-			/* Code here */

-		#endif

-		/* Code here */

-	}

-#endif

-

-#if (GDISP_NEED_ELLIPSE && GDISP_HARDWARE_ELLIPSEFILLS) || defined(__DOXYGEN__)

-	/**

-	 * @brief   Create a filled ellipse.

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

-	 * @note    If GDISP_NEED_CLIPPING is defined this routine MUST behave

-	 *          correctly if the ellipse is over the edges of the screen.

-	 *

-	 * @param[in] x, y     The centre of the ellipse

-	 * @param[in] a, b     The dimensions of the ellipse

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

-	 *

-	 * @notapi

-	 */

-	void GDISP_LLD(fillellipse)(coord_t x, coord_t y, coord_t a, coord_t b, color_t color) {

-		#if GDISP_NEED_VALIDATION

-			/* Code here */

-		#endif

-		/* Code here */

-	}

-#endif

-

-#if (GDISP_NEED_TEXT && GDISP_HARDWARE_TEXT) || defined(__DOXYGEN__)

-	#include "gdisp_fonts.h"

-#endif

-

-#if (GDISP_NEED_TEXT && GDISP_HARDWARE_TEXT) || defined(__DOXYGEN__)

-	/**

-	 * @brief   Draw a character using a transparent background.

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

-	 *

-	 * @param[in] x, y     The top-left corner of the text

-	 * @param[in] c        The character to print

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

-	 *

-	 * @notapi

-	 */

-	void GDISP_LLD(drawchar)(coord_t x, coord_t y, char c, font_t font, color_t color) {

-		#if GDISP_NEED_VALIDATION

-			/* Code here */

-		#endif

-		/* Code here */

-	}

-#endif

-

-#if (GDISP_NEED_TEXT && GDISP_HARDWARE_TEXTFILLS) || defined(__DOXYGEN__)

-	/**

-	 * @brief   Draw a character using a filled background.

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

-	 *

-	 * @param[in] x, y     The top-left corner of the text

-	 * @param[in] c        The character to print

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

-	 * @param[in] bgcolor  The background color

-	 *

-	 * @notapi

-	 */

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

-		#if GDISP_NEED_VALIDATION

-			/* Code here */

-		#endif

-		/* Code here */

-	}

-#endif

-

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

 	/**

 	 * @brief   Get the color of a particular pixel.

@@ -483,8 +324,8 @@ void GDISP_LLD(drawpixel)(coord_t x, coord_t y, color_t color) {
 		 */

 		color_t color;

 

-		#if GDISP_NEED_VALIDATION

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

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

@@ -521,15 +362,15 @@ void GDISP_LLD(drawpixel)(coord_t x, coord_t y, color_t color) {
 		coord_t row0, row1;

 		unsigned i, gap, abslines;

 

-		abslines = lines < 0 ? -lines : lines;

-

-		#if GDISP_NEED_VALIDATION

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

-			if (x+cx > GDISP.Width)	cx = GDISP.Width - x;

-			if (y+cy > GDISP.Height)	cy = GDISP.Height - y;

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

 

-		if (!abslines) return;

+		abslines = lines < 0 ? -lines : lines;

 		if (abslines >= cy) {

 			abslines = cy;

 			gap = 0;

@@ -642,6 +483,12 @@ void GDISP_LLD(drawpixel)(coord_t x, coord_t y, color_t color) {
 			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;

 /*

@@ -652,37 +499,5 @@ void GDISP_LLD(drawpixel)(coord_t x, coord_t y, color_t color) {
 	}

 #endif

 

-#if (GDISP_NEED_QUERY && GDISP_HARDWARE_QUERY) || defined(__DOXYGEN__)

-/**

- * @brief   Query a driver value.

- * @detail	Typecase the result to the type you want.

- * @note	GDISP_QUERY_WIDTH			- (coord_t)	Gets the width of the screen

- * 			GDISP_QUERY_HEIGHT			- (coord_t)	Gets the height of the screen

- * 			GDISP_QUERY_POWER			- (gdisp_powermode_t) Get the current powermode

- * 			GDISP_QUERY_ORIENTATION		- (gdisp_orientation_t) Get the current screen orientation

- * 			GDISP_QUERY_BACKLIGHT		- (coord_t) Get the backlight state (0 to 100)

- * 			GDISP_QUERY_CONTRAST		- (coord_t) Get the contrast (0 to 100).

- * 			GDISP_QUERY_LLD				- Low level driver control constants start at

- * 											this value.

- *

- * @param[in] what     What to Query

- *

- * @notapi

- */

-void *GDISP_LLD(query)(unsigned what) {

-	switch(what) {

-	case GDISP_QUERY_WIDTH:			return (void *)(unsigned)GDISP.Width;

-	case GDISP_QUERY_HEIGHT:		return (void *)(unsigned)GDISP.Height;

-	case GDISP_QUERY_POWER:			return (void *)(unsigned)GDISP.Powermode;

-	case GDISP_QUERY_ORIENTATION:	return (void *)(unsigned)GDISP.Orientation;

-	case GDISP_QUERY_BACKLIGHT:		return (void *)(unsigned)GDISP.Backlight;

-	case GDISP_QUERY_CONTRAST:		return (void *)(unsigned)GDISP.Contrast;

-	case GDISP_QUERY_LLD+0:

-		/* Code here */

-	default:						return (void *)-1;

-	}

-}

-#endif

-

 #endif /* HAL_USE_GDISP */

 /** @} */

diff --git a/drivers/gdisp/S6D1121/gdisp_lld_config.h b/drivers/gdisp/S6D1121/gdisp_lld_config.h
index ee3fdeee..65849c40 100644
--- a/drivers/gdisp/S6D1121/gdisp_lld_config.h
+++ b/drivers/gdisp/S6D1121/gdisp_lld_config.h
@@ -35,30 +35,17 @@
 /* Driver hardware support.                                                  */

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

 

-#define GDISP_DRIVER_NAME				"S6d1121"

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

+#define GDISP_DRIVER_NAME				"S6D1121"

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

 

-#define GDISP_HARDWARE_LINES			FALSE

 #define GDISP_HARDWARE_CLEARS			TRUE

 #define GDISP_HARDWARE_FILLS			TRUE

 #define GDISP_HARDWARE_BITFILLS			TRUE

-#define GDISP_HARDWARE_CIRCLES			FALSE

-#define GDISP_HARDWARE_CIRCLEFILLS		FALSE

-#define GDISP_HARDWARE_ELLIPSES			FALSE

-#define GDISP_HARDWARE_ELLIPSEFILLS		FALSE

-#define GDISP_HARDWARE_TEXT				FALSE

-#define GDISP_HARDWARE_TEXTFILLS		FALSE

 #define GDISP_HARDWARE_SCROLL			TRUE

 #define GDISP_HARDWARE_PIXELREAD		FALSE

 #define GDISP_HARDWARE_CONTROL			TRUE

-#define GDISP_HARDWARE_QUERY			FALSE

-

-#define GDISP_SOFTWARE_TEXTFILLDRAW		FALSE

-#define GDISP_SOFTWARE_TEXTBLITCOLUMN	FALSE

 

 #define GDISP_PIXELFORMAT				GDISP_PIXELFORMAT_RGB565

-#define GDISP_PACKED_PIXELS				FALSE

-#define GDISP_PACKED_LINES				FALSE

 

 #endif	/* HAL_USE_GDISP */