Fixed bugs 3531290 and 3534819.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/stable_2.4.x@4302 35acf78f-673a-0410-8e92-d51de3d6d3f4
This commit is contained in:
parent
ed3f7f271b
commit
e463ac52a3
|
@ -48,7 +48,11 @@
|
|||
#define BUFFER_SIZE ((((STM32_MAC_BUFFERS_SIZE - 1) | 3) + 1) / 4)
|
||||
|
||||
/* MII divider optimal value.*/
|
||||
#if (STM32_HCLK >= 60000000)
|
||||
#if (STM32_HCLK >= 150000000)
|
||||
#define MACMIIDR_CR ETH_MACMIIAR_CR_Div102
|
||||
#elif (STM32_HCLK >= 100000000)
|
||||
#define MACMIIDR_CR ETH_MACMIIAR_CR_Div62
|
||||
#elif (STM32_HCLK >= 60000000)
|
||||
#define MACMIIDR_CR ETH_MACMIIAR_CR_Div42
|
||||
#elif (STM32_HCLK >= 35000000)
|
||||
#define MACMIIDR_CR ETH_MACMIIAR_CR_Div26
|
||||
|
@ -268,6 +272,9 @@ void mac_lld_init(void) {
|
|||
#else
|
||||
/* PHY soft reset procedure.*/
|
||||
mii_write(ÐD1, MII_BMCR, BMCR_RESET);
|
||||
#if defined(BOARD_PHY_RESET_DELAY)
|
||||
halPolledDelay(BOARD_PHY_RESET_DELAY);
|
||||
#endif
|
||||
while (mii_read(ÐD1, MII_BMCR) & BMCR_RESET)
|
||||
;
|
||||
#endif
|
||||
|
|
|
@ -81,8 +81,12 @@
|
|||
*** 2.4.2 ***
|
||||
- FIX: Fixed wrong DMA channels on USART2 in STM32F10X_MD_VL devices (bug
|
||||
3536070).
|
||||
|
||||
- FIX: Fixed unreliable PHY initialization (bug 3534819)(backported to 2.4.2).
|
||||
|
||||
- FIX: Fixed lwIP-related files missing from version 2.4.1 (bug 3533887).
|
||||
|
||||
- FIX: Fixed wrong MAC divider setting in STM32 MAC driver (bug 3531290).
|
||||
- FIX: Fixed wrong MCO1 divider in STM32F2/F4 HAL (bug 3531289).
|
||||
- FIX: Fixed missing "break" in AVR PAL driver (bug 3530924).
|
||||
- FIX: Fixed timeout related race condition in STM32 I2C driver (bug 3530043).
|
||||
|
|
Loading…
Reference in New Issue