aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorgdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>2013-09-08 19:11:58 +0000
committergdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>2013-09-08 19:11:58 +0000
commit2bb04cb0f5573f45ddc0de7cdc386519eed8583d (patch)
tree1cc9f5694749e245775e323898d3b21ec7268f45
parentc44f71c52d3a90ccb5c302df378e610e25723f2a (diff)
downloadChibiOS-2bb04cb0f5573f45ddc0de7cdc386519eed8583d.tar.gz
ChibiOS-2bb04cb0f5573f45ddc0de7cdc386519eed8583d.tar.bz2
ChibiOS-2bb04cb0f5573f45ddc0de7cdc386519eed8583d.zip
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/kernel_3_dev@6279 35acf78f-673a-0410-8e92-d51de3d6d3f4
-rw-r--r--demos/nil/NIL-STM32L152-DISCOVERY/main.c8
-rw-r--r--demos/nil/NIL-STM32L152-DISCOVERY/nilconf.h2
-rw-r--r--os/hal/ports/STM32L1xx/stm32_isr.h34
3 files changed, 22 insertions, 22 deletions
diff --git a/demos/nil/NIL-STM32L152-DISCOVERY/main.c b/demos/nil/NIL-STM32L152-DISCOVERY/main.c
index 9f36cc6a7..7f54cdb1c 100644
--- a/demos/nil/NIL-STM32L152-DISCOVERY/main.c
+++ b/demos/nil/NIL-STM32L152-DISCOVERY/main.c
@@ -29,9 +29,9 @@ THD_FUNCTION(Thread1, arg) {
(void)arg;
while (true) {
-// palSetPad(GPIOE, GPIOE_LED3_RED);
+ palSetPad(GPIOB, GPIOB_LED4);
chThdSleepMilliseconds(250);
-// palClearPad(GPIOE, GPIOE_LED3_RED);
+ palClearPad(GPIOB, GPIOB_LED4);
chThdSleepMilliseconds(250);
}
}
@@ -45,9 +45,9 @@ THD_FUNCTION(Thread2, arg) {
(void)arg;
while (true) {
-// palSetPad(GPIOE, GPIOE_LED4_BLUE);
+ palSetPad(GPIOB, GPIOB_LED3);
chThdSleepMilliseconds(500);
-// palClearPad(GPIOE, GPIOE_LED4_BLUE);
+ palClearPad(GPIOB, GPIOB_LED3);
chThdSleepMilliseconds(500);
}
}
diff --git a/demos/nil/NIL-STM32L152-DISCOVERY/nilconf.h b/demos/nil/NIL-STM32L152-DISCOVERY/nilconf.h
index 5276a3f2a..440d43beb 100644
--- a/demos/nil/NIL-STM32L152-DISCOVERY/nilconf.h
+++ b/demos/nil/NIL-STM32L152-DISCOVERY/nilconf.h
@@ -41,7 +41,7 @@
/**
* @brief System tick frequency.
*/
-#define NIL_CFG_ST_FREQUENCY 50000
+#define NIL_CFG_ST_FREQUENCY 1000
/**
* @brief Time delta constant for the tick-less mode.
diff --git a/os/hal/ports/STM32L1xx/stm32_isr.h b/os/hal/ports/STM32L1xx/stm32_isr.h
index d90d28c0b..f7f2d8d63 100644
--- a/os/hal/ports/STM32L1xx/stm32_isr.h
+++ b/os/hal/ports/STM32L1xx/stm32_isr.h
@@ -36,35 +36,35 @@
/*
* TIM units.
*/
-#define STM32_TIM2_HANDLER TIM2_IRQHandler
-#define STM32_TIM3_HANDLER TIM3_IRQHandler
-#define STM32_TIM4_HANDLER TIM4_IRQHandler
-#define STM32_TIM9_HANDLER TIM9_IRQHandler
+#define STM32_TIM2_HANDLER VectorB0
+#define STM32_TIM3_HANDLER VectorB4
+#define STM32_TIM4_HANDLER VectorB8
+#define STM32_TIM9_HANDLER VectorA4
-#define STM32_TIM2_NUMBER TIM2_IRQn
-#define STM32_TIM3_NUMBER TIM3_IRQn
-#define STM32_TIM4_NUMBER TIM4_IRQn
-#define STM32_TIM9_NUMBER TIM9_IRQn
+#define STM32_TIM2_NUMBER 28
+#define STM32_TIM3_NUMBER 29
+#define STM32_TIM4_NUMBER 30
+#define STM32_TIM9_NUMBER 25
/*
* USART units.
*/
-#define STM32_USART1_HANDLER USART1_IRQHandler
-#define STM32_USART2_HANDLER USART2_IRQHandler
-#define STM32_USART3_HANDLER USART3_IRQHandler
+#define STM32_USART1_HANDLER VectorD4
+#define STM32_USART2_HANDLER VectorD8
+#define STM32_USART3_HANDLER VectorDC
-#define STM32_USART1_NUMBER USART1_IRQn
-#define STM32_USART2_NUMBER USART2_IRQn
-#define STM32_USART3_NUMBER USART3_IRQn
+#define STM32_USART1_NUMBER 37
+#define STM32_USART2_NUMBER 38
+#define STM32_USART3_NUMBER 39
/*
* USB units.
*/
#define STM32_USB1_HP_HANDLER Vector8C
-#define STM32_USB1_LP_HANDLER Vector90
+#define STM32_USB1_LP_HANDLER Vector30
-#define STM32_USB1_HP_NUMBER USB_HP_IRQn
-#define STM32_USB1_LP_NUMBER USB_LP_IRQn
+#define STM32_USB1_HP_NUMBER 19
+#define STM32_USB1_LP_NUMBER 20
/** @} */
/*===========================================================================*/