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

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

Browse Source 
wireless/ieee802154: Lots of small fixes to eliminate build issues.

Approved-by: Gregory Nutt <gnutt@nuttx.org>
This commit is contained in:
Anthony Merlino
2017-04-18 20:11:22 +00:00
committed by Gregory Nutt
parent 52cddc45de 9ad3b375e5
commit ea224e8ddb
5 changed files with 418 additions and 233 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drivers/wireless/ieee802154/mrf24j40.c
+246 -99
View File
File diff suppressed because it is too large Load Diff
include/nuttx/wireless/ieee802154/ieee802154_mac.h
+4 -23
View File
@@ -85,7 +85,7 @@
#define MAC802154IOC_MCPS_REGISTER _MAC802154IOC(0x0001)
#define MAC802154IOC_MLME_REGISER _MAC802154IOC(0x0002);
#define MAC802154IOC_MLME_REGISTER _MAC802154IOC(0x0002)
#define MAC802154IOC_MLME_ASSOC_REQUEST _MAC802154IOC(0x0003)
#define MAC802154IOC_MLME_ASSOC_RESPONSE _MAC802154IOC(0x0004)
#define MAC802154IOC_MLME_DISASSOC_REQUEST _MAC802154IOC(0x0005)
@@ -103,8 +103,6 @@
#define MAC802154IOC_MLME_SOUNDING_REQUEST _MAC802154IOC(0x0011)
#define MAC802154IOC_MLME_CALIBRATE_REQUEST _MAC802154IOC(0x0012)
/* IEEE 802.15.4 MAC Interface **********************************************/
/* Frame Type */
@@ -351,12 +349,9 @@ struct ieee802154_addr_s
enum ieee802154_addr_mode_e mode;
uint16_t panid; /* PAN identifier, can be IEEE802154_PAN_UNSPEC */
union
{
uint16_t saddr; /* short address */
uint8_t eaddr[8]; /* extended address */
} u;
uint16_t panid; /* PAN identifier, can be IEEE802154_PAN_UNSPEC */
uint16_t saddr; /* short address */
uint8_t eaddr[8]; /* extended address */
};
#define IEEE802154_ADDRSTRLEN 22 /* (2*2+1+8*2, PPPP/EEEEEEEEEEEEEEEE) */
@@ -397,19 +392,6 @@ enum ieee802154_ranging_e
IEEE802154_PHY_HEADER_ONLY
};
struct ieee802154_frame_s
{
struct ieee802154_framecontrol_s frame_control;
uint8_t seq_num;
struct ieee802154_addr_s dest_addr;
struct ieee802154_addr_s src_addr;
#ifdef CONFIG_IEEE802154_SECURITY
struct ieee802154_auxsec_s aux_sec_hdr;
#endif
void *payload;
uint16_t fcs;
};
struct ieee802154_data_req_s
{
enum ieee802154_addr_mode_e src_addr_mode; /* Source Address Mode */
@@ -464,7 +446,6 @@ struct ieee802154_data_req_s
uint8_t msdu[1];
};
#define SIZEOF_IEEE802154_DATA_REQ_S(n) \
(sizeof(struct ieee802154_data_req_s) + (n) - 1)
include/nuttx/wireless/ieee802154/ieee802154_radio.h
+6 -6
View File
@@ -190,14 +190,14 @@ struct ieee802154_radio_s; /* Forward reference */
struct ieee802154_radioops_s
{
CODE int (*bind) (FAR struct ieee802154_radio_s *dev,
FAR const struct ieee802154_phyif_s *phyif);
CODE int (*ioctl)(FAR struct ieee802154_radio_s *ieee, int cmd,
CODE int (*bind) (FAR struct ieee802154_radio_s *radio,
FAR struct ieee802154_phyif_s *phyif);
CODE int (*ioctl)(FAR struct ieee802154_radio_s *radio, int cmd,
unsigned long arg);
CODE int (*rxenable)(FAR struct ieee802154_radio_s *dev, bool state,
CODE int (*rxenable)(FAR struct ieee802154_radio_s *radio, bool state,
FAR struct ieee802154_packet_s *packet);
CODE int (*txnotify_csma)(FAR struct ieee802154_radio_s *dev);
CODE int (*txnotify_gts)(FAR struct ieee802154_radio_s *dev);
CODE int (*txnotify_csma)(FAR struct ieee802154_radio_s *radio);
CODE int (*txnotify_gts)(FAR struct ieee802154_radio_s *radio);
};
struct ieee802154_radio_s
wireless/ieee802154/mac802154.c
+84 -45
View File
@@ -43,6 +43,7 @@
#include <assert.h>
#include <errno.h>
#include <debug.h>
#include <string.h>
#include <nuttx/kmalloc.h>
#include <nuttx/wireless/ieee802154/ieee802154_radio.h>
@@ -96,7 +97,7 @@ struct ieee802154_privmac_s
FAR const struct ieee802154_maccb_s *cb; /* Contained MAC callbacks */
FAR struct ieee802154_phyif_s phyif; /* Interface to bind to radio */
sem_t excl_sem; /* Support exclusive access */
sem_t exclsem; /* Support exclusive access */
/* Support a singly linked list of transactions that will be sent using the
* CSMA algorithm. On a non-beacon enabled PAN, these transactions will be
@@ -207,14 +208,14 @@ struct ieee802154_privmac_s
*/
uint32_t sync_symb_offset : 12;
}
};
struct
{
uint32_t beacon_tx_time : 24; /* Time of last beacon transmit */
uint32_t min_be : 4; /* Min value of backoff exponent (BE) */
uint32_t max_be : 4; /* Max value of backoff exponent (BE) */
}
};
struct
{
@@ -223,11 +224,33 @@ struct ieee802154_privmac_s
uint32_t tx_ctrl_pause_dur : 1; /* Duration after tx before another tx is
* permitted. 0=2000, 1= 10000 */
uint32_t timestamp_support : 1; /* Does MAC layer supports timestamping */
}
uint32_t is_coord : 1; /* Is this device acting as coordinator */
};
/* TODO: Add Security-related MAC PIB attributes */
};
/****************************************************************************
* Private Function Prototypes
****************************************************************************/
static inline int mac802154_takesem(sem_t *sem);
#define mac802154_givesem(s) sem_post(s);
/* Internal Functions */
static int mac802154_defaultmib(FAR struct ieee802154_privmac_s *priv);
static int mac802154_applymib(FAR struct ieee802154_privmac_s *priv);
/* IEEE 802.15.4 PHY Interface OPs */
static int mac802154_poll_csma(FAR struct ieee802154_phyif_s *phyif,
FAR struct ieee802154_txdesc_s *tx_desc,
uint8_t *buf);
static int mac802154_poll_gts(FAR struct ieee802154_phyif_s *phyif,
FAR struct ieee802154_txdesc_s *tx_desc,
uint8_t *buf);
/****************************************************************************
* Private Data
@@ -350,7 +373,7 @@ MACHANDLE mac802154_create(FAR struct ieee802154_radio_s *radiodev)
/* Bind our PHY interface to the radio */
radiodev->ops->bind(radiodev, mac->phyif);
radiodev->ops->bind(radiodev, &mac->phyif);
return (MACHANDLE)mac;
}
@@ -444,7 +467,7 @@ int mac802154_req_data(MACHANDLE mac, FAR struct ieee802154_data_req_s *req)
{
FAR struct ieee802154_privmac_s *priv =
(FAR struct ieee802154_privmac_s *)mac;
FAR struct mac802154_trans_s *trans;
FAR struct mac802154_trans_s trans;
struct mac802154_unsec_mhr_s mhr;
int ret;
@@ -462,11 +485,12 @@ int mac802154_req_data(MACHANDLE mac, FAR struct ieee802154_data_req_s *req)
/* Ensure we start with a clear frame control field */
mhr.frame_control = 0;
mhr.u.frame_control = 0;
/* Set the frame type to Data */
mhr.frame_control |= IEEE802154_FRAME_DATA << IEEE802154_FRAMECTRL_SHIFT_FTYPE;
mhr.u.frame_control |= IEEE802154_FRAME_DATA <<
IEEE802154_FRAMECTRL_SHIFT_FTYPE;
/* If the msduLength is greater than aMaxMACSafePayloadSize, the MAC sublayer
* will set the Frame Version to one. [1] pg. 118.
@@ -474,7 +498,7 @@ int mac802154_req_data(MACHANDLE mac, FAR struct ieee802154_data_req_s *req)
if (req->msdu_length > IEEE802154_MAX_SAFE_MAC_PAYLOAD_SIZE)
{
mhr.frame_ctrl |= IEEE802154_FRAMECTRL_VERSION;
mhr.u.frame_control |= IEEE802154_FRAMECTRL_VERSION;
}
/* If the TXOptions parameter specifies that an acknowledged transmission is
@@ -482,7 +506,8 @@ int mac802154_req_data(MACHANDLE mac, FAR struct ieee802154_data_req_s *req)
* 5.1.6.4 [1] pg. 118.
*/
mhr.frame_ctrl |= (req->msdu_flags.ack_tx << IEEE802154_FRAMECTRL_SHIFT_ACKREQ);
mhr.u.frame_control |= (req->msdu_flags.ack_tx <<
IEEE802154_FRAMECTRL_SHIFT_ACKREQ);
/* If the destination address is present, copy the PAN ID and one of the
* addresses, depending on mode, into the MHR .
@@ -490,28 +515,29 @@ int mac802154_req_data(MACHANDLE mac, FAR struct ieee802154_data_req_s *req)
if (req->dest_addr.mode != IEEE802154_ADDRMODE_NONE)
{
memcpy(&mhr.data[mhr.length], req->dest_addr.panid, 2);
memcpy(&mhr.u.data[mhr.length], &req->dest_addr.panid, 2);
mhr.length += 2;
if (req->dest_addr.mode == IEEE802154_ADDRMODE_SHORT)
{
memcpy(&mhr.data[mhr.length], req->dest_addr.saddr, 2);
memcpy(&mhr.u.data[mhr.length], &req->dest_addr.saddr, 2);
mhr.length += 2;
}
else if (req->dest_addr.mode == IEEE802154_ADDRMODE_EXTENDED)
{
memcpy(&mhr.data[mhr.length], req->dest_addr.eaddr, 8);
memcpy(&mhr.u.data[mhr.length], &req->dest_addr.eaddr, 8);
mhr.length += 8;
}
}
/* Set the destination addr mode inside the frame contorl field */
mhr.frame_ctrl |= (req->dest_addr.mode << IEEE802154_FRAMECTRL_SHIFT_DADDR);
mhr.u.frame_control |= (req->dest_addr.mode <<
IEEE802154_FRAMECTRL_SHIFT_DADDR);
/* From this point on, we need exclusive access to the privmac struct */
ret = mac802154dev_takesem(&dev->md_exclsem);
ret = mac802154_takesem(&priv->exclsem);
if (ret < 0)
{
wlerr("ERROR: mac802154_takesem failed: %d\n", ret);
@@ -533,7 +559,7 @@ int mac802154_req_data(MACHANDLE mac, FAR struct ieee802154_data_req_s *req)
if (req->dest_addr.panid == priv->addr.panid)
{
mhr.frame_control |= IEEE802154_FRAMECTRL_PANIDCOMP;
mhr.u.frame_control |= IEEE802154_FRAMECTRL_PANIDCOMP;
}
}
@@ -543,35 +569,36 @@ int mac802154_req_data(MACHANDLE mac, FAR struct ieee802154_data_req_s *req)
* is off, we need to include the Source PAN ID.
*/
if (req->dest_addr.mode == IEEE802154_ADDRMODE_NONE ||
(mhr.frame_control & IEEE802154_FRAMECTRL_PANIDCOMP)
if ((req->dest_addr.mode == IEEE802154_ADDRMODE_NONE) ||
(mhr.u.frame_control & IEEE802154_FRAMECTRL_PANIDCOMP))
{
memcpy(&mhr.data[mhr.length], priv->addr.panid, 2);
memcpy(&mhr.u.data[mhr.length], &priv->addr.panid, 2);
mhr.length += 2;
}
if (req->src_addr_mode == IEEE802154_ADDRMODE_SHORT)
{
memcpy(&mhr.data[mhr.length], priv->addr.saddr, 2);
memcpy(&mhr.u.data[mhr.length], &priv->addr.saddr, 2);
mhr.length += 2;
}
else if (req->src_addr_mode == IEEE802154_ADDRMODE_EXTENDED)
{
memcpy(&mhr.data[mhr.length], priv->addr.eaddr, 8);
memcpy(&mhr.u.data[mhr.length], &priv->addr.eaddr, 8);
mhr.length += 8;
}
}
/* Set the source addr mode inside the frame control field */
mhr.frame_ctrl |= (req->src_addr_mode << IEEE802154_FRAMECTRL_SHIFT_SADDR);
mhr.u.frame_control |= (req->src_addr_mode <<
IEEE802154_FRAMECTRL_SHIFT_SADDR);
/* Each time a data or a MAC command frame is generated, the MAC sublayer
* shall copy the value of macDSN into the Sequence Number field of the MHR
* of the outgoing frame and then increment it by one. [1] pg. 40.
*/
mhr.data[mhr.length++] = priv.dsn++;
mhr.u.data[mhr.length++] = priv->dsn++;
/* Now that we know which fields are included in the header, we can make
* sure we actually have enough room in the PSDU.
@@ -583,13 +610,13 @@ int mac802154_req_data(MACHANDLE mac, FAR struct ieee802154_data_req_s *req)
return -E2BIG;
}
trans->mhr_buf = &mhr.data[0];
trans->mhr_len = mhr.length;
trans.mhr_buf = &mhr.u.data[0];
trans.mhr_len = mhr.length;
trans->d_buf = &req->msdu[0];
trans->d_len = req->msdu_length;
trans.d_buf = &req->msdu[0];
trans.d_len = req->msdu_length;
trans->msdu_handle = req->msdu_handle;
trans.msdu_handle = req->msdu_handle;
/* If the TxOptions parameter specifies that a GTS transmission is required,
* the MAC sublayer will determine whether it has a valid GTS as described
@@ -635,14 +662,14 @@ int mac802154_req_data(MACHANDLE mac, FAR struct ieee802154_data_req_s *req)
{
/* Link the transaction into the indirect_trans list */
priv->indirect_tail->flink = trans;
priv->indirect_tail = trans;
priv->indirect_tail->flink = &trans;
priv->indirect_tail = &trans;
}
else
{
/* Override the setting since it wasn't valid */
req->msgu_flags.indirect_tx = 0;
req->msdu_flags.indirect_tx = 0;
}
}
@@ -652,40 +679,50 @@ int mac802154_req_data(MACHANDLE mac, FAR struct ieee802154_data_req_s *req)
{
/* Link the transaction into the CSMA transaction list */
priv->csma_tail->flink = trans;
priv->csma_tail = trans;
priv->csma_tail->flink = &trans;
priv->csma_tail = &trans;
/* We no longer need to have the MAC layer locked. */
mac802154_givesem(&priv->exclsem);
/* Notify the radio driver that there is data available */
priv->radio->ops->tx_notify(priv->radio);
priv->radio->ops->txnotify_csma(priv->radio);
sem_wait(&trans->sem);
sem_wait(&trans.sem);
}
}
return OK;
}
/* Called from interrupt level or worker thread with interrupts disabled */
static uint16_t mac802154_poll_csma(FAR struct ieee802154_phyif_s *phyif,
static int mac802154_poll_csma(FAR struct ieee802154_phyif_s *phyif,
FAR struct ieee802154_txdesc_s *tx_desc,
uint8_t *buf)
{
FAR struct ieee802154_privmac_s *priv =
(FAR struct ieee802154_privmac_s *)&phyif->priv;
FAR struct mac802154_trans_s *trans;
int ret = 0;
DEBUGASSERT(priv != 0);
/* Get exclusive access to the driver structure. We don't care about any
* signals so if we see one, just go back to trying to get access again */
while (mac802154_takesem(&priv->exclsem) != 0);
/* Check to see if there are any CSMA transactions waiting */
if (mac->csma_head)
if (priv->csma_head)
{
/* Pop a CSMA transaction off the list */
trans = mac->csma_head;
mac->csma_head = mac->csma_head.flink;
trans = priv->csma_head;
priv->csma_head = priv->csma_head->flink;
/* Setup the transmit descriptor */
@@ -703,15 +740,17 @@ static uint16_t mac802154_poll_csma(FAR struct ieee802154_phyif_s *phyif,
* returns.
*/
sem_post(trans->sem);
sem_post(&trans->sem);
return txdesc->psdu_length;
ret = tx_desc->psdu_length;
}
return 0;
mac802154_givesem(&priv->exclsem);
return ret;
}
static uint16_t mac802154_poll_gts(FAR struct ieee802154_phyif_s *phyif,
static int mac802154_poll_gts(FAR struct ieee802154_phyif_s *phyif,
FAR struct ieee802154_txdesc_s *tx_desc,
uint8_t *buf)
{
wireless/ieee802154/mac802154_device.c
+78 -60
View File
@@ -45,6 +45,7 @@
#include <string.h>
#include <errno.h>
#include <time.h>
#include <fcntl.h>
#include <nuttx/arch.h>
#include <nuttx/kmalloc.h>
@@ -66,31 +67,6 @@
* Private Types
****************************************************************************/
struct mac802154_devwrapper_s
{
MACHANDLE md_mac; /* Saved binding to the mac layer */
sem_t md_exclsem; /* Exclusive device access */
/* The following is a singly linked list of open references to the
* MAC device.
*/
FAR struct mac802154_open_s *md_open;
FAR struct mac802154dev_dwait_s *md_dwait;
#ifndef CONFIG_DISABLE_SIGNALS
/* MCPS Service notification information */
struct mac802154dev_notify_s md_mcps_notify;
pid_t md_mcps_pid;
/* MLME Service notification information */
struct mac802154dev_notify_s md_mlme_notify;
pid_t md_mlme_pid;
#endif
};
struct mac802154dev_notify_s
{
uint8_t mn_signo; /* Signal number to use in the notification */
@@ -120,6 +96,31 @@ struct mac802154dev_dwait_s
FAR struct mac802154dev_dwait_s *mw_flink;
};
struct mac802154_devwrapper_s
{
MACHANDLE md_mac; /* Saved binding to the mac layer */
sem_t md_exclsem; /* Exclusive device access */
/* The following is a singly linked list of open references to the
* MAC device.
*/
FAR struct mac802154dev_open_s *md_open;
FAR struct mac802154dev_dwait_s *md_dwait;
#ifndef CONFIG_DISABLE_SIGNALS
/* MCPS Service notification information */
struct mac802154dev_notify_s md_mcps_notify;
pid_t md_mcps_pid;
/* MLME Service notification information */
struct mac802154dev_notify_s md_mlme_notify;
pid_t md_mlme_pid;
#endif
};
/****************************************************************************
* Private Function Prototypes
****************************************************************************/
@@ -358,7 +359,8 @@ static ssize_t mac802154dev_read(FAR struct file *filep, FAR char *buffer,
* packet.
*/
if (len < sizeof(struct ieee802154_frame_s))
if ((len >= SIZEOF_IEEE802154_DATA_REQ_S(1)) &&
(len <= SIZEOF_IEEE802154_DATA_REQ_S(IEEE802154_MAX_MAC_PAYLOAD_SIZE)))
{
wlerr("ERROR: buffer too small: %lu\n", (unsigned long)len);
return -EINVAL;
@@ -394,7 +396,6 @@ static ssize_t mac802154dev_write(FAR struct file *filep,
FAR struct inode *inode;
FAR struct mac802154_devwrapper_s *dev;
FAR struct ieee802154_data_req_s *req;
FAR struct ieee802154_frame_s *frame;
struct mac802154dev_dwait_s dwait;
int ret;
@@ -404,64 +405,82 @@ static ssize_t mac802154dev_write(FAR struct file *filep,
dev = (FAR struct mac802154_devwrapper_s *)inode->i_private;
/* Check to make sure that the buffer is big enough to hold at least one
* packet.
*/
* packet. */
if (len < sizeof(struct ieee802154_frame_s))
if ((len >= SIZEOF_IEEE802154_DATA_REQ_S(1)) &&
(len <= SIZEOF_IEEE802154_DATA_REQ_S(IEEE802154_MAX_MAC_PAYLOAD_SIZE)))
{
wlerr("ERROR: buffer too small: %lu\n", (unsigned long)len);
wlerr("ERROR: buffer isn't an ieee802154_data_req_s: %lu\n",
(unsigned long)len);
return -EINVAL;
}
DEBUGASSERT(buffer != NULL);
frame = (FAR struct ieee802154_frame_s *)buffer;
req = (FAR struct ieee802154_data_req_s *)buffer;
/* Get exclusive access to the driver structure */
/* If this is a blocking operation, we need to setup a wait struct so we
* can unblock when the packet transmission has finished. If this is a
* non-blocking write, we pass off the data and then move along. Technically
* we stil have to wait for the transaction to get put into the buffer, but we
* won't wait for the transaction to actually finish. */
ret = mac802154dev_takesem(&dev->md_exclsem);
if (ret < 0)
if (!(filep->f_oflags & O_NONBLOCK))
{
wlerr("ERROR: mac802154dev_takesem failed: %d\n", ret);
return ret;
}
/* Get exclusive access to the driver structure */
/* Setup the wait struct */
ret = mac802154dev_takesem(&dev->md_exclsem);
if (ret < 0)
{
wlerr("ERROR: mac802154dev_takesem failed: %d\n", ret);
return ret;
}
dwait.mw_handle = req->msdu_handle;
/* Setup the wait struct */
/* Link the wait struct */
dwait.mw_handle = req->msdu_handle;
dwait.mw_flink = dev->md_dwait;
dev->md_dwait = &dwait;
/* Link the wait struct */
dwait.mw_flink = dev->md_dwait;
dev->md_dwait = &dwait;
mac802154dev_givesem(&dev->md_exclsem);
}
/* Pass the request to the MAC layer */
ret = mac802154_req_data(dev->md_mac, req);
mac802154dev_givesem(&dev->md_exclsem);
if (ret < 0)
{
wlerr("ERROR: req_data failed %d\n", ret);
return ret;
}
/* Wait for the DATA.confirm callback to be called for our handle */
if (sem_wait(dwait.mw_sem) < 0)
if (!(filep->f_oflags & O_NONBLOCK))
{
/* This should only happen if the wait was canceled by an signal */
/* Wait for the DATA.confirm callback to be called for our handle */
DEBUGASSERT(errno == EINTR);
return -EINTR;
if (sem_wait(&dwait.mw_sem) < 0)
{
/* This should only happen if the wait was canceled by an signal */
DEBUGASSERT(errno == EINTR);
return -EINTR;
}
/* The unlinking of the wait struct happens inside the callback. This
* is more efficient since it will already have to find the struct in
* the list in order to perform the sem_post.
*/
return dwait.mw_status;
}
/* The unlinking of the wait struct happens inside the callback. This
* is more efficient since it will already have to find the struct in
* the list in order to perform the sem_post.
*/
return dwait.status;
return OK;
}
/****************************************************************************
@@ -477,7 +496,6 @@ static int mac802154dev_ioctl(FAR struct file *filep, int cmd,
{
FAR struct inode *inode;
FAR struct mac802154_devwrapper_s *dev;
MACHANDLE mac;
int ret;
DEBUGASSERT(filep != NULL && filep->f_priv != NULL &&
@@ -564,10 +582,10 @@ static int mac802154dev_ioctl(FAR struct file *filep, int cmd,
void mac802154dev_conf_data(MACHANDLE mac,
FAR struct ieee802154_data_conf_s *conf)
{
FAR struct mac802154_devwrapper_s *dev;
FAR struct mac802154_devwrapper_s *dev =
(FAR struct mac802154_devwrapper_s *)mac;
FAR struct mac802154dev_dwait_s *curr;
FAR struct mac802154dev_dwait_s *prev;
int ret;
/* Get the dev from the callback context. This should have been set when
* the char driver was registered.
@@ -579,7 +597,7 @@ void mac802154dev_conf_data(MACHANDLE mac,
/* Get exclusive access to the driver structure. We don't care about any
* signals so if we see one, just go back to trying to get access again */
while(mac802154dev_takesem(&dev->md_exclsem) != OK);
while (mac802154dev_takesem(&dev->md_exclsem) != 0);
/* Search to see if there is a dwait pending for this transaction */