diff options
| author | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2010-04-02 08:59:10 +0000 |
|---|---|---|
| committer | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2010-04-02 08:59:10 +0000 |
| commit | 876463f7215f0166ef9b7cafca77c7dca966d632 (patch) | |
| tree | bb486f6db2520670b2c6bb512a18d606418105e4 /testhal | |
| parent | ee8e0c61f9fd4e8c496b13ac47179c9621206db6 (diff) | |
| download | ChibiOS-876463f7215f0166ef9b7cafca77c7dca966d632.tar.gz ChibiOS-876463f7215f0166ef9b7cafca77c7dca966d632.tar.bz2 ChibiOS-876463f7215f0166ef9b7cafca77c7dca966d632.zip | |
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@1827 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'testhal')
| -rw-r--r-- | testhal/STM32/Makefile | 4 | ||||
| -rw-r--r-- | testhal/STM32/mcuconf.h | 26 |
2 files changed, 15 insertions, 15 deletions
diff --git a/testhal/STM32/Makefile b/testhal/STM32/Makefile index ea7e5a03e..a7f9c9091 100644 --- a/testhal/STM32/Makefile +++ b/testhal/STM32/Makefile @@ -60,7 +60,7 @@ CHIBIOS = ../.. include $(CHIBIOS)/boards/OLIMEX_STM32_P103/board.mk
include $(CHIBIOS)/os/hal/platforms/STM32/platform.mk
include $(CHIBIOS)/os/hal/hal.mk
-include $(CHIBIOS)/os/ports/GCC/ARMCMx/STM32F103/port.mk
+include $(CHIBIOS)/os/ports/GCC/ARMCMx/STM32F10x/port.mk
include $(CHIBIOS)/os/kernel/kernel.mk
include $(CHIBIOS)/test/test.mk
@@ -102,7 +102,7 @@ TCPPSRC = # List ASM source files here
ASMSRC = $(PORTASM) \
- $(CHIBIOS)/os/ports/GCC/ARMCMx/STM32F103/vectors.s
+ $(CHIBIOS)/os/ports/GCC/ARMCMx/STM32F10x/vectors.s
INCDIR = $(PORTINC) $(KERNINC) $(TESTINC) \
$(HALINC) $(PLATFORMINC) $(BOARDINC) \
diff --git a/testhal/STM32/mcuconf.h b/testhal/STM32/mcuconf.h index ae6a7a125..5d690faa0 100644 --- a/testhal/STM32/mcuconf.h +++ b/testhal/STM32/mcuconf.h @@ -45,14 +45,14 @@ */
#define USE_STM32_ADC1 TRUE
#define STM32_ADC1_DMA_PRIORITY 3
-#define STM32_ADC1_IRQ_PRIORITY CORTEX_PRIORITY(5)
+#define STM32_ADC1_IRQ_PRIORITY 5
#define STM32_ADC1_DMA_ERROR_HOOK() chSysHalt()
/*
* CAN driver system settings.
*/
#define USE_STM32_CAN1 TRUE
-#define STM32_CAN1_IRQ_PRIORITY CORTEX_PRIORITY(11)
+#define STM32_CAN1_IRQ_PRIORITY 11
/*
* PWM driver system settings.
@@ -61,10 +61,10 @@ #define USE_STM32_PWM2 FALSE
#define USE_STM32_PWM3 FALSE
#define USE_STM32_PWM4 FALSE
-#define STM32_PWM1_IRQ_PRIORITY CORTEX_PRIORITY(7)
-#define STM32_PWM2_IRQ_PRIORITY CORTEX_PRIORITY(7)
-#define STM32_PWM3_IRQ_PRIORITY CORTEX_PRIORITY(7)
-#define STM32_PWM4_IRQ_PRIORITY CORTEX_PRIORITY(7)
+#define STM32_PWM1_IRQ_PRIORITY 7
+#define STM32_PWM2_IRQ_PRIORITY 7
+#define STM32_PWM3_IRQ_PRIORITY 7
+#define STM32_PWM4_IRQ_PRIORITY 7
/*
* SERIAL driver system settings.
@@ -76,12 +76,12 @@ #define USE_STM32_UART4 FALSE
#define USE_STM32_UART5 FALSE
#endif
-#define STM32_USART1_PRIORITY CORTEX_PRIORITY(12)
-#define STM32_USART2_PRIORITY CORTEX_PRIORITY(12)
-#define STM32_USART3_PRIORITY CORTEX_PRIORITY(12)
+#define STM32_USART1_PRIORITY 12
+#define STM32_USART2_PRIORITY 12
+#define STM32_USART3_PRIORITY 12
#if defined(STM32F10X_HD) || defined(STM32F10X_CL)
-#define STM32_UART4_PRIORITY CORTEX_PRIORITY(12)
-#define STM32_UART5_PRIORITY CORTEX_PRIORITY(12)
+#define STM32_UART4_PRIORITY 12
+#define STM32_UART5_PRIORITY 12
#endif
/*
@@ -91,6 +91,6 @@ #define USE_STM32_SPI2 TRUE
#define STM32_SPI1_DMA_PRIORITY 2
#define STM32_SPI2_DMA_PRIORITY 2
-#define STM32_SPI1_IRQ_PRIORITY CORTEX_PRIORITY(10)
-#define STM32_SPI2_IRQ_PRIORITY CORTEX_PRIORITY(10)
+#define STM32_SPI1_IRQ_PRIORITY 10
+#define STM32_SPI2_IRQ_PRIORITY 10
#define STM32_SPI1_DMA_ERROR_HOOK() chSysHalt()
|