aboutsummaryrefslogtreecommitdiffstats
path: root/os
diff options
context:
space:
mode:
authorgdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>2014-05-12 09:26:23 +0000
committergdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>2014-05-12 09:26:23 +0000
commit9b11ca4993ac19f70f182e3cb0fb45537b2d5a4c (patch)
treea0225855cc49ca0259340e664d5f7323230a8698 /os
parente0dbac1295c77bfec49037bdb0678c216978f655 (diff)
downloadChibiOS-9b11ca4993ac19f70f182e3cb0fb45537b2d5a4c.tar.gz
ChibiOS-9b11ca4993ac19f70f182e3cb0fb45537b2d5a4c.tar.bz2
ChibiOS-9b11ca4993ac19f70f182e3cb0fb45537b2d5a4c.zip
Fixed bug #496.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@6930 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'os')
-rw-r--r--os/hal/ports/STM32/LLD/I2Cv1/i2c_lld.c4
-rw-r--r--os/hal/ports/STM32/STM32F4xx/stm32_isr.h9
2 files changed, 8 insertions, 5 deletions
diff --git a/os/hal/ports/STM32/LLD/I2Cv1/i2c_lld.c b/os/hal/ports/STM32/LLD/I2Cv1/i2c_lld.c
index 9a88bedf5..c63a295a2 100644
--- a/os/hal/ports/STM32/LLD/I2Cv1/i2c_lld.c
+++ b/os/hal/ports/STM32/LLD/I2Cv1/i2c_lld.c
@@ -465,7 +465,7 @@ OSAL_IRQ_HANDLER(STM32_I2C2_ERROR_HANDLER) {
*
* @notapi
*/
-OSAL_IRQ_HANDLER(I2C3_EV_IRQHandler) {
+OSAL_IRQ_HANDLER(STM32_I2C3_EVENT_HANDLER) {
OSAL_IRQ_PROLOGUE();
@@ -479,7 +479,7 @@ OSAL_IRQ_HANDLER(I2C3_EV_IRQHandler) {
*
* @notapi
*/
-OSAL_IRQ_HANDLER(I2C3_ER_IRQHandler) {
+OSAL_IRQ_HANDLER(STM32_I2C3_ERROR_HANDLER) {
uint16_t sr = I2CD3.i2c->SR1;
OSAL_IRQ_PROLOGUE();
diff --git a/os/hal/ports/STM32/STM32F4xx/stm32_isr.h b/os/hal/ports/STM32/STM32F4xx/stm32_isr.h
index dc7fbd1ab..fee66ecd0 100644
--- a/os/hal/ports/STM32/STM32F4xx/stm32_isr.h
+++ b/os/hal/ports/STM32/STM32F4xx/stm32_isr.h
@@ -67,6 +67,11 @@
#define STM32_I2C2_EVENT_NUMBER 33
#define STM32_I2C2_ERROR_NUMBER 34
+#define STM32_I2C3_EVENT_HANDLER Vector160
+#define STM32_I2C3_ERROR_HANDLER Vector164
+#define STM32_I2C3_EVENT_NUMBER 72
+#define STM32_I2C3_ERROR_NUMBER 73
+
/*
* OTG units.
*/
@@ -140,12 +145,10 @@
/*
* Ethernet
*/
-#define ETH_IRQHandler Vector134
+#define ETH_IRQHandler Vector134
/** @} */
-
-
/*===========================================================================*/
/* Driver pre-compile time settings. */
/*===========================================================================*/