git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@3645 35acf78f-673a-0410-8e92-d51de3d6d3f4

3 files changed, 3 insertions, 5 deletions

diff --git a/os/hal/platforms/STM32F4xx/adc_lld.c b/os/hal/platforms/STM32F4xx/adc_lld.c
index 777804b5a..963ffc7c7 100644
--- a/os/hal/platforms/STM32F4xx/adc_lld.c
+++ b/os/hal/platforms/STM32F4xx/adc_lld.c
@@ -220,7 +220,7 @@ void adc_lld_init(void) {
 

   /* The shared vector is initialized on driver initialization and never

      disabled.*/

-  NVICEnableVector(ADC_IRQn, CORTEX_PRIORITY_MASK(STM32_ADC_IRQ_PRIORITY));

+  nvicEnableVector(ADC_IRQn, CORTEX_PRIORITY_MASK(STM32_ADC_IRQ_PRIORITY));

 }

 

 /**

diff --git a/os/hal/platforms/STM32F4xx/hal_lld.c b/os/hal/platforms/STM32F4xx/hal_lld.c
index d33237c2d..fa87998c5 100644
--- a/os/hal/platforms/STM32F4xx/hal_lld.c
+++ b/os/hal/platforms/STM32F4xx/hal_lld.c
@@ -29,8 +29,6 @@
 #include "ch.h"

 #include "hal.h"

 

-#define AIRCR_VECTKEY           0x05FA0000

-

 /*===========================================================================*/

 /* Driver exported variables.                                                */

 /*===========================================================================*/

diff --git a/os/hal/platforms/STM32F4xx/stm32_dma.c b/os/hal/platforms/STM32F4xx/stm32_dma.c
index d7005b77b..4a0ea3e8e 100644
--- a/os/hal/platforms/STM32F4xx/stm32_dma.c
+++ b/os/hal/platforms/STM32F4xx/stm32_dma.c
@@ -489,7 +489,7 @@ bool_t 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, CORTEX_PRIORITY_MASK(priority));

 

   return FALSE;

 }

@@ -516,7 +516,7 @@ void dmaStreamRelease(const stm32_dma_stream_t *dmastp) {
               "dmaRelease(), #1", "not allocated");

 

   /* Disables the associated IRQ vector.*/

-  NVICDisableVector(dmastp->vector);

+  nvicDisableVector(dmastp->vector);

 

   /* Marks the stream as not allocated.*/

   dma_streams_mask &= ~(1 << dmastp->selfindex);