From 8710b1fd06898920c3a61baaa69efd0737afd5d8 Mon Sep 17 00:00:00 2001 From: SummerGift Date: Mon, 10 Jun 2019 10:05:11 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BF=AE=E5=A4=8D=E3=80=91PHY=20?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E6=9F=A5=E8=AF=A2=E8=BF=87=E7=A8=8B=E4=B8=AD?= =?UTF-8?q?=E7=9A=84=20bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bsp/stm32/libraries/HAL_Drivers/drv_eth.c | 50 +++++++++++++---------- 1 file changed, 29 insertions(+), 21 deletions(-) diff --git a/bsp/stm32/libraries/HAL_Drivers/drv_eth.c b/bsp/stm32/libraries/HAL_Drivers/drv_eth.c index 148a03f45b..b9b584ade9 100644 --- a/bsp/stm32/libraries/HAL_Drivers/drv_eth.c +++ b/bsp/stm32/libraries/HAL_Drivers/drv_eth.c @@ -468,32 +468,40 @@ static void phy_monitor_thread_entry(void *parameter) while (1) { - HAL_ETH_ReadPHYRegister(&EthHandle, PHY_BASIC_STATUS_REG, (uint32_t *)&status); - LOG_D("PHY BASIC STATUS REG:0x%04X", status); - phy_speed_new = 0; - if (status & (PHY_AUTONEGO_COMPLETE_MASK | PHY_LINKED_STATUS_MASK)) + if(HAL_ETH_ReadPHYRegister(&EthHandle, PHY_BASIC_STATUS_REG, (uint32_t *)&status) == HAL_OK) { - rt_uint32_t SR; - - phy_speed_new = PHY_LINK_MASK; - - SR = HAL_ETH_ReadPHYRegister(&EthHandle, PHY_Status_REG, (uint32_t *)&SR); - LOG_D("PHY Control/Status REG:0x%04X ", SR); - - if (SR & PHY_100M_MASK) + LOG_D("PHY BASIC STATUS REG:0x%04X", status); + + if (status & (PHY_AUTONEGO_COMPLETE_MASK | PHY_LINKED_STATUS_MASK)) { - phy_speed_new |= PHY_100M_MASK; - } - else if (SR & PHY_10M_MASK) - { - phy_speed_new |= PHY_10M_MASK; - } + rt_uint32_t SR; - if (SR & PHY_FULL_DUPLEX_MASK) - { - phy_speed_new |= PHY_FULL_DUPLEX_MASK; + phy_speed_new = PHY_LINK_MASK; + + if(HAL_ETH_ReadPHYRegister(&EthHandle, PHY_Status_REG, (uint32_t *)&SR) == HAL_OK) + { + LOG_D("PHY Control/Status REG:0x%04X ", SR); + + if (SR & PHY_100M_MASK) + { + phy_speed_new |= PHY_100M_MASK; + } + else if (SR & PHY_10M_MASK) + { + phy_speed_new |= PHY_10M_MASK; + } + + if (SR & PHY_FULL_DUPLEX_MASK) + { + phy_speed_new |= PHY_FULL_DUPLEX_MASK; + } + } + else + { + LOG_D("PHY Control/Status REG read error."); + } } }