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

DMA fixed and tested for SSD1963

remotes/origin_old/ugfx_release_2.6
mobyfab 2012-09-17 22:51:02 +02:00
parent ac228656ae
commit 4991834cbb
1 changed files with 24 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
drivers/gdisp/SSD1963/gdisp_lld.c
View File

@ -184,11 +184,13 @@ bool_t GDISP_LLD(init)(void) {
/* Initialise the display */ /* Initialise the display */
#if defined(LCD_USE_FSMC) #if defined(LCD_USE_FSMC)
#if defined(LCD_USE_DMA) #if defined(LCD_USE_DMA)
dmaStreamAllocate(LCD_DMA_STREAM, 0, NULL, NULL); if (dmaStreamAllocate(LCD_DMA_STREAM, 0, NULL, NULL)) chSysHalt();
#endif //#ifdef LCD_USE_DMA dmaStreamSetMemory0(LCD_DMA_STREAM, &LCD_RAM);
dmaStreamSetMode(LCD_DMA_STREAM, STM32_DMA_CR_PL(0) | STM32_DMA_CR_PSIZE_HWORD | STM32_DMA_CR_MSIZE_HWORD | STM32_DMA_CR_DIR_M2M);
#endif
#if defined(STM32F1XX) || defined(STM32F3XX) #if defined(STM32F1XX) || defined(STM32F3XX)
/* FSMC setup for F1/F3 */ /* FSMC setup for F1/F3 */
rccEnableAHB(RCC_AHBENR_FSMCEN, 0); rccEnableAHB(RCC_AHBENR_FSMCEN, 0);
@ -384,27 +386,18 @@ void GDISP_LLD(drawpixel)(coord_t x, coord_t y, color_t color) {
GDISP_LLD(setwindow)(x, y, x+cx-1, y+cy-1); GDISP_LLD(setwindow)(x, y, x+cx-1, y+cy-1);
GDISP_LLD(writestreamstart)(); GDISP_LLD(writestreamstart)();
#if defined(LCD_USE_DMA) #if defined(LCD_USE_FSMC) && defined(LCD_USE_DMA)
if (area > 1000) { // Do not use DMA for small areas uint16_t i, splitarea;
dmaStreamSetPeripheral(LCD_DMA_STREAM, &color); dmaStreamSetPeripheral(LCD_DMA_STREAM, &color);
dmaStreamSetMemory0(LCD_DMA_STREAM, LCD_RAM);
uint32_t i;
uint16_t splitarea;
for (i = (area/65535)+1; i > 0; i--) { for (i = (area/65535)+1; i > 0; i--) {
if (i <= 1) splitarea = area%65535; if (i <= 1) splitarea = area%65535; else splitarea = 65535;
else splitarea = 65535;
dmaStreamSetTransactionSize(LCD_DMA_STREAM, splitarea); dmaStreamSetTransactionSize(LCD_DMA_STREAM, splitarea);
dmaStreamSetMode(LCD_DMA_STREAM, STM32_DMA_CR_PSIZE_HWORD | STM32_DMA_CR_MSIZE_HWORD | STM32_DMA_CR_DIR_M2M | STM32_DMA_CR_EN); dmaStreamEnable(LCD_DMA_STREAM);
while ((LCD_DMA_STREAM)->stream->NDTR > 0) chThdSleepMilliseconds(5); dmaWaitCompletion(LCD_DMA_STREAM);
} }
}
else {
for(index = 0; index < area; index++)
GDISP_LLD(writedata)(color);
}
#else #else
for(index = 0; index < area; index++) for(index = 0; index < area; index++)
GDISP_LLD(writedata)(color); GDISP_LLD(writedata)(color);
#endif //#ifdef LCD_USE_DMA #endif //#ifdef LCD_USE_DMA
} }
#endif #endif
@ -444,33 +437,21 @@ void GDISP_LLD(drawpixel)(coord_t x, coord_t y, color_t color) {
buffer += srcx + srcy * srccx; buffer += srcx + srcy * srccx;
#if defined(LCD_USE_DMA) #if defined(LCD_USE_FSMC) && defined(LCD_USE_DMA)
uint32_t area = cx*cy; uint32_t area = cx*cy;
if (area > 1000) { // Do not use DMA for small areas uint16_t i, splitarea;
dmaStreamSetPeripheral(LCD_DMA_STREAM, buffer); dmaStreamSetPeripheral(LCD_DMA_STREAM, buffer);
dmaStreamSetMemory0(LCD_DMA_STREAM, LCD_RAM);
uint32_t i;
uint16_t splitarea;
for (i = (area/65535)+1; i > 0; i--) { for (i = (area/65535)+1; i > 0; i--) {
if (i <= 1) splitarea = area%65535; if (i <= 1) splitarea = area%65535; else splitarea = 65535;
else splitarea = 65535;
dmaStreamSetTransactionSize(LCD_DMA_STREAM, splitarea); dmaStreamSetTransactionSize(LCD_DMA_STREAM, splitarea);
dmaStreamSetMode(LCD_DMA_STREAM, STM32_DMA_CR_PSIZE_HWORD | STM32_DMA_CR_MSIZE_HWORD | STM32_DMA_CR_PINC | STM32_DMA_CR_DIR_M2M | STM32_DMA_CR_EN); dmaStreamEnable(LCD_DMA_STREAM);
while ((LCD_DMA_STREAM)->stream->NDTR > 0) chThdSleepMilliseconds(5); dmaWaitCompletion(LCD_DMA_STREAM);
} }
}
else {
for(; y < endy; y++, buffer += lg)
for(x=srcx; x < endx; x++)
GDISP_LLD(writedata)(*buffer++);
}
#else #else
for(; y < endy; y++, buffer += lg) for(; y < endy; y++, buffer += lg)
for(x=srcx; x < endx; x++) for(x=srcx; x < endx; x++)
GDISP_LLD(writedata)(*buffer++); GDISP_LLD(writedata)(*buffer++);
#endif //#ifdef LCD_USE_DMA #endif //#ifdef LCD_USE_DMA
} }
#endif #endif