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

Merged in antmerlino/nuttx/multi-macnet (pull request #979)

Browse Source 
mac802154: Moves iobuffer into macnet struct so that more than one macnet dev can exist.

Approved-by: Gregory Nutt <gnutt@nuttx.org>
This commit is contained in:
Anthony Merlino 2019-08-10 17:51:05 +00:00 committed by Gregory Nutt
parent cc6dee64c0
commit 4f696dc9cd
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
wireless/ieee802154/mac802154_netdev.c
View File

@ -165,6 +165,10 @@ struct macnet_driver_s
pid_t md_notify_pid; pid_t md_notify_pid;
struct sigevent md_notify_event; struct sigevent md_notify_event;
struct sigwork_s md_notify_work; struct sigwork_s md_notify_work;
#ifdef CONFIG_NET_6LOWPAN
struct sixlowpan_reassbuf_s md_iobuffer;
#endif
}; };
/**************************************************************************** /****************************************************************************
@ -231,10 +235,6 @@ static int macnet_properties(FAR struct radio_driver_s *netdev,
* Private Data * Private Data
****************************************************************************/ ****************************************************************************/
#ifdef CONFIG_NET_6LOWPAN
static struct sixlowpan_reassbuf_s g_iobuffer;
#endif
/**************************************************************************** /****************************************************************************
* Private Functions * Private Functions
****************************************************************************/ ****************************************************************************/
@ -489,7 +489,7 @@ static int macnet_rxframe(FAR struct macnet_driver_s *priv,
{ {
/* Make sure the our single packet buffer is attached */ /* Make sure the our single packet buffer is attached */
priv->md_dev.r_dev.d_buf = g_iobuffer.rb_buf; priv->md_dev.r_dev.d_buf = priv->md_iobuffer.rb_buf;
/* And give the packet to 6LoWPAN */ /* And give the packet to 6LoWPAN */
@ -584,7 +584,7 @@ static void macnet_txpoll_work(FAR void *arg)
#ifdef CONFIG_NET_6LOWPAN #ifdef CONFIG_NET_6LOWPAN
/* Make sure the our single packet buffer is attached */ /* Make sure the our single packet buffer is attached */
priv->md_dev.r_dev.d_buf = g_iobuffer.rb_buf; priv->md_dev.r_dev.d_buf = priv->md_iobuffer.rb_buf;
#endif #endif
/* Then perform the poll */ /* Then perform the poll */
@ -865,7 +865,7 @@ static void macnet_txavail_work(FAR void *arg)
#ifdef CONFIG_NET_6LOWPAN #ifdef CONFIG_NET_6LOWPAN
/* Make sure the our single packet buffer is attached */ /* Make sure the our single packet buffer is attached */
priv->md_dev.r_dev.d_buf = g_iobuffer.rb_buf; priv->md_dev.r_dev.d_buf = priv->md_iobuffer.rb_buf;
#endif #endif
/* Then poll the network for new XMIT data */ /* Then poll the network for new XMIT data */