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

Merged in merlin17/nuttx/ieee802154 (pull request #328)

Browse Source 
wireless/ieee802154: Fixes radio callback arguments

Approved-by: Gregory Nutt <gnutt@nuttx.org>
This commit is contained in:
Anthony Merlino 2017-04-19 22:18:26 +00:00 committed by Gregory Nutt
commit 00d52c1942
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/wireless/ieee802154/mrf24j40.c
View File

@ -1520,7 +1520,7 @@ static void mrf24j40_irqwork_txnorm(FAR struct mrf24j40_radio_s *dev)
/* Inform the next layer of the transmission success/failure */
dev->radiocb->txdone_csma(dev->radiocb, dev->csma_desc.pub);
dev->radiocb->txdone_csma(dev->radiocb, &dev->csma_desc.pub);
/* We are now done with the transaction */
@ -1566,7 +1566,7 @@ static void mrf24j40_irqwork_txgts(FAR struct mrf24j40_radio_s *dev,
/* Inform the next layer of the transmission success/failure */
dev->radiocb->txdone_gts(dev->radiocb, dev->gts_desc[gts].pub);
dev->radiocb->txdone_gts(dev->radiocb, &dev->gts_desc[gts].pub);
/* We are now done with the transaction */

4
include/nuttx/wireless/ieee802154/ieee802154_radio.h
View File

@ -175,9 +175,9 @@ struct ieee802154_radiocb_s
CODE int (*poll_gts) (FAR struct ieee802154_radiocb_s *radiocb,
FAR struct ieee802154_txdesc_s *tx_desc, FAR uint8_t *buf);
CODE int (*txdone_csma) (FAR struct ieee802154_radiocb_s *radiocb,
FAR struct ieee802154_txdesc_s tx_desc);
FAR const struct ieee802154_txdesc_s *tx_desc);
CODE int (*txdone_gts) (FAR struct ieee802154_radiocb_s *radiocb,
FAR struct ieee802154_txdesc_s tx_desc);
FAR const struct ieee802154_txdesc_s *tx_desc);
};
struct ieee802154_radio_s; /* Forward reference */