From d9f02858fdc04c4404834a033850f758e4c8ee7e Mon Sep 17 00:00:00 2001 From: inmarket Date: Sat, 21 Dec 2013 13:21:59 +1000 Subject: Replace NULL's with 0 as NULL is not defined by the Raw32 GOS. --- boards/addons/gdisp/board_SSD1289_stm32f4discovery.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'boards/addons/gdisp/board_SSD1289_stm32f4discovery.h') diff --git a/boards/addons/gdisp/board_SSD1289_stm32f4discovery.h b/boards/addons/gdisp/board_SSD1289_stm32f4discovery.h index 866311dc..1d86a67e 100644 --- a/boards/addons/gdisp/board_SSD1289_stm32f4discovery.h +++ b/boards/addons/gdisp/board_SSD1289_stm32f4discovery.h @@ -24,12 +24,12 @@ static const PWMConfig pwmcfg = { 100000, /* 100 kHz PWM clock frequency. */ 100, /* PWM period is 100 cycles. */ - NULL, + 0, { - {PWM_OUTPUT_DISABLED, NULL}, - {PWM_OUTPUT_DISABLED, NULL}, - {PWM_OUTPUT_ACTIVE_HIGH, NULL}, - {PWM_OUTPUT_DISABLED, NULL} + {PWM_OUTPUT_DISABLED, 0}, + {PWM_OUTPUT_DISABLED, 0}, + {PWM_OUTPUT_ACTIVE_HIGH, 0}, + {PWM_OUTPUT_DISABLED, 0} }, 0 }; @@ -61,7 +61,7 @@ static inline void init_board(GDisplay *g) { rccEnableAHB3(RCC_AHB3ENR_FSMCEN, 0); #if defined(GDISP_USE_DMA) - if (dmaStreamAllocate(GDISP_DMA_STREAM, 0, NULL, NULL)) gfxExit(); + if (dmaStreamAllocate(GDISP_DMA_STREAM, 0, 0, 0)) 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); #else -- cgit v1.2.3