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

ieee802.15.4: de-couple MAC driver interface. Now works more like other drivers.

Browse Source
This commit is contained in:
Gregory Nutt
2017-04-13 12:17:36 -06:00
parent 6b8a8bda35
commit c1ddae5c5e
4 changed files with 236 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files
wireless/ieee802154/mac802154.c
+75 -3
View File
@@ -61,7 +61,9 @@
struct ieee802154_privmac_s
{
struct ieee802154_mac_s pubmac; /* This MUST be the first member */
struct ieee802154_mac_s pubmac; /* This MUST be the first member */
FAR struct ieee802154_radio_s *radio; /* Contained IEEE802.15.4 radio dev */
FAR const struct ieee802154_maccb_s *cb; /* Contained MAC callbacks */
/* MIB attributes, grouped to save memory */
/* 0x40 */ uint8_t macAckWaitDuration : 1; /* 55 or 120(true) */
@@ -143,6 +145,10 @@ static int mac802154_rsp_associate(FAR struct ieee802154_mac_s *mac,
static int mac802154_rsp_orphan(FAR struct ieee802154_mac_s *mac,
FAR uint8_t *orphanaddr, uint16_t saddr, bool associated);
static int mac802154_bind(FAR struct ieee802154_mac_s *mac,
FAR struct ieee802154_maccb_s *cb);
static int mac802154_ioctl(FAR struct ieee802154_mac_s *mac, int cmd,
unsigned long arg);
/****************************************************************************
* Private Data
@@ -502,10 +508,76 @@ static int mac802154_rsp_orphan(FAR struct ieee802154_mac_s *mac,
FAR uint8_t *orphanaddr, uint16_t saddr,
bool associated)
{
FAR struct ieee802154_privmac_s *priv = (FAR struct ieee802154_privmac_s *)mac;
FAR struct ieee802154_privmac_s *priv =
(FAR struct ieee802154_privmac_s *)mac;
return -ENOTTY;
}
/****************************************************************************
* Name: mac802154_bind
*
* Description:
* Bind the MAC callback table to the MAC state.
*
* Parameters:
* mac - Reference to the MAC driver state structure
* cb - MAC callback operations
*
* Returned Value:
* OK on success; Negated errno on failure.
*
****************************************************************************/
static int mac802154_bind(FAR struct ieee802154_mac_s *mac,
FAR const struct ieee802154_maccb_s *cb)
{
FAR struct ieee802154_privmac_s *priv =
(FAR struct ieee802154_privmac_s *)mac;
priv->cb = cb;
return OK;
}
/****************************************************************************
* Name: mac802154_ioctl
*
* Description:
* Handle MAC and radio IOCTL commands directed to the MAC.
*
* Parameters:
* mac - Reference to the MAC driver state structure
* cmd - The IOCTL command
* arg - The argument for the IOCTL command
*
* Returned Value:
* OK on success; Negated errno on failure.
*
****************************************************************************/
static int mac802154_ioctl(FAR struct ieee802154_mac_s *mac, int cmd,
unsigned long arg)
{
FAR struct ieee802154_privmac_s *priv =
(FAR struct ieee802154_privmac_s *)mac;
int ret = -EINVAL;
/* Check for IOCTLs aimed at the IEEE802.15.4 MAC layer */
if (_MAC802154IOCVALID(cmd))
{
/* Handle the MAC IOCTL command */
#warning Missing logic
}
/* No, other IOCTLs must be aimed at the IEEE802.15.4 radio layer */
else
{
ret = priv->radio->ioctl(priv->radio, cmd, arg);
}
}
#endif
/****************************************************************************
* Public Functions
****************************************************************************/
@@ -552,7 +624,7 @@ FAR struct ieee802154_mac_s *
/* Initialize fields */
mac->pubmac.radio = radiodev;
mac->radio = radiodev;
mac->pubmac.ops = mac802154ops;
mac802154_defaultmib(mac);