Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-06-02 17:48:54 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

IEEE 802.15.4 network drivr: Fix more compile issues that only show up when CONFIG_NET_STARPOINT is defined.

Browse Source
This commit is contained in:
Gregory Nutt
2017-08-05 10:18:34 -06:00
parent 75ffb5b0e6
commit 7ed665833f
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
wireless/ieee802154/mac802154_netdev.c
+6 -6
View File
@@ -170,10 +170,10 @@ static void macnet_txpoll_expiry(int argc, wdparm_t arg, ...);
#ifdef CONFIG_NET_STARPOINT #ifdef CONFIG_NET_STARPOINT
#ifdef CONFIG_NET_6LOWPAN_EXTENDEDADDR #ifdef CONFIG_NET_6LOWPAN_EXTENDEDADDR
static int macnet_coord_eaddr(FAR struct sixlowpan_driver_s *radio, static int macnet_coord_eaddr(FAR struct sixlowpan_driver_s *radio,
FAR struct uint8_t *eaddr); FAR uint8_t *eaddr);
#else #else
static int macnet_coord_saddr(FAR struct sixlowpan_driver_s *radio, static int macnet_coord_saddr(FAR struct sixlowpan_driver_s *radio,
FAR struct uint8_t *saddr) FAR uint8_t *saddr);
#endif #endif
#endif #endif
@@ -573,7 +573,7 @@ static void macnet_txpoll_expiry(int argc, wdparm_t arg, ...)
#if defined(CONFIG_NET_STARPOINT) && defined(CONFIG_NET_6LOWPAN_EXTENDEDADDR) #if defined(CONFIG_NET_STARPOINT) && defined(CONFIG_NET_6LOWPAN_EXTENDEDADDR)
static int macnet_coord_eaddr(FAR struct sixlowpan_driver_s *radio, static int macnet_coord_eaddr(FAR struct sixlowpan_driver_s *radio,
FAR struct uint8_t *eaddr) FAR uint8_t *eaddr)
{ {
FAR struct macnet_driver_s *priv = (FAR struct macnet_driver_s *)radio; FAR struct macnet_driver_s *priv = (FAR struct macnet_driver_s *)radio;
union ieee802154_macarg_u arg; union ieee802154_macarg_u arg;
@@ -610,7 +610,7 @@ static int macnet_coord_eaddr(FAR struct sixlowpan_driver_s *radio,
#if defined(CONFIG_NET_STARPOINT) && !defined(CONFIG_NET_6LOWPAN_EXTENDEDADDR) #if defined(CONFIG_NET_STARPOINT) && !defined(CONFIG_NET_6LOWPAN_EXTENDEDADDR)
static int macnet_coord_saddr(FAR struct sixlowpan_driver_s *radio, static int macnet_coord_saddr(FAR struct sixlowpan_driver_s *radio,
FAR struct uint8_t *saddr) FAR uint8_t *saddr)
{ {
FAR struct macnet_driver_s *priv = (FAR struct macnet_driver_s *)radio; FAR struct macnet_driver_s *priv = (FAR struct macnet_driver_s *)radio;
union ieee802154_macarg_u arg; union ieee802154_macarg_u arg;
@@ -1097,8 +1097,8 @@ static int macnet_properties(FAR struct sixlowpan_driver_s *netdev,
(void)macnet_coord_eaddr(netdev, properties->sp_hubnode.nv_addr); (void)macnet_coord_eaddr(netdev, properties->sp_hubnode.nv_addr);
properties->sp_hubnode.nv_addrlen = NET_6LOWPAN_EADDRSIZE; properties->sp_hubnode.nv_addrlen = NET_6LOWPAN_EADDRSIZE;
#else #else
(void)macnet_coord_saddr(netdev, &properties->sp_hubnode.nv_addr); (void)macnet_coord_saddr(netdev, properties->sp_hubnode.nv_addr);
properties->sp_hubnode.>nv_addrlen = NET_6LOWPAN_SADDRSIZE; properties->sp_hubnode.nv_addrlen = NET_6LOWPAN_SADDRSIZE;
#endif #endif
#endif #endif