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

wireless/ieee802154: Finishes MAC processing of received data frame

Browse Source
This commit is contained in:
Anthony Merlino
2017-05-08 16:21:29 -04:00
parent 2ea6bb4dc1
commit 2da6f71e84
1 changed files with 21 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
wireless/ieee802154/mac802154.c
+21 -13
View File
@@ -409,7 +409,7 @@ static FAR struct mac802154_txframe_s *
} }
/**************************************************************************** /****************************************************************************
* Name: mac802154_push_rxframe * Name: mac802154_push_dataind
* *
* Description: * Description:
* Push a data indication onto the list to be processed * Push a data indication onto the list to be processed
@@ -814,6 +814,7 @@ static void mac802154_rxframe_worker(FAR void *arg)
FAR struct iob_s *frame; FAR struct iob_s *frame;
uint16_t *frame_ctrl; uint16_t *frame_ctrl;
bool panid_comp; bool panid_comp;
uint8_t ftype;
while(1) while(1)
{ {
@@ -839,7 +840,7 @@ static void mac802154_rxframe_worker(FAR void *arg)
/* Get a local copy of the frame to make it easier to access */ /* Get a local copy of the frame to make it easier to access */
frame = iob->frame; frame = ind->frame;
/* Set a local pointer to the frame control then move the offset past /* Set a local pointer to the frame control then move the offset past
* the frame control field * the frame control field
@@ -852,16 +853,16 @@ static void mac802154_rxframe_worker(FAR void *arg)
* this isn't a data frame * this isn't a data frame
*/ */
ind->src.mode = (frame_ctrl & IEEE802154_FRAMECTRL_SADDR) >> ind->src.mode = (*frame_ctrl & IEEE802154_FRAMECTRL_SADDR) >>
IEEE802154_FRAMECTRL_SHIFT_SADDR; IEEE802154_FRAMECTRL_SHIFT_SADDR;
ind->dest.mode = (frame_ctrl & IEEE802154_FRAMECTRL_DADDR) >> ind->dest.mode = (*frame_ctrl & IEEE802154_FRAMECTRL_DADDR) >>
IEEE802154_FRAMECTRL_SHIFT_DADDR; IEEE802154_FRAMECTRL_SHIFT_DADDR;
panid_comp = (frame_ctrl & IEEE802154_FRAMECTRL_PANIDCOMP) >> panid_comp = (*frame_ctrl & IEEE802154_FRAMECTRL_PANIDCOMP) >>
IEEE802154_FRAMECTRL_SHIFT_PANIDCOMP; IEEE802154_FRAMECTRL_SHIFT_PANIDCOMP;
ind->dsn = iob->frame->io_data[frame->io_offset++]; ind->dsn = frame->io_data[frame->io_offset++];
/* If the destination address is included */ /* If the destination address is included */
@@ -879,7 +880,7 @@ static void mac802154_rxframe_worker(FAR void *arg)
} }
else if (ind->dest.mode == IEEE802154_ADDRMODE_EXTENDED) else if (ind->dest.mode == IEEE802154_ADDRMODE_EXTENDED)
{ {
memcpy(&ind->dest.eaddr[0], frame->io_data[frame->io_offset], memcpy(&ind->dest.eaddr[0], &frame->io_data[frame->io_offset],
IEEE802154_EADDR_LEN); IEEE802154_EADDR_LEN);
frame->io_offset += 8; frame->io_offset += 8;
} }
@@ -913,13 +914,16 @@ static void mac802154_rxframe_worker(FAR void *arg)
} }
else if (ind->src.mode == IEEE802154_ADDRMODE_EXTENDED) else if (ind->src.mode == IEEE802154_ADDRMODE_EXTENDED)
{ {
memcpy(&ind->src.eaddr[0], frame->io_data[frame->io_offset], memcpy(&ind->src.eaddr[0], &frame->io_data[frame->io_offset],
IEEE802154_EADDR_LEN); IEEE802154_EADDR_LEN);
frame->io_offset += 8; frame->io_offset += 8;
} }
} }
if (frame_ctrl & IEEE802154_FRAMECTRL_FTYPE == IEEE802154_FRAME_DATA) ftype = (*frame_ctrl & IEEE802154_FRAMECTRL_FTYPE) >>
IEEE802154_FRAMECTRL_SHIFT_FTYPE;
if (ftype == IEEE802154_FRAME_DATA)
{ {
/* If there is a registered MCPS callback receiver registered, send /* If there is a registered MCPS callback receiver registered, send
* the frame, otherwise, throw it out. * the frame, otherwise, throw it out.
@@ -929,7 +933,7 @@ static void mac802154_rxframe_worker(FAR void *arg)
{ {
mcps_notify.dataind = ind; mcps_notify.dataind = ind;
priv->cb->mcps_notify(priv->cb, IEEE802154_NOTIFY_IND_DATA, priv->cb->mcps_notify(priv->cb, IEEE802154_NOTIFY_IND_DATA,
mcps_notify); &mcps_notify);
} }
else else
{ {
@@ -938,11 +942,11 @@ static void mac802154_rxframe_worker(FAR void *arg)
ieee802154_ind_free(ind); ieee802154_ind_free(ind);
} }
} }
else if (frame_ctrl & IEEE802154_FRAMECTRL_FTYPE == IEEE802154_FRAME_COMMAND) else if (ftype == IEEE802154_FRAME_COMMAND)
{ {
} }
else if (frame_ctrl & IEEE802154_FRAMECTRL_FTYPE == IEEE802154_FRAME_BEACON) else if (ftype == IEEE802154_FRAME_BEACON)
{ {
} }
@@ -1023,6 +1027,10 @@ MACHANDLE mac802154_create(FAR struct ieee802154_radio_s *radiodev)
radiodev->ops->bind(radiodev, &mac->radiocb.cb); radiodev->ops->bind(radiodev, &mac->radiocb.cb);
/* Initialize our data indication pool */
ieee802154_indpool_initialize();
return (MACHANDLE)mac; return (MACHANDLE)mac;
} }
@@ -1360,7 +1368,7 @@ int mac802154_req_data(MACHANDLE mac,
*/ */
if ((meta->dest_addr.mode == IEEE802154_ADDRMODE_NONE) || if ((meta->dest_addr.mode == IEEE802154_ADDRMODE_NONE) ||
(*frame_ctrl & IEEE802154_FRAMECTRL_PANIDCOMP)) (!(*frame_ctrl & IEEE802154_FRAMECTRL_PANIDCOMP)))
{ {
memcpy(&frame->io_data[mhr_len], &priv->addr.panid, 2); memcpy(&frame->io_data[mhr_len], &priv->addr.panid, 2);
mhr_len += 2; mhr_len += 2;