sergiotarxz/nuttx-apps
sergiotarxz/nuttx-apps
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

NSH: Misc changes needed for PktRadio support.

Browse Source
This commit is contained in:
Gregory Nutt 2017-07-30 16:03:56 -06:00
parent 411e053460
commit 7d0037b08a
2 changed files with 34 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
nshlib/nsh_netcmds.c
View File

@ -113,15 +113,24 @@
#undef HAVE_PING #undef HAVE_PING
#undef HAVE_PING6 #undef HAVE_PING6
#undef HAVE_EADDR
#if defined(CONFIG_NET_ICMP) && defined(CONFIG_NET_ICMP_PING) && \ #if defined(CONFIG_NET_ICMP) && defined(CONFIG_NET_ICMP_PING) && \
!defined(CONFIG_DISABLE_SIGNALS) && !defined(CONFIG_NSH_DISABLE_PING) !defined(CONFIG_DISABLE_SIGNALS) && !defined(CONFIG_NSH_DISABLE_PING)
# define HAVE_PING # define HAVE_PING 1
#endif #endif
#if defined(CONFIG_NET_ICMPv6) && defined(CONFIG_NET_ICMPv6_PING) && \ #if defined(CONFIG_NET_ICMPv6) && defined(CONFIG_NET_ICMPv6_PING) && \
!defined(CONFIG_DISABLE_SIGNALS) && !defined(CONFIG_NSH_DISABLE_PING6) !defined(CONFIG_DISABLE_SIGNALS) && !defined(CONFIG_NSH_DISABLE_PING6)
# define HAVE_PING6 # define HAVE_PING6 1
#endif
#if defined(CONFIG_NET_6LOWPAN)
# if defined(CONFIG_WIRELESS_IEEE802154)
# define HAVE_EADDR 1
# elif defined(CONFIG_WIRELESS_PKTRADIO)
# warning Missing logic
# endif
#endif #endif
/* Size of the ECHO data */ /* Size of the ECHO data */
@ -748,7 +757,7 @@ int cmd_ifconfig(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv)
FAR char *gwip = NULL; FAR char *gwip = NULL;
FAR char *mask = NULL; FAR char *mask = NULL;
FAR char *tmp = NULL; FAR char *tmp = NULL;
#if defined(CONFIG_NET_ETHERNET) || defined(CONFIG_NET_6LOWPAN) #if defined(CONFIG_NET_ETHERNET) || defined(HAVE_EADDR)
FAR char *hw = NULL; FAR char *hw = NULL;
#endif #endif
#if defined(CONFIG_NSH_DHCPC) || defined(CONFIG_NSH_DNS) #if defined(CONFIG_NSH_DHCPC) || defined(CONFIG_NSH_DNS)
@ -760,7 +769,7 @@ int cmd_ifconfig(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv)
bool badarg = false; bool badarg = false;
#if defined(CONFIG_NET_ETHERNET) #if defined(CONFIG_NET_ETHERNET)
uint8_t mac[IFHWADDRLEN]; uint8_t mac[IFHWADDRLEN];
#elif defined(CONFIG_NET_6LOWPAN) #elif defined(HAVE_EADDR)
uint8_t eaddr[8]; uint8_t eaddr[8];
#endif #endif
#if defined(CONFIG_NSH_DHCPC) #if defined(CONFIG_NSH_DHCPC)
@ -849,7 +858,7 @@ int cmd_ifconfig(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv)
#endif #endif
} }
#if defined(CONFIG_NET_ETHERNET) || defined(CONFIG_NET_6LOWPAN) #if defined(CONFIG_NET_ETHERNET) || defined(HAVE_EADDR)
/* REVISIT: How will we handle Ethernet and SLIP networks together? */ /* REVISIT: How will we handle Ethernet and SLIP networks together? */
else if (!strcmp(tmp, "hw")) else if (!strcmp(tmp, "hw"))
@ -895,7 +904,7 @@ int cmd_ifconfig(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv)
return ERROR; return ERROR;
} }
#if defined(CONFIG_NET_ETHERNET) || defined(CONFIG_NET_6LOWPAN) #if defined(CONFIG_NET_ETHERNET) || defined(HAVE_EADDR)
/* Set Hardware Ethernet MAC address */ /* Set Hardware Ethernet MAC address */
/* REVISIT: How will we handle Ethernet and SLIP networks together? */ /* REVISIT: How will we handle Ethernet and SLIP networks together? */
@ -1022,6 +1031,8 @@ int cmd_ifconfig(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv)
} }
#endif /* CONFIG_NET_IPv4 */ #endif /* CONFIG_NET_IPv4 */
UNUSED(intf); /* Not used in all configurations */
#if defined(CONFIG_NSH_DHCPC) || defined(CONFIG_NSH_DNS) #if defined(CONFIG_NSH_DHCPC) || defined(CONFIG_NSH_DNS)
#ifdef CONFIG_NET_IPv6 #ifdef CONFIG_NET_IPv6
#ifdef CONFIG_NET_IPv4 #ifdef CONFIG_NET_IPv4

21
nshlib/nsh_netinit.c
View File

@ -130,6 +130,20 @@
# define HAVE_MAC 1 # define HAVE_MAC 1
#endif #endif
/* Currently there is only logic in 6LoWPAN configurations to
* set the IEEE 802.15.4 addresses.
*/
#undef HAVE_EADDR
#if defined(CONFIG_NET_6LOWPAN)
# if defined(CONFIG_WIRELESS_IEEE802154)
# define HAVE_EADDR 1
# elif defined(CONFIG_WIRELESS_PKTRADIO)
# warning Missing logic
# endif
#endif
/* Provide a default DNS address */ /* Provide a default DNS address */
#if defined(CONFIG_NSH_DRIPADDR) && !defined(CONFIG_NSH_DNSIPADDR) #if defined(CONFIG_NSH_DRIPADDR) && !defined(CONFIG_NSH_DNSIPADDR)
@ -278,7 +292,7 @@ static void nsh_set_macaddr(void)
{ {
#if defined(CONFIG_NET_ETHERNET) #if defined(CONFIG_NET_ETHERNET)
uint8_t mac[IFHWADDRLEN]; uint8_t mac[IFHWADDRLEN];
#elif defined(CONFIG_NET_6LOWPAN) #elif defined(HAVE_EADDR)
uint8_t eaddr[8]; uint8_t eaddr[8];
#endif #endif
@ -298,7 +312,7 @@ static void nsh_set_macaddr(void)
netlib_setmacaddr(NET_DEVNAME, mac); netlib_setmacaddr(NET_DEVNAME, mac);
#elif defined(CONFIG_NET_6LOWPAN) #elif defined(HAVE_EADDR)
/* Use the configured, fixed extended address */ /* Use the configured, fixed extended address */
eaddr[0] = (CONFIG_NSH_MACADDR >> (8 * 7)) & 0xff; eaddr[0] = (CONFIG_NSH_MACADDR >> (8 * 7)) & 0xff;
@ -313,8 +327,7 @@ static void nsh_set_macaddr(void)
/* Set the 6LoWPAN extended address */ /* Set the 6LoWPAN extended address */
(void)netlib_seteaddr(NET_DEVNAME, eaddr); (void)netlib_seteaddr(NET_DEVNAME, eaddr);
#endif /* CONFIG_NET_ETHERNET or HAVE_EADDR */
#endif /* CONFIG_NET_ETHERNET */
} }
#else #else
# define nsh_set_macaddr() # define nsh_set_macaddr()