From af76613c4c48bf7dd9f654d009cdde36b26d2154 Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Fri, 21 Apr 2017 07:49:55 -0600 Subject: [PATCH] Move apps/include/ieee802154/ieee802154.h to apps/include/wireless/ieee802154. Add file that I forgot to add in last commit. --- include/{ieee802154 => wireless}/ieee802154.h | 8 +-- wireless/ieee802154/coord/coord_main.c | 2 +- wireless/ieee802154/i8sak/i8sak_main.c | 2 +- wireless/ieee802154/libradio/Makefile | 5 +- .../ieee802154/libradio/ieee802154_getcca.c | 2 +- .../ieee802154/libradio/ieee802154_getchan.c | 2 +- .../ieee802154/libradio/ieee802154_getpanid.c | 71 +++++++++++++++++++ .../ieee802154/libradio/ieee802154_setcca.c | 2 +- .../ieee802154/libradio/ieee802154_setchan.c | 2 +- .../libradio/ieee802154_setdevmode.c | 2 +- .../ieee802154/libradio/ieee802154_seteaddr.c | 2 +- .../ieee802154/libradio/ieee802154_setpanid.c | 2 +- .../libradio/ieee802154_setpromisc.c | 2 +- .../ieee802154/libradio/ieee802154_setsaddr.c | 2 +- wireless/ieee802154/libutils/.gitignore | 11 +++ .../libutils/ieee802154_addrparse.c | 2 +- .../libutils/ieee802154_addrstore.c | 2 +- .../libutils/ieee802154_addrtostr.c | 2 +- 18 files changed, 103 insertions(+), 20 deletions(-) rename include/{ieee802154 => wireless}/ieee802154.h (94%) create mode 100644 wireless/ieee802154/libradio/ieee802154_getpanid.c create mode 100644 wireless/ieee802154/libutils/.gitignore diff --git a/include/ieee802154/ieee802154.h b/include/wireless/ieee802154.h similarity index 94% rename from include/ieee802154/ieee802154.h rename to include/wireless/ieee802154.h index 57c97d86a..1cc645cb4 100644 --- a/include/ieee802154/ieee802154.h +++ b/include/wireless/ieee802154.h @@ -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 @@ -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 */ diff --git a/wireless/ieee802154/coord/coord_main.c b/wireless/ieee802154/coord/coord_main.c index 05287bf28..a644cbeff 100644 --- a/wireless/ieee802154/coord/coord_main.c +++ b/wireless/ieee802154/coord/coord_main.c @@ -71,7 +71,7 @@ #include #include -#include "ieee802154/ieee802154.h" +#include "wireless/ieee802154.h" /**************************************************************************** * Pre-processor Definitions diff --git a/wireless/ieee802154/i8sak/i8sak_main.c b/wireless/ieee802154/i8sak/i8sak_main.c index 628545404..931b3d847 100644 --- a/wireless/ieee802154/i8sak/i8sak_main.c +++ b/wireless/ieee802154/i8sak/i8sak_main.c @@ -62,7 +62,7 @@ #include #include -#include "ieee802154/ieee802154.h" +#include "wireless/ieee802154.h" /**************************************************************************** * Private Types diff --git a/wireless/ieee802154/libradio/Makefile b/wireless/ieee802154/libradio/Makefile index f9c75be92..4f3ec9314 100644 --- a/wireless/ieee802154/libradio/Makefile +++ b/wireless/ieee802154/libradio/Makefile @@ -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 diff --git a/wireless/ieee802154/libradio/ieee802154_getcca.c b/wireless/ieee802154/libradio/ieee802154_getcca.c index ab39ee0ae..6636f5d4c 100644 --- a/wireless/ieee802154/libradio/ieee802154_getcca.c +++ b/wireless/ieee802154/libradio/ieee802154_getcca.c @@ -48,7 +48,7 @@ #include #include -#include "ieee802154/ieee802154.h" +#include "wireless/ieee802154.h" /**************************************************************************** * Public Functions diff --git a/wireless/ieee802154/libradio/ieee802154_getchan.c b/wireless/ieee802154/libradio/ieee802154_getchan.c index 6ca6c3c66..fc11bd386 100644 --- a/wireless/ieee802154/libradio/ieee802154_getchan.c +++ b/wireless/ieee802154/libradio/ieee802154_getchan.c @@ -45,7 +45,7 @@ #include #include -#include "ieee802154/ieee802154.h" +#include "wireless/ieee802154.h" /**************************************************************************** * Public Functions diff --git a/wireless/ieee802154/libradio/ieee802154_getpanid.c b/wireless/ieee802154/libradio/ieee802154_getpanid.c new file mode 100644 index 000000000..db2ac0b96 --- /dev/null +++ b/wireless/ieee802154/libradio/ieee802154_getpanid.c @@ -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 + * + * 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 + +#include +#include +#include +#include + +#include +#include + +#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; +} diff --git a/wireless/ieee802154/libradio/ieee802154_setcca.c b/wireless/ieee802154/libradio/ieee802154_setcca.c index cf2cfef33..aef66044c 100644 --- a/wireless/ieee802154/libradio/ieee802154_setcca.c +++ b/wireless/ieee802154/libradio/ieee802154_setcca.c @@ -48,7 +48,7 @@ #include #include -#include "ieee802154/ieee802154.h" +#include "wireless/ieee802154.h" /**************************************************************************** * Public Functions diff --git a/wireless/ieee802154/libradio/ieee802154_setchan.c b/wireless/ieee802154/libradio/ieee802154_setchan.c index 58af0e493..c54ade1c4 100644 --- a/wireless/ieee802154/libradio/ieee802154_setchan.c +++ b/wireless/ieee802154/libradio/ieee802154_setchan.c @@ -44,7 +44,7 @@ #include #include #include -#include "ieee802154/ieee802154.h" +#include "wireless/ieee802154.h" /**************************************************************************** * Public Functions diff --git a/wireless/ieee802154/libradio/ieee802154_setdevmode.c b/wireless/ieee802154/libradio/ieee802154_setdevmode.c index 66aed7492..2d6d66506 100644 --- a/wireless/ieee802154/libradio/ieee802154_setdevmode.c +++ b/wireless/ieee802154/libradio/ieee802154_setdevmode.c @@ -44,7 +44,7 @@ #include #include #include -#include "ieee802154/ieee802154.h" +#include "wireless/ieee802154.h" /**************************************************************************** * Public Functions diff --git a/wireless/ieee802154/libradio/ieee802154_seteaddr.c b/wireless/ieee802154/libradio/ieee802154_seteaddr.c index 5f08ca062..3df83a761 100644 --- a/wireless/ieee802154/libradio/ieee802154_seteaddr.c +++ b/wireless/ieee802154/libradio/ieee802154_seteaddr.c @@ -48,7 +48,7 @@ #include #include -#include "ieee802154/ieee802154.h" +#include "wireless/ieee802154.h" /**************************************************************************** * Public Functions diff --git a/wireless/ieee802154/libradio/ieee802154_setpanid.c b/wireless/ieee802154/libradio/ieee802154_setpanid.c index 4a639cedc..f5880c18d 100644 --- a/wireless/ieee802154/libradio/ieee802154_setpanid.c +++ b/wireless/ieee802154/libradio/ieee802154_setpanid.c @@ -44,7 +44,7 @@ #include #include #include -#include "ieee802154/ieee802154.h" +#include "wireless/ieee802154.h" int ieee802154_setpanid(int fd, uint16_t panid) { diff --git a/wireless/ieee802154/libradio/ieee802154_setpromisc.c b/wireless/ieee802154/libradio/ieee802154_setpromisc.c index 2b8fbbace..7f1581e2d 100644 --- a/wireless/ieee802154/libradio/ieee802154_setpromisc.c +++ b/wireless/ieee802154/libradio/ieee802154_setpromisc.c @@ -45,7 +45,7 @@ #include #include #include -#include "ieee802154/ieee802154.h" +#include "wireless/ieee802154.h" /**************************************************************************** * Public Functions diff --git a/wireless/ieee802154/libradio/ieee802154_setsaddr.c b/wireless/ieee802154/libradio/ieee802154_setsaddr.c index c7327a5f4..4ef7c4d7c 100644 --- a/wireless/ieee802154/libradio/ieee802154_setsaddr.c +++ b/wireless/ieee802154/libradio/ieee802154_setsaddr.c @@ -44,7 +44,7 @@ #include #include #include -#include "ieee802154/ieee802154.h" +#include "wireless/ieee802154.h" /**************************************************************************** * Public Functions diff --git a/wireless/ieee802154/libutils/.gitignore b/wireless/ieee802154/libutils/.gitignore new file mode 100644 index 000000000..fa1ec7579 --- /dev/null +++ b/wireless/ieee802154/libutils/.gitignore @@ -0,0 +1,11 @@ +/Make.dep +/.depend +/.built +/*.asm +/*.obj +/*.rel +/*.lst +/*.sym +/*.adb +/*.lib +/*.src diff --git a/wireless/ieee802154/libutils/ieee802154_addrparse.c b/wireless/ieee802154/libutils/ieee802154_addrparse.c index f8fa7c1cd..3dce1e5e7 100644 --- a/wireless/ieee802154/libutils/ieee802154_addrparse.c +++ b/wireless/ieee802154/libutils/ieee802154_addrparse.c @@ -46,7 +46,7 @@ #include #include -#include "ieee802154/ieee802154.h" +#include "wireless/ieee802154.h" /**************************************************************************** * Public Functions diff --git a/wireless/ieee802154/libutils/ieee802154_addrstore.c b/wireless/ieee802154/libutils/ieee802154_addrstore.c index 0dd900a2a..31115530e 100644 --- a/wireless/ieee802154/libutils/ieee802154_addrstore.c +++ b/wireless/ieee802154/libutils/ieee802154_addrstore.c @@ -44,7 +44,7 @@ #include #include -#include "ieee802154/ieee802154.h" +#include "wireless/ieee802154.h" /**************************************************************************** * Public Functions diff --git a/wireless/ieee802154/libutils/ieee802154_addrtostr.c b/wireless/ieee802154/libutils/ieee802154_addrtostr.c index 5618f53c4..42c9ed02a 100644 --- a/wireless/ieee802154/libutils/ieee802154_addrtostr.c +++ b/wireless/ieee802154/libutils/ieee802154_addrtostr.c @@ -42,7 +42,7 @@ #include #include -#include "ieee802154/ieee802154.h" +#include "wireless/ieee802154.h" /**************************************************************************** * Public Functions