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

wireless/ieee802154: Fix some easy compilation problems introduced with header file changes.

Browse Source
This commit is contained in:
Gregory Nutt
2017-04-14 12:05:28 -06:00
parent fba8c96540
commit beee02843a
5 changed files with 43 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/nuttx/wireless/ieee802154/ieee802154_mac.h
+2 -2
View File
@@ -851,9 +851,9 @@ struct ieee802154_pollreq_s
union ieee802154_macarg_u
{
struct ieee802154_assoc_req_s assocreq; /* MAC802154IOC_MLME_ASSOC_REQUEST */
struct ieee802154_assocresp_s assocresp: /* MAC802154IOC_MLME_ASSOC_RESPONSE */
struct ieee802154_assocresp_s assocresp; /* MAC802154IOC_MLME_ASSOC_RESPONSE */
struct ieee802154_disassoc_req_s disassocreq; /* MAC802154IOC_MLME_DISASSOC_REQUEST */
struct ieee802154_mlmereq_s getreq; /* MAC802154IOC_MLME_GET_REQUEST */
struct ieee802154_getreq_s getreq; /* MAC802154IOC_MLME_GET_REQUEST */
struct ieee802154_gtsreq_s gtsreq; /* MAC802154IOC_MLME_GTS_REQUEST */
struct ieee802154_orphanresp_s orphanresp; /* MAC802154IOC_MLME_ORPHAN_RESPONSE */
struct ieee802154_resetreq_s resetreq; /* MAC802154IOC_MLME_RESET_REQUEST */
include/nuttx/wireless/ieee802154/ieee802154_radio.h
+2 -18
View File
@@ -138,7 +138,7 @@ union ieee802154_radioarg_u
bool promisc; /* PHY802154IOC_GET/SET_EADDR */
uint8_t devmode; /* PHY802154IOC_GET/SET_DEVMODE */
int32_t txpwr; /* PHY802154IOC_GET/SET_TXPWR */
bool energy /* PHY802154IOC_ENERGYDETECT */
bool energy; /* PHY802154IOC_ENERGYDETECT */
struct ieee802154_cca_s cca; /* PHY802154IOC_GET/SET_CCA */
};
@@ -158,23 +158,7 @@ struct ieee802154_netradio_s
/* IEEE802.15.4 Radio Interface Operations **********************************/
struct ieee802154_cca_s
{
uint8_t use_ed : 1; /* CCA using ED */
uint8_t use_cs : 1; /* CCA using carrier sense */
uint8_t edth; /* Energy detection threshold for CCA */
uint8_t csth; /* Carrier sense threshold for CCA */
};
struct ieee802154_packet_s
{
uint8_t len;
uint8_t data[127];
uint8_t lqi;
uint8_t rssi;
};
struct ieee802154_radio_s;
struct ieee802154_radio_s; /* Forward reference */
struct ieee802154_radioops_s
{