diff options
author | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2013-09-30 13:04:10 +0000 |
---|---|---|
committer | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2013-09-30 13:04:10 +0000 |
commit | 8c1fc9af2b96a9a3ccae3d8810c21bd7afae97ab (patch) | |
tree | 27ab79db6ed83a893b78ee8d878a0ff416cca7b8 /os/hal | |
parent | 984148e9dbda3053aec71ea7da545bc75cd33e94 (diff) | |
download | ChibiOS-8c1fc9af2b96a9a3ccae3d8810c21bd7afae97ab.tar.gz ChibiOS-8c1fc9af2b96a9a3ccae3d8810c21bd7afae97ab.tar.bz2 ChibiOS-8c1fc9af2b96a9a3ccae3d8810c21bd7afae97ab.zip |
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/kernel_3_dev@6337 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'os/hal')
-rw-r--r-- | os/hal/ports/STM32/SPIv1/spi_lld.h | 15 | ||||
-rw-r--r-- | os/hal/ports/STM32/USARTv1/uart_lld.h | 173 | ||||
-rw-r--r-- | os/hal/ports/STM32/USARTv2/uart_lld.h | 10 | ||||
-rw-r--r-- | os/hal/ports/STM32L1xx/adc_lld.c | 2 | ||||
-rw-r--r-- | os/hal/ports/STM32L1xx/adc_lld.h | 8 | ||||
-rw-r--r-- | os/hal/ports/STM32L1xx/ext_lld_isr.c | 26 | ||||
-rw-r--r-- | os/hal/ports/STM32L1xx/stm32_dma.c | 16 |
7 files changed, 64 insertions, 186 deletions
diff --git a/os/hal/ports/STM32/SPIv1/spi_lld.h b/os/hal/ports/STM32/SPIv1/spi_lld.h index 2ea288ea9..53a7607ff 100644 --- a/os/hal/ports/STM32/SPIv1/spi_lld.h +++ b/os/hal/ports/STM32/SPIv1/spi_lld.h @@ -121,21 +121,8 @@ * @brief SPI DMA error hook.
*/
#if !defined(STM32_SPI_DMA_ERROR_HOOK) || defined(__DOXYGEN__)
-#define STM32_SPI_DMA_ERROR_HOOK(spip) chSysHalt()
+#define STM32_SPI_DMA_ERROR_HOOK(spip) osalSysHalt("DMA failure")
#endif
-
-
-#if 0
-/* Fixed streams for platforms using the old DMA peripheral, the values are
- valid for both STM32F1xx and STM32L1xx.*/
-#define STM32_SPI_SPI1_RX_DMA_STREAM STM32_DMA_STREAM_ID(1, 2)
-#define STM32_SPI_SPI1_TX_DMA_STREAM STM32_DMA_STREAM_ID(1, 3)
-#define STM32_SPI_SPI2_RX_DMA_STREAM STM32_DMA_STREAM_ID(1, 4)
-#define STM32_SPI_SPI2_TX_DMA_STREAM STM32_DMA_STREAM_ID(1, 5)
-#define STM32_SPI_SPI3_RX_DMA_STREAM STM32_DMA_STREAM_ID(2, 1)
-#define STM32_SPI_SPI3_TX_DMA_STREAM STM32_DMA_STREAM_ID(2, 2)
-
-#endif /* !STM32_ADVANCED_DMA*/
/** @} */
/*===========================================================================*/
diff --git a/os/hal/ports/STM32/USARTv1/uart_lld.h b/os/hal/ports/STM32/USARTv1/uart_lld.h index 6c7df15e0..12ecd0923 100644 --- a/os/hal/ports/STM32/USARTv1/uart_lld.h +++ b/os/hal/ports/STM32/USARTv1/uart_lld.h @@ -201,121 +201,8 @@ * error can only happen because programming errors.
*/
#if !defined(STM32_UART_DMA_ERROR_HOOK) || defined(__DOXYGEN__)
-#define STM32_UART_DMA_ERROR_HOOK(uartp) chSysHalt()
+#define STM32_UART_DMA_ERROR_HOOK(uartp) osalSysHalt("DMA failure")
#endif
-
-#if STM32_ADVANCED_DMA || defined(__DOXYGEN__)
-
-/**
- * @brief DMA stream used for USART1 RX operations.
- * @note This option is only available on platforms with enhanced DMA.
- */
-#if !defined(STM32_UART_USART1_RX_DMA_STREAM) || defined(__DOXYGEN__)
-#define STM32_UART_USART1_RX_DMA_STREAM STM32_DMA_STREAM_ID(2, 5)
-#endif
-
-/**
- * @brief DMA stream used for USART1 TX operations.
- * @note This option is only available on platforms with enhanced DMA.
- */
-#if !defined(STM32_UART_USART1_TX_DMA_STREAM) || defined(__DOXYGEN__)
-#define STM32_UART_USART1_TX_DMA_STREAM STM32_DMA_STREAM_ID(2, 7)
-#endif
-
-/**
- * @brief DMA stream used for USART2 RX operations.
- * @note This option is only available on platforms with enhanced DMA.
- */
-#if !defined(STM32_UART_USART2_RX_DMA_STREAM) || defined(__DOXYGEN__)
-#define STM32_UART_USART2_RX_DMA_STREAM STM32_DMA_STREAM_ID(1, 5)
-#endif
-
-/**
- * @brief DMA stream used for USART2 TX operations.
- * @note This option is only available on platforms with enhanced DMA.
- */
-#if !defined(STM32_UART_USART2_TX_DMA_STREAM) || defined(__DOXYGEN__)
-#define STM32_UART_USART2_TX_DMA_STREAM STM32_DMA_STREAM_ID(1, 6)
-#endif
-
-/**
- * @brief DMA stream used for USART3 RX operations.
- * @note This option is only available on platforms with enhanced DMA.
- */
-#if !defined(STM32_UART_USART3_RX_DMA_STREAM) || defined(__DOXYGEN__)
-#define STM32_UART_USART3_RX_DMA_STREAM STM32_DMA_STREAM_ID(1, 1)
-#endif
-
-/**
- * @brief DMA stream used for USART3 TX operations.
- * @note This option is only available on platforms with enhanced DMA.
- */
-#if !defined(STM32_UART_USART3_TX_DMA_STREAM) || defined(__DOXYGEN__)
-#define STM32_UART_USART3_TX_DMA_STREAM STM32_DMA_STREAM_ID(1, 3)
-#endif
-
-/**
- * @brief DMA stream used for UART4 RX operations.
- * @note This option is only available on platforms with enhanced DMA.
- */
-#if !defined(STM32_UART_UART4_RX_DMA_STREAM) || defined(__DOXYGEN__)
-#define STM32_UART_UART4_RX_DMA_STREAM STM32_DMA_STREAM_ID(1, 2)
-#endif
-
-/**
- * @brief DMA stream used for UART4 TX operations.
- * @note This option is only available on platforms with enhanced DMA.
- */
-#if !defined(STM32_UART_UART4_TX_DMA_STREAM) || defined(__DOXYGEN__)
-#define STM32_UART_UART4_TX_DMA_STREAM STM32_DMA_STREAM_ID(1, 4)
-#endif
-
-/**
- * @brief DMA stream used for UART5 RX operations.
- * @note This option is only available on platforms with enhanced DMA.
- */
-#if !defined(STM32_UART_UART5_RX_DMA_STREAM) || defined(__DOXYGEN__)
-#define STM32_UART_UART5_RX_DMA_STREAM STM32_DMA_STREAM_ID(1, 0)
-#endif
-
-/**
- * @brief DMA stream used for UART5 TX operations.
- * @note This option is only available on platforms with enhanced DMA.
- */
-#if !defined(STM32_UART_UART5_TX_DMA_STREAM) || defined(__DOXYGEN__)
-#define STM32_UART_UART5_TX_DMA_STREAM STM32_DMA_STREAM_ID(1, 7)
-#endif
-
-/**
- * @brief DMA stream used for USART6 RX operations.
- * @note This option is only available on platforms with enhanced DMA.
- */
-#if !defined(STM32_UART_USART6_RX_DMA_STREAM) || defined(__DOXYGEN__)
-#define STM32_UART_USART6_RX_DMA_STREAM STM32_DMA_STREAM_ID(2, 2)
-#endif
-
-/**
- * @brief DMA stream used for USART6 TX operations.
- * @note This option is only available on platforms with enhanced DMA.
- */
-#if !defined(STM32_UART_USART6_TX_DMA_STREAM) || defined(__DOXYGEN__)
-#define STM32_UART_USART6_TX_DMA_STREAM STM32_DMA_STREAM_ID(2, 7)
-#endif
-
-#else /* !STM32_ADVANCED_DMA */
-
-/* Fixed streams for platforms using the old DMA peripheral, the values are
- valid for both STM32F1xx and STM32L1xx.*/
-#define STM32_UART_USART1_RX_DMA_STREAM STM32_DMA_STREAM_ID(1, 5)
-#define STM32_UART_USART1_TX_DMA_STREAM STM32_DMA_STREAM_ID(1, 4)
-#define STM32_UART_USART2_RX_DMA_STREAM STM32_DMA_STREAM_ID(1, 6)
-#define STM32_UART_USART2_TX_DMA_STREAM STM32_DMA_STREAM_ID(1, 7)
-#define STM32_UART_USART3_RX_DMA_STREAM STM32_DMA_STREAM_ID(1, 3)
-#define STM32_UART_USART3_TX_DMA_STREAM STM32_DMA_STREAM_ID(1, 2)
-#define STM32_UART_UART4_RX_DMA_STREAM STM32_DMA_STREAM_ID(2, 3)
-#define STM32_UART_UART4_TX_DMA_STREAM STM32_DMA_STREAM_ID(2, 5)
-
-#endif /* !STM32_ADVANCED_DMA*/
/** @} */
/*===========================================================================*/
@@ -339,7 +226,7 @@ #error "UART4 not present in the selected device"
#endif
- #if !defined(STM32F4XX) || !defined(STM32F4XX)
+ #if !defined(STM32F2XX) && !defined(STM32F4XX)
#error "UART4 DMA access not supported in this platform"
#endif
#endif
@@ -349,7 +236,7 @@ #error "UART5 not present in the selected device"
#endif
- #if !defined(STM32F4XX) || !defined(STM32F4XX)
+ #if !defined(STM32F2XX) && !defined(STM32F4XX)
#error "UART5 DMA access not supported in this platform"
#endif
#endif
@@ -424,6 +311,41 @@ #error "Invalid DMA priority assigned to USART6"
#endif
+/* The following checks are only required when there is a DMA able to
+ reassign streams to different channels.*/
+#if STM32_ADVANCED_DMA
+/* Check on the presence of the DMA streams settings in mcuconf.h.*/
+#if STM32_UART_USE_USART1 && (!defined(STM32_UART_USART1_RX_DMA_STREAM) || \
+ !defined(STM32_UART_USART1_TX_DMA_STREAM))
+#error "USART1 DMA streams not defined"
+#endif
+
+#if STM32_UART_USE_USART2 && (!defined(STM32_UART_USART2_RX_DMA_STREAM) || \
+ !defined(STM32_UART_USART2_TX_DMA_STREAM))
+#error "USART2 DMA streams not defined"
+#endif
+
+#if STM32_UART_USE_USART3 && (!defined(STM32_UART_USART3_RX_DMA_STREAM) || \
+ !defined(STM32_UART_USART3_TX_DMA_STREAM))
+#error "USART3 DMA streams not defined"
+#endif
+
+#if STM32_UART_USE_UART4 && (!defined(STM32_UART_UART4_RX_DMA_STREAM) || \
+ !defined(STM32_UART_UART4_TX_DMA_STREAM))
+#error "UART4 DMA streams not defined"
+#endif
+
+#if STM32_UART_USE_UART5 && (!defined(STM32_UART_UART5_RX_DMA_STREAM) || \
+ !defined(STM32_UART_UART5_TX_DMA_STREAM))
+#error "UART5 DMA streams not defined"
+#endif
+
+#if STM32_UART_USE_USART6 && (!defined(STM32_UART_USART6_RX_DMA_STREAM) || \
+ !defined(STM32_UART_USART6_TX_DMA_STREAM))
+#error "USART6 DMA streams not defined"
+#endif
+
+/* Check on the validity of the assigned DMA channels.*/
#if STM32_UART_USE_USART1 && \
!STM32_DMA_IS_VALID_ID(STM32_UART_USART1_RX_DMA_STREAM, \
STM32_USART1_RX_DMA_MSK)
@@ -461,40 +383,23 @@ #endif
#if STM32_UART_USE_UART4 && \
- !STM32_DMA_IS_VALID_ID(STM32_UART_UART4_RX_DMA_STREAM, \
- STM32_UART4_RX_DMA_MSK)
-#error "invalid DMA stream associated to UART4 RX"
-#endif
-
-#if STM32_UART_USE_UART4 && \
!STM32_DMA_IS_VALID_ID(STM32_UART_UART4_TX_DMA_STREAM, \
STM32_UART4_TX_DMA_MSK)
#error "invalid DMA stream associated to UART4 TX"
#endif
#if STM32_UART_USE_UART5 && \
- !STM32_DMA_IS_VALID_ID(STM32_UART_UART5_RX_DMA_STREAM, \
- STM32_UART5_RX_DMA_MSK)
-#error "invalid DMA stream associated to UART5 RX"
-#endif
-
-#if STM32_UART_USE_UART5 && \
!STM32_DMA_IS_VALID_ID(STM32_UART_UART5_TX_DMA_STREAM, \
STM32_UART5_TX_DMA_MSK)
#error "invalid DMA stream associated to UART5 TX"
#endif
#if STM32_UART_USE_USART6 && \
- !STM32_DMA_IS_VALID_ID(STM32_UART_USART6_RX_DMA_STREAM, \
- STM32_USART6_RX_DMA_MSK)
-#error "invalid DMA stream associated to USART6 RX"
-#endif
-
-#if STM32_UART_USE_USART6 && \
!STM32_DMA_IS_VALID_ID(STM32_UART_USART6_TX_DMA_STREAM, \
STM32_USART6_TX_DMA_MSK)
#error "invalid DMA stream associated to USART6 TX"
#endif
+#endif /* STM32_ADVANCED_DMA */
#if !defined(STM32_DMA_REQUIRED)
#define STM32_DMA_REQUIRED
diff --git a/os/hal/ports/STM32/USARTv2/uart_lld.h b/os/hal/ports/STM32/USARTv2/uart_lld.h index 32b1f6e47..b9ee5aeb7 100644 --- a/os/hal/ports/STM32/USARTv2/uart_lld.h +++ b/os/hal/ports/STM32/USARTv2/uart_lld.h @@ -125,16 +125,6 @@ #if !defined(STM32_UART_DMA_ERROR_HOOK) || defined(__DOXYGEN__)
#define STM32_UART_DMA_ERROR_HOOK(uartp) osalSysHalt("DMA failure")
#endif
-
-#if defined(STM32F37X)
-/* Fixed values for STM32F3xx devices.*/
-#define STM32_UART_USART1_RX_DMA_STREAM STM32_DMA_STREAM_ID(1, 5)
-#define STM32_UART_USART1_TX_DMA_STREAM STM32_DMA_STREAM_ID(1, 4)
-#define STM32_UART_USART2_RX_DMA_STREAM STM32_DMA_STREAM_ID(1, 6)
-#define STM32_UART_USART2_TX_DMA_STREAM STM32_DMA_STREAM_ID(1, 7)
-#define STM32_UART_USART3_RX_DMA_STREAM STM32_DMA_STREAM_ID(1, 3)
-#define STM32_UART_USART3_TX_DMA_STREAM STM32_DMA_STREAM_ID(1, 2)
-#endif /* defined(STM32F30X) */
/** @} */
/*===========================================================================*/
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;
}
|