aboutsummaryrefslogtreecommitdiffstats
path: root/os/ports
diff options
context:
space:
mode:
authorgdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>2013-07-23 13:51:02 +0000
committergdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>2013-07-23 13:51:02 +0000
commitfa64f08fc1ad45d0984828695697f6abde7e8ffd (patch)
tree6d7c116760540a13a3e87c2b512dff4618de196f /os/ports
parent30895b26766443c620dfe5a5aabc90fc8c53c7f8 (diff)
downloadChibiOS-fa64f08fc1ad45d0984828695697f6abde7e8ffd.tar.gz
ChibiOS-fa64f08fc1ad45d0984828695697f6abde7e8ffd.tar.bz2
ChibiOS-fa64f08fc1ad45d0984828695697f6abde7e8ffd.zip
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/kernel_3_dev@6024 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'os/ports')
-rw-r--r--os/ports/GCC/ARMCMx/STM32F3xx/chtimer.c2
-rw-r--r--os/ports/GCC/ARMCMx/chcore_v7m.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/os/ports/GCC/ARMCMx/STM32F3xx/chtimer.c b/os/ports/GCC/ARMCMx/STM32F3xx/chtimer.c
index 5cb8d8c75..78d2aaf06 100644
--- a/os/ports/GCC/ARMCMx/STM32F3xx/chtimer.c
+++ b/os/ports/GCC/ARMCMx/STM32F3xx/chtimer.c
@@ -53,7 +53,7 @@
*
* @isr
*/
-CH_IRQ_HANDLER(Vector7C) {
+CH_IRQ_HANDLER(VectorB0) {
CH_IRQ_PROLOGUE();
diff --git a/os/ports/GCC/ARMCMx/chcore_v7m.c b/os/ports/GCC/ARMCMx/chcore_v7m.c
index dfe2e2d5a..23554935a 100644
--- a/os/ports/GCC/ARMCMx/chcore_v7m.c
+++ b/os/ports/GCC/ARMCMx/chcore_v7m.c
@@ -124,6 +124,8 @@ void _port_init(void) {
#if CH_CFG_TIMEDELTA == 0
nvicSetSystemHandlerPriority(HANDLER_SYSTICK,
CORTEX_PRIORITY_MASK(CORTEX_PRIORITY_SYSTICK));
+#else
+ port_timer_init();
#endif
}