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, 6 insertions, 268 deletions

diff --git a/drivers/gdisp/TestStub/gdisp_lld.c b/drivers/gdisp/TestStub/gdisp_lld.c
index fd8410fb..1999d4ec 100644
--- a/drivers/gdisp/TestStub/gdisp_lld.c
+++ b/drivers/gdisp/TestStub/gdisp_lld.c
@@ -35,30 +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.                                                   */

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

-

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

-/* Driver interrupt handlers.                                                */

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

-

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

-/* Driver exported functions.                                                */

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

-

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

 /*

 	The following 2 routines are required.

@@ -78,6 +54,12 @@ bool_t GDISP_LLD(init)(void) {
 	GDISP.Powermode = powerOff;

 	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;

 }

 

@@ -94,179 +76,6 @@ void GDISP_LLD(drawpixel)(coord_t UNUSED(x), coord_t UNUSED(y), color_t UNUSED(c
 }

 

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

-	/**

-	 * @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 UNUSED(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 UNUSED(x0), coord_t UNUSED(y0), coord_t UNUSED(x1), coord_t UNUSED(y1), color_t UNUSED(color)) {

-	}

-#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(fillarea)(coord_t UNUSED(x), coord_t UNUSED(y), coord_t UNUSED(cx), coord_t UNUSED(cy), color_t UNUSED(color)) {

-	}

-#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] buffer   The pixels to use to fill the area.

-	 *

-	 * @notapi

-	 */

-	void GDISP_LLD(blitarea)(coord_t UNUSED(x), coord_t UNUSED(y), coord_t UNUSED(cx), coord_t UNUSED(cy), const pixel_t *UNUSED(buffer)) {

-	}

-#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 UNUSED(x), coord_t UNUSED(y), coord_t UNUSED(radius), color_t UNUSED(color)) {

-	}

-#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 UNUSED(x), coord_t UNUSED(y), coord_t UNUSED(radius), color_t UNUSED(color)) {

-	}

-#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 UNUSED(x), coord_t UNUSED(y), coord_t UNUSED(a), coord_t UNUSED(b), color_t UNUSED(color)) {

-	}

-#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 UNUSED(x), coord_t UNUSED(y), coord_t UNUSED(a), coord_t UNUSED(b), color_t UNUSED(color)) {

-	}

-#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 UNUSED(x), coord_t UNUSED(y), char UNUSED(c), font_t UNUSED(font), color_t UNUSED(color)) {

-	}

-#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 UNUSED(x), coord_t UNUSED(y), char UNUSED(c), font_t UNUSED(font), color_t UNUSED(color), color_t UNUSED(bgcolor)) {

-	}

-#endif

 

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

 	/**

@@ -301,61 +110,5 @@ void GDISP_LLD(drawpixel)(coord_t UNUSED(x), coord_t UNUSED(y), color_t UNUSED(c
 	}

 #endif

 

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

-	/**

-	 * @brief   Driver Control

-	 * @detail	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 UNUSED(what), void *UNUSED(value)) {

-	}

-#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/TestStub/gdisp_lld_config.h b/drivers/gdisp/TestStub/gdisp_lld_config.h
index d66e050f..b570ef39 100644
--- a/drivers/gdisp/TestStub/gdisp_lld_config.h
+++ b/drivers/gdisp/TestStub/gdisp_lld_config.h
@@ -38,23 +38,8 @@
 #define GDISP_DRIVER_NAME				"TestStub"

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

 

-#define GDISP_HARDWARE_LINES			FALSE

-#define GDISP_HARDWARE_CLEARS			FALSE

-#define GDISP_HARDWARE_FILLS			FALSE

-#define GDISP_HARDWARE_BITFILLS			FALSE

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

 #define GDISP_HARDWARE_PIXELREAD		GDISP_NEED_PIXELREAD

-#define GDISP_HARDWARE_CONTROL			FALSE

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