diff options
| author | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2014-01-22 13:19:18 +0000 |
|---|---|---|
| committer | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2014-01-22 13:19:18 +0000 |
| commit | feaff06e8b4516db9a40f0fdd9492d711522496b (patch) | |
| tree | 10114d3a33e9cc4011a1a708e8074552b3793130 | |
| parent | fb6967cd23dbaee0c49c1447a159bd90e2860817 (diff) | |
| download | ChibiOS-feaff06e8b4516db9a40f0fdd9492d711522496b.tar.gz ChibiOS-feaff06e8b4516db9a40f0fdd9492d711522496b.tar.bz2 ChibiOS-feaff06e8b4516db9a40f0fdd9492d711522496b.zip | |
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/kernel_3_dev@6636 35acf78f-673a-0410-8e92-d51de3d6d3f4
| -rw-r--r-- | demos/rt/RT-STM32F051-DISCOVERY/chconf.h | 2 | ||||
| -rw-r--r-- | os/hal/ports/STM32F0xx/adc_lld.c | 2 | ||||
| -rw-r--r-- | testhal/STM32F0xx/ADC/chconf.h | 4 | ||||
| -rw-r--r-- | testhal/STM32F0xx/EXT/chconf.h | 2 | ||||
| -rw-r--r-- | testhal/STM32F0xx/IRQ_STORM/chconf.h | 2 | ||||
| -rw-r--r-- | testhal/STM32F0xx/PWM-ICU/chconf.h | 2 | ||||
| -rw-r--r-- | testhal/STM32F0xx/SPI/chconf.h | 2 | ||||
| -rw-r--r-- | testhal/STM32F0xx/UART/chconf.h | 2 |
8 files changed, 9 insertions, 9 deletions
diff --git a/demos/rt/RT-STM32F051-DISCOVERY/chconf.h b/demos/rt/RT-STM32F051-DISCOVERY/chconf.h index dc01d6174..41ac72eee 100644 --- a/demos/rt/RT-STM32F051-DISCOVERY/chconf.h +++ b/demos/rt/RT-STM32F051-DISCOVERY/chconf.h @@ -57,7 +57,7 @@ * this value.
*/
#define CH_CFG_ST_TIMEDELTA 2
-ports/STM32/STM32
+
/** @} */
/*===========================================================================*/
diff --git a/os/hal/ports/STM32F0xx/adc_lld.c b/os/hal/ports/STM32F0xx/adc_lld.c index 8bca93f05..9e95c0007 100644 --- a/os/hal/ports/STM32F0xx/adc_lld.c +++ b/os/hal/ports/STM32F0xx/adc_lld.c @@ -155,7 +155,7 @@ void adc_lld_init(void) { /* The shared vector is initialized on driver initialization and never
disabled.*/
- nvicEnableVector(ADC1_COMP_IRQn, STM32_ADC_IRQ_PRIORITY);
+ nvicEnableVector(12, STM32_ADC_IRQ_PRIORITY);
/* Calibration procedure.*/
rccEnableADC1(FALSE);
diff --git a/testhal/STM32F0xx/ADC/chconf.h b/testhal/STM32F0xx/ADC/chconf.h index feea94663..aad274eab 100644 --- a/testhal/STM32F0xx/ADC/chconf.h +++ b/testhal/STM32F0xx/ADC/chconf.h @@ -57,7 +57,7 @@ * this value.
*/
#define CH_CFG_ST_TIMEDELTA 2
-ports/STM32/STM32
+
/** @} */
/*===========================================================================*/
@@ -137,7 +137,7 @@ ports/STM32/STM32 *
* @note The default is @p TRUE.
*/
-#define CH_CFG_USE_TM TRUE
+#define CH_CFG_USE_TM FALSE
/**
* @brief Threads registry APIs.
diff --git a/testhal/STM32F0xx/EXT/chconf.h b/testhal/STM32F0xx/EXT/chconf.h index feea94663..333080236 100644 --- a/testhal/STM32F0xx/EXT/chconf.h +++ b/testhal/STM32F0xx/EXT/chconf.h @@ -57,7 +57,7 @@ * this value.
*/
#define CH_CFG_ST_TIMEDELTA 2
-ports/STM32/STM32
+
/** @} */
/*===========================================================================*/
diff --git a/testhal/STM32F0xx/IRQ_STORM/chconf.h b/testhal/STM32F0xx/IRQ_STORM/chconf.h index 76b317c2b..8a2d5efa1 100644 --- a/testhal/STM32F0xx/IRQ_STORM/chconf.h +++ b/testhal/STM32F0xx/IRQ_STORM/chconf.h @@ -57,7 +57,7 @@ * this value.
*/
#define CH_CFG_ST_TIMEDELTA 2
-ports/STM32/STM32
+
/** @} */
/*===========================================================================*/
diff --git a/testhal/STM32F0xx/PWM-ICU/chconf.h b/testhal/STM32F0xx/PWM-ICU/chconf.h index feea94663..333080236 100644 --- a/testhal/STM32F0xx/PWM-ICU/chconf.h +++ b/testhal/STM32F0xx/PWM-ICU/chconf.h @@ -57,7 +57,7 @@ * this value.
*/
#define CH_CFG_ST_TIMEDELTA 2
-ports/STM32/STM32
+
/** @} */
/*===========================================================================*/
diff --git a/testhal/STM32F0xx/SPI/chconf.h b/testhal/STM32F0xx/SPI/chconf.h index feea94663..333080236 100644 --- a/testhal/STM32F0xx/SPI/chconf.h +++ b/testhal/STM32F0xx/SPI/chconf.h @@ -57,7 +57,7 @@ * this value.
*/
#define CH_CFG_ST_TIMEDELTA 2
-ports/STM32/STM32
+
/** @} */
/*===========================================================================*/
diff --git a/testhal/STM32F0xx/UART/chconf.h b/testhal/STM32F0xx/UART/chconf.h index feea94663..333080236 100644 --- a/testhal/STM32F0xx/UART/chconf.h +++ b/testhal/STM32F0xx/UART/chconf.h @@ -57,7 +57,7 @@ * this value.
*/
#define CH_CFG_ST_TIMEDELTA 2
-ports/STM32/STM32
+
/** @} */
/*===========================================================================*/
|