From 2d80f63d513700713870baa898fbae411464a6a9 Mon Sep 17 00:00:00 2001 From: Giovanni Di Sirio Date: Thu, 6 Aug 2015 12:52:31 +0000 Subject: Fixed bug #626. git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@8170 35acf78f-673a-0410-8e92-d51de3d6d3f4 --- os/hal/ports/STM32/LLD/MACv1/mac_lld.c | 6 +++--- os/hal/ports/STM32/STM32F1xx/stm32_registry.h | 2 ++ os/hal/ports/STM32/STM32F4xx/stm32_registry.h | 4 ++++ 3 files changed, 9 insertions(+), 3 deletions(-) (limited to 'os/hal/ports') diff --git a/os/hal/ports/STM32/LLD/MACv1/mac_lld.c b/os/hal/ports/STM32/LLD/MACv1/mac_lld.c index 5142df163..3679d33dd 100644 --- a/os/hal/ports/STM32/LLD/MACv1/mac_lld.c +++ b/os/hal/ports/STM32/LLD/MACv1/mac_lld.c @@ -173,7 +173,7 @@ static void mac_lld_set_address(const uint8_t *p) { /* Driver interrupt handlers. */ /*===========================================================================*/ -OSAL_IRQ_HANDLER(ETH_IRQHandler) { +OSAL_IRQ_HANDLER(STM32_ETH_HANDLER) { uint32_t dmasr; OSAL_IRQ_PROLOGUE(); @@ -308,7 +308,7 @@ void mac_lld_start(MACDriver *macp) { #endif /* ISR vector enabled.*/ - nvicEnableVector(ETH_IRQn, STM32_MAC_ETH1_IRQ_PRIORITY); + nvicEnableVector(STM32_ETH_NUMBER, STM32_MAC_ETH1_IRQ_PRIORITY); #if STM32_MAC_ETH1_CHANGE_PHY_STATE /* PHY in power up mode.*/ @@ -382,7 +382,7 @@ void mac_lld_stop(MACDriver *macp) { rccDisableETH(false); /* ISR vector disabled.*/ - nvicDisableVector(ETH_IRQn); + nvicDisableVector(STM32_ETH_NUMBER); } } diff --git a/os/hal/ports/STM32/STM32F1xx/stm32_registry.h b/os/hal/ports/STM32/STM32F1xx/stm32_registry.h index f694c79c3..62a792e66 100644 --- a/os/hal/ports/STM32/STM32F1xx/stm32_registry.h +++ b/os/hal/ports/STM32/STM32F1xx/stm32_registry.h @@ -1141,6 +1141,8 @@ /* ETH attributes.*/ #define STM32_HAS_ETH TRUE +#define STM32_ETH_HANDLER Vector134 +#define STM32_ETH_NUMBER 61 /* EXTI attributes.*/ #define STM32_EXTI_NUM_LINES 20 diff --git a/os/hal/ports/STM32/STM32F4xx/stm32_registry.h b/os/hal/ports/STM32/STM32F4xx/stm32_registry.h index 23ee93b21..03007c976 100644 --- a/os/hal/ports/STM32/STM32F4xx/stm32_registry.h +++ b/os/hal/ports/STM32/STM32F4xx/stm32_registry.h @@ -144,6 +144,8 @@ /* ETH attributes.*/ #define STM32_HAS_ETH TRUE +#define STM32_ETH_HANDLER Vector134 +#define STM32_ETH_NUMBER 61 /* EXTI attributes.*/ #define STM32_EXTI_NUM_LINES 23 @@ -485,6 +487,8 @@ #define STM32_HAS_ETH FALSE #else #define STM32_HAS_ETH TRUE +#define STM32_ETH_HANDLER Vector134 +#define STM32_ETH_NUMBER 61 #endif /* EXTI attributes.*/ -- cgit v1.2.3