Fixed various errors.

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

13 files changed, 22 insertions, 24 deletions

diff --git a/demos/STM32/NIL-STM32F051-DISCOVERY/mcuconf.h b/demos/STM32/NIL-STM32F051-DISCOVERY/mcuconf.h
index 98c62521c..a5e2be167 100644
--- a/demos/STM32/NIL-STM32F051-DISCOVERY/mcuconf.h
+++ b/demos/STM32/NIL-STM32F051-DISCOVERY/mcuconf.h
@@ -90,8 +90,8 @@
 #define STM32_I2C_USE_I2C1                  FALSE

 #define STM32_I2C_USE_I2C2                  FALSE

 #define STM32_I2C_BUSY_TIMEOUT              50

-#define STM32_I2C_I2C1_IRQ_PRIORITY         10

-#define STM32_I2C_I2C2_IRQ_PRIORITY         10

+#define STM32_I2C_I2C1_IRQ_PRIORITY         3

+#define STM32_I2C_I2C2_IRQ_PRIORITY         3

 #define STM32_I2C_I2C1_DMA_PRIORITY         1

 #define STM32_I2C_I2C2_DMA_PRIORITY         1

 #define STM32_I2C_DMA_ERROR_HOOK(i2cp)      osalSysHalt("DMA failure")

diff --git a/demos/STM32/RT-STM32F051-DISCOVERY/mcuconf.h b/demos/STM32/RT-STM32F051-DISCOVERY/mcuconf.h
index 98c62521c..a5e2be167 100644
--- a/demos/STM32/RT-STM32F051-DISCOVERY/mcuconf.h
+++ b/demos/STM32/RT-STM32F051-DISCOVERY/mcuconf.h
@@ -90,8 +90,8 @@
 #define STM32_I2C_USE_I2C1                  FALSE

 #define STM32_I2C_USE_I2C2                  FALSE

 #define STM32_I2C_BUSY_TIMEOUT              50

-#define STM32_I2C_I2C1_IRQ_PRIORITY         10

-#define STM32_I2C_I2C2_IRQ_PRIORITY         10

+#define STM32_I2C_I2C1_IRQ_PRIORITY         3

+#define STM32_I2C_I2C2_IRQ_PRIORITY         3

 #define STM32_I2C_I2C1_DMA_PRIORITY         1

 #define STM32_I2C_I2C2_DMA_PRIORITY         1

 #define STM32_I2C_DMA_ERROR_HOOK(i2cp)      osalSysHalt("DMA failure")

diff --git a/os/hal/ports/STM32/LLD/I2Cv2/i2c_lld.c b/os/hal/ports/STM32/LLD/I2Cv2/i2c_lld.c
index 249a6f54b..a358ba0f3 100644
--- a/os/hal/ports/STM32/LLD/I2Cv2/i2c_lld.c
+++ b/os/hal/ports/STM32/LLD/I2Cv2/i2c_lld.c
@@ -422,8 +422,7 @@ void i2c_lld_start(I2CDriver *i2cp) {
       rccEnableI2C1(FALSE);

 

 #if defined(STM32_I2C1_GLOBAL_NUMBER) || defined(__DOXYGEN__)

-      nvicEnableVector(STM32_I2C1_GLOBAL_NUMBER,

-                       CORTEX_PRIORITY_MASK(STM32_I2C_I2C1_IRQ_PRIORITY));

+      nvicEnableVector(STM32_I2C1_GLOBAL_NUMBER, STM32_I2C_I2C1_IRQ_PRIORITY);

 #elif defined(STM32_I2C1_EVENT_NUMBER) && defined(STM32_I2C1_ERROR_NUMBER)

       nvicEnableVector(STM32_I2C1_EVENT_NUMBER, STM32_I2C_I2C1_IRQ_PRIORITY);

       nvicEnableVector(STM32_I2C1_ERROR_NUMBER, STM32_I2C_I2C1_IRQ_PRIORITY);

@@ -456,8 +455,7 @@ void i2c_lld_start(I2CDriver *i2cp) {
       rccEnableI2C2(FALSE);

 

 #if defined(STM32_I2C2_GLOBAL_NUMBER) || defined(__DOXYGEN__)

-      nvicEnableVector(STM32_I2C2_GLOBAL_NUMBER,

-                       CORTEX_PRIORITY_MASK(STM32_I2C_I2C2_IRQ_PRIORITY));

+      nvicEnableVector(STM32_I2C2_GLOBAL_NUMBER, STM32_I2C_I2C2_IRQ_PRIORITY);

 #elif defined(STM32_I2C2_EVENT_NUMBER) && defined(STM32_I2C2_ERROR_NUMBER)

       nvicEnableVector(STM32_I2C2_EVENT_NUMBER, STM32_I2C_I2C2_IRQ_PRIORITY);

       nvicEnableVector(STM32_I2C2_ERROR_NUMBER, STM32_I2C_I2C2_IRQ_PRIORITY);

diff --git a/testhal/STM32/STM32F0xx/ADC/mcuconf.h b/testhal/STM32/STM32F0xx/ADC/mcuconf.h
index 652af90a1..497264595 100644
--- a/testhal/STM32/STM32F0xx/ADC/mcuconf.h
+++ b/testhal/STM32/STM32F0xx/ADC/mcuconf.h
@@ -90,8 +90,8 @@
 #define STM32_I2C_USE_I2C1                  FALSE

 #define STM32_I2C_USE_I2C2                  FALSE

 #define STM32_I2C_BUSY_TIMEOUT              50

-#define STM32_I2C_I2C1_IRQ_PRIORITY         10

-#define STM32_I2C_I2C2_IRQ_PRIORITY         10

+#define STM32_I2C_I2C1_IRQ_PRIORITY         3

+#define STM32_I2C_I2C2_IRQ_PRIORITY         3

 #define STM32_I2C_I2C1_DMA_PRIORITY         1

 #define STM32_I2C_I2C2_DMA_PRIORITY         1

 #define STM32_I2C_DMA_ERROR_HOOK(i2cp)      osalSysHalt("DMA failure")

diff --git a/testhal/STM32/STM32F0xx/EXT/chconf.h b/testhal/STM32/STM32F0xx/EXT/chconf.h
index 0e7bac72f..89abbc2dc 100644
--- a/testhal/STM32/STM32F0xx/EXT/chconf.h
+++ b/testhal/STM32/STM32F0xx/EXT/chconf.h
@@ -137,7 +137,7 @@
  *

  * @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/STM32/STM32F0xx/EXT/mcuconf.h b/testhal/STM32/STM32F0xx/EXT/mcuconf.h
index df3f85580..04fea8ea3 100644
--- a/testhal/STM32/STM32F0xx/EXT/mcuconf.h
+++ b/testhal/STM32/STM32F0xx/EXT/mcuconf.h
@@ -90,8 +90,8 @@
 #define STM32_I2C_USE_I2C1                  FALSE

 #define STM32_I2C_USE_I2C2                  FALSE

 #define STM32_I2C_BUSY_TIMEOUT              50

-#define STM32_I2C_I2C1_IRQ_PRIORITY         10

-#define STM32_I2C_I2C2_IRQ_PRIORITY         10

+#define STM32_I2C_I2C1_IRQ_PRIORITY         3

+#define STM32_I2C_I2C2_IRQ_PRIORITY         3

 #define STM32_I2C_I2C1_DMA_PRIORITY         1

 #define STM32_I2C_I2C2_DMA_PRIORITY         1

 #define STM32_I2C_DMA_ERROR_HOOK(i2cp)      osalSysHalt("DMA failure")

diff --git a/testhal/STM32/STM32F0xx/IRQ_STORM/mcuconf.h b/testhal/STM32/STM32F0xx/IRQ_STORM/mcuconf.h
index 2a9c91850..a9364b960 100644
--- a/testhal/STM32/STM32F0xx/IRQ_STORM/mcuconf.h
+++ b/testhal/STM32/STM32F0xx/IRQ_STORM/mcuconf.h
@@ -90,8 +90,8 @@
 #define STM32_I2C_USE_I2C1                  FALSE

 #define STM32_I2C_USE_I2C2                  FALSE

 #define STM32_I2C_BUSY_TIMEOUT              50

-#define STM32_I2C_I2C1_IRQ_PRIORITY         10

-#define STM32_I2C_I2C2_IRQ_PRIORITY         10

+#define STM32_I2C_I2C1_IRQ_PRIORITY         3

+#define STM32_I2C_I2C2_IRQ_PRIORITY         3

 #define STM32_I2C_I2C1_DMA_PRIORITY         1

 #define STM32_I2C_I2C2_DMA_PRIORITY         1

 #define STM32_I2C_DMA_ERROR_HOOK(i2cp)      osalSysHalt("DMA failure")

diff --git a/testhal/STM32/STM32F0xx/PWM-ICU/chconf.h b/testhal/STM32/STM32F0xx/PWM-ICU/chconf.h
index 0e7bac72f..89abbc2dc 100644
--- a/testhal/STM32/STM32F0xx/PWM-ICU/chconf.h
+++ b/testhal/STM32/STM32F0xx/PWM-ICU/chconf.h
@@ -137,7 +137,7 @@
  *

  * @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/STM32/STM32F0xx/PWM-ICU/mcuconf.h b/testhal/STM32/STM32F0xx/PWM-ICU/mcuconf.h
index b4678a1f6..29bdca5a4 100644
--- a/testhal/STM32/STM32F0xx/PWM-ICU/mcuconf.h
+++ b/testhal/STM32/STM32F0xx/PWM-ICU/mcuconf.h
@@ -90,8 +90,8 @@
 #define STM32_I2C_USE_I2C1                  FALSE

 #define STM32_I2C_USE_I2C2                  FALSE

 #define STM32_I2C_BUSY_TIMEOUT              50

-#define STM32_I2C_I2C1_IRQ_PRIORITY         10

-#define STM32_I2C_I2C2_IRQ_PRIORITY         10

+#define STM32_I2C_I2C1_IRQ_PRIORITY         3

+#define STM32_I2C_I2C2_IRQ_PRIORITY         3

 #define STM32_I2C_I2C1_DMA_PRIORITY         1

 #define STM32_I2C_I2C2_DMA_PRIORITY         1

 #define STM32_I2C_DMA_ERROR_HOOK(i2cp)      osalSysHalt("DMA failure")

diff --git a/testhal/STM32/STM32F0xx/SPI/chconf.h b/testhal/STM32/STM32F0xx/SPI/chconf.h
index 0e7bac72f..89abbc2dc 100644
--- a/testhal/STM32/STM32F0xx/SPI/chconf.h
+++ b/testhal/STM32/STM32F0xx/SPI/chconf.h
@@ -137,7 +137,7 @@
  *

  * @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/STM32/STM32F0xx/SPI/mcuconf.h b/testhal/STM32/STM32F0xx/SPI/mcuconf.h
index 33146eb6a..a578e221b 100644
--- a/testhal/STM32/STM32F0xx/SPI/mcuconf.h
+++ b/testhal/STM32/STM32F0xx/SPI/mcuconf.h
@@ -90,8 +90,8 @@
 #define STM32_I2C_USE_I2C1                  FALSE

 #define STM32_I2C_USE_I2C2                  FALSE

 #define STM32_I2C_BUSY_TIMEOUT              50

-#define STM32_I2C_I2C1_IRQ_PRIORITY         10

-#define STM32_I2C_I2C2_IRQ_PRIORITY         10

+#define STM32_I2C_I2C1_IRQ_PRIORITY         3

+#define STM32_I2C_I2C2_IRQ_PRIORITY         3

 #define STM32_I2C_I2C1_DMA_PRIORITY         1

 #define STM32_I2C_I2C2_DMA_PRIORITY         1

 #define STM32_I2C_DMA_ERROR_HOOK(i2cp)      osalSysHalt("DMA failure")

diff --git a/testhal/STM32/STM32F0xx/UART/chconf.h b/testhal/STM32/STM32F0xx/UART/chconf.h
index 0e7bac72f..89abbc2dc 100644
--- a/testhal/STM32/STM32F0xx/UART/chconf.h
+++ b/testhal/STM32/STM32F0xx/UART/chconf.h
@@ -137,7 +137,7 @@
  *

  * @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/STM32/STM32F0xx/UART/mcuconf.h b/testhal/STM32/STM32F0xx/UART/mcuconf.h
index 1fd22d532..e910a149d 100644
--- a/testhal/STM32/STM32F0xx/UART/mcuconf.h
+++ b/testhal/STM32/STM32F0xx/UART/mcuconf.h
@@ -90,8 +90,8 @@
 #define STM32_I2C_USE_I2C1                  FALSE

 #define STM32_I2C_USE_I2C2                  FALSE

 #define STM32_I2C_BUSY_TIMEOUT              50

-#define STM32_I2C_I2C1_IRQ_PRIORITY         10

-#define STM32_I2C_I2C2_IRQ_PRIORITY         10

+#define STM32_I2C_I2C1_IRQ_PRIORITY         3

+#define STM32_I2C_I2C2_IRQ_PRIORITY         3

 #define STM32_I2C_I2C1_DMA_PRIORITY         1

 #define STM32_I2C_I2C2_DMA_PRIORITY         1

 #define STM32_I2C_DMA_ERROR_HOOK(i2cp)      osalSysHalt("DMA failure")