From 33842740874adf5739da8a775341e0ff57e5ba48 Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Mon, 9 Feb 2015 13:18:31 -0600 Subject: [PATCH] Fix IPv4-dependend debug output --- arch/arm/src/tiva/tm4c_ethernet.c | 8 ++++++-- drivers/net/skeleton.c | 10 +++++++++- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/arch/arm/src/tiva/tm4c_ethernet.c b/arch/arm/src/tiva/tm4c_ethernet.c index a30377cb1a..9a504e1445 100644 --- a/arch/arm/src/tiva/tm4c_ethernet.c +++ b/arch/arm/src/tiva/tm4c_ethernet.c @@ -2477,8 +2477,12 @@ static int tiva_ifup(struct net_driver_s *dev) ndbg("Bringing up: %d.%d.%d.%d\n", dev->d_ipaddr & 0xff, (dev->d_ipaddr >> 8) & 0xff, (dev->d_ipaddr >> 16) & 0xff, dev->d_ipaddr >> 24); -#else - ndbg("Bringing the network up\n"); +#endif +#ifdef CONFIG_NET_IPv4 + ndbg("Bringing up: %04x:%04x:%04x:%04x:%04x:%04x:%04x:%04x\n", + dev->d_ipv6addr[0], dev->d_ipv6addr[1], dev->d_ipv6addr[2], + dev->d_ipv6addr[3], dev->d_ipv6addr[4], dev->d_ipv6addr[5], + dev->d_ipv6addr[6], dev->d_ipv6addr[7]); #endif /* Configure the Ethernet interface for DMA operation. */ diff --git a/drivers/net/skeleton.c b/drivers/net/skeleton.c index 100ad92ef8..d2b78be329 100644 --- a/drivers/net/skeleton.c +++ b/drivers/net/skeleton.c @@ -828,9 +828,17 @@ static int skel_ifup(struct net_driver_s *dev) { FAR struct skel_driver_s *priv = (FAR struct skel_driver_s *)dev->d_private; +#ifdef CONFIG_NET_IPv4 ndbg("Bringing up: %d.%d.%d.%d\n", dev->d_ipaddr & 0xff, (dev->d_ipaddr >> 8) & 0xff, - (dev->d_ipaddr >> 16) & 0xff, dev->d_ipaddr >> 24 ); + (dev->d_ipaddr >> 16) & 0xff, dev->d_ipaddr >> 24); +#endif +#ifdef CONFIG_NET_IPv4 + ndbg("Bringing up: %04x:%04x:%04x:%04x:%04x:%04x:%04x:%04x\n", + dev->d_ipv6addr[0], dev->d_ipv6addr[1], dev->d_ipv6addr[2], + dev->d_ipv6addr[3], dev->d_ipv6addr[4], dev->d_ipv6addr[5], + dev->d_ipv6addr[6], dev->d_ipv6addr[7]); +#endif /* Initialize PHYs, the Ethernet interface, and setup up Ethernet interrupts */