Rename GDISP driver files to prevent problems when compiling for multiple controllers on platforms that put all generated object files into a single directory.

1 files changed, 373 insertions, 0 deletions

diff --git a/drivers/gdisp/ILI9341/gdisp_lld_ILI9341.c b/drivers/gdisp/ILI9341/gdisp_lld_ILI9341.c
new file mode 100644
index 00000000..e5c4b7d0
--- /dev/null
+++ b/drivers/gdisp/ILI9341/gdisp_lld_ILI9341.c
@@ -0,0 +1,373 @@
+/*
+ * This file is subject to the terms of the GFX License. If a copy of
+ * the license was not distributed with this file, you can obtain one at:
+ *
+ *              http://ugfx.org/license.html
+ */
+
+/**
+ * @file    drivers/gdisp/ILI9341/gdisp_lld.c
+ * @brief   GDISP Graphics Driver subsystem low level driver source for
+ * 			the ILI9341 and compatible HVGA display
+ */
+
+#include "gfx.h"
+
+#if GFX_USE_GDISP
+
+#if defined(GDISP_SCREEN_HEIGHT)
+	#warning "GDISP: This low level driver does not support setting a screen size. It is being ignored."
+	#undef GISP_SCREEN_HEIGHT
+#endif
+#if defined(GDISP_SCREEN_WIDTH)
+	#warning "GDISP: This low level driver does not support setting a screen size. It is being ignored."
+	#undef GDISP_SCREEN_WIDTH
+#endif
+
+#define GDISP_DRIVER_VMT			GDISPVMT_ILI9341
+#include "../drivers/gdisp/ILI9341/gdisp_lld_config.h"
+#include "gdisp/lld/gdisp_lld.h"
+
+#include "board_ILI9341.h"
+
+/*===========================================================================*/
+/* Driver local definitions.                                                 */
+/*===========================================================================*/
+
+#ifndef GDISP_SCREEN_HEIGHT
+	#define GDISP_SCREEN_HEIGHT		320
+#endif
+#ifndef GDISP_SCREEN_WIDTH
+	#define GDISP_SCREEN_WIDTH		240
+#endif
+#ifndef GDISP_INITIAL_CONTRAST
+	#define GDISP_INITIAL_CONTRAST	50
+#endif
+#ifndef GDISP_INITIAL_BACKLIGHT
+	#define GDISP_INITIAL_BACKLIGHT	100
+#endif
+
+#include "../drivers/gdisp/ILI9341/ILI9341.h"
+
+/*===========================================================================*/
+/* Driver local functions.                                                   */
+/*===========================================================================*/
+
+// Some common routines and macros
+#define dummy_read(g)				{ volatile uint16_t dummy; dummy = read_data(g); (void) dummy; }
+#define write_reg(g, reg, data)		{ write_index(g, reg); write_data(g, data); }
+#define write_data16(g, data)		{ write_data(g, data >> 8); write_data(g, (uint8_t)data); }
+#define delay(us)					gfxSleepMicroseconds(us)
+#define delayms(ms)					gfxSleepMilliseconds(ms)
+
+static inline void set_cursor(GDisplay *g) {
+	write_index(g, 0x2A);
+	write_data(g, (g->p.x >> 8));
+	write_data(g, (uint8_t) g->p.x);
+	write_data(g, (g->p.x) >> 8);
+	write_data(g, (uint8_t) (g->p.x));
+
+	write_index(g, 0x2B);
+	write_data(g, (g->p.y >> 8));
+	write_data(g, (uint8_t) g->p.y);
+	write_data(g, (g->p.y) >> 8);
+	write_data(g, (uint8_t) (g->p.y));
+
+	write_index(g, 0x2C);
+}
+
+static void set_viewport(GDisplay *g) {
+	write_index(g, 0x2A);
+	write_data(g, (g->p.x >> 8));
+	write_data(g, (uint8_t) g->p.x);
+	write_data(g, (g->p.x + g->p.cx - 1) >> 8);
+	write_data(g, (uint8_t) (g->p.x + g->p.cx - 1));
+
+	write_index(g, 0x2B);
+	write_data(g, (g->p.y >> 8));
+	write_data(g, (uint8_t) g->p.y);
+	write_data(g, (g->p.y + g->p.cy - 1) >> 8);
+	write_data(g, (uint8_t) (g->p.y + g->p.cy - 1));
+}
+
+/*===========================================================================*/
+/* Driver exported functions.                                                */
+/*===========================================================================*/
+
+LLDSPEC bool_t gdisp_lld_init(GDisplay *g) {
+	// No private area for this controller
+	g->priv = 0;
+
+	// Initialise the board interface
+	init_board(g);
+
+	// Hardware reset
+	setpin_reset(g, TRUE);
+	gfxSleepMilliseconds(20);
+	setpin_reset(g, FALSE);
+	gfxSleepMilliseconds(20);
+
+	// Get the bus for the following initialisation commands
+	acquire_bus(g);
+
+	write_index(g, 0x01); //software reset
+	chThdSleepMilliseconds(5);
+	write_index(g, 0x28);
+	// display off
+	//---------------------------------------------------------
+	// magic?
+	write_index(g, 0xcf);
+	write_data(g, 0x00);
+	write_data(g, 0x83);
+	write_data(g, 0x30);
+
+	write_index(g, 0xed);
+	write_data(g, 0x64);
+	write_data(g, 0x03);
+	write_data(g, 0x12);
+	write_data(g, 0x81);
+	write_index(g, 0xe8);
+	write_data(g, 0x85);
+	write_data(g, 0x01);
+	write_data(g, 0x79);
+	write_index(g, 0xcb);
+	write_data(g, 0x39);
+	write_data(g, 0x2c);
+	write_data(g, 0x00);
+	write_data(g, 0x34);
+	write_data(g, 0x02);
+	write_index(g, 0xf7);
+	write_data(g, 0x20);
+	write_index(g, 0xea);
+	write_data(g, 0x00);
+	write_data(g, 0x00);
+	//------------power control------------------------------
+	write_index(g, 0xc0); //power control
+	write_data(g, 0x26);
+	write_index(g, 0xc1); //power control
+	write_data(g, 0x11);
+	//--------------VCOM
+	write_index(g, 0xc5); //vcom control
+	write_data(g, 0x35);//35
+	write_data(g, 0x3e);//3E
+	write_index(g, 0xc7); //vcom control
+	write_data(g, 0xbe); // 0x94
+	//------------memory access control------------------------
+	write_index(g, 0x36);
+	// memory access control
+	write_data(g, 0x48); //0048 my,mx,mv,ml,BGR,mh,0.0
+	write_index(g, 0x3a); // pixel format set
+	write_data(g, 0x55);//16bit /pixel
+	//----------------- frame rate------------------------------
+	write_index(g, 0xb1);
+	// frame rate
+	write_data(g, 0x00);
+	write_data(g, 0x1B); //70
+	//----------------Gamma---------------------------------
+	write_index(g, 0xf2); // 3Gamma Function Disable
+	write_data(g, 0x08);
+	write_index(g, 0x26);
+	write_data(g, 0x01); // gamma set 4 gamma curve 01/02/04/08
+
+	write_index(g, 0xE0); //positive gamma correction
+	write_data(g, 0x1f);
+	write_data(g, 0x1a);
+	write_data(g, 0x18);
+	write_data(g, 0x0a);
+	write_data(g, 0x0f);
+	write_data(g, 0x06);
+	write_data(g, 0x45);
+	write_data(g, 0x87);
+	write_data(g, 0x32);
+	write_data(g, 0x0a);
+	write_data(g, 0x07);
+	write_data(g, 0x02);
+	write_data(g, 0x07);
+	write_data(g, 0x05);
+	write_data(g, 0x00);
+	write_index(g, 0xE1); //negamma correction
+	write_data(g, 0x00);
+	write_data(g, 0x25);
+	write_data(g, 0x27);
+	write_data(g, 0x05);
+	write_data(g, 0x10);
+	write_data(g, 0x09);
+	write_data(g, 0x3a);
+	write_data(g, 0x78);
+	write_data(g, 0x4d);
+	write_data(g, 0x05);
+	write_data(g, 0x18);
+	write_data(g, 0x0d);
+	write_data(g, 0x38);
+	write_data(g, 0x3a);
+	write_data(g, 0x1f);
+	//--------------ddram ---------------------
+	write_index(g, 0x2a);
+	// column set
+	// size = 239
+	write_data(g, 0x00);
+	write_data(g, 0x00);
+	write_data(g, 0x00);
+	write_data(g, 0xEF);
+	write_index(g, 0x2b);
+	// page address set
+	// size = 319
+	write_data(g, 0x00);
+	write_data(g, 0x00);
+	write_data(g, 0x01);
+	write_data(g, 0x3F);
+	// write_index(g, 0x34);
+	//write_index(g, 0x35);
+	// tearing effect off
+	// tearing effect on
+	// write_index(g, 0xb4); // display inversion
+	// write_data(g, 0x00);
+	write_index(g, 0xb7); //entry mode set
+	write_data(g, 0x07);
+	//-----------------display---------------------
+	write_index(g, 0xb6);
+	// display function control
+	write_data(g, 0x0a);
+	write_data(g, 0x82);
+	write_data(g, 0x27);
+	write_data(g, 0x00);
+	write_index(g, 0x11); //sleep out
+	chThdSleepMilliseconds(100);
+	write_index(g, 0x29); // display on
+	chThdSleepMilliseconds(100);
+
+    // Finish Init
+    post_init_board(g);
+
+ 	// Release the bus
+	release_bus(g);
+	
+	/* Turn on the back-light */
+	set_backlight(g, GDISP_INITIAL_BACKLIGHT);
+
+	/* Initialise the GDISP structure */
+	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;
+}
+
+#if GDISP_HARDWARE_STREAM_WRITE
+	LLDSPEC	void gdisp_lld_write_start(GDisplay *g) {
+		acquire_bus(g);
+		set_viewport(g);
+		#if !GDISP_HARDWARE_STREAM_POS
+			set_cursor(g);
+		#endif
+	}
+	LLDSPEC	void gdisp_lld_write_color(GDisplay *g) {
+		write_data16(g, g->p.color);
+	}
+	LLDSPEC	void gdisp_lld_write_stop(GDisplay *g) {
+		release_bus(g);
+	}
+	#if GDISP_HARDWARE_STREAM_POS
+		LLDSPEC void gdisp_lld_write_pos(GDisplay *g) {
+			set_cursor(g);
+		}
+	#endif
+#endif
+
+#if GDISP_HARDWARE_STREAM_READ
+	LLDSPEC	void gdisp_lld_read_start(GDisplay *g) {
+		acquire_bus(g);
+		set_viewport(g);
+		set_cursor(g);
+		setreadmode(g);
+		dummy_read(g);
+	}
+	LLDSPEC	color_t gdisp_lld_read_color(GDisplay *g) {
+		return read_data(g);
+	}
+	LLDSPEC	void gdisp_lld_read_stop(GDisplay *g) {
+		setwritemode(g);
+		release_bus(g);
+	}
+#endif
+
+#if GDISP_NEED_CONTROL && GDISP_HARDWARE_CONTROL
+	LLDSPEC void gdisp_lld_control(GDisplay *g) {
+		switch(g->p.x) {
+		case GDISP_CONTROL_POWER:
+			if (g->g.Powermode == (powermode_t)g->p.ptr)
+				return;
+			switch((powermode_t)g->p.ptr) {
+			case powerOff:
+			case powerSleep:
+			case powerDeepSleep:
+				acquire_bus(g);
+				write_reg(g, 0x0010, 0x0001);	/* enter sleep mode */
+				release_bus(g);
+				break;
+			case powerOn:
+				acquire_bus(g);
+				write_reg(g, 0x0010, 0x0000);	/* leave sleep mode */
+				release_bus(g);
+				break;
+			default:
+				return;
+			}
+			g->g.Powermode = (powermode_t)g->p.ptr;
+			return;
+
+		case GDISP_CONTROL_ORIENTATION:
+			if (g->g.Orientation == (orientation_t)g->p.ptr)
+				return;
+			switch((orientation_t)g->p.ptr) {
+			case GDISP_ROTATE_0:
+				acquire_bus(g);
+				write_reg(g, 0x36, 0x00);	/* X and Y axes non-inverted */
+				release_bus(g);
+				g->g.Height = GDISP_SCREEN_HEIGHT;
+				g->g.Width = GDISP_SCREEN_WIDTH;
+				break;
+			case GDISP_ROTATE_90:
+				acquire_bus(g);
+				write_reg(g, 0x36, 0x20);	/* Invert X and Y axes */
+				release_bus(g);
+				g->g.Height = GDISP_SCREEN_WIDTH;
+				g->g.Width = GDISP_SCREEN_HEIGHT;
+				break;
+			case GDISP_ROTATE_180:
+				acquire_bus(g);
+				write_reg(g, 0x36, 0x80);	/* X and Y axes non-inverted */
+				release_bus(g);
+				g->g.Height = GDISP_SCREEN_HEIGHT;
+				g->g.Width = GDISP_SCREEN_WIDTH;
+				break;
+			case GDISP_ROTATE_270:
+				acquire_bus(g);
+				write_reg(g, 0x36, 0xE0);	/* Invert X and Y axes */
+				release_bus(g);
+				g->g.Height = GDISP_SCREEN_WIDTH;
+				g->g.Width = GDISP_SCREEN_HEIGHT;
+				break;
+			default:
+				return;
+			}
+			g->g.Orientation = (orientation_t)g->p.ptr;
+			return;
+
+        case GDISP_CONTROL_BACKLIGHT:
+            if ((unsigned)g->p.ptr > 100)
+            	g->p.ptr = (void *)100;
+            set_backlight(g, (unsigned)g->p.ptr);
+            g->g.Backlight = (unsigned)g->p.ptr;
+            return;
+
+		//case GDISP_CONTROL_CONTRAST:
+        default:
+            return;
+		}
+	}
+#endif
+
+#endif /* GFX_USE_GDISP */