Skip to content

Commit

Permalink
[BACKPORT] Ethernet :Fix nuttx preprocessor commands
Browse files Browse the repository at this point in the history
Added
  • Loading branch information
garfieldG committed Aug 2, 2018
1 parent ae2218f commit 520d9d3
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions arch/arm/src/stm32f7/stm32_ethernet.c
Original file line number Diff line number Diff line change
Expand Up @@ -750,7 +750,7 @@ static void stm32_rxdescinit(struct stm32_ethmac_s *priv,
static int stm32_phyintenable(struct stm32_ethmac_s *priv);
#endif

#if defined(CONFIG_NETDEV_PHY_IOCTL)
#if defined(CONFIG_NETDEV_PHY_IOCTL) || defined(CONFIG_STM32F7_AUTONEG)
static int stm32_phyread(uint16_t phydevaddr, uint16_t phyregaddr,
uint16_t *value);
static int stm32_phywrite(uint16_t phydevaddr, uint16_t phyregaddr,
Expand Down Expand Up @@ -3046,7 +3046,7 @@ static int stm32_phyintenable(struct stm32_ethmac_s *priv)
}
#endif

#if defined(CONFIG_NETDEV_PHY_IOCTL)
#if defined(CONFIG_NETDEV_PHY_IOCTL) || defined(CONFIG_STM32F7_AUTONEG)
/****************************************************************************
* Function: stm32_phyread
*
Expand Down Expand Up @@ -3247,7 +3247,7 @@ static inline int stm32_dm9161(struct stm32_ethmac_s *priv)
static int stm32_phyinit(struct stm32_ethmac_s *priv)
{
uint32_t regval;
#if defined(CONFIG_NETDEV_PHY_IOCTL)
#if defined(CONFIG_NETDEV_PHY_IOCTL) || defined(CONFIG_STM32F7_AUTONEG)
uint16_t phyval;
#endif
int ret = OK;
Expand Down

0 comments on commit 520d9d3

Please sign in to comment.