uGFX/ugfx
2
0
Fork 0
Code Issues 2 Pull requests Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/GDISPStreaming' into GDISPStreaming

Browse source
This commit is contained in:
inmarket 2013-10-25 14:42:09 +10:00
commit 1346f48204
2 changed files with 40 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

64
drivers/gdisp/RA8875/board_RA8875_marlin.h
View file

@ -10,52 +10,62 @@
* @brief GDISP Graphic Driver subsystem board interface for the RA8875 display. * @brief GDISP Graphic Driver subsystem board interface for the RA8875 display.
*/ */
#ifndef _GDISP_LLD_BOARD_H #ifndef _BOARD_RA8875_H
#define _GDISP_LLD_BOARD_H #define _BOARD_RA8875_H
// For a multiple display configuration we would put all this in a structure and then // For a multiple display configuration we would put all this in a structure and then
// set g->board to that structure. // set g->board to that structure.
#define GDISP_RAM (*((volatile uint16_t *) 0x68000000)) /* RS = 0 */ #define GDISP_RAM (*((volatile uint16_t *) 0x68000000)) /* RS = 0 */
#define GDISP_REG (*((volatile uint16_t *) 0x68020000)) /* RS = 1 */ #define GDISP_REG (*((volatile uint16_t *) 0x68020000)) /* RS = 1 */
#define FSMC_BANK 4 #define FSMC_BANK 4
static inline void init_board(GDisplay *g) { 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. // As we are not using multiple displays we set g->board to NULL as we don't use it.
g->board = 0; g->board = 0;
switch(g->controllerdisplay) { switch(g->controllerdisplay) {
case 0: // Set up for Display 0 // setup for display 0
/* set pins to FSMC mode */ case 0: {
IOBus busD = {GPIOD, (1 << 0) | (1 << 1) | (1 << 4) | (1 << 5) | (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) | // enable the FSMC peripheral
(1 << 13) | (1 << 14) | (1 << 15), 0}; rccEnableAHB3(RCC_AHB3ENR_FSMCEN, 0);
IOBus busG = {GPIOG, (1 << 10), 0}; // setup the pin modes for FSMC
IOBus busD = {GPIOD, (1 << 0) | (1 << 1) | (1 << 4) | (1 << 5) | (1 << 8) |
(1 << 9) | (1 << 10) | (1 << 11) | (1 << 14) | (1 << 15), 0};
palSetBusMode(&busD, PAL_MODE_ALTERNATE(12)); IOBus busE = {GPIOE, (1 << 7) | (1 << 8) | (1 << 9) | (1 << 10) | (1 << 11) | (1 << 12) |
palSetBusMode(&busE, PAL_MODE_ALTERNATE(12)); (1 << 13) | (1 << 14) | (1 << 15), 0};
palSetBusMode(&busG, PAL_MODE_ALTERNATE(12));
/* FSMC timing */ IOBus busG = {GPIOG, (1 << 10), 0};
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 palSetBusMode(&busD, PAL_MODE_ALTERNATE(12));
* This is actually not needed as already set by default after reset */ palSetBusMode(&busE, PAL_MODE_ALTERNATE(12));
FSMC_Bank1->BTCR[FSMC_BANK] = FSMC_BCR1_MWID_0 | FSMC_BCR1_WREN | FSMC_BCR1_MBKEN; palSetBusMode(&busG, PAL_MODE_ALTERNATE(12));
break;
// 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;
break;
}
// marlin does not have any secondary display so far
default:
break;
} }
} }
static inline void post_init_board(GDisplay *g) { static inline void post_init_board(GDisplay *g) {
(void) g; (void) g;
/* FSMC delay reduced as the controller now runs at full speed */ // FSMC delay reduced as the controller now runs at full speed
FSMC_Bank1->BTCR[2+1] = FSMC_BTR1_ADDSET_0 | FSMC_BTR1_DATAST_2 | FSMC_BTR1_BUSTURN_0 ; FSMC_Bank1->BTCR[2+1] = FSMC_BTR1_ADDSET_0 | FSMC_BTR1_DATAST_2 | FSMC_BTR1_BUSTURN_0 ;
FSMC_Bank1->BTCR[2] = FSMC_BCR1_MWID_0 | FSMC_BCR1_WREN | FSMC_BCR1_MBKEN; FSMC_Bank1->BTCR[2] = FSMC_BCR1_MWID_0 | FSMC_BCR1_WREN | FSMC_BCR1_MBKEN;
} }
@ -75,11 +85,13 @@ static inline void release_bus(GDisplay *g) {
static inline void write_index(GDisplay *g, uint16_t index) { static inline void write_index(GDisplay *g, uint16_t index) {
(void) g; (void) g;
GDISP_REG = index; GDISP_REG = index;
} }
static inline void write_data(GDisplay *g, uint16_t data) { static inline void write_data(GDisplay *g, uint16_t data) {
(void) g; (void) g;
GDISP_RAM = data; GDISP_RAM = data;
} }
@ -93,7 +105,9 @@ static inline void setwritemode(GDisplay *g) {
static inline uint16_t read_data(GDisplay *g) { static inline uint16_t read_data(GDisplay *g) {
(void) g; (void) g;
return GDISP_RAM; return GDISP_RAM;
} }
#endif /* _GDISP_LLD_BOARD_H */ #endif /* _BOARD_RA8875_H */

2
drivers/gdisp/RA8875/gdisp_lld.c
View file

@ -19,7 +19,7 @@
#include "gdisp/lld/gdisp_lld.h" #include "gdisp/lld/gdisp_lld.h"
/* include the users board interface */ /* include the users board interface */
#include "board_ra8875.h" #include "board_RA8875.h"
/*===========================================================================*/ /*===========================================================================*/
/* Driver local definitions. */ /* Driver local definitions. */