zcy
/
tinySA
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed bug #626. 

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@8170 35acf78f-673a-0410-8e92-d51de3d6d3f4
master
Giovanni Di Sirio 2015-08-06 12:52:31 +00:00
parent c36680dd3c
commit 2d80f63d51
4 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
os/hal/ports/STM32/LLD/MACv1/mac_lld.c
View File

@ -173,7 +173,7 @@ static void mac_lld_set_address(const uint8_t *p) {
/* Driver interrupt handlers. */ /* Driver interrupt handlers. */
/*===========================================================================*/ /*===========================================================================*/
OSAL_IRQ_HANDLER(ETH_IRQHandler) { OSAL_IRQ_HANDLER(STM32_ETH_HANDLER) {
uint32_t dmasr; uint32_t dmasr;
OSAL_IRQ_PROLOGUE(); OSAL_IRQ_PROLOGUE();
@ -308,7 +308,7 @@ void mac_lld_start(MACDriver *macp) {
#endif #endif
/* ISR vector enabled.*/ /* 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 #if STM32_MAC_ETH1_CHANGE_PHY_STATE
/* PHY in power up mode.*/ /* PHY in power up mode.*/
@ -382,7 +382,7 @@ void mac_lld_stop(MACDriver *macp) {
rccDisableETH(false); rccDisableETH(false);
/* ISR vector disabled.*/ /* ISR vector disabled.*/
nvicDisableVector(ETH_IRQn); nvicDisableVector(STM32_ETH_NUMBER);
} }
} }

2
os/hal/ports/STM32/STM32F1xx/stm32_registry.h
View File

@ -1141,6 +1141,8 @@
/* ETH attributes.*/ /* ETH attributes.*/
#define STM32_HAS_ETH TRUE #define STM32_HAS_ETH TRUE
#define STM32_ETH_HANDLER Vector134
#define STM32_ETH_NUMBER 61
/* EXTI attributes.*/ /* EXTI attributes.*/
#define STM32_EXTI_NUM_LINES 20 #define STM32_EXTI_NUM_LINES 20

4
os/hal/ports/STM32/STM32F4xx/stm32_registry.h
View File

@ -144,6 +144,8 @@
/* ETH attributes.*/ /* ETH attributes.*/
#define STM32_HAS_ETH TRUE #define STM32_HAS_ETH TRUE
#define STM32_ETH_HANDLER Vector134
#define STM32_ETH_NUMBER 61
/* EXTI attributes.*/ /* EXTI attributes.*/
#define STM32_EXTI_NUM_LINES 23 #define STM32_EXTI_NUM_LINES 23
@ -485,6 +487,8 @@
#define STM32_HAS_ETH FALSE #define STM32_HAS_ETH FALSE
#else #else
#define STM32_HAS_ETH TRUE #define STM32_HAS_ETH TRUE
#define STM32_ETH_HANDLER Vector134
#define STM32_ETH_NUMBER 61
#endif #endif
/* EXTI attributes.*/ /* EXTI attributes.*/

1
readme.txt
View File

@ -97,6 +97,7 @@
(bug #625). (bug #625).
- RT: Fixed missing configuration options from NIL and RT PPC ports - RT: Fixed missing configuration options from NIL and RT PPC ports
(bug #625). (bug #625).
- HAL: Fixed broken MAC driver for STM32F107 (bug #626)(backported to 3.0.1).
- HAL: Fixed wrong offset in STM32 DAC driver (bug #624)(backported to 3.0.1). - HAL: Fixed wrong offset in STM32 DAC driver (bug #624)(backported to 3.0.1).
- HAL: Fixed crash on STM32F030x4/6 devices (bug #623)(backported to 3.0.1). - HAL: Fixed crash on STM32F030x4/6 devices (bug #623)(backported to 3.0.1).
- HAL: Fixed duplicated doxygen tag in STM32F4xx hal_lld.h file (bug #621) - HAL: Fixed duplicated doxygen tag in STM32F4xx hal_lld.h file (bug #621)