From 04c11df0b2d3ef9fa2e8f6d9a27668a8d3d24c7c Mon Sep 17 00:00:00 2001 From: barthess Date: Tue, 15 Mar 2016 10:19:56 +0300 Subject: Updated some testhal projects to new ChibiOS code --- os/hal/ports/STM32/LLD/DMA2Dv1/stm32_dma2d.c | 2 +- os/hal/ports/STM32/LLD/FSMCv1/nand_lld.h | 6 ------ os/hal/ports/STM32/LLD/LTDCv1/stm32_ltdc.c | 2 +- 3 files changed, 2 insertions(+), 8 deletions(-) (limited to 'os/hal/ports/STM32') diff --git a/os/hal/ports/STM32/LLD/DMA2Dv1/stm32_dma2d.c b/os/hal/ports/STM32/LLD/DMA2Dv1/stm32_dma2d.c index 75643d6..977eba0 100644 --- a/os/hal/ports/STM32/LLD/DMA2Dv1/stm32_dma2d.c +++ b/os/hal/ports/STM32/LLD/DMA2Dv1/stm32_dma2d.c @@ -150,7 +150,7 @@ OSAL_IRQ_HANDLER(STM32_DMA2D_HANDLER) { if (dma2dp->thread != NULL) { tp = dma2dp->thread; dma2dp->thread = NULL; - tp->p_u.rdymsg = MSG_OK; + tp->u.rdymsg = MSG_OK; chSchReadyI(tp); } #endif /* DMA2D_USE_WAIT */ diff --git a/os/hal/ports/STM32/LLD/FSMCv1/nand_lld.h b/os/hal/ports/STM32/LLD/FSMCv1/nand_lld.h index 23e8e51..c891fcc 100644 --- a/os/hal/ports/STM32/LLD/FSMCv1/nand_lld.h +++ b/os/hal/ports/STM32/LLD/FSMCv1/nand_lld.h @@ -124,12 +124,6 @@ #error "External interrupt controller must be enabled to use this feature" #endif -#if (STM32_NAND_USE_FSMC_NAND2 || STM32_NAND_USE_FSMC_NAND1) && \ - !STM32_DMA_IS_VALID_ID(STM32_NAND_DMA_STREAM, \ - STM32_FSMC_DMA_MSK) -#error "invalid DMA stream associated to NAND" -#endif - #if !defined(STM32_DMA_REQUIRED) #define STM32_DMA_REQUIRED #endif diff --git a/os/hal/ports/STM32/LLD/LTDCv1/stm32_ltdc.c b/os/hal/ports/STM32/LLD/LTDCv1/stm32_ltdc.c index 72c9d06..7037a7c 100644 --- a/os/hal/ports/STM32/LLD/LTDCv1/stm32_ltdc.c +++ b/os/hal/ports/STM32/LLD/LTDCv1/stm32_ltdc.c @@ -173,7 +173,7 @@ OSAL_IRQ_HANDLER(STM32_LTDC_EV_HANDLER) { if (ltdcp->thread != NULL) { tp = ltdcp->thread; ltdcp->thread = NULL; - tp->p_u.rdymsg = MSG_OK; + tp->u.rdymsg = MSG_OK; chSchReadyI(tp); } #endif /* LTDC_USE_WAIT */ -- cgit v1.2.3