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

Move apps/ieee802154 to apps/wireless/ieee802154

Browse Source
This commit is contained in:
Gregory Nutt 2017-04-11 13:39:07 -06:00
parent 77ae3bf02b
commit 988bb0cf9a
29 changed files with 73 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ieee802154/Kconfig → wireless/ieee802154/Kconfig
View File

@ -5,8 +5,8 @@
menu "IEEE 802.15.4 applications" menu "IEEE 802.15.4 applications"
source "$APPSDIR/ieee802154/common/Kconfig" source "$APPSDIR/wireless/ieee802154/common/Kconfig"
source "$APPSDIR/ieee802154/coord/Kconfig" source "$APPSDIR/wireless/ieee802154/coord/Kconfig"
source "$APPSDIR/ieee802154/i8sak/Kconfig" source "$APPSDIR/wireless/ieee802154/i8sak/Kconfig"
endmenu #ieee 802.15.4 apps endmenu #ieee 802.15.4 apps

4
ieee802154/Make.defs → wireless/ieee802154/Make.defs
View File

@ -1,5 +1,5 @@
############################################################################ ############################################################################
# apps/ieee802154/Make.defs # apps/wireless/ieee802154/Make.defs
# Adds selected applications to apps/ build # Adds selected applications to apps/ build
# #
# Copyright (C) 2012, 2015 Gregory Nutt. All rights reserved. # Copyright (C) 2012, 2015 Gregory Nutt. All rights reserved.
@ -34,4 +34,4 @@
# #
############################################################################ ############################################################################
include $(wildcard ieee802154/*/Make.defs) include $(wildcard wireless/ieee802154/*/Make.defs)

2
ieee802154/Makefile → wireless/ieee802154/Makefile
View File

@ -1,5 +1,5 @@
############################################################################ ############################################################################
# apps/ieee802154/Makefile # apps/wireless/ieee802154/Makefile
# #
# Copyright (C) 2014 Gregory Nutt. All rights reserved. # Copyright (C) 2014 Gregory Nutt. All rights reserved.
# Author: Sebastien Lorquet <sebastien@lorquet.fr> # Author: Sebastien Lorquet <sebastien@lorquet.fr>

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

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

0
ieee802154/common/Kconfig → wireless/ieee802154/common/Kconfig
View File

4
ieee802154/common/Make.defs → wireless/ieee802154/common/Make.defs
View File

@ -1,5 +1,5 @@
############################################################################ ############################################################################
# apps/nshlib/Make.defs # apps/wireless/ieee802154/Make.defs
# Adds selected applications to apps/ build # Adds selected applications to apps/ build
# #
# Copyright (C) 2012 Gregory Nutt. All rights reserved. # Copyright (C) 2012 Gregory Nutt. All rights reserved.
@ -35,6 +35,6 @@
############################################################################ ############################################################################
ifeq ($(CONFIG_IEEE802154_COMMON),y) ifeq ($(CONFIG_IEEE802154_COMMON),y)
CONFIGURED_APPS += ieee802154/common CONFIGURED_APPS += wireless/ieee802154/common
endif endif

8
ieee802154/common/Makefile → wireless/ieee802154/common/Makefile
View File

@ -1,5 +1,5 @@
############################################################################ ############################################################################
# apps/nshlib/Makefile # apps/wireless/ieee802154/Makefile
# #
# Copyright (C) 2011-2013 Gregory Nutt. All rights reserved. # Copyright (C) 2011-2013 Gregory Nutt. All rights reserved.
# Author: Gregory Nutt <gnutt@nuttx.org> # Author: Gregory Nutt <gnutt@nuttx.org>
@ -56,12 +56,12 @@ SRCS = $(ASRCS) $(CSRCS)
OBJS = $(AOBJS) $(COBJS) OBJS = $(AOBJS) $(COBJS)
ifeq ($(CONFIG_WINDOWS_NATIVE),y) ifeq ($(CONFIG_WINDOWS_NATIVE),y)
BIN = ..\..\libapps$(LIBEXT) BIN = ..\..\..\libapps$(LIBEXT)
else else
ifeq ($(WINTOOL),y) ifeq ($(WINTOOL),y)
BIN = ..\\..\\libapps$(LIBEXT) BIN = ..\\..\\..\\libapps$(LIBEXT)
else else
BIN = ../../libapps$(LIBEXT) BIN = ../../../libapps$(LIBEXT)
endif endif
endif endif

2
ieee802154/common/ieee802154_addrparse.c → wireless/ieee802154/common/ieee802154_addrparse.c
View File

@ -1,5 +1,5 @@
/**************************************************************************** /****************************************************************************
* ieee802154/common/ieee802154_addrparse.c * apps/wireless/ieee802154/common/ieee802154_addrparse.c
* *
* Copyright (C) 2015 Sebastien Lorquet. All rights reserved. * Copyright (C) 2015 Sebastien Lorquet. All rights reserved.
* Author: Sebastien Lorquet <sebastien@lorquet.fr> * Author: Sebastien Lorquet <sebastien@lorquet.fr>

2
ieee802154/common/ieee802154_addrstore.c → wireless/ieee802154/common/ieee802154_addrstore.c
View File

@ -1,5 +1,5 @@
/**************************************************************************** /****************************************************************************
* ieee802154/common/ieee802154_addrparse.c * apps/wireless/ieee802154/common/ieee802154_addrparse.c
* *
* Copyright (C) 2015 Sebastien Lorquet. All rights reserved. * Copyright (C) 2015 Sebastien Lorquet. All rights reserved.
* Author: Sebastien Lorquet <sebastien@lorquet.fr> * Author: Sebastien Lorquet <sebastien@lorquet.fr>

2
ieee802154/common/ieee802154_addrtostr.c → wireless/ieee802154/common/ieee802154_addrtostr.c
View File

@ -1,5 +1,5 @@
/**************************************************************************** /****************************************************************************
* ieee802154/common/ieee802154_addrtostr.c * apps/wireless/ieee802154/common/ieee802154_addrtostr.c
* *
* Copyright (C) 2015 Sebastien Lorquet. All rights reserved. * Copyright (C) 2015 Sebastien Lorquet. All rights reserved.
* Author: Sebastien Lorquet <sebastien@lorquet.fr> * Author: Sebastien Lorquet <sebastien@lorquet.fr>

2
ieee802154/common/ieee802154_getcca.c → wireless/ieee802154/common/ieee802154_getcca.c
View File

@ -1,5 +1,5 @@
/**************************************************************************** /****************************************************************************
* ieee802154/common/ieee802154_getcca.c * apps/wireless/ieee802154/common/ieee802154_getcca.c
* *
* Copyright (C) 2015 Sebastien Lorquet. All rights reserved. * Copyright (C) 2015 Sebastien Lorquet. All rights reserved.
* Author: Sebastien Lorquet <sebastien@lorquet.fr> * Author: Sebastien Lorquet <sebastien@lorquet.fr>

2
ieee802154/common/ieee802154_getchan.c → wireless/ieee802154/common/ieee802154_getchan.c
View File

@ -1,5 +1,5 @@
/**************************************************************************** /****************************************************************************
* ieee802154/common/ieee802154_getchan.c * apps/wireless/ieee802154/common/ieee802154_getchan.c
* *
* Copyright (C) 2015 Sebastien Lorquet. All rights reserved. * Copyright (C) 2015 Sebastien Lorquet. All rights reserved.
* Author: Sebastien Lorquet <sebastien@lorquet.fr> * Author: Sebastien Lorquet <sebastien@lorquet.fr>

2
ieee802154/common/ieee802154_setcca.c → wireless/ieee802154/common/ieee802154_setcca.c
View File

@ -1,5 +1,5 @@
/**************************************************************************** /****************************************************************************
* ieee802154/common/ieee802154_setchan.c * apps/wireless/ieee802154/common/ieee802154_setchan.c
* *
* Copyright (C) 2015 Sebastien Lorquet. All rights reserved. * Copyright (C) 2015 Sebastien Lorquet. All rights reserved.
* Author: Sebastien Lorquet <sebastien@lorquet.fr> * Author: Sebastien Lorquet <sebastien@lorquet.fr>

2
ieee802154/common/ieee802154_setchan.c → wireless/ieee802154/common/ieee802154_setchan.c
View File

@ -1,5 +1,5 @@
/**************************************************************************** /****************************************************************************
* ieee802154/common/ieee802154_setchan.c * apps/wireless/ieee802154/common/ieee802154_setchan.c
* *
* Copyright (C) 2015 Sebastien Lorquet. All rights reserved. * Copyright (C) 2015 Sebastien Lorquet. All rights reserved.
* Author: Sebastien Lorquet <sebastien@lorquet.fr> * Author: Sebastien Lorquet <sebastien@lorquet.fr>

2
ieee802154/common/ieee802154_setdevmode.c → wireless/ieee802154/common/ieee802154_setdevmode.c
View File

@ -1,5 +1,5 @@
/**************************************************************************** /****************************************************************************
* ieee802154/common/ieee802154_setdevmode.c * apps/wireless/ieee802154/common/ieee802154_setdevmode.c
* *
* Copyright (C) 2015 Sebastien Lorquet. All rights reserved. * Copyright (C) 2015 Sebastien Lorquet. All rights reserved.
* Author: Sebastien Lorquet <sebastien@lorquet.fr> * Author: Sebastien Lorquet <sebastien@lorquet.fr>

2
ieee802154/common/ieee802154_seteaddr.c → wireless/ieee802154/common/ieee802154_seteaddr.c
View File

@ -1,5 +1,5 @@
/**************************************************************************** /****************************************************************************
* ieee802154/common/ieee802154_eaddr.c * apps/wireless/ieee802154/common/ieee802154_eaddr.c
* *
* Copyright (C) 2015 Sebastien Lorquet. All rights reserved. * Copyright (C) 2015 Sebastien Lorquet. All rights reserved.
* Author: Sebastien Lorquet <sebastien@lorquet.fr> * Author: Sebastien Lorquet <sebastien@lorquet.fr>

2
ieee802154/common/ieee802154_setpanid.c → wireless/ieee802154/common/ieee802154_setpanid.c
View File

@ -1,5 +1,5 @@
/**************************************************************************** /****************************************************************************
* ieee802154/common/ieee802154_setpanid.c * apps/wireless/ieee802154/common/ieee802154_setpanid.c
* *
* Copyright (C) 2015 Sebastien Lorquet. All rights reserved. * Copyright (C) 2015 Sebastien Lorquet. All rights reserved.
* Author: Sebastien Lorquet <sebastien@lorquet.fr> * Author: Sebastien Lorquet <sebastien@lorquet.fr>

2
ieee802154/common/ieee802154_setpromisc.c → wireless/ieee802154/common/ieee802154_setpromisc.c
View File

@ -1,5 +1,5 @@
/**************************************************************************** /****************************************************************************
* ieee802154/common/ieee802154_setpromisc.c * apps/wireless/ieee802154/common/ieee802154_setpromisc.c
* *
* Copyright (C) 2015 Sebastien Lorquet. All rights reserved. * Copyright (C) 2015 Sebastien Lorquet. All rights reserved.
* Author: Sebastien Lorquet <sebastien@lorquet.fr> * Author: Sebastien Lorquet <sebastien@lorquet.fr>

2
ieee802154/common/ieee802154_setsaddr.c → wireless/ieee802154/common/ieee802154_setsaddr.c
View File

@ -1,5 +1,5 @@
/**************************************************************************** /****************************************************************************
* ieee802154/common/ieee802154_setsaddr.c * apps/wireless/ieee802154/common/ieee802154_setsaddr.c
* *
* Copyright (C) 2015 Sebastien Lorquet. All rights reserved. * Copyright (C) 2015 Sebastien Lorquet. All rights reserved.
* Author: Sebastien Lorquet <sebastien@lorquet.fr> * Author: Sebastien Lorquet <sebastien@lorquet.fr>

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

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

0
ieee802154/coord/Kconfig → wireless/ieee802154/coord/Kconfig
View File

4
ieee802154/coord/Make.defs → wireless/ieee802154/coord/Make.defs
View File

@ -1,5 +1,5 @@
############################################################################ ############################################################################
# apps/ieee802154/coord/Make.defs # apps/wireless/ieee802154/coord/Make.defs
# Adds selected applications to apps/ build # Adds selected applications to apps/ build
# #
# Copyright (C) 2015 Gregory Nutt. All rights reserved. # Copyright (C) 2015 Gregory Nutt. All rights reserved.
@ -35,5 +35,5 @@
############################################################################ ############################################################################
ifeq ($(CONFIG_IEEE802154_COORD),y) ifeq ($(CONFIG_IEEE802154_COORD),y)
CONFIGURED_APPS += ieee802154/coord CONFIGURED_APPS += wireless/ieee802154/coord
endif endif

8
ieee802154/coord/Makefile → wireless/ieee802154/coord/Makefile
View File

@ -1,5 +1,5 @@
############################################################################ ############################################################################
# apps/ieee802154/coord/Makefile # apps/wireless/ieee802154/coord/Makefile
# #
# Copyright (C) 2014-2015 Gregory Nutt. All rights reserved. # Copyright (C) 2014-2015 Gregory Nutt. All rights reserved.
# Copyright (C) 2014-2015 Sebastien Lorquet. All rights reserved. # Copyright (C) 2014-2015 Sebastien Lorquet. All rights reserved.
@ -62,12 +62,12 @@ ifneq ($(CONFIG_BUILD_KERNEL),y)
endif endif
ifeq ($(CONFIG_WINDOWS_NATIVE),y) ifeq ($(CONFIG_WINDOWS_NATIVE),y)
BIN = ..\..\libapps$(LIBEXT) BIN = ..\..\..\libapps$(LIBEXT)
else else
ifeq ($(WINTOOL),y) ifeq ($(WINTOOL),y)
BIN = ..\\..\\libapps$(LIBEXT) BIN = ..\\..\\..\\libapps$(LIBEXT)
else else
BIN = ../../libapps$(LIBEXT) BIN = ../../../libapps$(LIBEXT)
endif endif
endif endif

3
ieee802154/coord/coord_main.c → wireless/ieee802154/coord/coord_main.c
View File

@ -1,5 +1,5 @@
/**************************************************************************** /****************************************************************************
* apps/ieee802154/coord/coord_main.c * apps/wireless/ieee802154/coord/coord_main.c
* *
* Copyright (C) 2014-2015 Gregory Nutt. All rights reserved. * Copyright (C) 2014-2015 Gregory Nutt. All rights reserved.
* Copyright (C) 2014-2015 Sebastien Lorquet. All rights reserved. * Copyright (C) 2014-2015 Sebastien Lorquet. All rights reserved.
@ -138,7 +138,6 @@ static pthread_t g_daemon_pid;
static int coord_beacon(FAR struct ieee_coord_s *coord) static int coord_beacon(FAR struct ieee_coord_s *coord)
{ {
FAR struct ieee_frame_s *rx = &coord->rxbuf;
printf("Beacon!\n"); printf("Beacon!\n");
return 0; return 0;
} }

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

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

0
ieee802154/i8sak/Kconfig → wireless/ieee802154/i8sak/Kconfig
View File

4
ieee802154/i8sak/Make.defs → wireless/ieee802154/i8sak/Make.defs
View File

@ -1,5 +1,5 @@
############################################################################ ############################################################################
# apps/ieee802154/i8sak/Make.defs # apps/wireless/ieee802154/i8sak/Make.defs
# Adds selected applications to apps/ build # Adds selected applications to apps/ build
# #
# Copyright (C) 2015 Gregory Nutt. All rights reserved. # Copyright (C) 2015 Gregory Nutt. All rights reserved.
@ -35,5 +35,5 @@
############################################################################ ############################################################################
ifeq ($(CONFIG_IEEE802154_I8SAK),y) ifeq ($(CONFIG_IEEE802154_I8SAK),y)
CONFIGURED_APPS += ieee802154/i8sak CONFIGURED_APPS += wireless/ieee802154/i8sak
endif endif

8
ieee802154/i8sak/Makefile → wireless/ieee802154/i8sak/Makefile
View File

@ -1,5 +1,5 @@
############################################################################ ############################################################################
# apps/ieee802154/i8sak/Makefile # apps/wireless/ieee802154/i8sak/Makefile
# #
# Copyright (C) 2014-2015 Gregory Nutt. All rights reserved. # Copyright (C) 2014-2015 Gregory Nutt. All rights reserved.
# Copyright (C) 2014-2015 Sebastien Lorquet. All rights reserved. # Copyright (C) 2014-2015 Sebastien Lorquet. All rights reserved.
@ -62,12 +62,12 @@ ifneq ($(CONFIG_BUILD_KERNEL),y)
endif endif
ifeq ($(CONFIG_WINDOWS_NATIVE),y) ifeq ($(CONFIG_WINDOWS_NATIVE),y)
BIN = ..\..\libapps$(LIBEXT) BIN = ..\..\..\libapps$(LIBEXT)
else else
ifeq ($(WINTOOL),y) ifeq ($(WINTOOL),y)
BIN = ..\\..\\libapps$(LIBEXT) BIN = ..\\..\\..\\libapps$(LIBEXT)
else else
BIN = ../../libapps$(LIBEXT) BIN = ../../../libapps$(LIBEXT)
endif endif
endif endif

6
ieee802154/i8sak/i8sak_main.c → wireless/ieee802154/i8sak/i8sak_main.c
View File

@ -1,5 +1,5 @@
/**************************************************************************** /****************************************************************************
* ieee802154/i8sak/i8sak_main.c * apps/wireless/ieee802154/i8sak/i8sak_main.c
* IEEE 802.15.4 Swiss Army Knife * IEEE 802.15.4 Swiss Army Knife
* *
* Copyright (C) 2014-2015 Gregory Nutt. All rights reserved. * Copyright (C) 2014-2015 Gregory Nutt. All rights reserved.
@ -346,7 +346,7 @@ static FAR void *sniff(FAR void *arg)
display(chan, &g_rxpacket, sa->verbose); display(chan, &g_rxpacket, sa->verbose);
} }
return (FAR void*)ret; return (FAR void *)((uintptr_t)ret);
} }
/**************************************************************************** /****************************************************************************
@ -540,7 +540,7 @@ int i8_main(int argc, char *argv[])
args.fd = fd; args.fd = fd;
args.verbose = FALSE; args.verbose = FALSE;
ret = (int)sniff(&args); ret = (int)((intptr_t)sniff(&args));
ret = ieee802154_setpromisc(fd, FALSE); ret = ieee802154_setpromisc(fd, FALSE);