diff options
author | Gregory Nutt <gnutt@nuttx.org> | 2015-02-09 13:18:31 -0600 |
---|---|---|
committer | Gregory Nutt <gnutt@nuttx.org> | 2015-02-09 13:18:31 -0600 |
commit | 0b91dfa2662ab42a7cde5a54188bdff0ef977dc5 (patch) | |
tree | 9ab6f54a74f60ae28b6d01f8319242616f87fae2 | |
parent | bdbe6f27555a217d3196ba78027adac72b78bbd5 (diff) | |
download | px4-nuttx-0b91dfa2662ab42a7cde5a54188bdff0ef977dc5.tar.gz px4-nuttx-0b91dfa2662ab42a7cde5a54188bdff0ef977dc5.tar.bz2 px4-nuttx-0b91dfa2662ab42a7cde5a54188bdff0ef977dc5.zip |
Fix IPv4-dependend debug output
-rw-r--r-- | nuttx/arch/arm/src/tiva/tm4c_ethernet.c | 8 | ||||
-rw-r--r-- | nuttx/drivers/net/skeleton.c | 10 |
2 files changed, 15 insertions, 3 deletions
diff --git a/nuttx/arch/arm/src/tiva/tm4c_ethernet.c b/nuttx/arch/arm/src/tiva/tm4c_ethernet.c index a30377cb1..9a504e144 100644 --- a/nuttx/arch/arm/src/tiva/tm4c_ethernet.c +++ b/nuttx/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/nuttx/drivers/net/skeleton.c b/nuttx/drivers/net/skeleton.c index 100ad92ef..d2b78be32 100644 --- a/nuttx/drivers/net/skeleton.c +++ b/nuttx/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 */ |