Move apps/include/ieee802154/ieee802154.h to apps/include/wireless/ieee802154. Add file that I forgot to add in last commit.

This commit is contained in:
Gregory Nutt 2017-04-21 07:49:55 -06:00
parent eb8121b9f7
commit af76613c4c
18 changed files with 103 additions and 20 deletions

View File

@ -1,5 +1,5 @@
/****************************************************************************
* apps/include/ieee802154/ieee802154.h
* apps/include/wireless/ieee802154.h
*
* Copyright(C) 2015 Sebastien Lorquet. All rights reserved.
* Author: Sebastien Lorquet <sebastien@lorquet.fr>
@ -33,8 +33,8 @@
*
****************************************************************************/
#ifndef __APPS_INCLUDE_IEEE802154_IEEE802154_H
#define __APPS_INCLUDE_IEEE802154_IEEE802154_H
#ifndef __APPS_INCLUDE_WIRELESS_IEEE802154_H
#define __APPS_INCLUDE_WIRELESS_IEEE802154_H
/****************************************************************************
* Included Files
@ -80,4 +80,4 @@ int ieee802154_addrstore(FAR struct ieee802154_packet_s *inPacket,
int ieee802154_addrtostr(FAR char *buf, int len,
FAR struct ieee802154_addr_s *addr);
#endif /*__APPS_INCLUDE_IEEE802154_IEEE802154_H */
#endif /*__APPS_INCLUDE_WIRELESS_IEEE802154_H */

View File

@ -71,7 +71,7 @@
#include <nuttx/wireless/ieee802154/ieee802154_radio.h>
#include <nuttx/wireless/ieee802154/ieee802154_mac.h>
#include "ieee802154/ieee802154.h"
#include "wireless/ieee802154.h"
/****************************************************************************
* Pre-processor Definitions

View File

@ -62,7 +62,7 @@
#include <nuttx/wireless/ieee802154/ieee802154_radio.h>
#include <nuttx/wireless/ieee802154/ieee802154_mac.h>
#include "ieee802154/ieee802154.h"
#include "wireless/ieee802154.h"
/****************************************************************************
* Private Types

View File

@ -41,8 +41,9 @@ include $(APPDIR)/Make.defs
ASRCS =
CSRCS = ieee802154_setchan.c ieee802154_getchan.c
CSRCS += ieee802154_setpanid.c
CSRCS += ieee802154_seteaddr.c ieee802154_setsaddr.c
CSRCS += ieee802154_setpanid.c ieee802154_getpanid.c
CSRCS += ieee802154_seteaddr.c ieee802154_geteaddr.c
CSRCS += ieee802154_setsaddr.c
CSRCS += ieee802154_setpromisc.c ieee802154_setdevmode.c
CSRCS += ieee802154_setcca.c ieee802154_getcca.c

View File

@ -48,7 +48,7 @@
#include <nuttx/fs/ioctl.h>
#include <nuttx/wireless/ieee802154/ieee802154_radio.h>
#include "ieee802154/ieee802154.h"
#include "wireless/ieee802154.h"
/****************************************************************************
* Public Functions

View File

@ -45,7 +45,7 @@
#include <nuttx/fs/ioctl.h>
#include <nuttx/wireless/ieee802154/ieee802154_radio.h>
#include "ieee802154/ieee802154.h"
#include "wireless/ieee802154.h"
/****************************************************************************
* Public Functions

View File

@ -0,0 +1,71 @@
/****************************************************************************
* apps/wireless/ieee802154/libradio/ieee802154_getpanid.c
*
* Copyright (C) 2017 Gregory Nutt. All rights reserved.
* Copyright (C) 2015 Sebastien Lorquet. All rights reserved.
* Author: Sebastien Lorquet <sebastien@lorquet.fr>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
* 3. Neither the name NuttX nor the names of its contributors may be
* used to endorse or promote products derived from this software
* without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
* FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
* COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
* BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
* OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
* AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
* ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*
****************************************************************************/
/****************************************************************************
* Included Files
****************************************************************************/
#include <nuttx/config.h>
#include <sys/ioctl.h>
#include <stdint.h>
#include <stdio.h>
#include <errno.h>
#include <nuttx/fs/ioctl.h>
#include <nuttx/wireless/ieee802154/ieee802154_radio.h>
#include "wireless/ieee802154.h"
/****************************************************************************
* Public Functions
****************************************************************************/
int ieee802154_getpanid(int fd, FAR uint16_t *panid)
{
union ieee802154_radioarg_u arg;
int ret = ioctl(fd, PHY802154IOC_GET_PANID,
(unsigned long)((uintptr_t)&arg));
if (ret < 0)
{
int errcode = errno;
printf("PHY802154IOC_GET_PANID failed: %d\n", errcode);
}
*panid = arg.panid;
return ret;
}

View File

@ -48,7 +48,7 @@
#include <nuttx/fs/ioctl.h>
#include <nuttx/wireless/ieee802154/ieee802154_radio.h>
#include "ieee802154/ieee802154.h"
#include "wireless/ieee802154.h"
/****************************************************************************
* Public Functions

View File

@ -44,7 +44,7 @@
#include <sys/ioctl.h>
#include <nuttx/fs/ioctl.h>
#include <nuttx/wireless/ieee802154/ieee802154_radio.h>
#include "ieee802154/ieee802154.h"
#include "wireless/ieee802154.h"
/****************************************************************************
* Public Functions

View File

@ -44,7 +44,7 @@
#include <sys/ioctl.h>
#include <nuttx/fs/ioctl.h>
#include <nuttx/wireless/ieee802154/ieee802154_radio.h>
#include "ieee802154/ieee802154.h"
#include "wireless/ieee802154.h"
/****************************************************************************
* Public Functions

View File

@ -48,7 +48,7 @@
#include <nuttx/fs/ioctl.h>
#include <nuttx/wireless/ieee802154/ieee802154_radio.h>
#include "ieee802154/ieee802154.h"
#include "wireless/ieee802154.h"
/****************************************************************************
* Public Functions

View File

@ -44,7 +44,7 @@
#include <sys/ioctl.h>
#include <nuttx/fs/ioctl.h>
#include <nuttx/wireless/ieee802154/ieee802154_radio.h>
#include "ieee802154/ieee802154.h"
#include "wireless/ieee802154.h"
int ieee802154_setpanid(int fd, uint16_t panid)
{

View File

@ -45,7 +45,7 @@
#include <sys/ioctl.h>
#include <nuttx/fs/ioctl.h>
#include <nuttx/wireless/ieee802154/ieee802154_radio.h>
#include "ieee802154/ieee802154.h"
#include "wireless/ieee802154.h"
/****************************************************************************
* Public Functions

View File

@ -44,7 +44,7 @@
#include <sys/ioctl.h>
#include <nuttx/fs/ioctl.h>
#include <nuttx/wireless/ieee802154/ieee802154_radio.h>
#include "ieee802154/ieee802154.h"
#include "wireless/ieee802154.h"
/****************************************************************************
* Public Functions

11
wireless/ieee802154/libutils/.gitignore vendored Normal file
View File

@ -0,0 +1,11 @@
/Make.dep
/.depend
/.built
/*.asm
/*.obj
/*.rel
/*.lst
/*.sym
/*.adb
/*.lib
/*.src

View File

@ -46,7 +46,7 @@
#include <nuttx/wireless/ieee802154/ieee802154_radio.h>
#include <nuttx/wireless/ieee802154/ieee802154_mac.h>
#include "ieee802154/ieee802154.h"
#include "wireless/ieee802154.h"
/****************************************************************************
* Public Functions

View File

@ -44,7 +44,7 @@
#include <nuttx/wireless/ieee802154/ieee802154_radio.h>
#include <nuttx/wireless/ieee802154/ieee802154_mac.h>
#include "ieee802154/ieee802154.h"
#include "wireless/ieee802154.h"
/****************************************************************************
* Public Functions

View File

@ -42,7 +42,7 @@
#include <stdio.h>
#include <nuttx/wireless/ieee802154/ieee802154_mac.h>
#include "ieee802154/ieee802154.h"
#include "wireless/ieee802154.h"
/****************************************************************************
* Public Functions