From de461671aa5c617d90e767c8e8d991188b32d8f1 Mon Sep 17 00:00:00 2001 From: "rudi ;-)" Date: Tue, 21 Feb 2017 02:52:27 +0100 Subject: [PATCH] examples/ethernet: Same sense of meaning SW_STRAP Merges #366 #367 https://github.com/espressif/esp-idf/pull/366 https://github.com/espressif/esp-idf/pull/367 --- examples/ethernet/ethernet/main/ethernet_main.c | 2 +- examples/ethernet/ethernet/main/tlk110_phy.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/ethernet/ethernet/main/ethernet_main.c b/examples/ethernet/ethernet/main/ethernet_main.c index d406ab4dc7..f76bd1d76e 100644 --- a/examples/ethernet/ethernet/main/ethernet_main.c +++ b/examples/ethernet/ethernet/main/ethernet_main.c @@ -108,7 +108,7 @@ void phy_tlk110_init(void) while (esp_eth_smi_read(PHY_IDENTIFIER_REG) != OUI_MSB_21TO6_DEF) { } - esp_eth_smi_write(SOFTWARE_STRAP_CONTROL_REG, DEFAULT_PHY_CONFIG |SW_STRAP_CONFIG_DONE); + esp_eth_smi_write(SW_STRAP_CONTROL_REG, DEFAULT_PHY_CONFIG | SW_STRAP_CONFIG_DONE); ets_delay_us(300); diff --git a/examples/ethernet/ethernet/main/tlk110_phy.h b/examples/ethernet/ethernet/main/tlk110_phy.h index 87d512c42b..63236edebd 100644 --- a/examples/ethernet/ethernet/main/tlk110_phy.h +++ b/examples/ethernet/ethernet/main/tlk110_phy.h @@ -13,7 +13,7 @@ #define PARTNER_ASM_DIR BIT(11) #define PARTNER_PAUSE BIT(10) -#define SOFTWARE_STRAP_CONTROL_REG (0x9) +#define SW_STRAP_CONTROL_REG (0x9) #define SW_STRAP_CONFIG_DONE BIT(15) #define AUTO_MDIX_ENABLE BIT(14) #define AUTO_NEGOTIATION_ENABLE BIT(13)