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

Merged in merlin17/apps/ieee802154 (pull request #73)

Browse Source 
ieee802154: Removes ieee802154.h references

Approved-by: Gregory Nutt <gnutt@nuttx.org>
This commit is contained in:
Anthony Merlino 2017-03-29 16:49:12 +00:00 committed by Gregory Nutt
commit a82ac83463
9 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ieee802154/common/ieee802154_addrparse.c
View File

@ -41,7 +41,8 @@
#include <stdint.h>
#include <string.h>
#include <errno.h>
#include <nuttx/wireless/ieee802154/ieee802154.h>
#include <nuttx/wireless/ieee802154/ieee802154_radio.h>
#include <nuttx/wireless/ieee802154/ieee802154_mac.h>
#include "ieee802154/ieee802154.h"
@ -102,7 +103,7 @@ int ieee802154_addrparse(FAR struct ieee802154_packet_s *packet,
{
/* If PANID compression, src PAN ID is same as dest */
if(frame_ctrl & IEEE802154_FRAMECTRL_INTRA)
if(frame_ctrl & IEEE802154_FRAMECTRL_PANIDCOMP)
{
src->ia_panid = dest->ia_panid;
}

9
ieee802154/common/ieee802154_addrstore.c
View File

@ -41,7 +41,8 @@
#include <stdint.h>
#include <string.h>
#include <errno.h>
#include <nuttx/wireless/ieee802154/ieee802154.h>
#include <nuttx/wireless/ieee802154/ieee802154_radio.h>
#include <nuttx/wireless/ieee802154/ieee802154_mac.h>
#include "ieee802154/ieee802154.h"
@ -102,7 +103,7 @@ int ieee802154_addrstore(FAR struct ieee802154_packet_s *packet,
/* Clear the PAN ID Compression Field */
frame_ctrl &= ~IEEE802154_FRAMECTRL_INTRA;
frame_ctrl &= ~IEEE802154_FRAMECTRL_PANIDCOMP;
if( (dest != NULL && dest->ia_mode != IEEE802154_ADDRMODE_NONE) &&
(src != NULL && src->ia_mode != IEEE802154_ADDRMODE_NONE) )
@ -111,7 +112,7 @@ int ieee802154_addrstore(FAR struct ieee802154_packet_s *packet,
if( dest->ia_panid == src->ia_panid)
{
frame_ctrl |= IEEE802154_FRAMECTRL_INTRA;
frame_ctrl |= IEEE802154_FRAMECTRL_PANIDCOMP;
}
}
@ -131,7 +132,7 @@ int ieee802154_addrstore(FAR struct ieee802154_packet_s *packet,
{
/* Add src pan id if it was not compressed before */
if(!(frame_ctrl & IEEE802154_FRAMECTRL_INTRA))
if(!(frame_ctrl & IEEE802154_FRAMECTRL_PANIDCOMP))
{
memcpy(packet->data+index, &src->ia_panid, 2);
index += 2; /*skip src pan id*/

3
ieee802154/common/ieee802154_addrtostr.c
View File

@ -40,7 +40,8 @@
#include <nuttx/config.h>
#include <stdint.h>
#include <stdio.h>
#include <nuttx/wireless/ieee802154/ieee802154.h>
#include <nuttx/wireless/ieee802154/ieee802154_mac.h>
#include "ieee802154/ieee802154.h"
/****************************************************************************

2
ieee802154/common/ieee802154_getcca.c
View File

@ -42,7 +42,7 @@
#include <stdio.h>
#include <sys/ioctl.h>
#include <nuttx/fs/ioctl.h>
#include <nuttx/wireless/ieee802154/ieee802154.h>
#include <nuttx/wireless/ieee802154/ieee802154_radio.h>
#include "ieee802154/ieee802154.h"

4
ieee802154/common/ieee802154_getchan.c
View File

@ -42,7 +42,7 @@
#include <stdio.h>
#include <sys/ioctl.h>
#include <nuttx/fs/ioctl.h>
#include <nuttx/wireless/ieee802154/ieee802154.h>
#include <nuttx/wireless/ieee802154/ieee802154_radio.h>
#include "ieee802154/ieee802154.h"
@ -52,7 +52,7 @@
int ieee802154_getchan(int fd, FAR uint8_t *chan)
{
int ret = ioctl(fd, PHY802154IOC_GET_CHAN, (unsigned long)chan );
int ret = ioctl(fd, PHY802154IOC_GET_CHAN, (unsigned long)chan);
if (ret < 0)
{
printf("PHY802154IOC_GET_CHAN failed\n");

2
ieee802154/common/ieee802154_setcca.c
View File

@ -42,7 +42,7 @@
#include <stdio.h>
#include <sys/ioctl.h>
#include <nuttx/fs/ioctl.h>
#include <nuttx/wireless/ieee802154/ieee802154.h>
#include <nuttx/wireless/ieee802154/ieee802154_radio.h>
#include "ieee802154/ieee802154.h"

2
ieee802154/coord/coord_main.c
View File

@ -68,7 +68,7 @@
#include <errno.h>
#include <signal.h>
#include <nuttx/wireless/ieee802154/ieee802154.h>
#include <nuttx/wireless/ieee802154/ieee802154_radio.h>
#include <nuttx/wireless/ieee802154/ieee802154_mac.h>
#include "ieee802154/ieee802154.h"

2
ieee802154/i8sak/i8sak_main.c
View File

@ -59,7 +59,7 @@
#include <fcntl.h>
#include <sys/ioctl.h>
#include <nuttx/fs/ioctl.h>
#include <nuttx/wireless/ieee802154/ieee802154.h>
#include <nuttx/wireless/ieee802154/ieee802154_radio.h>
#include <nuttx/wireless/ieee802154/ieee802154_mac.h>
#include "ieee802154/ieee802154.h"

3
include/ieee802154/ieee802154.h
View File

@ -38,8 +38,9 @@
#include <stdint.h>
#include <stdbool.h>
#include <nuttx/wireless/ieee802154/ieee802154.h>
#include <nuttx/wireless/ieee802154/ieee802154_radio.h>
#include <nuttx/wireless/ieee802154/ieee802154_mac.h>
int ieee802154_setchan (int fd, uint8_t chan);
int ieee802154_getchan (int fd, FAR uint8_t *chan);