aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gdisp/ILI9320
diff options
context:
space:
mode:
authorinmarket <andrewh@inmarket.com.au>2013-10-28 20:04:03 +1000
committerinmarket <andrewh@inmarket.com.au>2013-10-28 20:04:03 +1000
commit555257933af6e7e3b106ac3589520b5dad45061b (patch)
treeb2c2cd148855bc20ebb476e62e0fa39ed1efbab0 /drivers/gdisp/ILI9320
parentdc2d5be60625dc03f0982d61a55dd3ccf844fff5 (diff)
downloaduGFX-555257933af6e7e3b106ac3589520b5dad45061b.tar.gz
uGFX-555257933af6e7e3b106ac3589520b5dad45061b.tar.bz2
uGFX-555257933af6e7e3b106ac3589520b5dad45061b.zip
Clean up the driver directory structure by moving all board specific files into the boards sub-structure.
Diffstat (limited to 'drivers/gdisp/ILI9320')
-rw-r--r--drivers/gdisp/ILI9320/board_ILI9320_olimex_pic32mx_lcd.h126
-rw-r--r--drivers/gdisp/ILI9320/board_ILI9320_olimex_stm32_lcd.h100
2 files changed, 0 insertions, 226 deletions
diff --git a/drivers/gdisp/ILI9320/board_ILI9320_olimex_pic32mx_lcd.h b/drivers/gdisp/ILI9320/board_ILI9320_olimex_pic32mx_lcd.h
deleted file mode 100644
index 5315127b..00000000
--- a/drivers/gdisp/ILI9320/board_ILI9320_olimex_pic32mx_lcd.h
+++ /dev/null
@@ -1,126 +0,0 @@
-/*
- * 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/ILI9320/board_ILI9320_olimex_pic32mx_lcd.h
- * @brief GDISP Graphic Driver subsystem board interface for the ILI9325 display.
- */
-
-#ifndef GDISP_LLD_BOARD_H
-#define GDISP_LLD_BOARD_H
-
-#ifndef noinline
-#define noinline __attribute__((noinline))
-#endif
-
-static void init_board(GDisplay *g) {
-
- // As we are not using multiple displays we set g->board to NULL as we don't use it.
- g->board = 0;
-
- switch(g->controllerdisplay) {
- case 0: // Set up for Display 0
- // RST
- palSetPadMode(IOPORTA, 7, PAL_MODE_OUTPUT);
- palClearPad(IOPORTA, 7);
-
- // RS
- palSetPadMode(IOPORTA, 10, PAL_MODE_OUTPUT);
- palSetPad(IOPORTA, 10);
-
- // CS
- palSetPadMode(IOPORTA, 9, PAL_MODE_OUTPUT);
- palClearPad(IOPORTA, 9);
-
- // Backlight
- palSetPadMode(IOPORTD, 3, PAL_MODE_OUTPUT);
- palSetPad(IOPORTD, 3);
-
- // PMP setup
- PMMODE = 0;
- PMAEN = 0;
- PMCON = 0;
- PMMODEbits.MODE = 2;
- PMMODEbits.WAITB = 0;
- PMMODEbits.WAITM = 1;
- PMMODEbits.WAITE = 0;
- PMCONbits.CSF = 0;
- PMCONbits.PTRDEN = 1;
- PMCONbits.PTWREN = 1;
- PMMODEbits.MODE16 = 1;
- PMCONbits.PMPEN = 1;
-
- palClearPad(IOPORTA, 9);
- break;
- }
-}
-
-#define PmpWaitBusy() do {} while (PMMODEbits.BUSY)
-
-static inline void post_init_board(GDisplay *g) {
- (void) g;
-}
-
-static noinline void setpin_reset(GDisplay *g, bool_t state) {
- (void) g;
- if (state)
- palClearPad(IOPORTA, 7);
- else
- palSetPad(IOPORTA, 7);
-}
-
-static void set_backlight(GDisplay *g, uint8_t percent) {
- (void) g;
- if (percentage)
- palClearPad(IOPORTD, 3);
- else
- palSetPad(IOPORTD, 3);
-}
-
-static inline void acquire_bus(GDisplay *g) {
- (void) g;
-}
-
-static inline void release_bus(GDisplay *g) {
- (void) g;
-}
-
-static noinline void write_index(GDisplay *g, uint16_t index) {
- volatile uint16_t dummy;
- (void) g;
-
- PmpWaitBusy();
- palClearPad(IOPORTA, 10);
- PMDIN = index;
- PmpWaitBusy();
- palSetPad(IOPORTA, 10);
-
- dummy = PMDIN;
- (void)dummy;
-}
-
-static noinline void write_data(GDisplay *g, uint16_t data) {
- (void) g;
- PMDIN = data;
- PmpWaitBusy();
-}
-
-static inline void setreadmode(GDisplay *g) {
- (void) g;
-}
-
-static inline void setwritemode(GDisplay *g) {
- (void) g;
-}
-
-static noinline uint16_t read_data(GDisplay *g) {
- (void) g;
- PmpWaitBusy();
- return PMDIN;
-}
-
-#endif /* GDISP_LLD_BOARD_H */
diff --git a/drivers/gdisp/ILI9320/board_ILI9320_olimex_stm32_lcd.h b/drivers/gdisp/ILI9320/board_ILI9320_olimex_stm32_lcd.h
deleted file mode 100644
index bca5caf8..00000000
--- a/drivers/gdisp/ILI9320/board_ILI9320_olimex_stm32_lcd.h
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * 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/ILI9320/board_ILI9320_olimex_stm32_lcd.h
- * @brief GDISP Graphic Driver subsystem board interface for the ILI9320 display.
- */
-
-#ifndef GDISP_LLD_BOARD_H
-#define GDISP_LLD_BOARD_H
-
-// For a multiple display configuration we would put all this in a structure and then
-// set g->board to that structure.
-#define GDISP_REG (*((volatile uint16_t *) 0x60000000)) /* RS = 0 */
-#define GDISP_RAM (*((volatile uint16_t *) 0x60100000)) /* RS = 1 */
-
-static inline void init_board(GDisplay *g) {
-
- // As we are not using multiple displays we set g->board to NULL as we don't use it.
- g->board = 0;
-
- switch(g->controllerdisplay) {
- case 0: // Set up for Display 0
- /* FSMC setup for F1 */
- rccEnableAHB(RCC_AHBENR_FSMCEN, 0);
-
- /* set pin modes */
- IOBus busD = {GPIOD, PAL_WHOLE_PORT, 0};
- IOBus busE = {GPIOE, PAL_WHOLE_PORT, 0};
- palSetBusMode(&busD, PAL_MODE_STM32_ALTERNATE_PUSHPULL);
- palSetBusMode(&busE, PAL_MODE_STM32_ALTERNATE_PUSHPULL);
- palSetPadMode(GPIOE, GPIOE_TFT_RST, PAL_MODE_OUTPUT_PUSHPULL);
- palSetPadMode(GPIOD, GPIOD_TFT_LIGHT, PAL_MODE_OUTPUT_PUSHPULL);
-
- /* FSMC timing */
- FSMC_Bank1->BTCR[0+1] = (6) | (10 << 8) | (10 << 16);
-
- /* Bank1 NOR/SRAM control register configuration
- * This is actually not needed as already set by default after reset */
- FSMC_Bank1->BTCR[0] = FSMC_BCR1_MWID_0 | FSMC_BCR1_WREN | FSMC_BCR1_MBKEN;
- break;
- }
-}
-
-static inline void post_init_board(GDisplay *g) {
- (void) g;
-}
-
-static inline void setpin_reset(GDisplay *g, bool_t state) {
- (void) g;
- if(state)
- palClearPad(GPIOE, GPIOE_TFT_RST);
- else
- palSetPad(GPIOE, GPIOE_TFT_RST);
-}
-
-static inline void set_backlight(GDisplay *g, uint8_t percent) {
- (void) g;
- if(percent)
- palClearPad(GPIOD, GPIOD_TFT_LIGHT);
- else
- palSetPad(GPIOD, GPIOD_TFT_LIGHT);
-}
-
-static inline void acquire_bus(GDisplay *g) {
- (void) g;
-}
-
-static inline void release_bus(GDisplay *g) {
- (void) g;
-}
-
-static inline void write_index(GDisplay *g, uint16_t index) {
- (void) g;
- GDISP_REG = index;
-}
-
-static inline void write_data(GDisplay *g, uint16_t data) {
- (void) g;
- GDISP_RAM = data;
-}
-
-static inline void setreadmode(GDisplay *g) {
- (void) g;
-}
-
-static inline void setwritemode(GDisplay *g) {
- (void) g;
-}
-
-static inline uint16_t read_data(GDisplay *g) {
- (void) g;
- return GDISP_RAM;
-}
-
-#endif /* GDISP_LLD_BOARD_H */