removed GDISP_LLD() macro

7 files changed, 0 insertions, 1106 deletions

diff --git a/drivers/gdisp/SSD1289/gdisp_lld.c b/drivers/gdisp/SSD1289/gdisp_lld.c
deleted file mode 100644
index d8d185cd..00000000
--- a/drivers/gdisp/SSD1289/gdisp_lld.c
+++ /dev/null
@@ -1,583 +0,0 @@
-/*

-    ChibiOS/GFX - Copyright (C) 2012

-                 Joel Bodenmann aka Tectu <joel@unormal.org>

-

-    This file is part of ChibiOS/GFX.

-

-    ChibiOS/GFX is free software; you can redistribute it and/or modify

-    it under the terms of the GNU General Public License as published by

-    the Free Software Foundation; either version 3 of the License, or

-    (at your option) any later version.

-

-    ChibiOS/GFX is distributed in the hope that it will be useful,

-    but WITHOUT ANY WARRANTY; without even the implied warranty of

-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

-    GNU General Public License for more details.

-

-    You should have received a copy of the GNU General Public License

-    along with this program.  If not, see <http://www.gnu.org/licenses/>.

-*/

-

-/**

- * @file    drivers/gdisp/SSD1289/gdisp_lld.c

- * @brief   GDISP Graphics Driver subsystem low level driver source for the SSD1289 display.

- *

- * @addtogroup GDISP

- * @{

- */

-

-#include "ch.h"

-#include "hal.h"

-#include "gfx.h"

-

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

-

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

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

-

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

-/* Driver local definitions.                                                 */

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

-

-#ifndef GDISP_SCREEN_HEIGHT

-	#define GDISP_SCREEN_HEIGHT		320

-#endif

-#ifndef GDISP_SCREEN_WIDTH

-	#define GDISP_SCREEN_WIDTH		240

-#endif

-

-#define GDISP_INITIAL_CONTRAST	50

-#define GDISP_INITIAL_BACKLIGHT	100

-

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

-/* Driver local functions.                                                   */

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

-

-#if defined(GDISP_USE_CUSTOM_BOARD) && GDISP_USE_CUSTOM_BOARD

-	/* Include the user supplied board definitions */

-	#include "gdisp_lld_board.h"

-#elif defined(BOARD_FIREBULL_STM32_F103)

-	#include "gdisp_lld_board_firebullstm32f103.h"

-#else

-	/* Include the user supplied board definitions */

-	#include "gdisp_lld_board.h"

-#endif

-

-// Some common routines and macros

-#define write_reg(reg, data)		{ write_index(reg); write_data(data); }

-#define stream_start()				write_index(0x0022);

-#define stream_stop()

-#define delay(us)					chThdSleepMicroseconds(us)

-#define delayms(ms)					chThdSleepMilliseconds(ms)

-

-static __inline void set_cursor(coord_t x, coord_t y) {

-	/* Reg 0x004E is an 8 bit value

-	 * Reg 0x004F is 9 bit

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

-	 */

-	switch(GDISP.Orientation) {

-		case GDISP_ROTATE_180:

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

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

-			break;

-		case GDISP_ROTATE_0:

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

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

-			break;

-		case GDISP_ROTATE_270:

-			write_reg(0x004e, y & 0x00FF);

-			write_reg(0x004f, x & 0x01FF);

-			break;

-		case GDISP_ROTATE_90:

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

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

-			break;

-	}

-}

-

-static void set_viewport(coord_t x, coord_t y, coord_t cx, coord_t cy) {

-

-	set_cursor(x, y);

-

-	/* Reg 0x44 - Horizontal RAM address position

-	 * 		Upper Byte - HEA

-	 * 		Lower Byte - HSA

-	 * 		0 <= HSA <= HEA <= 0xEF

-	 * Reg 0x45,0x46 - Vertical RAM address position

-	 * 		Lower 9 bits gives 0-511 range in each value

-	 * 		0 <= Reg(0x45) <= Reg(0x46) <= 0x13F

-	 */

-

-	switch(GDISP.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, (((x+cx-1) << 8) & 0xFF00 ) | (y & 0x00FF));

-			write_reg(0x45, x & 0x01FF);

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

-			break;

-		case GDISP_ROTATE_180:

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

-			write_reg(0x45, (GDISP_SCREEN_HEIGHT-(y+cy)) & 0x01FF);

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

-			break;

-		case GDISP_ROTATE_90:

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

-			write_reg(0x45, (GDISP_SCREEN_HEIGHT - (x+cx)) & 0x01FF);

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

-			break;

-	}

-

-	set_cursor(x, y);

-}

-

-static __inline void reset_viewport(void) {

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

-}

-

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

-/* Driver interrupt handlers.                                                */

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

-

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

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

-	/* Initialise your display */

-	init_board();

-

-	// Hardware reset

-	setpin_reset(TRUE);

-	delayms(20);

-	setpin_reset(FALSE);

-	delayms(20);

-

-	// Get the bus for the following initialisation commands

-	acquire_bus();

-	

-	write_reg(0x0000,0x0001);		delay(5);

-	write_reg(0x0003,0xA8A4);    	delay(5);

-	write_reg(0x000C,0x0000);    	delay(5);

-	write_reg(0x000D,0x080C);    	delay(5);

-    write_reg(0x000E,0x2B00);    	delay(5);

-    write_reg(0x001E,0x00B0);    	delay(5);

-	write_reg(0x0001,0x2B3F);		delay(5);

-    write_reg(0x0002,0x0600);    	delay(5);

-    write_reg(0x0010,0x0000);    	delay(5);

-    write_reg(0x0011,0x6070);    	delay(5);

-    write_reg(0x0005,0x0000);    	delay(5);

-    write_reg(0x0006,0x0000);    	delay(5);

-    write_reg(0x0016,0xEF1C);    	delay(5);

-    write_reg(0x0017,0x0003);    	delay(5);

-    write_reg(0x0007,0x0133);    	delay(5);

-    write_reg(0x000B,0x0000);    	delay(5);

-    write_reg(0x000F,0x0000);    	delay(5);

-    write_reg(0x0041,0x0000);    	delay(5);

-    write_reg(0x0042,0x0000);    	delay(5);

-    write_reg(0x0048,0x0000);    	delay(5);

-    write_reg(0x0049,0x013F);    	delay(5);

-    write_reg(0x004A,0x0000);    	delay(5);

-    write_reg(0x004B,0x0000);    	delay(5);

-    write_reg(0x0044,0xEF00);    	delay(5);

-    write_reg(0x0045,0x0000);    	delay(5);

-    write_reg(0x0046,0x013F);    	delay(5);

-    write_reg(0x0030,0x0707);    	delay(5);

-    write_reg(0x0031,0x0204);    	delay(5);

-    write_reg(0x0032,0x0204);    	delay(5);

-    write_reg(0x0033,0x0502);    	delay(5);

-    write_reg(0x0034,0x0507);    	delay(5);

-    write_reg(0x0035,0x0204);    	delay(5);

-    write_reg(0x0036,0x0204);    	delay(5);

-    write_reg(0x0037,0x0502);    	delay(5);

-    write_reg(0x003A,0x0302);    	delay(5);

-    write_reg(0x003B,0x0302);    	delay(5);

-    write_reg(0x0023,0x0000);    	delay(5);

-    write_reg(0x0024,0x0000);    	delay(5);

-    write_reg(0x0025,0x8000);    	delay(5);

-    write_reg(0x004f,0x0000);		delay(5);

-    write_reg(0x004e,0x0000);		delay(5);

-

- 	// Release the bus

-	release_bus();

-	

-	/* Turn on the back-light */

-	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

-	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(drawpixel)(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 i;

-

-		acquire_bus();

-		reset_viewport();

-		set_cursor(0, 0);

-		stream_start();

-		for(i = 0; i < GDISP_SCREEN_WIDTH * GDISP_SCREEN_HEIGHT; i++)

-			write_data(color);

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

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

-

-		acquire_bus();

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

-		stream_start();

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

-			write_data(color);

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

-

-		acquire_bus();

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

-		stream_start();

-

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

-				write_data(*buffer++);

-		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(getpixelcolor)(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

-

-		acquire_bus();

-		set_cursor(x, y);

-		stream_start();

-		color = read_data();			// dummy read

-		color = read_data();

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

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

-				stream_start();

-				j = read_data();			// dummy read

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

-					buf[j] = read_data();

-				stream_stop();

-

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

-				stream_start();

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

-					write_data(buf[j]);

-				stream_stop();

-			}

-		}

-

-		/* fill the remaining gap */

-		set_viewport(x, lines > 0 ? (y+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) {

-		case GDISP_CONTROL_POWER:

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

-				return;

-			switch((gdisp_powermode_t)value) {

-			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

-				release_bus();

-				break;

-			case powerOn:

-				acquire_bus();

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

-				release_bus();

-				if (GDISP.Powermode != powerSleep)

-					GDISP_LLD(init)();

-				break;

-			case powerSleep:

-				acquire_bus();

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

-				release_bus();

-				break;

-			default:

-				return;

-			}

-			GDISP.Powermode = (gdisp_powermode_t)value;

-			return;

-		case GDISP_CONTROL_ORIENTATION:

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

-				return;

-			switch((gdisp_orientation_t)value) {

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

-				break;

-			case GDISP_ROTATE_90:

-				acquire_bus();

-				write_reg(0x0001, 0x293F);

-				/* ID = 11 AM = 1 */

-				write_reg(0x0011, 0x6078);

-				release_bus();

-				GDISP.Height = GDISP_SCREEN_WIDTH;

-				GDISP.Width = GDISP_SCREEN_HEIGHT;

-				break;

-			case GDISP_ROTATE_180:

-				acquire_bus();

-				write_reg(0x0001, 0x2B3F);

-				/* ID = 01 AM = 0 */

-				write_reg(0x0011, 0x6040);

-				release_bus();

-				GDISP.Height = GDISP_SCREEN_HEIGHT;

-				GDISP.Width = GDISP_SCREEN_WIDTH;

-				break;

-			case GDISP_ROTATE_270:

-				acquire_bus();

-				write_reg(0x0001, 0x293F);

-				/* ID = 01 AM = 1 */

-				write_reg(0x0011, 0x6048);

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

-		case GDISP_CONTROL_CONTRAST:

-*/

-		}

-	}

-#endif

-

-#endif /* GFX_USE_GDISP */

-/** @} */

diff --git a/drivers/gdisp/SSD1289/gdisp_lld.mk b/drivers/gdisp/SSD1289/gdisp_lld.mk
deleted file mode 100644
index e340a7dc..00000000
--- a/drivers/gdisp/SSD1289/gdisp_lld.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-# List the required driver.

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

-

-# Required include directories

-GFXINC += $(GFXLIB)/drivers/gdisp/SSD1289

diff --git a/drivers/gdisp/SSD1289/gdisp_lld_board_example.h b/drivers/gdisp/SSD1289/gdisp_lld_board_example.h
deleted file mode 100644
index 00c4b869..00000000
--- a/drivers/gdisp/SSD1289/gdisp_lld_board_example.h
+++ /dev/null
@@ -1,125 +0,0 @@
-/*

-    ChibiOS/GFX - Copyright (C) 2012

-                 Joel Bodenmann aka Tectu <joel@unormal.org>

-

-    This file is part of ChibiOS/GFX.

-

-    ChibiOS/GFX is free software; you can redistribute it and/or modify

-    it under the terms of the GNU General Public License as published by

-    the Free Software Foundation; either version 3 of the License, or

-    (at your option) any later version.

-

-    ChibiOS/GFX is distributed in the hope that it will be useful,

-    but WITHOUT ANY WARRANTY; without even the implied warranty of

-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

-    GNU General Public License for more details.

-

-    You should have received a copy of the GNU General Public License

-    along with this program.  If not, see <http://www.gnu.org/licenses/>.

-*/

-

-/**

- * @file    drivers/gdisp/SSD1289/gdisp_lld_board_example.h

- * @brief   GDISP Graphic Driver subsystem board interface for the SSD1289 display.

- *

- * @addtogroup GDISP

- * @{

- */

-

-#ifndef _GDISP_LLD_BOARD_H

-#define _GDISP_LLD_BOARD_H

-

-/**

- * @brief   Initialise the board for the display.

- *

- * @notapi

- */

-static __inline void init_board(void) {

-	/* Code here */

-#error "SSD1289: You must supply a definition for init_board for your board"

-}

-

-/**

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

-	/* Code here */

-#error "SSD1289: You must supply a definition for setpin_reset for your board"

-}

-

-/**

- * @brief   Set the lcd back-light level.

- *

- * @param[in] percent		0 to 100%

- * 

- * @notapi

- */

-static __inline void set_backlight(uint8_t percent) {

-	/* Code here */

-#error "SSD1289: You must supply a definition for set_backlight for your board"

-}

-

-/**

- * @brief   Take exclusive control of the bus

- *

- * @notapi

- */

-static __inline void acquire_bus(void) {

-#error "SSD1289: You must supply a definition for acquire_bus for your board"

-}

-

-/**

- * @brief   Release exclusive control of the bus

- *

- * @notapi

- */

-static __inline void release_bus(void) {

-#error "SSD1289: You must supply a definition for release_bus for your board"

-}

-

-/**

- * @brief   Send data to the index register.

- *

- * @param[in] index		The index register to set

- *

- * @notapi

- */

-static __inline void write_index(uint16_t index) {

-	/* Code here */

-#error "SSD1289: You must supply a definition for write_index for your board"

-}

-

-/**

- * @brief   Send data to the lcd.

- *

- * @param[in] data		The data to send

- * 

- * @notapi

- */

-static __inline void write_data(uint16_t data) {

-	/* Code here */

-#error "SSD1289: You must supply a definition for write_data for your board"

-}

-

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

-/**

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

-	/* Code here */

-#error "SSD1289: You must supply a definition for read_data for your board"

-}

-#endif

-

-#endif /* _GDISP_LLD_BOARD_H */

-/** @} */

diff --git a/drivers/gdisp/SSD1289/gdisp_lld_board_example_fsmc.h b/drivers/gdisp/SSD1289/gdisp_lld_board_example_fsmc.h
deleted file mode 100644
index 76a5c04c..00000000
--- a/drivers/gdisp/SSD1289/gdisp_lld_board_example_fsmc.h
+++ /dev/null
@@ -1,164 +0,0 @@
-/*

-    ChibiOS/GFX - Copyright (C) 2012

-                 Joel Bodenmann aka Tectu <joel@unormal.org>

-

-    This file is part of ChibiOS/GFX.

-

-    ChibiOS/GFX is free software; you can redistribute it and/or modify

-    it under the terms of the GNU General Public License as published by

-    the Free Software Foundation; either version 3 of the License, or

-    (at your option) any later version.

-

-    ChibiOS/GFX is distributed in the hope that it will be useful,

-    but WITHOUT ANY WARRANTY; without even the implied warranty of

-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

-    GNU General Public License for more details.

-

-    You should have received a copy of the GNU General Public License

-    along with this program.  If not, see <http://www.gnu.org/licenses/>.

-*/

-

-/**

- * @file    drivers/gdisp/SSD1289/gdisp_lld_board_example_fsmc.h

- * @brief   GDISP Graphic Driver subsystem board interface for the SSD1289 display.

- *

- * @addtogroup GDISP

- * @{

- */

-

-#ifndef _GDISP_LLD_BOARD_H

-#define _GDISP_LLD_BOARD_H

-

-#define GDISP_REG              ((volatile uint16_t *) 0x60000000)[0] /* RS = 0 */

-#define GDISP_RAM              ((volatile uint16_t *) 0x60020000)[0] /* RS = 1 */

-

-/**

- * @brief   Initialise the board for the display.

- * @notes	Performs the following functions:

- *			1. initialise the io port used by your display

- *			2. initialise the reset pin (initial state not-in-reset)

- *			3. initialise the chip select pin (initial state not-active)

- *			4. initialise the backlight pin (initial state back-light off)

- *

- * @notapi

- */

-static __inline void init_board(void) {

-	const unsigned char FSMC_Bank;

-	

-	#if defined(STM32F1XX) || defined(STM32F3XX)

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

-		#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 (dmaStreamAllocate(GDISP_DMA_STREAM, 0, NULL, NULL)) chSysHalt();

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

-		#endif

-	#else

-		#error "FSMC not implemented for this device"

-	#endif

-

-	/* set pins to FSMC mode */

-	IOBus busD = {GPIOD, (1 << 0) | (1 << 1) | (1 << 4) | (1 << 5) | (1 << 7) | (1 << 8) |

-							(1 << 9) | (1 << 10) | (1 << 11) | (1 << 14) | (1 << 15), 0};

-

-	IOBus busE = {GPIOE, (1 << 7) | (1 << 8) | (1 << 9) | (1 << 10) | (1 << 11) | (1 << 12) |

-						(1 << 13) | (1 << 14) | (1 << 15), 0};

-

-	palSetBusMode(&busD, PAL_MODE_ALTERNATE(12));

-	palSetBusMode(&busE, PAL_MODE_ALTERNATE(12));

-

-	FSMC_Bank = 0;

-	

-	/* FSMC timing */

-	FSMC_Bank1->BTCR[FSMC_Bank+1] = (FSMC_BTR1_ADDSET_1 | FSMC_BTR1_ADDSET_3) \

-			| (FSMC_BTR1_DATAST_1 | FSMC_BTR1_DATAST_3) \

-			| (FSMC_BTR1_BUSTURN_1 | FSMC_BTR1_BUSTURN_3) ;

-

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

-}

-

-/**

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

-	(void) state;

-	/* Nothing to do here */

-}

-

-/**

- * @brief   Set the lcd back-light level.

- *

- * @param[in] percent		0 to 100%

- * 

- * @notapi

- */

-static __inline void set_backlight(uint8_t percent) {

-	(void) percent;

-	/* Nothing to do here */

-}

-

-/**

- * @brief   Take exclusive control of the bus

- *

- * @notapi

- */

-static __inline void acquire_bus(void) {

-	/* Nothing to do here */

-}

-

-/**

- * @brief   Release exclusive control of the bus

- *

- * @notapi

- */

-static __inline void release_bus(void) {

-	/* Nothing to do here */

-}

-

-/**

- * @brief   Send data to the index register.

- *

- * @param[in] index		The index register to set

- *

- * @notapi

- */

-static __inline void write_index(uint16_t index) { GDISP_REG = index; }

-

-/**

- * @brief   Send data to the lcd.

- *

- * @param[in] data		The data to send

- * 

- * @notapi

- */

-static __inline void write_data(uint16_t data) { GDISP_RAM = data; }

-

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

-/**

- * @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; }

-#endif

-

-#endif /* _GDISP_LLD_BOARD_H */

-/** @} */

diff --git a/drivers/gdisp/SSD1289/gdisp_lld_board_firebullstm32f103.h b/drivers/gdisp/SSD1289/gdisp_lld_board_firebullstm32f103.h
deleted file mode 100644
index 9cff5a19..00000000
--- a/drivers/gdisp/SSD1289/gdisp_lld_board_firebullstm32f103.h
+++ /dev/null
@@ -1,157 +0,0 @@
-/*

-    ChibiOS/GFX - Copyright (C) 2012

-                 Joel Bodenmann aka Tectu <joel@unormal.org>

-

-    This file is part of ChibiOS/GFX.

-

-    ChibiOS/GFX is free software; you can redistribute it and/or modify

-    it under the terms of the GNU General Public License as published by

-    the Free Software Foundation; either version 3 of the License, or

-    (at your option) any later version.

-

-    ChibiOS/GFX is distributed in the hope that it will be useful,

-    but WITHOUT ANY WARRANTY; without even the implied warranty of

-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

-    GNU General Public License for more details.

-

-    You should have received a copy of the GNU General Public License

-    along with this program.  If not, see <http://www.gnu.org/licenses/>.

-*/

-

-/**

- * @file    drivers/gdisp/SSD1289/gdisp_lld_board_firebullstm32f103.h

- * @brief   GDISP Graphic Driver subsystem board interface for the SSD1289 display.

- *

- * @addtogroup GDISP

- * @{

- */

-

-#ifndef _GDISP_LLD_BOARD_H

-#define _GDISP_LLD_BOARD_H

-

-#define SET_CS		palSetPad(GPIOD, 12);

-#define CLR_CS		palClearPad(GPIOD, 12);

-#define SET_RS		palSetPad(GPIOD, 13);

-#define CLR_RS		palClearPad(GPIOD, 13);

-#define SET_WR		palSetPad(GPIOD, 14);

-#define CLR_WR		palClearPad(GPIOD, 14);

-#define SET_RD		palSetPad(GPIOD, 15);

-#define CLR_RD		palClearPad(GPIOD, 15);

-

-/**

- * @brief   Initialise the board for the display.

- * @notes	This board definition uses GPIO and assumes exclusive access to these GPIO pins

- *

- * @notapi

- */

-static __inline void init_board(void) {

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

-	palSetPadMode(GPIOD, 12, PAL_MODE_OUTPUT_PUSHPULL);

-	palSetPadMode(GPIOD, 13, PAL_MODE_OUTPUT_PUSHPULL);

-	palSetPadMode(GPIOD, 14, PAL_MODE_OUTPUT_PUSHPULL);

-	palSetPadMode(GPIOD, 15, PAL_MODE_OUTPUT_PUSHPULL);

-	

-	// Configure the pins to a well know state

-	SET_RS;

-	SET_RD;

-	SET_WR;

-	CLR_CS;

-}

-

-

-/**

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

-	(void) state;

-	/* Nothing to do here - reset pin tied to Vcc */

-}

-

-/**

- * @brief   Set the lcd back-light level.

- *

- * @param[in] percent		0 to 100%

- * 

- * @notapi

- */

-static __inline void set_backlight(uint8_t percent) {

-	(void) percent;

-	/* Nothing to do here - Backlight always on */

-}

-

-/**

- * @brief   Take exclusive control of the bus

- *

- * @notapi

- */

-static __inline void acquire_bus(void) {

-	/* Nothing to do here since LCD is the only device on that bus */

-}

-

-/**

- * @brief   Release exclusive control of the bus

- *

- * @notapi

- */

-static __inline void release_bus(void) {

-	/* Nothing to do here since LCD is the only device on that bus */

-}

-

-/**

- * @brief   Send data to the index register.

- *

- * @param[in] index		The index register to set

- *

- * @notapi

- */

-static __inline void write_index(uint16_t index) {

-	palWritePort(GPIOE, index);

-	CLR_RS; CLR_WR; SET_WR; SET_RS;

-}

-

-/**

- * @brief   Send data to the lcd.

- *

- * @param[in] data		The data to send

- * 

- * @notapi

- */

-static __inline void write_data(uint16_t data) {

-	palWritePort(GPIOE, data);

-	CLR_WR; SET_WR;

-}

-

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

-/**

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

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

-}

-#endif

-

-#endif /* _GDISP_LLD_BOARD_H */

-/** @} */

diff --git a/drivers/gdisp/SSD1289/gdisp_lld_config.h b/drivers/gdisp/SSD1289/gdisp_lld_config.h
deleted file mode 100644
index dafbc90f..00000000
--- a/drivers/gdisp/SSD1289/gdisp_lld_config.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/*

-    ChibiOS/GFX - Copyright (C) 2012

-                 Joel Bodenmann aka Tectu <joel@unormal.org>

-

-    This file is part of ChibiOS/GFX.

-

-    ChibiOS/GFX is free software; you can redistribute it and/or modify

-    it under the terms of the GNU General Public License as published by

-    the Free Software Foundation; either version 3 of the License, or

-    (at your option) any later version.

-

-    ChibiOS/GFX is distributed in the hope that it will be useful,

-    but WITHOUT ANY WARRANTY; without even the implied warranty of

-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

-    GNU General Public License for more details.

-

-    You should have received a copy of the GNU General Public License

-    along with this program.  If not, see <http://www.gnu.org/licenses/>.

-*/

-

-/**

- * @file    drivers/gdisp/SSD1289/gdisp_lld_config.h

- * @brief   GDISP Graphic Driver subsystem low level driver header for the SSD1289 display.

- *

- * @addtogroup GDISP

- * @{

- */

-

-#ifndef _GDISP_LLD_CONFIG_H

-#define _GDISP_LLD_CONFIG_H

-

-#if GFX_USE_GDISP

-

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

-/* Driver hardware support.                                                  */

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

-

-#define GDISP_DRIVER_NAME				"SSD1289"

-#define GDISP_LLD(x)					gdisp_lld_##x##_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_PIXELFORMAT				GDISP_PIXELFORMAT_RGB565

-

-#endif	/* GFX_USE_GDISP */

-

-#endif	/* _GDISP_LLD_CONFIG_H */

-/** @} */

diff --git a/drivers/gdisp/SSD1289/readme.txt b/drivers/gdisp/SSD1289/readme.txt
deleted file mode 100644
index b160abbe..00000000
--- a/drivers/gdisp/SSD1289/readme.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-To use this driver:

-

-1. Add in your halconf.h:

-	a) #define GFX_USE_GDISP	TRUE

-

-	b) Any optional high level driver defines (see gdisp.h) eg: GDISP_NEED_MULTITHREAD

-

-	c) If you are not using a known board then create a gdisp_lld_board.h file

-		and ensure it is on your include path.

-		Use the gdisp_lld_board_example.h or gdisp_lld_board_fsmc.h file as a basis.

-		Currently known boards are:

-		 	BOARD_FIREBULL_STM32_F103	- GPIO interface: requires GDISP_CMD_PORT and GDISP_DATA_PORT to be defined

-

-	d) The following are optional - define them if you are not using the defaults below:

-		#define GDISP_SCREEN_WIDTH	320

-		#define GDISP_SCREEN_HEIGHT	240

-

-2. To your makefile add the following lines:

-	include $(GFXLIB)/drivers/gdisp/SSD1289/gdisp_lld.mk