From f7f46905ec64b3d7d37cbc3b1883617a5992ec3d Mon Sep 17 00:00:00 2001 From: Jakob Hasse Date: Tue, 8 Sep 2020 17:39:56 +0800 Subject: [PATCH] esp_eth: moved extern "C" after includes --- components/esp_eth/include/esp_eth.h | 8 ++++---- components/esp_eth/include/esp_eth_com.h | 6 +++--- components/esp_eth/include/esp_eth_mac.h | 8 ++++---- components/esp_eth/include/esp_eth_netif_glue.h | 4 ++-- components/esp_eth/include/esp_eth_phy.h | 8 ++++---- components/esp_eth/include/eth_phy_regs_struct.h | 4 ++-- 6 files changed, 19 insertions(+), 19 deletions(-) diff --git a/components/esp_eth/include/esp_eth.h b/components/esp_eth/include/esp_eth.h index 34ee91594f..deb6a4126a 100644 --- a/components/esp_eth/include/esp_eth.h +++ b/components/esp_eth/include/esp_eth.h @@ -13,14 +13,14 @@ // limitations under the License. #pragma once -#ifdef __cplusplus -extern "C" { -#endif - #include "esp_eth_com.h" #include "esp_eth_mac.h" #include "esp_eth_phy.h" +#ifdef __cplusplus +extern "C" { +#endif + /** * @brief Handle of Ethernet driver * diff --git a/components/esp_eth/include/esp_eth_com.h b/components/esp_eth/include/esp_eth_com.h index 8ad52bb478..fcfa7dcd31 100644 --- a/components/esp_eth/include/esp_eth_com.h +++ b/components/esp_eth/include/esp_eth_com.h @@ -13,13 +13,13 @@ // limitations under the License. #pragma once +#include "esp_err.h" +#include "esp_event_base.h" + #ifdef __cplusplus extern "C" { #endif -#include "esp_err.h" -#include "esp_event_base.h" - /** * @brief Maximum Ethernet payload size * diff --git a/components/esp_eth/include/esp_eth_mac.h b/components/esp_eth/include/esp_eth_mac.h index d499d7ced4..f12c66ae1f 100644 --- a/components/esp_eth/include/esp_eth_mac.h +++ b/components/esp_eth/include/esp_eth_mac.h @@ -13,10 +13,6 @@ // limitations under the License. #pragma once -#ifdef __cplusplus -extern "C" { -#endif - #include #include "esp_eth_com.h" #include "sdkconfig.h" @@ -24,6 +20,10 @@ extern "C" { #include "driver/spi_master.h" #endif +#ifdef __cplusplus +extern "C" { +#endif + /** * @brief Ethernet MAC * diff --git a/components/esp_eth/include/esp_eth_netif_glue.h b/components/esp_eth/include/esp_eth_netif_glue.h index 25bc1cff6c..5e88b5ba5e 100644 --- a/components/esp_eth/include/esp_eth_netif_glue.h +++ b/components/esp_eth/include/esp_eth_netif_glue.h @@ -13,12 +13,12 @@ // limitations under the License. #pragma once +#include "esp_eth.h" + #ifdef __cplusplus extern "C" { #endif -#include "esp_eth.h" - /** * @brief Create a netif glue for Ethernet driver * @note netif glue is used to attach io driver to TCP/IP netif diff --git a/components/esp_eth/include/esp_eth_phy.h b/components/esp_eth/include/esp_eth_phy.h index 8f4d97ad31..cda3e77752 100644 --- a/components/esp_eth/include/esp_eth_phy.h +++ b/components/esp_eth/include/esp_eth_phy.h @@ -13,14 +13,14 @@ // limitations under the License. #pragma once -#ifdef __cplusplus -extern "C" { -#endif - #include #include "esp_eth_com.h" #include "sdkconfig.h" +#ifdef __cplusplus +extern "C" { +#endif + #define ESP_ETH_PHY_ADDR_AUTO (-1) /** diff --git a/components/esp_eth/include/eth_phy_regs_struct.h b/components/esp_eth/include/eth_phy_regs_struct.h index 023ccf2a6b..e725333e52 100644 --- a/components/esp_eth/include/eth_phy_regs_struct.h +++ b/components/esp_eth/include/eth_phy_regs_struct.h @@ -13,12 +13,12 @@ // limitations under the License. #pragma once +#include + #ifdef __cplusplus extern "C" { #endif -#include - /******************Basic PHY Registers*******************/ /**