From 8c1fc9af2b96a9a3ccae3d8810c21bd7afae97ab Mon Sep 17 00:00:00 2001 From: gdisirio Date: Mon, 30 Sep 2013 13:04:10 +0000 Subject: git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/kernel_3_dev@6337 35acf78f-673a-0410-8e92-d51de3d6d3f4 --- os/hal/ports/STM32L1xx/adc_lld.c | 2 +- os/hal/ports/STM32L1xx/adc_lld.h | 8 ++------ os/hal/ports/STM32L1xx/ext_lld_isr.c | 26 +++++++++++++------------- os/hal/ports/STM32L1xx/stm32_dma.c | 16 ++++++++-------- 4 files changed, 24 insertions(+), 28 deletions(-) (limited to 'os/hal/ports/STM32L1xx') diff --git a/os/hal/ports/STM32L1xx/adc_lld.c b/os/hal/ports/STM32L1xx/adc_lld.c index ab4b7cd1a..bce7e3725 100644 --- a/os/hal/ports/STM32L1xx/adc_lld.c +++ b/os/hal/ports/STM32L1xx/adc_lld.c @@ -87,7 +87,7 @@ static void adc_lld_serve_rx_interrupt(ADCDriver *adcp, uint32_t flags) { * * @isr */ -OSAL_IRQ_HANDLER(ADC1_IRQHandler) { +OSAL_IRQ_HANDLER(Vector88) { uint32_t sr; OSAL_IRQ_PROLOGUE(); diff --git a/os/hal/ports/STM32L1xx/adc_lld.h b/os/hal/ports/STM32L1xx/adc_lld.h index 6d11ea93c..c7bb73612 100644 --- a/os/hal/ports/STM32L1xx/adc_lld.h +++ b/os/hal/ports/STM32L1xx/adc_lld.h @@ -343,17 +343,13 @@ struct ADCDriver { /** * @brief Waiting thread. */ - Thread *thread; + thread_reference_t thread; #endif #if ADC_USE_MUTUAL_EXCLUSION || defined(__DOXYGEN__) -#if CH_USE_MUTEXES || defined(__DOXYGEN__) /** * @brief Mutex protecting the peripheral. */ - Mutex mutex; -#elif CH_USE_SEMAPHORES - Semaphore semaphore; -#endif + mutex_t mutex; #endif /* ADC_USE_MUTUAL_EXCLUSION */ #if defined(ADC_DRIVER_EXT_FIELDS) ADC_DRIVER_EXT_FIELDS diff --git a/os/hal/ports/STM32L1xx/ext_lld_isr.c b/os/hal/ports/STM32L1xx/ext_lld_isr.c index fda41f1ac..ebc556e6b 100644 --- a/os/hal/ports/STM32L1xx/ext_lld_isr.c +++ b/os/hal/ports/STM32L1xx/ext_lld_isr.c @@ -53,7 +53,7 @@ * * @isr */ -OSAL_IRQ_HANDLER(EXTI0_IRQHandler) { +OSAL_IRQ_HANDLER(Vector58) { OSAL_IRQ_PROLOGUE(); @@ -68,7 +68,7 @@ OSAL_IRQ_HANDLER(EXTI0_IRQHandler) { * * @isr */ -OSAL_IRQ_HANDLER(EXTI1_IRQHandler) { +OSAL_IRQ_HANDLER(Vector5C) { OSAL_IRQ_PROLOGUE(); @@ -83,7 +83,7 @@ OSAL_IRQ_HANDLER(EXTI1_IRQHandler) { * * @isr */ -OSAL_IRQ_HANDLER(EXTI2_IRQHandler) { +OSAL_IRQ_HANDLER(Vector60) { OSAL_IRQ_PROLOGUE(); @@ -98,7 +98,7 @@ OSAL_IRQ_HANDLER(EXTI2_IRQHandler) { * * @isr */ -OSAL_IRQ_HANDLER(EXTI3_IRQHandler) { +OSAL_IRQ_HANDLER(Vector64) { OSAL_IRQ_PROLOGUE(); @@ -113,7 +113,7 @@ OSAL_IRQ_HANDLER(EXTI3_IRQHandler) { * * @isr */ -OSAL_IRQ_HANDLER(EXTI4_IRQHandler) { +OSAL_IRQ_HANDLER(Vector68) { OSAL_IRQ_PROLOGUE(); @@ -128,7 +128,7 @@ OSAL_IRQ_HANDLER(EXTI4_IRQHandler) { * * @isr */ -OSAL_IRQ_HANDLER(EXTI9_5_IRQHandler) { +OSAL_IRQ_HANDLER(Vector9C) { uint32_t pr; OSAL_IRQ_PROLOGUE(); @@ -154,7 +154,7 @@ OSAL_IRQ_HANDLER(EXTI9_5_IRQHandler) { * * @isr */ -OSAL_IRQ_HANDLER(EXTI15_10_IRQHandler) { +OSAL_IRQ_HANDLER(VectorE0) { uint32_t pr; OSAL_IRQ_PROLOGUE(); @@ -183,7 +183,7 @@ OSAL_IRQ_HANDLER(EXTI15_10_IRQHandler) { * * @isr */ -OSAL_IRQ_HANDLER(PVD_IRQHandler) { +OSAL_IRQ_HANDLER(Vector44) { OSAL_IRQ_PROLOGUE(); @@ -198,7 +198,7 @@ OSAL_IRQ_HANDLER(PVD_IRQHandler) { * * @isr */ -OSAL_IRQ_HANDLER(RTC_Alarm_IRQHandler) { +OSAL_IRQ_HANDLER(VectorE4) { OSAL_IRQ_PROLOGUE(); @@ -212,7 +212,7 @@ OSAL_IRQ_HANDLER(RTC_Alarm_IRQHandler) { * * @isr */ -OSAL_IRQ_HANDLER(USB_FS_WKUP_IRQHandler) { +OSAL_IRQ_HANDLER(VectorE8) { OSAL_IRQ_PROLOGUE(); @@ -227,7 +227,7 @@ OSAL_IRQ_HANDLER(USB_FS_WKUP_IRQHandler) { * * @isr */ -OSAL_IRQ_HANDLER(TAMPER_STAMP_IRQHandler) { +OSAL_IRQ_HANDLER(Vector48) { OSAL_IRQ_PROLOGUE(); @@ -242,7 +242,7 @@ OSAL_IRQ_HANDLER(TAMPER_STAMP_IRQHandler) { * * @isr */ -OSAL_IRQ_HANDLER(RTC_WKUP_IRQHandler) { +OSAL_IRQ_HANDLER(Vector4C) { OSAL_IRQ_PROLOGUE(); @@ -257,7 +257,7 @@ OSAL_IRQ_HANDLER(RTC_WKUP_IRQHandler) { * * @isr */ -OSAL_IRQ_HANDLER(COMP_IRQHandler) { +OSAL_IRQ_HANDLER(Vector98) { uint32_t pr; OSAL_IRQ_PROLOGUE(); diff --git a/os/hal/ports/STM32L1xx/stm32_dma.c b/os/hal/ports/STM32L1xx/stm32_dma.c index f277fab0d..0b7623281 100644 --- a/os/hal/ports/STM32L1xx/stm32_dma.c +++ b/os/hal/ports/STM32L1xx/stm32_dma.c @@ -110,7 +110,7 @@ static dma_isr_redir_t dma_isr_redir[STM32_DMA_STREAMS]; * * @isr */ -OSAL_IRQ_HANDLER(DMA1_Ch1_IRQHandler) { +OSAL_IRQ_HANDLER(Vector6C) { uint32_t flags; OSAL_IRQ_PROLOGUE(); @@ -128,7 +128,7 @@ OSAL_IRQ_HANDLER(DMA1_Ch1_IRQHandler) { * * @isr */ -OSAL_IRQ_HANDLER(DMA1_Ch2_IRQHandler) { +OSAL_IRQ_HANDLER(Vector70) { uint32_t flags; OSAL_IRQ_PROLOGUE(); @@ -146,7 +146,7 @@ OSAL_IRQ_HANDLER(DMA1_Ch2_IRQHandler) { * * @isr */ -OSAL_IRQ_HANDLER(DMA1_Ch3_IRQHandler) { +OSAL_IRQ_HANDLER(Vector74) { uint32_t flags; OSAL_IRQ_PROLOGUE(); @@ -164,7 +164,7 @@ OSAL_IRQ_HANDLER(DMA1_Ch3_IRQHandler) { * * @isr */ -OSAL_IRQ_HANDLER(DMA1_Ch4_IRQHandler) { +OSAL_IRQ_HANDLER(Vector78) { uint32_t flags; OSAL_IRQ_PROLOGUE(); @@ -182,7 +182,7 @@ OSAL_IRQ_HANDLER(DMA1_Ch4_IRQHandler) { * * @isr */ -OSAL_IRQ_HANDLER(DMA1_Ch5_IRQHandler) { +OSAL_IRQ_HANDLER(Vector7C) { uint32_t flags; OSAL_IRQ_PROLOGUE(); @@ -200,7 +200,7 @@ OSAL_IRQ_HANDLER(DMA1_Ch5_IRQHandler) { * * @isr */ -OSAL_IRQ_HANDLER(DMA1_Ch6_IRQHandler) { +OSAL_IRQ_HANDLER(Vector80) { uint32_t flags; OSAL_IRQ_PROLOGUE(); @@ -218,7 +218,7 @@ OSAL_IRQ_HANDLER(DMA1_Ch6_IRQHandler) { * * @isr */ -OSAL_IRQ_HANDLER(DMA1_Ch7_IRQHandler) { +OSAL_IRQ_HANDLER(Vector84) { uint32_t flags; OSAL_IRQ_PROLOGUE(); @@ -301,7 +301,7 @@ bool dmaStreamAllocate(const stm32_dma_stream_t *dmastp, /* Enables the associated IRQ vector if a callback is defined.*/ if (func != NULL) - nvicEnableVector(dmastp->vector, CORTEX_PRIORITY_MASK(priority)); + nvicEnableVector(dmastp->vector, priority); return FALSE; } -- cgit v1.2.3