Merge branch 'master' into fonts

3 files changed, 370 insertions, 2 deletions

diff --git a/drivers/gdisp/SSD1963/gdisp_lld_board_example_fsmc.h b/drivers/gdisp/SSD1963/gdisp_lld_board_example_fsmc.h
new file mode 100644
index 00000000..a2c296b9
--- /dev/null
+++ b/drivers/gdisp/SSD1963/gdisp_lld_board_example_fsmc.h
@@ -0,0 +1,177 @@
+/*
+ * 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://chibios-gfx.com/license.html
+ */
+
+/**
+ * @file    drivers/gdisp/SSD1963/gdisp_lld_board_example_fsmc.h
+ * @brief   GDISP Graphic Driver subsystem board interface for the SSD1963 display.
+ *
+ * @details	This file demonstrates how to interface an SSD1963 based display to an
+ *			STM32 microcontroller using ChibiOS/RT.
+ *
+ * @addtogroup GDISP
+ * @{
+ */
+
+#ifndef _GDISP_LLD_BOARD_H
+#define _GDISP_LLD_BOARD_H
+
+/* Using FSMC A16 as RS */
+#define GDISP_REG              (*((volatile uint16_t *) 0x60000000)) /* RS = 0 */
+#define GDISP_RAM              (*((volatile uint16_t *) 0x60020000)) /* RS = 1 */
+
+/**
+ * @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;
+}
+
+/**
+ * @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 = 0;
+	
+	#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)) 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);  
+		#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 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;
+}
+
+static inline void post_init_board(void) {
+	const unsigned char FSMC_Bank = 0;
+	/* FSMC delay reduced as the controller now runs at full speed */
+	FSMC_Bank1->BTCR[FSMC_Bank+1] = FSMC_BTR1_ADDSET_0 | FSMC_BTR1_DATAST_2 | FSMC_BTR1_BUSTURN_0 ;
+	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) {
+	//duty_cycle is 00..FF
+	//Work in progress: the SSD1963 has a built-in PWM, its output can
+	//be used by a Dynamic Background Control or by a host (user)
+	//Check your LCD's hardware, the PWM connection is default left open and instead
+	//connected to a LED connection on the breakout board
+	write_index(SSD1963_SET_PWM_CONF);//set PWM for BackLight
+	write_data(0x0001);
+	write_data(percent & 0x00FF);
+	write_data(0x0001);//controlled by host (not DBC), enabled
+	write_data(0x00FF);
+	write_data(0x0060);//don't let it go too dark, avoid a useless LCD
+	write_data(0x000F);//prescaler ???
+}
+
+/**
+ * @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 */
+}
+
+#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/SSD1963/gdisp_lld_board_example_gpio.h b/drivers/gdisp/SSD1963/gdisp_lld_board_example_gpio.h
new file mode 100644
index 00000000..38f5b2a5
--- /dev/null
+++ b/drivers/gdisp/SSD1963/gdisp_lld_board_example_gpio.h
@@ -0,0 +1,191 @@
+/*
+ * 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://chibios-gfx.com/license.html
+ */
+
+/**
+ * @file    drivers/gdisp/SSD1963/gdisp_lld_board_example_gpio.h
+ * @brief   GDISP Graphic Driver subsystem board interface for the SSD1963 display.
+ *
+ * @brief	This file demonstrates how to interface an SSD1963 based display using
+ *			a GPIO interface of an STM32 out of ChibiOS/RT.
+ *
+ * @addtogroup GDISP
+ * @{
+ */
+
+#ifndef _GDISP_LLD_BOARD_H
+#define _GDISP_LLD_BOARD_H
+
+/**
+ * @brief	The GPIO pin config
+ *
+ * @details	This block of defines tell your driver how you wired your display
+ *			controller to your MCU. Please change them accordingly.
+ */
+#define GDISP_CMD_PORT		GPIOC
+#define GDISP_DATA_PORT		GPIOD
+#define GDISP_CS			0
+#define GDISP_RS			1
+#define GDISP_WR			2
+#define GDISP_RD			3
+
+#define Set_CS		palSetPad(GDISP_CMD_PORT, GDISP_CS);
+#define Clr_CS		palClearPad(GDISP_CMD_PORT, GDISP_CS);
+#define Set_RS		palSetPad(GDISP_CMD_PORT, GDISP_RS);
+#define Clr_RS		palClearPad(GDISP_CMD_PORT, GDISP_RS);
+#define Set_WR		palSetPad(GDISP_CMD_PORT, GDISP_WR);
+#define Clr_WR		palClearPad(GDISP_CMD_PORT, GDISP_WR);
+#define Set_RD		palSetPad(GDISP_CMD_PORT, GDISP_RD);
+#define Clr_RD		palClearPad(GDISP_CMD_PORT, GDISP_RD);
+
+/**
+ * @brief   Send data to the index register.
+ *
+ * @param[in] index		The index register to set
+ *
+ * @notapi
+ */
+static inline void write_index(uint16_t index) {
+	Set_CS; Set_RS; Set_WR; Clr_RD;
+
+	palWritePort(GDISP_DATA_PORT, index);
+
+	Clr_CS;
+}
+
+/**
+ * @brief   Send data to the lcd.
+ *
+ * @param[in] data		The data to send
+ * 
+ * @notapi
+ */
+static inline void write_data(uint16_t data) {
+	Set_CS; Clr_RS; Set_WR; Clr_RD;
+
+	palWritePort(GDISP_DATA_PORT, data);
+
+	Clr_CS;
+}
+
+/**
+ * @brief   Initialise the board for the display.
+ *
+ * @notapi
+ */
+static inline void init_board(void) {
+	IOBus busCMD = {GDISP_CMD_PORT, (1 << GDISP_CS) | (1 << GDISP_RS) | (1 << GDISP_WR) | (1 << GDISP_RD), 0};
+	IOBus busDATA = {GDISP_CMD_PORT, 0xFFFFF, 0};
+	palSetBusMode(&busCMD, PAL_MODE_OUTPUT_PUSHPULL);
+	palSetBusMode(&busDATA, PAL_MODE_OUTPUT_PUSHPULL);
+}
+
+static inline void post_init_board(void) {
+	/* Nothing to do here */
+}
+
+/**
+ * @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) {
+	/* optional */
+}
+
+/**
+ * @brief   Set the lcd back-light level.
+ *
+ * @param[in] percent		0 to 100%
+ * 
+ * @notapi
+ */
+static inline void set_backlight(uint8_t percent) {
+	//duty_cycle is 00..FF
+	//Work in progress: the SSD1963 has a built-in PWM, its output can
+	//be used by a Dynamic Background Control or by a host (user)
+	//Check your LCD's hardware, the PWM connection is default left open and instead
+	//connected to a LED connection on the breakout board
+	write_index(SSD1963_SET_PWM_CONF);//set PWM for BackLight
+	write_data(0x0001);
+	write_data(percent & 0x00FF);
+	write_data(0x0001);//controlled by host (not DBC), enabled
+	write_data(0x00FF);
+	write_data(0x0060);//don't let it go too dark, avoid a useless LCD
+	write_data(0x000F);//prescaler ???
+}
+
+/**
+ * @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 */
+}
+
+__inline void write_stream(uint16_t *buffer, uint16_t size) {
+	uint16_t i;
+
+	Set_CS; Clr_RS; Set_WR; Clr_RD;
+
+	for (i = 0; i < size; i++) {
+		Set_WR;
+		palWritePort(GDISP_DATA_PORT, buffer[i]);
+		Clr_WR;
+	}
+
+	Clr_CS;
+}
+
+__inline void read_stream(uint16_t *buffer, size_t size) {
+	uint16_t i;
+	
+	Set_CS; Clr_RS; Clr_WR; Set_RD;
+	
+	for (i = 0; i < size; i++) {
+		Set_RD;
+		buffer[i] = palReadPort(GDISP_DATA_PORT);
+		Clr_RD;
+	}
+}
+
+#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 data;
+
+	Set_CS; Clr_RS; Clr_WR; Set_RD;
+	
+	data = palReadPort(GDISP_DATA_PORT); 
+
+	Clr_CS;
+
+	return data;
+}
+#endif
+
+#endif /* _GDISP_LLD_BOARD_H */
+/** @} */
diff --git a/include/gos/gos.h b/include/gos/gos.h
index cf143ded..8e7840e3 100644
--- a/include/gos/gos.h
+++ b/include/gos/gos.h
@@ -360,7 +360,7 @@
 	 *
 	 * @api
 	 */
-	semcount_t gfxSemCounter(gfxSem *pSem);
+	semcount_t gfxSemCounter(gfxSem *psem);
 
 	/**
 	 * @brief	Get the current semaphore count
@@ -371,7 +371,7 @@
 	 * @iclass
 	 * @api
 	 */
-	semcount_t gfxSemCounterI(gfxSem *pSem);
+	semcount_t gfxSemCounterI(gfxSem *psem);
 
 	/**
 	 * @brief	Start a new thread.