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

wireless/ieee802154: Finishes some IOCTL logic for MAC layer

Browse Source
This commit is contained in:
Anthony Merlino
2017-05-02 13:59:22 -04:00
parent 893c42561f
commit 653a0217f2
4 changed files with 101 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/nuttx/wireless/ieee802154/ieee802154_mac.h
+3 -3
View File
@@ -168,7 +168,7 @@
#define IEEE802154_GTS_DESC_PERSISTENCE_TIME 4 #define IEEE802154_GTS_DESC_PERSISTENCE_TIME 4
#define IEEE802154_MAX_BEACON_OVERHEAD 75 #define IEEE802154_MAX_BEACON_OVERHEAD 75
#define IEEE802154_MAX_BEACON_PAYLOAD_LENGTH \ #define IEEE802154_MAX_BEACON_PAYLOAD_LEN \
(IEEE802154_MAX_PHY_PACKET_SIZE - IEEE802154_MAX_BEACON_OVERHEAD) (IEEE802154_MAX_PHY_PACKET_SIZE - IEEE802154_MAX_BEACON_OVERHEAD)
#define IEEE802154_MAX_LOST_BEACONS 4 #define IEEE802154_MAX_LOST_BEACONS 4
@@ -840,12 +840,12 @@ struct ieee802154_beaconnotify_ind_s
/* Beacon payload */ /* Beacon payload */
uint8_t sdu[IEEE802154_MAX_BEACON_PAYLOAD_LENGTH]; uint8_t sdu[IEEE802154_MAX_BEACON_PAYLOAD_LEN];
}; };
#define SIZEOF_IEEE802154_BEACONNOTIFY_IND_S(n) \ #define SIZEOF_IEEE802154_BEACONNOTIFY_IND_S(n) \
(sizeof(struct ieee802154_beaconnotify_ind_s) \ (sizeof(struct ieee802154_beaconnotify_ind_s) \
- IEEE802154_MAX_BEACON_PAYLOAD_LENGTH + (n)) - IEEE802154_MAX_BEACON_PAYLOAD_LEN + (n))
/***************************************************************************** /*****************************************************************************
* Primitive: MLME-COMM-STATUS.indication * Primitive: MLME-COMM-STATUS.indication
wireless/ieee802154/mac802154.c
+82 -10
View File
@@ -187,7 +187,7 @@ struct ieee802154_privmac_s
/* Contents of beacon payload */ /* Contents of beacon payload */
uint8_t beacon_payload[IEEE802154_MAX_BEACON_PAYLOAD_LENGTH]; uint8_t beacon_payload[IEEE802154_MAX_BEACON_PAYLOAD_LEN];
uint8_t beacon_payload_len; /* Length of beacon payload */ uint8_t beacon_payload_len; /* Length of beacon payload */
uint8_t batt_life_ext_periods; /* # of backoff periods during which rx is uint8_t batt_life_ext_periods; /* # of backoff periods during which rx is
@@ -423,8 +423,9 @@ static int mac802154_defaultmib(FAR struct ieee802154_privmac_s *priv)
priv->beacon_order = 15; /* Non-beacon enabled network */ priv->beacon_order = 15; /* Non-beacon enabled network */
priv->superframe_order = 15; /* Length of active portion of outgoing SF */ priv->superframe_order = 15; /* Length of active portion of outgoing SF */
priv->beacon_tx_time = 0; /* Device never sent a beacon */ priv->beacon_tx_time = 0; /* Device never sent a beacon */
priv->bsn = #warning Set BSN and DSN to random values!
priv->dsn = priv->bsn = 0;
priv->dsn = 0;
priv->gts_permit = true; /* PAN Coord accepting GTS requests */ priv->gts_permit = true; /* PAN Coord accepting GTS requests */
priv->min_be = 3; /* Min value of backoff exponent (BE) */ priv->min_be = 3; /* Min value of backoff exponent (BE) */
priv->max_be = 5; /* Max value of backoff exponent (BE) */ priv->max_be = 5; /* Max value of backoff exponent (BE) */
@@ -433,7 +434,7 @@ static int mac802154_defaultmib(FAR struct ieee802154_privmac_s *priv)
priv->promisc_mode = false; /* Device not in promiscuous mode */ priv->promisc_mode = false; /* Device not in promiscuous mode */
priv->rng_support = false; /* Ranging not yet supported */ priv->rng_support = false; /* Ranging not yet supported */
priv->resp_wait_time = 32; /* 32 SF durations */ priv->resp_wait_time = 32; /* 32 SF durations */
priv->rx_on_idle = false; /* Don't receive while idle */ priv->rx_when_idle = false; /* Don't receive while idle */
priv->sec_enabled = false; /* Security disabled by default */ priv->sec_enabled = false; /* Security disabled by default */
priv->tx_total_dur = 0; /* 0 transmit duration */ priv->tx_total_dur = 0; /* 0 transmit duration */
@@ -449,7 +450,7 @@ static int mac802154_defaultmib(FAR struct ieee802154_privmac_s *priv)
/* Reset the device's address */ /* Reset the device's address */
priv->addr.mode = IEEE802154_ADDRMODE_NONE; priv->addr.mode = IEEE802154_ADDRMODE_NONE;
priv->addr.pan_id = IEEE802154_PAN_UNSPEC; priv->addr.panid = IEEE802154_PAN_UNSPEC;
priv->addr.saddr = IEEE802154_SADDR_UNSPEC; priv->addr.saddr = IEEE802154_SADDR_UNSPEC;
memcpy(&priv->addr.eaddr[0], IEEE802154_EADDR_UNSPEC, 8); memcpy(&priv->addr.eaddr[0], IEEE802154_EADDR_UNSPEC, 8);
@@ -859,6 +860,9 @@ int mac802154_ioctl(MACHANDLE mac, int cmd, unsigned long arg)
(FAR struct ieee802154_privmac_s *)mac; (FAR struct ieee802154_privmac_s *)mac;
int ret = -EINVAL; int ret = -EINVAL;
FAR union ieee802154_macarg_u *macarg =
(FAR union ieee802154_macarg_u *)((uintptr_t)arg);
DEBUGASSERT(priv != NULL); DEBUGASSERT(priv != NULL);
/* Check for IOCTLs aimed at the IEEE802.15.4 MAC layer */ /* Check for IOCTLs aimed at the IEEE802.15.4 MAC layer */
@@ -866,7 +870,75 @@ int mac802154_ioctl(MACHANDLE mac, int cmd, unsigned long arg)
if (_MAC802154IOCVALID(cmd)) if (_MAC802154IOCVALID(cmd))
{ {
/* Handle the MAC IOCTL command */ /* Handle the MAC IOCTL command */
#warning Missing logic
switch (cmd)
{
case MAC802154IOC_MLME_ASSOC_REQUEST:
{
mac802154_req_associate(mac, &macarg->assocreq);
}
break;
case MAC802154IOC_MLME_ASSOC_RESPONSE:
{
mac802154_resp_associate(mac, &macarg->assocresp);
}
break;
case MAC802154IOC_MLME_DISASSOC_REQUEST:
{
mac802154_req_disassociate(mac, &macarg->disassocreq);
}
break;
case MAC802154IOC_MLME_GET_REQUEST:
{
mac802154_req_get(mac, &macarg->getreq);
}
break;
case MAC802154IOC_MLME_GTS_REQUEST:
{
mac802154_req_gts(mac, &macarg->gtsreq);
}
break;
case MAC802154IOC_MLME_ORPHAN_RESPONSE:
{
mac802154_resp_orphan(mac, &macarg->orphanresp);
}
break;
case MAC802154IOC_MLME_RESET_REQUEST:
{
mac802154_req_reset(mac, &macarg->resetreq);
}
break;
case MAC802154IOC_MLME_RXENABLE_REQUEST:
{
mac802154_req_rxenable(mac, &macarg->rxenabreq);
}
break;
case MAC802154IOC_MLME_SCAN_REQUEST:
{
mac802154_req_scan(mac, &macarg->scanreq);
}
break;
case MAC802154IOC_MLME_SET_REQUEST:
{
mac802154_req_set(mac, &macarg->setreq);
}
break;
case MAC802154IOC_MLME_START_REQUEST:
{
mac802154_req_start(mac, &macarg->startreq);
}
break;
case MAC802154IOC_MLME_SYNC_REQUEST:
{
mac802154_req_sync(mac, &macarg->syncreq);
}
break;
case MAC802154IOC_MLME_POLL_REQUEST:
{
mac802154_req_poll(mac, &macarg->pollreq);
}
break;
}
} }
/* No, other IOCTLs must be aimed at the IEEE802.15.4 radio layer */ /* No, other IOCTLs must be aimed at the IEEE802.15.4 radio layer */
@@ -1444,7 +1516,7 @@ int mac802154_req_poll(MACHANDLE mac, FAR struct ieee802154_poll_req_s *req)
} }
/**************************************************************************** /****************************************************************************
* Name: mac802154_rsp_associate * Name: mac802154_resp_associate
* *
* Description: * Description:
* The MLME-ASSOCIATE.response primitive is used to initiate a response to * The MLME-ASSOCIATE.response primitive is used to initiate a response to
@@ -1452,7 +1524,7 @@ int mac802154_req_poll(MACHANDLE mac, FAR struct ieee802154_poll_req_s *req)
* *
****************************************************************************/ ****************************************************************************/
int mac802154_rsp_associate(MACHANDLE mac, int mac802154_resp_associate(MACHANDLE mac,
FAR struct ieee802154_assoc_resp_s *resp) FAR struct ieee802154_assoc_resp_s *resp)
{ {
FAR struct ieee802154_privmac_s *priv = FAR struct ieee802154_privmac_s *priv =
@@ -1461,7 +1533,7 @@ int mac802154_rsp_associate(MACHANDLE mac,
} }
/**************************************************************************** /****************************************************************************
* Name: mac802154_rsp_orphan * Name: mac802154_resp_orphan
* *
* Description: * Description:
* The MLME-ORPHAN.response primitive allows the next higher layer of a * The MLME-ORPHAN.response primitive allows the next higher layer of a
@@ -1469,7 +1541,7 @@ int mac802154_rsp_associate(MACHANDLE mac,
* *
****************************************************************************/ ****************************************************************************/
int mac802154_rsp_orphan(MACHANDLE mac, int mac802154_resp_orphan(MACHANDLE mac,
FAR struct ieee802154_orphan_resp_s *resp) FAR struct ieee802154_orphan_resp_s *resp)
{ {
FAR struct ieee802154_privmac_s *priv = FAR struct ieee802154_privmac_s *priv =
wireless/ieee802154/mac802154.h
+4 -4
View File
@@ -282,7 +282,7 @@ int mac802154_req_sync(MACHANDLE mac, FAR struct ieee802154_sync_req_s *req);
int mac802154_req_poll(MACHANDLE mac, FAR struct ieee802154_poll_req_s *req); int mac802154_req_poll(MACHANDLE mac, FAR struct ieee802154_poll_req_s *req);
/**************************************************************************** /****************************************************************************
* Name: mac802154_rsp_associate * Name: mac802154_resp_associate
* *
* Description: * Description:
* The MLME-ASSOCIATE.response primitive is used to initiate a response to * The MLME-ASSOCIATE.response primitive is used to initiate a response to
@@ -290,11 +290,11 @@ int mac802154_req_poll(MACHANDLE mac, FAR struct ieee802154_poll_req_s *req);
* *
****************************************************************************/ ****************************************************************************/
int mac802154_rsp_associate(MACHANDLE mac, int mac802154_resp_associate(MACHANDLE mac,
FAR struct ieee802154_assoc_resp_s *resp); FAR struct ieee802154_assoc_resp_s *resp);
/**************************************************************************** /****************************************************************************
* Name: mac802154_rsp_orphan * Name: mac802154_resp_orphan
* *
* Description: * Description:
* The MLME-ORPHAN.response primitive allows the next higher layer of a * The MLME-ORPHAN.response primitive allows the next higher layer of a
@@ -302,7 +302,7 @@ int mac802154_rsp_associate(MACHANDLE mac,
* *
****************************************************************************/ ****************************************************************************/
int mac802154_rsp_orphan(MACHANDLE mac, int mac802154_resp_orphan(MACHANDLE mac,
FAR struct ieee802154_orphan_resp_s *resp); FAR struct ieee802154_orphan_resp_s *resp);
#undef EXTERN #undef EXTERN
wireless/ieee802154/mac802154_device.c
+6 -10
View File
@@ -602,17 +602,13 @@ static int mac802154dev_ioctl(FAR struct file *filep, int cmd,
} }
break; break;
#endif #endif
case MAC802154IOC_MLME_ASSOC_REQUEST:
{
FAR struct ieee802154_assoc_req_s *req =
(FAR struct ieee802154_assoc_req_s *)((uintptr_t)arg);
}
break;
default: default:
wlerr("ERROR: Unrecognized command %ld\n", cmd); {
ret = -EINVAL; /* Forward any unrecognized commands to the MAC layer */
mac802154_ioctl(dev->md_mac, cmd, arg);
}
break; break;
} }