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

3 files changed, 4 insertions, 12 deletions

diff --git a/os/hal/ports/STM32F37x/adc_lld.h b/os/hal/ports/STM32F37x/adc_lld.h
index db7ae39ec..42cff6d61 100644
--- a/os/hal/ports/STM32F37x/adc_lld.h
+++ b/os/hal/ports/STM32F37x/adc_lld.h
@@ -515,23 +515,18 @@ struct ADCDriver {
   /**

    * @brief Current conversion group pointer or @p NULL.

    */

-  const ADCConversionGroup    *grpp;

-

+  const ADCConversionGroup  *grpp;

 #if ADC_USE_WAIT || defined(__DOXYGEN__)

   /**

    * @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/STM32F37x/stm32_dma.c b/os/hal/ports/STM32F37x/stm32_dma.c
index 362348957..688d43dfc 100644
--- a/os/hal/ports/STM32F37x/stm32_dma.c
+++ b/os/hal/ports/STM32F37x/stm32_dma.c
@@ -403,7 +403,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;

 }

diff --git a/os/hal/src/hal.c b/os/hal/src/hal.c
index 8b56b4ac8..7b6dc4640 100644
--- a/os/hal/src/hal.c
+++ b/os/hal/src/hal.c
@@ -65,9 +65,6 @@ void halInit(void) {
   /* Platform low level initializations.*/

   hal_lld_init();

 

-#if HAL_USE_TM || defined(__DOXYGEN__)

-  tmInit();

-#endif

 #if HAL_USE_PAL || defined(__DOXYGEN__)

   palInit(&pal_default_config);

 #endif