From b68b625556543fd9a9c9ba40ed5ca5c4b725f7ed Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Sat, 15 Nov 2014 08:22:51 -0600 Subject: Netwoek: Ada a parameter to netdev_register() to indicate the link protocol supported by the driver. Use this value to replace some logic commited yesterday --- nuttx/arch/arm/src/c5471/c5471_ethernet.c | 2 +- nuttx/arch/arm/src/kinetis/kinetis_enet.c | 2 +- nuttx/arch/arm/src/lpc17xx/lpc17_ethernet.c | 2 +- nuttx/arch/arm/src/sam34/sam_emac.c | 2 +- nuttx/arch/arm/src/sama5/sam_emaca.c | 2 +- nuttx/arch/arm/src/sama5/sam_emacb.c | 2 +- nuttx/arch/arm/src/sama5/sam_gmac.c | 2 +- nuttx/arch/arm/src/stm32/stm32_eth.c | 2 +- nuttx/arch/arm/src/tiva/tiva_ethernet.c | 2 +- nuttx/arch/hc/src/m9s12/m9s12_ethernet.c | 2 +- nuttx/arch/mips/src/pic32mx/pic32mx-ethernet.c | 2 +- nuttx/arch/sim/src/up_netdriver.c | 2 +- nuttx/arch/z80/src/ez80/ez80_emac.c | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) (limited to 'nuttx/arch') diff --git a/nuttx/arch/arm/src/c5471/c5471_ethernet.c b/nuttx/arch/arm/src/c5471/c5471_ethernet.c index 12a15eee7..abf608cf0 100644 --- a/nuttx/arch/arm/src/c5471/c5471_ethernet.c +++ b/nuttx/arch/arm/src/c5471/c5471_ethernet.c @@ -2156,7 +2156,7 @@ void up_netinitialize(void) /* Register the device with the OS so that socket IOCTLs can be performed */ - (void)netdev_register(&g_c5471[0].c_dev); + (void)netdev_register(&g_c5471[0].c_dev, NET_LL_ETHERNET); } #endif /* CONFIG_NET */ diff --git a/nuttx/arch/arm/src/kinetis/kinetis_enet.c b/nuttx/arch/arm/src/kinetis/kinetis_enet.c index 096d3fbd0..9042fca40 100644 --- a/nuttx/arch/arm/src/kinetis/kinetis_enet.c +++ b/nuttx/arch/arm/src/kinetis/kinetis_enet.c @@ -1541,7 +1541,7 @@ int kinetis_netinitialize(int intf) /* Register the device with the OS so that socket IOCTLs can be performed */ - (void)netdev_register(&priv->dev); + (void)netdev_register(&priv->dev, NET_LL_ETHERNET); return OK; } diff --git a/nuttx/arch/arm/src/lpc17xx/lpc17_ethernet.c b/nuttx/arch/arm/src/lpc17xx/lpc17_ethernet.c index 46c857ed2..05108d3cf 100644 --- a/nuttx/arch/arm/src/lpc17xx/lpc17_ethernet.c +++ b/nuttx/arch/arm/src/lpc17xx/lpc17_ethernet.c @@ -2587,7 +2587,7 @@ static inline int lpc17_ethinitialize(int intf) /* Register the device with the OS so that socket IOCTLs can be performed */ - (void)netdev_register(&priv->lp_dev); + (void)netdev_register(&priv->lp_dev, NET_LL_ETHERNET); return OK; } diff --git a/nuttx/arch/arm/src/sam34/sam_emac.c b/nuttx/arch/arm/src/sam34/sam_emac.c index bb0e1ff2d..2573778a4 100644 --- a/nuttx/arch/arm/src/sam34/sam_emac.c +++ b/nuttx/arch/arm/src/sam34/sam_emac.c @@ -3108,7 +3108,7 @@ void up_netinitialize(void) /* Register the device with the OS so that socket IOCTLs can be performed */ - ret = netdev_register(&priv->dev); + ret = netdev_register(&priv->dev, NET_LL_ETHERNET); if (ret >= 0) { return; diff --git a/nuttx/arch/arm/src/sama5/sam_emaca.c b/nuttx/arch/arm/src/sama5/sam_emaca.c index f7df54fd6..ecfa5a45c 100644 --- a/nuttx/arch/arm/src/sama5/sam_emaca.c +++ b/nuttx/arch/arm/src/sama5/sam_emaca.c @@ -3157,7 +3157,7 @@ int sam_emac_initialize(void) /* Register the device with the OS so that socket IOCTLs can be performed */ - ret = netdev_register(&priv->dev); + ret = netdev_register(&priv->dev, NET_LL_ETHERNET); if (ret >= 0) { return ret; diff --git a/nuttx/arch/arm/src/sama5/sam_emacb.c b/nuttx/arch/arm/src/sama5/sam_emacb.c index b52144cef..a32174512 100644 --- a/nuttx/arch/arm/src/sama5/sam_emacb.c +++ b/nuttx/arch/arm/src/sama5/sam_emacb.c @@ -3851,7 +3851,7 @@ int sam_emac_initialize(int intf) /* Register the device with the OS so that socket IOCTLs can be performed */ - ret = netdev_register(&priv->dev); + ret = netdev_register(&priv->dev, NET_LL_ETHERNET); if (ret >= 0) { return ret; diff --git a/nuttx/arch/arm/src/sama5/sam_gmac.c b/nuttx/arch/arm/src/sama5/sam_gmac.c index fb18c8953..7f112b04c 100644 --- a/nuttx/arch/arm/src/sama5/sam_gmac.c +++ b/nuttx/arch/arm/src/sama5/sam_gmac.c @@ -3229,7 +3229,7 @@ int sam_gmac_initialize(void) /* Register the device with the OS so that socket IOCTLs can be performed */ - ret = netdev_register(&priv->dev); + ret = netdev_register(&priv->dev, NET_LL_ETHERNET); if (ret >= 0) { return ret; diff --git a/nuttx/arch/arm/src/stm32/stm32_eth.c b/nuttx/arch/arm/src/stm32/stm32_eth.c index 729e034f5..e72a008af 100644 --- a/nuttx/arch/arm/src/stm32/stm32_eth.c +++ b/nuttx/arch/arm/src/stm32/stm32_eth.c @@ -3610,7 +3610,7 @@ int stm32_ethinitialize(int intf) /* Register the device with the OS so that socket IOCTLs can be performed */ - (void)netdev_register(&priv->dev); + (void)netdev_register(&priv->dev, NET_LL_ETHERNET); return OK; } diff --git a/nuttx/arch/arm/src/tiva/tiva_ethernet.c b/nuttx/arch/arm/src/tiva/tiva_ethernet.c index a235fe0c1..1fb19f882 100644 --- a/nuttx/arch/arm/src/tiva/tiva_ethernet.c +++ b/nuttx/arch/arm/src/tiva/tiva_ethernet.c @@ -1448,7 +1448,7 @@ static inline int tiva_ethinitialize(int intf) /* Register the device with the OS so that socket IOCTLs can be performed */ - (void)netdev_register(&priv->ld_dev); + (void)netdev_register(&priv->ld_dev, NET_LL_ETHERNET); return OK; } diff --git a/nuttx/arch/hc/src/m9s12/m9s12_ethernet.c b/nuttx/arch/hc/src/m9s12/m9s12_ethernet.c index 023bc922b..b179fb728 100644 --- a/nuttx/arch/hc/src/m9s12/m9s12_ethernet.c +++ b/nuttx/arch/hc/src/m9s12/m9s12_ethernet.c @@ -685,7 +685,7 @@ int emac_initialize(int intf) /* Register the device with the OS so that socket IOCTLs can be performed */ - (void)netdev_register(&priv->d_dev); + (void)netdev_register(&priv->d_dev, NET_LL_ETHERNET); return OK; } diff --git a/nuttx/arch/mips/src/pic32mx/pic32mx-ethernet.c b/nuttx/arch/mips/src/pic32mx/pic32mx-ethernet.c index eeaf3ad5c..f1633f752 100644 --- a/nuttx/arch/mips/src/pic32mx/pic32mx-ethernet.c +++ b/nuttx/arch/mips/src/pic32mx/pic32mx-ethernet.c @@ -3143,7 +3143,7 @@ static inline int pic32mx_ethinitialize(int intf) /* Register the device with the OS so that socket IOCTLs can be performed */ - (void)netdev_register(&priv->pd_dev); + (void)netdev_register(&priv->pd_dev, NET_LL_ETHERNET); return OK; } diff --git a/nuttx/arch/sim/src/up_netdriver.c b/nuttx/arch/sim/src/up_netdriver.c index c6636a045..90ff0bb3e 100644 --- a/nuttx/arch/sim/src/up_netdriver.c +++ b/nuttx/arch/sim/src/up_netdriver.c @@ -215,7 +215,7 @@ int netdriver_init(void) /* Register the device with the OS so that socket IOCTLs can be performed */ - (void)netdev_register(&g_sim_dev); + (void)netdev_register(&g_sim_dev, NET_LL_ETHERNET); return OK; } diff --git a/nuttx/arch/z80/src/ez80/ez80_emac.c b/nuttx/arch/z80/src/ez80/ez80_emac.c index baaa953cf..f0f1797eb 100644 --- a/nuttx/arch/z80/src/ez80/ez80_emac.c +++ b/nuttx/arch/z80/src/ez80/ez80_emac.c @@ -2148,7 +2148,7 @@ int up_netinitialize(void) /* Register the device with the OS so that socket IOCTLs can be performed */ - (void)netdev_register(&priv->dev); + (void)netdev_register(&priv->dev, NET_LL_ETHERNET); return OK; errout: -- cgit v1.2.3