From 2f28ca86c294ea9941357f4b72d1eab3271830dd Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Fri, 26 Feb 2016 10:08:36 -0600 Subject: [PATCH] Clean up some naming; rename net/ieee802154 to net/6lowpan --- drivers/Kconfig | 2 +- drivers/ieee802154/Make.defs | 4 ++-- include/nuttx/net/arp.h | 2 +- include/nuttx/net/ieee802154.h | 4 ++-- include/nuttx/net/net.h | 2 +- include/sys/socket.h | 2 +- .../ieee802154.h => 6lowpan/6lowpan.h} | 2 +- net/{ieee802154 => 6lowpan}/Kconfig | 23 ++++++++----------- net/{ieee802154 => 6lowpan}/Make.defs | 12 +++++----- net/Kconfig | 2 +- net/Makefile | 2 +- net/netdev/netdev_register.c | 2 +- 12 files changed, 28 insertions(+), 31 deletions(-) rename net/{ieee802154/ieee802154.h => 6lowpan/6lowpan.h} (98%) rename net/{ieee802154 => 6lowpan}/Kconfig (70%) rename net/{ieee802154 => 6lowpan}/Make.defs (90%) diff --git a/drivers/Kconfig b/drivers/Kconfig index e2396dcc2e..3493d02c00 100644 --- a/drivers/Kconfig +++ b/drivers/Kconfig @@ -374,7 +374,7 @@ source drivers/ioexpander/Kconfig endif # IOEXPANDER menuconfig IEEE802154 - bool "IEEE 802.15-4 Device Support" + bool "IEEE 802.15.4 Device Support" default n depends on EXPERIMENTAL ---help--- diff --git a/drivers/ieee802154/Make.defs b/drivers/ieee802154/Make.defs index f45e479281..88c20db518 100644 --- a/drivers/ieee802154/Make.defs +++ b/drivers/ieee802154/Make.defs @@ -33,11 +33,11 @@ # ############################################################################ -# Include nothing if IEEE 802.15-4 is disabled +# Include nothing if IEEE 802.15.4 is disabled ifeq ($(CONFIG_IEEE802154),y) -# Include common IEEE 802.15-4 +# Include common IEEE 802.15.4 # Include IEEE 802.15.4 drivers diff --git a/include/nuttx/net/arp.h b/include/nuttx/net/arp.h index 4768c9fdff..236053ce70 100644 --- a/include/nuttx/net/arp.h +++ b/include/nuttx/net/arp.h @@ -69,7 +69,7 @@ */ #define ARPHRD_ETHER 1 /* Ethernet */ -#define ARPHRD_IEEE802154 804 /* IEEE 802-15-4 */ +#define ARPHRD_IEEE802154 804 /* IEEE 802.15.4 */ /**************************************************************************** * Public Types diff --git a/include/nuttx/net/ieee802154.h b/include/nuttx/net/ieee802154.h index cb3a3ef046..1ac577cea2 100644 --- a/include/nuttx/net/ieee802154.h +++ b/include/nuttx/net/ieee802154.h @@ -64,8 +64,8 @@ * Name: ieee802154_input * * Description: - * This function provides the interface between IEEE 802.15-4 device driver - * and IEEE 802.15-4 socket logic. All IPv6 frames that are received should + * This function provides the interface between IEEE 802.15.4 device driver + * and IEEE 802.15.4 socket logic. All IPv6 frames that are received should * be provided to ieee802154_input(). * * Input Parameters: diff --git a/include/nuttx/net/net.h b/include/nuttx/net/net.h index 86de2a18fa..45c84811ee 100644 --- a/include/nuttx/net/net.h +++ b/include/nuttx/net/net.h @@ -79,7 +79,7 @@ enum net_lltype_e NET_LL_LOOPBACK, /* Local loopback */ NET_LL_SLIP, /* Serial Line Internet Protocol (SLIP) */ NET_LL_TUN, /* TUN Virtual Network Device */ - NET_LL_IEEE802154 /* IEEE 802.15-4 */ + NET_LL_IEEE802154 /* IEEE 802.15.4 */ }; /* This defines a bitmap big enough for one bit for each socket option */ diff --git a/include/sys/socket.h b/include/sys/socket.h index 71710d308e..7276fe2700 100644 --- a/include/sys/socket.h +++ b/include/sys/socket.h @@ -64,7 +64,7 @@ #define PF_ATMPVC 8 /* Access to raw ATM PVCs */ #define PF_APPLETALK 9 /* Appletalk */ #define PF_PACKET 10 /* Low level packet interface */ -#define PF_IEEE802154 11 /* IEEE802.15-4 sockets */ +#define PF_IEEE802154 11 /* IEEE 802.15.4 sockets */ /* Address families */ diff --git a/net/ieee802154/ieee802154.h b/net/6lowpan/6lowpan.h similarity index 98% rename from net/ieee802154/ieee802154.h rename to net/6lowpan/6lowpan.h index 9d9e8191f4..cb5a54eb34 100644 --- a/net/ieee802154/ieee802154.h +++ b/net/6lowpan/6lowpan.h @@ -1,5 +1,5 @@ /**************************************************************************** - * net/ieee802154/ieee802154.h + * net/6lowpan/6lowpan.h * * Copyright (C) 2016 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/net/ieee802154/Kconfig b/net/6lowpan/Kconfig similarity index 70% rename from net/ieee802154/Kconfig rename to net/6lowpan/Kconfig index 0062c29fcd..a96521a49b 100644 --- a/net/ieee802154/Kconfig +++ b/net/6lowpan/Kconfig @@ -3,26 +3,24 @@ # see the file kconfig-language.txt in the NuttX tools repository. # -menu "IEEE802.15-4 Configuration" +menu "IEEE 802.15.4 Configuration" config NET_IEEE802154 - bool "IEEE802.15-4 support" + bool "IEEE 802.15.4 support" default n depends on EXPERIMENTAL && NET_IPv6 ---help--- - Enable IEEE802.15-4 protocol socket support + Enable IEEE 802.15.4 protocol socket support if NET_IEEE802154 config NET_IEEE802154_MTU - int "IEEE 802.15-4 packet buffer size (MTU)" - default 1294 if NET_IPv6 - default 590 if !NET_IPv6 - depends on NET_ETHERNET + int "IEEE 802.15.4 packet buffer size (MTU)" + default 1294 range 590 1518 ---help--- Packet buffer size. This size includes the TCP/UDP payload plus the - size of TCP/UDP header, the IP header, and the IEEE 802.15-4 header. + size of TCP/UDP header, the IP header, and the IEEE 802.15.4 header. This value is normally referred to as the MTU (Maximum Transmission Unit); the payload is the MSS (Maximum Segment Size). @@ -34,10 +32,9 @@ config NET_IEEE802154_MTU resulting in a minimum buffer size of of 1220+20+40+xx = xx. REVISIT! config IEEE802154_TCP_RECVWNDO - int "EEE 802.15-4 TCP receive window size" - default 1220 if NET_IPv6 - default 536 if !NET_IPv6 - depends on NET_ETHERNET && NET_TCP + int "IEEE 802.15.4 TCP receive window size" + default 1220 + depends on NET_TCP ---help--- The size of the advertised receiver's window. Should be set low (i.e., to the size of the MSS) if the application is slow to process @@ -45,4 +42,4 @@ config IEEE802154_TCP_RECVWNDO data quickly. REVISIT! endif # NET_IEEE802154 -endmenu # IEEE802.15-4 Configuration +endmenu # IEEE 802.15.4 Configuration diff --git a/net/ieee802154/Make.defs b/net/6lowpan/Make.defs similarity index 90% rename from net/ieee802154/Make.defs rename to net/6lowpan/Make.defs index de55524501..e04fd7a17c 100644 --- a/net/ieee802154/Make.defs +++ b/net/6lowpan/Make.defs @@ -1,5 +1,5 @@ ############################################################################ -# net/ieee802154/Make.defs +# net/6lowpan/Make.defs # # Copyright (C) 2016 Gregory Nutt. All rights reserved. # Author: Gregory Nutt @@ -33,17 +33,17 @@ # ############################################################################ -# IEEE802.15-4 support +# IEEE 802.15.4 support ifeq ($(CONFIG_NET_IEEE802154),y) -# Include IEEE802.15-4 file in the build +# Include IEEE 802.15.4 file in the build # NET_CSRCS += -# Include the ieee802154 directory in the build +# Include the 6lowpan directory in the build -DEPPATH += --dep-path ieee802154 -VPATH += :ieee802154 +DEPPATH += --dep-path 6lowpan +VPATH += :6lowpan endif # CONFIG_NET_IEEE802154 diff --git a/net/Kconfig b/net/Kconfig index d2d7c1c0cd..ca36d66e16 100644 --- a/net/Kconfig +++ b/net/Kconfig @@ -269,7 +269,7 @@ source "net/pkt/Kconfig" source "net/local/Kconfig" source "net/tcp/Kconfig" source "net/udp/Kconfig" -source "net/ieee802154/Kconfig" +source "net/6lowpan/Kconfig" source "net/icmp/Kconfig" source "net/icmpv6/Kconfig" source "net/igmp/Kconfig" diff --git a/net/Makefile b/net/Makefile index a8628c4a9a..5cfc2349e2 100644 --- a/net/Makefile +++ b/net/Makefile @@ -67,7 +67,7 @@ include pkt/Make.defs include local/Make.defs include tcp/Make.defs include udp/Make.defs -include ieee802154/Make.defs +include 6lowpan/Make.defs include devif/Make.defs include loopback/Make.defs include route/Make.defs diff --git a/net/netdev/netdev_register.c b/net/netdev/netdev_register.c index af523f5ad1..e1228de7b1 100644 --- a/net/netdev/netdev_register.c +++ b/net/netdev/netdev_register.c @@ -215,7 +215,7 @@ int netdev_register(FAR struct net_driver_s *dev, enum net_lltype_e lltype) #endif #ifdef CONFIG_NET_IEEE802154 - case NET_LL_IEEE802154: /* IEEE802.15-4 */ + case NET_LL_IEEE802154: /* IEEE 802.15.4 */ dev->d_llhdrlen = 0; /* REVISIT */ dev->d_mtu = CONFIG_NET_IEEE802154_MTU; #ifdef CONFIG_NET_TCP