From cfea8adacb2f353bc941f53f5135a1b5f1ab9c54 Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Sun, 18 Jun 2017 16:00:08 -0600 Subject: [PATCH] L should be capitalized in 6LoWPAN --- ChangeLog | 56 +++++++++---------- Documentation/NuttX.html | 4 +- Documentation/acronyms.txt | 2 +- ReleaseNotes | 14 ++--- TODO | 12 ++-- configs/b-l475e-iot01a/README.txt | 2 +- configs/clicker2-stm32/README.txt | 4 +- configs/clicker2-stm32/src/stm32_mrf24j40.c | 2 +- configs/sim/README.txt | 4 +- include/nuttx/net/netconfig.h | 4 +- include/nuttx/net/rfc6775.h | 2 +- include/nuttx/net/sixlowpan.h | 2 +- .../wireless/ieee802154/ieee802154_mac.h | 2 +- net/devif/devif_poll.c | 8 +-- net/devif/ipv6_input.c | 6 +- net/net_initialize.c | 2 +- net/netdev/netdev_ioctl.c | 2 +- net/sixlowpan/Kconfig | 12 ++-- net/sixlowpan/sixlowpan.h | 4 +- net/sixlowpan/sixlowpan_hc06.c | 2 +- net/sixlowpan/sixlowpan_initialize.c | 4 +- net/sixlowpan/sixlowpan_input.c | 14 ++--- net/sixlowpan/sixlowpan_internal.h | 4 +- net/sixlowpan/sixlowpan_tcpsend.c | 2 +- net/sixlowpan/sixlowpan_udpsend.c | 2 +- net/socket/send.c | 4 +- net/socket/sendto.c | 2 +- wireless/ieee802154/Kconfig | 8 +-- 28 files changed, 93 insertions(+), 93 deletions(-) diff --git a/ChangeLog b/ChangeLog index bd1e20ba37..7891d4fba8 100755 --- a/ChangeLog +++ b/ChangeLog @@ -14488,7 +14488,7 @@ pthread_mutex_trytake() which does sem_trywait() and if successful, does correctly add the mutext to the TCB list. This should eliminated the assertion (2017-03-29). - * 6loWPAN: IEEE802.15.4 MAC driver will need a special form of the + * 6LoWPAN: IEEE802.15.4 MAC driver will need a special form of the network device structure to manage fragmentation of the large packet into frames (2017-03-29). * wireless/ieee802154: Adds MAC character driver structure. @@ -14544,10 +14544,10 @@ Jussi Kivilinna (2017-03-31). * TCP/IPv6: Fix a compile issue when IPv6, but not IPv4 is enabled (2017-03-31). - * net/: Fix MULTINIC/MULTILINK selection when 6loWPAN selected + * net/: Fix MULTINIC/MULTILINK selection when 6LoWPAN selected (2017-03-31). * net/: Permit net/neighbor to build when IPv6 is defined, but not - Ethernet. Needs more work to support 6loWPAN (2017-03-31). + Ethernet. Needs more work to support 6LoWPAN (2017-03-31). * stm32f7: Serial fix for dropped data: (1) Revert the inherited dma bug from the stm32. see https://bitbucket.org/nuttx/nuttx/commits/df9ae3c13fc2fff2c21ebdb098c520b11f43280d @@ -14558,7 +14558,7 @@ (2017-03-31). * stm32f7: stm32_sdmmc removed stray semicolon. From David Sidrane (2017-03-31). - * 6loWPAN: Contiki 6loWPAN port is now complete (but completely + * 6LoWPAN: Contiki 6LoWPAN port is now complete (but completely untested) (2017-04-02). * iee802154 loopback: Eliminate dependency on CONFIG_NET_LOOPBACK (2017-04-02). @@ -14572,11 +14572,11 @@ * STM32: Add STM32L162VE to chip.h. From Juha Niskanen (2017-04-03). * iee802154 loopback: Eliminate dependency on CONFIG_NET_LOOPBACK (2017-04-02). - * sim: Add a configuration for testing 6loWPAN (2017-04-03). + * sim: Add a configuration for testing 6LoWPAN (2017-04-03). * wireless/ieee802154: Add initialization logic for loopback driver; - configs/sim: Add configuration for testing 6loWPAN; net/sixlowpan: + configs/sim: Add configuration for testing 6LoWPAN; net/sixlowpan: Fix for compilation with debug output enabled (2017-04-03). - * 6loWPAN: Updates/fixes from initial testing with the IEEE802.15.4 + * 6LoWPAN: Updates/fixes from initial testing with the IEEE802.15.4 loopback driver (2017-04-03). * STM32: Add I2C3 SDA pin mapping for STM32F411. From no1wudi (2017-04-04). @@ -14584,7 +14584,7 @@ sensor. From Juha Niskanen (2017-04-04). * STM32: stm32_flash: Add EEPROM writing for STM32L15XX. From Juha Niskanen (2017-04-04). - * 6loWPAN: Add option to dump buffers (2017-04-04). + * 6LoWPAN: Add option to dump buffers (2017-04-04). * STM32: stm32l15xx_rcc: Add support for using MSI as system clock. From Juha Niskanen (2017-04-05). * STM32: stm32l15xxx_rcc: configure medium performance voltage range @@ -14634,7 +14634,7 @@ to detect if RTC has valid time (after reset) or should application attempt to get real time by other means (for example, by launching ntpclient or GPS). From Jussi Kivilinna (2017-04-06). - * 6loWPAN: Add network IOCTL support to set the node address + * 6LoWPAN: Add network IOCTL support to set the node address (2017-04-06). * EFM32 I2C: Fix timeout calculation. From Masayuki Ishikawa (2017-04-06). @@ -14646,7 +14646,7 @@ priority, such that if any writers come in they are given priority for writing. From Mark Schulte (2017-04-07). * pthread rwlock bugfixes. From Mark Schulte (2017-04-07). - * 6loWPAN: Add calculation of TCP header size. It is not a constant + * 6LoWPAN: Add calculation of TCP header size. It is not a constant (2017-04-07). * Restore TCP_HDRLEN to MSS calculation. Also add to UDP MSS calculation where it never appearred. Add some missing MSS and @@ -14741,7 +14741,7 @@ CONFIG_NETDEV_MULTINIC. From Andreas Bihlmaier (2017-04-15). * networking: IPv4 change of last PR should also be applied to corresponding IPv6 logic (2017-04-15). - * 6loWPAN: Add some checks for the case where there are multiple + * 6LoWPAN: Add some checks for the case where there are multiple network devices and multiple link layer protocols (2017-04-15). * net/: Add IOCTL support for forwarding IEEE802.15.4 MAC and PHY IOCTLs (2017-04-15). @@ -14764,9 +14764,9 @@ * photon: Add sdpcm tx basic support. From Simon Piriou (2017-04-16). * photon: Request firmware version and MAC address. From Simon Piriou (2017-04-16). - * 6loWPAN network driver: Still only a skeleton but has some added + * 6LoWPAN network driver: Still only a skeleton but has some added thought experimentation (2017-04-16). - * 6loWPAN: Correct ordering of headers. fragmentation header was + * 6LoWPAN: Correct ordering of headers. fragmentation header was coming out before FCF (2017-04-16). * wireless/ieee802154: Continues development on transmit structure. From Anthony Merlino (2017-04-17). @@ -14811,14 +14811,14 @@ mac802154_chardevice_s. From Anthony Merlino (2017-04-19). * wireless/ieee802154: Changes radio interface to match MAC callback design. From Anthony Merlino (2017-04-19). - * 6loWPAN: Fix a missing source address in header. Correct + * 6LoWPAN: Fix a missing source address in header. Correct calculation of payload size (2017-04-19). * SAMV7 EMAC: Add conditional logic to account the fact that the SAMV71 has 6 rather than 3 queues after version 1. From Ian McAfee (2017-04-19). * wireless/ieee802154: Starts structuring transmission completion handling. From Anthony Merlino (2017-04-19). - * 6loWPAN: Add an IOCTL to set the IEEE802.15.4 PAN ID (2017-04-19). + * 6LoWPAN: Add an IOCTL to set the IEEE802.15.4 PAN ID (2017-04-19). * STM32 L1: stm32l15xx_rcc: Allow board to configure HSE clock in bypass-mode. Allows using MCO output from ST-link chip (on Nucleo and Discovery boards) as HSE input. From Juha Niskanen (2017-04-20). @@ -14852,17 +14852,17 @@ Jussi Kivilinna (2017-04-21). * wireless/ieee802154: Simplifies TX completion interface. Documents and cleans up some functions. From Anthony Merlino (2017-04-21). - * Remove the 6loWPAN PANID IOCTLs they are redundant (2017-04-21). - * 6loWPAN: Remove the PAN ID from the 6loWPAN data structure. This is + * Remove the 6LoWPAN PANID IOCTLs they are redundant (2017-04-21). + * 6LoWPAN: Remove the PAN ID from the 6LoWPAN data structure. This is owned by the radio driver. Rather, use an IOCTL to obtain the PAN ID from the downstream radio driver (2017-04-21). * photon: Add basic wlan scan function. From Simon Piriou (2017-04-22). - * 6loWPAN: Separate MAC-related definitions from sixlowpan.h. Put in + * 6LoWPAN: Separate MAC-related definitions from sixlowpan.h. Put in ieee802154.h (2017-04-22). * net/: network drver now retains Ethernet MAC address in a union so that other link layer addresses may be used in a MULTILINK environment (2017-04-22). - * 6loWPAN: Add IEEE802.15.4 Rime address to union of link layer + * 6LoWPAN: Add IEEE802.15.4 Rime address to union of link layer addresses in the network driver (2017-04-22). * SAM3/4: Fixed configurations for TWI master. Obviously an incomplete port from SAMA5 (2017-04-23). @@ -14945,7 +14945,7 @@ Simon Piriou (2017-04-28). * Add all network IOCTLs to include/sys/ioctl.h (2017-04-28). * Add all ieee802.15.4 IOCTLs to include/sys/ioctl.h (2017-04-28). - * 6loWPAN: Can't reuse same header on each fragment. DSN needs to + * 6LoWPAN: Can't reuse same header on each fragment. DSN needs to increment (2017-04-29). * SPI: Add an instance argument to the SPIDEV definitions (2017-04-29). * STM32F0: Add some protection. There is only one interrupt for @@ -15004,7 +15004,7 @@ F7. From Juha Niskanen (2017-05-02). * STM32L4: stm32l4x6xx_pinmap: Update I2C4 and DCMI pins. From Juha Niskanen (2017-05-02). - * 6loWPAN: Add basic call path to interface with the MAC layer through + * 6LoWPAN: Add basic call path to interface with the MAC layer through the MAC network driver. Logic has not yet been implemented. This is just a structural change in preparation for additional changes (2017-05-02). @@ -15012,11 +15012,11 @@ Merlino (2017-05-02). * wireless/ieee802154: Finishes some IOCTL logic for MAC layer. From Anthony Merlino (2017-05-02). - * 6loWPAN: Changes to use new MAC interfaces. Incomplete and needs + * 6LoWPAN: Changes to use new MAC interfaces. Incomplete and needs some clean-up of dangling, unused definitions (2017-05-03). * wireless/ieee802154: Starts work on setting PIB attributes. From Anthony Merlino (2017-05-03). - * 6loWPAN: Fixes hang in loopback test (2017-05-03). + * 6LoWPAN: Fixes hang in loopback test (2017-05-03). * drivers/wireless/bcmf: Fix frame not freed when dropped + cleanup. From Simon Piriou (2017-05-03). * STM32L4: stm32l4_i2c: Change wrong macro to CONFIG_I2C_POLLED. From @@ -15040,11 +15040,11 @@ * Fix STM32F7 I2C interrupt handler. From Jussi Kivilinna (2017-05-04). * STM32F7 serial: Allow configuring Rx DMA buffer size. From Jussi Kivilinna (2017-05-04). - * 6loWPAN: Replace Rime address naming with more consistent + * 6LoWPAN: Replace Rime address naming with more consistent short/exended address terminology (2017-05-04). - * 6loWPAN: Remove all ieee802.15.4 MAC knowledge from 6loWPAN. Now + * 6LoWPAN: Remove all ieee802.15.4 MAC knowledge from 6LoWPAN. Now relies on wires/ieee802154 for all MAC-related operations (2017-05-04). - * 6loWPAN: Local address length is fixed by the configuration. The + * 6LoWPAN: Local address length is fixed by the configuration. The remote address be with short or extended (2017-05-04). * STM32L4: Separate SYSCFG into product line specific files for clarity. From Juha Niskanen (2017-05-05). @@ -15075,7 +15075,7 @@ (2017-05-05). * STM32L4: Add support for many new MCUs from STM32L4X3XX product line and Nucleo-L452 board. From Juha Niskanen (2017-05-05). - * 6loWPAN: Use information in struct ieee802154_data_ind_s when + * 6LoWPAN: Use information in struct ieee802154_data_ind_s when reassembling a packet (2017-05-05). * ieee 802.15.4: Add a pool-based memory allocator for RX frame meta-data (2017-05-05). @@ -15096,7 +15096,7 @@ Hides private data. From Anthony Merlino (2017-05-06). * STM32: Serial Allow configuring Rx DMA buffer size. From David Sidrane (2017-05-06). - * 6loWPAN: Minor cleanup and re-verification of all compression modes + * 6LoWPAN: Minor cleanup and re-verification of all compression modes after so many recent changes (2017-05-06). * Update the C coding standard document (2017-05-06). * IEEE 802.15.4 network driver. Remove support for multicast address diff --git a/Documentation/NuttX.html b/Documentation/NuttX.html index 494a08777c..cd617cb884 100644 --- a/Documentation/NuttX.html +++ b/Documentation/NuttX.html @@ -816,7 +816,7 @@

-

  • IEEE 802.15.4 MAC + 6loWPAN
    • +
  • IEEE 802.15.4 MAC + 6LoWPAN

    • @@ -3998,7 +3998,7 @@ nsh>

    MikroElektronika Clicker2 for STM32. This is yet another board supported by NuttX that uses the same STM32F407VGT6 MCU as does the STM32F4-Discovery board. - This board has been used primarily with the MRF24J40 Click board for the development of IEEE 802.15.4 MAC and 6loWPAN support. + This board has been used primarily with the MRF24J40 Click board for the development of IEEE 802.15.4 MAC and 6LoWPAN support.

    See the Mikroelektronika website for more information about this board and the NuttX board README file for further information about the NuttX port.

    diff --git a/Documentation/acronyms.txt b/Documentation/acronyms.txt index aab1760a2b..dcf5fc5eed 100644 --- a/Documentation/acronyms.txt +++ b/Documentation/acronyms.txt @@ -1,4 +1,4 @@ -6loWPAN IPv6 over Low power Wireless Personal Area Networks +6LoWPAN IPv6 over Low power Wireless Personal Area Networks ACM Abstract Control Model (USB) ADC Analog to Digital Conversion AIC Advanced Interrupt Controller (Atmel SAM) diff --git a/ReleaseNotes b/ReleaseNotes index 92be9fef5f..6fb6fbc9e6 100644 --- a/ReleaseNotes +++ b/ReleaseNotes @@ -13652,8 +13652,8 @@ Additional new features and extended functionality: incomplete and has not been verified. - IEEE 802.15.4 Network Loopback Driver: A simple IEEE 802.15.4 MAC loopback driver was developed. This driver allowed for parallel - development of the IEEE 802.15.4 MAC and 6loWPAN. - - 6loWPAN: The Contiki 6loWPAN stack has been ported so that works + development of the IEEE 802.15.4 MAC and 6LoWPAN. + - 6LoWPAN: The Contiki 6LoWPAN stack has been ported so that works within the NuttX networking framework and interfaces with the new IEEE 802.15.4 MAC via the network driver. Live testing with IEEE 802.15.4 radios has not yet been done; all testing has used @@ -13721,7 +13721,7 @@ Additional new features and extended functionality: * Simulation - - configs/sim/sixlowpan: Configuration for testing the 6loWPAN with + - configs/sim/sixlowpan: Configuration for testing the 6LoWPAN with the IEEE 802.15.4 loopback network driver. * Infineon XMC4xxx: @@ -13926,7 +13926,7 @@ Additional new features and extended functionality: default is +x. No printing of a trace of script commands as they are executed. From David Sidrane. - Print expanded variables if -x. From David Sidrane. - - ifconfig command: Extend ifconfig to support 6loWPAN. Adapt to + - ifconfig command: Extend ifconfig to support 6LoWPAN. Adapt to some changes in configuration variable usage. - Network initialization: If IEEE802.11 selected use wlan0 instead of eth0 for network device name. @@ -13949,11 +13949,11 @@ Additional new features and extended functionality: cleanup handlers. From Juha Niskanen. - examples/usrsocktest: Add application for USRSOCK testing. From Jussi Kivilinna. - - examples/nettest: Adapt for use in testing 6loWPAN. + - examples/nettest: Adapt for use in testing 6LoWPAN. - examples/nettest: If doing loopback, but not using the official loopback device, then use the server should use the configured client IP address. - - examples/udpblaster: Several fixes to work with 6loWPAN. + - examples/udpblaster: Several fixes to work with 6LoWPAN. - examples/udpblaster: Add logic to bind the local UDP socket to a well-known address. - examples/configdata: Add stacksize and priority. From Juha Niskanen. @@ -13962,7 +13962,7 @@ Additional new features and extended functionality: - netutils/netlib: Add IEEE 802.11 wireless IOCTL wrappers. - netutils/netlib: Add a helper function to convert a string to a - 6loWPAN node address. + 6LoWPAN node address. - netlib and NSH: Add logic to get/set the IEEE802.15.4 PAN ID. - netutils/dhcpc: Make the network device name a configuration option. Was hardcoded to eth0 but may, instead, need to be wlan0. diff --git a/TODO b/TODO index f5975ae90b..79ca78ab3b 100644 --- a/TODO +++ b/TODO @@ -1232,11 +1232,11 @@ o Network (net/, drivers/net) deal with a list of devices. That would be a huge effect and certainly doesn't dount as a "simple solution". - Title: ICMPv6 FOR 6loWPAN + Title: ICMPv6 FOR 6LoWPAN Description: The current ICMPv6 and neighbor-related logic only works with - Ethernet MAC. For 6loWPAN, a new more conservative IPv6 + Ethernet MAC. For 6LoWPAN, a new more conservative IPv6 neigbor discovery is provided by RFC 6775. This RFC needs to - be supported in order to support ping6 on a 6loWPAN network. + be supported in order to support ping6 on a 6LoWPAN network. If RFC 6775 were implemented, then arbitrary IPv6 addresses, including addresses from DHCPv6 could be used. can @@ -1248,12 +1248,12 @@ o Network (net/, drivers/net) a neighbor table that, like the arp table, provides the mapping between IP addresses and node addresses. - The NuttX, Contiki-based 6loWPAN implementation circumvented + The NuttX, Contiki-based 6LoWPAN implementation circumvented the need for the neighbor discovery logic by using only MAC- based addressing, i.e., the lower two or eight bytes of the IP address are the node address. - Most of the 6loWPAN compression algorithms exploit this to + Most of the 6LoWPAN compression algorithms exploit this to compress the IPv6 address to nothing but a bit indicating that the IP address derives from the node address. So I think IPv6 neighbor discover is useless in the current @@ -1272,7 +1272,7 @@ o Network (net/, drivers/net) Status: Open Priority: Low for now. I don't plan on implementing this. It would only be relevant if we were to decide to abandon the use of - MAC-based addressing in the 6loWPAN implementation. + MAC-based addressing in the 6LoWPAN implementation. Title: ETHERNET LOCAL BROADCAST DOES NOT WORK diff --git a/configs/b-l475e-iot01a/README.txt b/configs/b-l475e-iot01a/README.txt index 013ac41fbf..0e0dc7f97a 100644 --- a/configs/b-l475e-iot01a/README.txt +++ b/configs/b-l475e-iot01a/README.txt @@ -78,7 +78,7 @@ Board Features This cannot integrate cleanly with the NuttX network stack. A USERSOCK option was recently added that would permit implementation of the Inventek support in an applications. But that would then - preclude the 6loWPAN integration into IPv6. + preclude the 6LoWPAN integration into IPv6. 2. The board uses Bluetooth® V4.1 module (SPBTLE-RF), which has built-in BLE stack. Similar with wifi, you only use simple AT command to talk diff --git a/configs/clicker2-stm32/README.txt b/configs/clicker2-stm32/README.txt index a2287418b3..45b594399f 100644 --- a/configs/clicker2-stm32/README.txt +++ b/configs/clicker2-stm32/README.txt @@ -374,7 +374,7 @@ Configurations This is another version of nsh that is very similar to the mrf24j40-mac configuration but is focused on testing the IEEE 802.15.4 MAC - integration with the 6loWPAN network stack. It derives directly from the + integration with the 6LoWPAN network stack. It derives directly from the mrf24j40-mac and all NOTES provided there apply. Additional differences are summarized below: @@ -426,7 +426,7 @@ Configurations the system has crashed because (a) it will be unresponsive and (b) the LD2 will be blinking at about 2Hz. - 4. IPv6 networking is enabled with TCP/IP, UDP, 6loWPAN, and NSH + 4. IPv6 networking is enabled with TCP/IP, UDP, 6LoWPAN, and NSH Telnet support. 5. Configuration instructions: Basic PAN configuration is the same as diff --git a/configs/clicker2-stm32/src/stm32_mrf24j40.c b/configs/clicker2-stm32/src/stm32_mrf24j40.c index 6ff5ad7bae..b299629945 100644 --- a/configs/clicker2-stm32/src/stm32_mrf24j40.c +++ b/configs/clicker2-stm32/src/stm32_mrf24j40.c @@ -256,7 +256,7 @@ static int stm32_mrf24j40_devsetup(FAR struct stm32_priv_s *priv) } #ifdef CONFIG_IEEE802154_NETDEV - /* Use the IEEE802.15.4 MAC interface instance to create a 6loWPAN + /* Use the IEEE802.15.4 MAC interface instance to create a 6LoWPAN * network interface by wrapping the MAC intrface instance in a * network device driver via mac802154dev_register(). */ diff --git a/configs/sim/README.txt b/configs/sim/README.txt index 15ec2078a8..6183b452bf 100644 --- a/configs/sim/README.txt +++ b/configs/sim/README.txt @@ -804,12 +804,12 @@ pashello sixlowpan This configuration was intended only for unit-level testing of the - 6loWPAN stack. It enables networking with 6loWPAN support and uses + 6LoWPAN stack. It enables networking with 6LoWPAN support and uses only a IEEE802.15.4 MAC loopback network device to supported testing. This configuration includes apps/examples/nettest and apps/examples/udpblaster. Neither are truly functional. The only intent of this configuration - is to verify that the 6loWPAN stack correctly encodes IEEE802.15.4 + is to verify that the 6LoWPAN stack correctly encodes IEEE802.15.4 packets on output to the loopback device and correct decodes the returned packet. diff --git a/include/nuttx/net/netconfig.h b/include/nuttx/net/netconfig.h index fbdd2772d5..019fa663db 100644 --- a/include/nuttx/net/netconfig.h +++ b/include/nuttx/net/netconfig.h @@ -218,7 +218,7 @@ /* There is no link layer header with SLIP */ # ifndef CONFIG_NET_IPv6 -# error 6loWPAN requires IPv support +# error 6LoWPAN requires IPv support # endif # define NET_LL_HDRLEN(d) 0 @@ -620,7 +620,7 @@ # define NET_DEV_RCVWNDO(d) CONFIG_NET_ETH_TCP_RECVWNDO #elif defined(CONFIG_NET_6LOWPAN) - /* Only 6loWPAN.. use the configured 6loWPAN receive window size */ + /* Only 6LoWPAN.. use the configured 6LoWPAN receive window size */ # define NET_DEV_RCVWNDO(d) CONFIG_NET_6LOWPAN_TCP_RECVWNDO diff --git a/include/nuttx/net/rfc6775.h b/include/nuttx/net/rfc6775.h index e7a309b4d0..04604283d1 100644 --- a/include/nuttx/net/rfc6775.h +++ b/include/nuttx/net/rfc6775.h @@ -108,7 +108,7 @@ struct sixlowpan_sllao_s uint8_t eui64[8]; /* Bytes 8-15: EUI-64 identifier assigned to interface */ }; -/* 4.2 6loWPAN Context Option (6CO) */ +/* 4.2 6LoWPAN Context Option (6CO) */ struct sixlowpan_6co_s { diff --git a/include/nuttx/net/sixlowpan.h b/include/nuttx/net/sixlowpan.h index f9b9655f15..986472c962 100644 --- a/include/nuttx/net/sixlowpan.h +++ b/include/nuttx/net/sixlowpan.h @@ -481,7 +481,7 @@ struct ieee802154_driver_s * Name: sixlowpan_input * * Description: - * Process an incoming 6loWPAN frame. + * Process an incoming 6LoWPAN frame. * * This function is called when the device driver has received an * IEEE802.15.4 frame from the network. The frame from the device diff --git a/include/nuttx/wireless/ieee802154/ieee802154_mac.h b/include/nuttx/wireless/ieee802154/ieee802154_mac.h index 60eafa1553..fcfeaab21c 100644 --- a/include/nuttx/wireless/ieee802154/ieee802154_mac.h +++ b/include/nuttx/wireless/ieee802154/ieee802154_mac.h @@ -1571,7 +1571,7 @@ int mac802154dev_register(MACHANDLE mac, int minor); * * Description: * Register a network driver to access the IEEE 802.15.4 MAC layer from - * a socket using 6loWPAN + * a socket using 6LoWPAN * * Input Parameters: * mac - Pointer to the mac layer struct to be registered. diff --git a/net/devif/devif_poll.c b/net/devif/devif_poll.c index 107f68c6de..900d1aaa1c 100644 --- a/net/devif/devif_poll.c +++ b/net/devif/devif_poll.c @@ -95,14 +95,14 @@ systime_t g_polltime; * * 1. TCP socket output. For the case of TCP output to an * IEEE802.15.4, the TCP output is caught in the socket - * send()/sendto() logic and and redirected to 6loWPAN logic. + * send()/sendto() logic and and redirected to 6LoWPAN logic. * 2. TCP output from the TCP state machine. That will occur * during TCP packet processing by the TCP state meachine. * 3. TCP output resulting from TX or timer polling * * Cases 2 is handled here. Logic here detected if (1) an attempt * to return with d_len > 0 and (2) that the device is an - * IEEE802.15.4 MAC network driver. Under those conditions, 6loWPAN + * IEEE802.15.4 MAC network driver. Under those conditions, 6LoWPAN * logic will be called to create the IEEE80215.4 frames. * * Assumptions: @@ -127,13 +127,13 @@ static void devif_packet_conversion(FAR struct net_driver_s *dev, FAR struct ipv6_hdr_s *ipv6 = (FAR struct ipv6_hdr_s *)dev->d_buf; /* This packet came from a response to TCP polling and is directed - * to an IEEE802.15.4 device using 6loWPAN. Verify that the outgoing + * to an IEEE802.15.4 device using 6LoWPAN. Verify that the outgoing * packet is IPv6 with TCP protocol. */ if (ipv6->vtc == IPv6_VERSION && ipv6->proto == IP_PROTO_TCP) { - /* Let 6loWPAN convert IPv6 TCP output into IEEE802.15.4 frames. */ + /* Let 6LoWPAN convert IPv6 TCP output into IEEE802.15.4 frames. */ sixlowpan_tcp_send(dev); } diff --git a/net/devif/ipv6_input.c b/net/devif/ipv6_input.c index 0e53240364..8ed331f7ef 100644 --- a/net/devif/ipv6_input.c +++ b/net/devif/ipv6_input.c @@ -265,14 +265,14 @@ int ipv6_input(FAR struct net_driver_s *dev) * * 1. TCP socket output. For the case of TCP output to an * IEEE802.15.4, the TCP output is caught in the socket - * send()/sendto() logic and and redirected to 6loWPAN logic. + * send()/sendto() logic and and redirected to 6LoWPAN logic. * 2. TCP output from the TCP state machine. That will occur * during TCP packet processing by the TCP state meachine. * 3. TCP output resulting from TX or timer polling * * Cases 2 is handled here. Logic here detected if (1) an attempt * to return with d_len > 0 and (2) that the device is an - * IEEE802.15.4 MAC network driver. Under those conditions, 6loWPAN + * IEEE802.15.4 MAC network driver. Under those conditions, 6LoWPAN * logic will be called to create the IEEE80215.4 frames. */ @@ -284,7 +284,7 @@ int ipv6_input(FAR struct net_driver_s *dev) if (dev->d_len > 0) #endif { - /* Let 6loWPAN handle the TCP output */ + /* Let 6LoWPAN handle the TCP output */ sixlowpan_tcp_send(dev); diff --git a/net/net_initialize.c b/net/net_initialize.c index c37a69c73a..a5e0c2d31e 100644 --- a/net/net_initialize.c +++ b/net/net_initialize.c @@ -102,7 +102,7 @@ void net_setup(void) neighbor_initialize(); #ifdef CONFIG_NET_6LOWPAN - /* Initialize 6loWPAN data structures */ + /* Initialize 6LoWPAN data structures */ sixlowpan_initialize(); #endif diff --git a/net/netdev/netdev_ioctl.c b/net/netdev/netdev_ioctl.c index 3978819d21..0d6c1ed49b 100644 --- a/net/netdev/netdev_ioctl.c +++ b/net/netdev/netdev_ioctl.c @@ -736,7 +736,7 @@ static int netdev_ifr_ioctl(FAR struct socket *psock, int cmd, } break; - /* MAC address operations only make sense if Ethernet or 6loWPAN are + /* MAC address operations only make sense if Ethernet or 6LoWPAN are * supported. */ diff --git a/net/sixlowpan/Kconfig b/net/sixlowpan/Kconfig index ae977359e0..e946ac84a6 100644 --- a/net/sixlowpan/Kconfig +++ b/net/sixlowpan/Kconfig @@ -7,7 +7,7 @@ menu "6LoWPAN Configuration" depends on NET_6LOWPAN config NET_6LOWPAN_FRAG - bool "6loWPAN Fragmentation" + bool "6LoWPAN Fragmentation" default y ---help--- CONFIG_NET_6LOWPAN_FRAG specifies if 6lowpan fragmentation should be @@ -22,7 +22,7 @@ config NET_6LOWPAN_FRAMELEN setting should never be smaller than 127. choice - prompt "6loWPAN Compression" + prompt "6LoWPAN Compression" default NET_6LOWPAN_COMPRESSION_HC06 config NET_6LOWPAN_COMPRESSION_IPv6 @@ -33,16 +33,16 @@ config NET_6LOWPAN_COMPRESSION_IPv6 the IPv6 dispatch byte before the packet. config NET_6LOWPAN_COMPRESSION_HC1 - bool "6loWPAN HC1" + bool "6LoWPAN HC1" ---help--- Compress IP/UDP header using HC1 and HC_UDP config NET_6LOWPAN_COMPRESSION_HC06 - bool "6loWPAN HC06" + bool "6LoWPAN HC06" ---help--- Compress IP/UDP header using HC06 compression -endchoice # 6loWPAN Compression +endchoice # 6LoWPAN Compression config NET_6LOWPAN_COMPRESSION_THRESHOLD int "Lower compression threshold" @@ -196,7 +196,7 @@ config NET_6LOWPAN_DUMPBUFFER depends on DEBUG_NET_INFO ---help--- Enable dumping of all packet and frame buffers coming into and out - of the 6loWPAN logic. This will generate a large volume of data if + of the 6LoWPAN logic. This will generate a large volume of data if selected. endmenu # 6LoWPAN Configuration diff --git a/net/sixlowpan/sixlowpan.h b/net/sixlowpan/sixlowpan.h index fe4451c093..a175a3d3f5 100644 --- a/net/sixlowpan/sixlowpan.h +++ b/net/sixlowpan/sixlowpan.h @@ -63,9 +63,9 @@ struct sockaddr; /* Forward reference */ * Description: * sixlowpan_initialize() is called during OS initialization at power-up * reset. It is called from the common net_setup() function. - * sixlowpan_initialize() configures 6loWPAN networking data structures. + * sixlowpan_initialize() configures 6LoWPAN networking data structures. * It is called prior to platform-specific driver initialization so that - * the 6loWPAN networking subsystem is prepared to deal with network + * the 6LoWPAN networking subsystem is prepared to deal with network * driver initialization actions. * * Input Parameters: diff --git a/net/sixlowpan/sixlowpan_hc06.c b/net/sixlowpan/sixlowpan_hc06.c index 4de177e0a8..e066da19b5 100644 --- a/net/sixlowpan/sixlowpan_hc06.c +++ b/net/sixlowpan/sixlowpan_hc06.c @@ -366,7 +366,7 @@ static void uncompress_addr(FAR net_ipv6addr_t ipaddr, uint8_t const prefix[], * reset. It is called from the common sixlowpan_initialize() function. * sixlowpan_hc06_initialize() configures HC06 networking data structures. * It is called prior to platform-specific driver initialization so that - * the 6loWPAN networking subsystem is prepared to deal with network + * the 6LoWPAN networking subsystem is prepared to deal with network * driver initialization actions. * * Input Parameters: diff --git a/net/sixlowpan/sixlowpan_initialize.c b/net/sixlowpan/sixlowpan_initialize.c index 54e32b8401..99222fc487 100644 --- a/net/sixlowpan/sixlowpan_initialize.c +++ b/net/sixlowpan/sixlowpan_initialize.c @@ -54,9 +54,9 @@ * Description: * sixlowpan_initialize() is called during OS initialization at power-up * reset. It is called from the common net_setup() function. - * sixlowpan_initialize() configures 6loWPAN networking data structures. + * sixlowpan_initialize() configures 6LoWPAN networking data structures. * It is called prior to platform-specific driver initialization so that - * the 6loWPAN networking subsystem is prepared to deal with network + * the 6LoWPAN networking subsystem is prepared to deal with network * driver initialization actions. * * Input Parameters: diff --git a/net/sixlowpan/sixlowpan_input.c b/net/sixlowpan/sixlowpan_input.c index db4f1c2c9f..9f1490bce2 100644 --- a/net/sixlowpan/sixlowpan_input.c +++ b/net/sixlowpan/sixlowpan_input.c @@ -1,6 +1,6 @@ /**************************************************************************** * net/sixlowpan/sixlowpan_input.c - * 6loWPAN implementation (RFC4944 and draft-ietf-6loWPAN-hc-06) + * 6LoWPAN implementation (RFC4944 and draft-ietf-6LoWPAN-hc-06) * * Copyright (C) 2017, Gregory Nutt, all rights reserved * Author: Gregory Nutt @@ -272,10 +272,10 @@ static void sixlowpan_uncompress_ipv6hdr(FAR uint8_t *fptr, FAR uint8_t *bptr) * Name: sixlowpan_frame_process * * Description: - * Process an incoming 6loWPAN frame in 'iob'. + * Process an incoming 6LoWPAN frame in 'iob'. * * If its a FRAG1 or a non-fragmented frame we first uncompress the IP - * header. The 6loWPAN payload and possibly the uncompressed IP header + * header. The 6LoWPAN payload and possibly the uncompressed IP header * are then copied into d_buf. An indication is returned if the packet * in d_buf is complete (i.e., non-fragmented frame or and the last * FRAGN frame). @@ -436,7 +436,7 @@ static int sixlowpan_frame_process(FAR struct ieee802154_driver_s *ieee, else if (fragsize == 0) { - nwarn("WARNING: Dropping zero-length 6loWPAN fragment\n"); + nwarn("WARNING: Dropping zero-length 6LoWPAN fragment\n"); return INPUT_PARTIAL; } @@ -460,7 +460,7 @@ static int sixlowpan_frame_process(FAR struct ieee802154_driver_s *ieee, * being reassembled or the packet is not a fragment. */ - nwarn("WARNING: Dropping 6loWPAN packet that is not a fragment of " + nwarn("WARNING: Dropping 6LoWPAN packet that is not a fragment of " "the packet currently being reassembled\n"); return INPUT_PARTIAL; } @@ -487,7 +487,7 @@ static int sixlowpan_frame_process(FAR struct ieee802154_driver_s *ieee, if (!isfirstfrag) { - nwarn("WARNING: FRAGN 6loWPAN fragment while not reassembling\n"); + nwarn("WARNING: FRAGN 6LoWPAN fragment while not reassembling\n"); return OK; } @@ -708,7 +708,7 @@ static int sixlowpan_dispatch(FAR struct ieee802154_driver_s *ieee) * Name: sixlowpan_input * * Description: - * Process an incoming 6loWPAN frame. + * Process an incoming 6LoWPAN frame. * * This function is called when the device driver has received an * IEEE802.15.4 frame from the network. The frame from the device diff --git a/net/sixlowpan/sixlowpan_internal.h b/net/sixlowpan/sixlowpan_internal.h index a4dd9b21d0..2d30f676fb 100644 --- a/net/sixlowpan/sixlowpan_internal.h +++ b/net/sixlowpan/sixlowpan_internal.h @@ -169,7 +169,7 @@ struct ipv6icmp_hdr_s /* In order to provide a customizable IEEE 802.15.4 MAC header, a structure * of meta data is passed to the MAC network driver, struct * ieee802154_frame_meta_s. Many of the settings in this meta data are - * fixed, deterimined by the 6loWPAN configuration. Other settings depend + * fixed, deterimined by the 6LoWPAN configuration. Other settings depend * on the protocol used in the current packet or on chacteristics of the * destination node. * @@ -382,7 +382,7 @@ int sixlowpan_queue_frames(FAR struct ieee802154_driver_s *ieee, * reset. It is called from the common sixlowpan_initialize() function. * sixlowpan_hc06_initialize() configures HC06 networking data structures. * It is called prior to platform-specific driver initialization so that - * the 6loWPAN networking subsystem is prepared to deal with network + * the 6LoWPAN networking subsystem is prepared to deal with network * driver initialization actions. * * Input Parameters: diff --git a/net/sixlowpan/sixlowpan_tcpsend.c b/net/sixlowpan/sixlowpan_tcpsend.c index d15e4f024a..7ce5064b89 100644 --- a/net/sixlowpan/sixlowpan_tcpsend.c +++ b/net/sixlowpan/sixlowpan_tcpsend.c @@ -325,7 +325,7 @@ ssize_t psock_6lowpan_tcp_send(FAR struct socket *psock, FAR const void *buf, sixlowpan_addrfromip(conn->u.ipv6.raddr, &destmac); - /* If routable, then call sixlowpan_send() to format and send the 6loWPAN + /* If routable, then call sixlowpan_send() to format and send the 6LoWPAN * packet. */ diff --git a/net/sixlowpan/sixlowpan_udpsend.c b/net/sixlowpan/sixlowpan_udpsend.c index f9efd643cc..f4324d1694 100644 --- a/net/sixlowpan/sixlowpan_udpsend.c +++ b/net/sixlowpan/sixlowpan_udpsend.c @@ -300,7 +300,7 @@ ssize_t psock_6lowpan_udp_sendto(FAR struct socket *psock, sixlowpan_addrfromip(to6->sin6_addr.in6_u.u6_addr16, &destmac); - /* If routable, then call sixlowpan_send() to format and send the 6loWPAN + /* If routable, then call sixlowpan_send() to format and send the 6LoWPAN * packet. */ diff --git a/net/socket/send.c b/net/socket/send.c index 646fba8bf4..33060b5a32 100644 --- a/net/socket/send.c +++ b/net/socket/send.c @@ -162,7 +162,7 @@ ssize_t psock_send(FAR struct socket *psock, FAR const void *buf, size_t len, #endif { #ifdef CONFIG_NET_6LOWPAN - /* Try 6loWPAN TCP packet send */ + /* Try 6LoWPAN TCP packet send */ ret = psock_6lowpan_tcp_send(psock, buf, len); @@ -205,7 +205,7 @@ ssize_t psock_send(FAR struct socket *psock, FAR const void *buf, size_t len, #endif { #if defined(CONFIG_NET_6LOWPAN) - /* Try 6loWPAN UDP packet send */ + /* Try 6LoWPAN UDP packet send */ ret = psock_6lowpan_udp_send(psock, buf, len); diff --git a/net/socket/sendto.c b/net/socket/sendto.c index 6b3490b10a..7b7c15f6c0 100644 --- a/net/socket/sendto.c +++ b/net/socket/sendto.c @@ -239,7 +239,7 @@ ssize_t psock_sendto(FAR struct socket *psock, FAR const void *buf, #endif { #if defined(CONFIG_NET_6LOWPAN) - /* Try 6loWPAN UDP packet sendto() */ + /* Try 6LoWPAN UDP packet sendto() */ nsent = psock_6lowpan_udp_sendto(psock, buf, len, flags, to, tolen); diff --git a/wireless/ieee802154/Kconfig b/wireless/ieee802154/Kconfig index a471e4804e..d06ed743c1 100644 --- a/wireless/ieee802154/Kconfig +++ b/wireless/ieee802154/Kconfig @@ -107,12 +107,12 @@ config IEEE802154_MACDEV_RECVRPRIO endif # IEEE802154_MACDEV config IEEE802154_NETDEV - bool "IEEE802154 6loWPAN Network Device" + bool "IEEE802154 6LoWPAN Network Device" default n depends on NET_6LOWPAN && NET_IPv6 select ARCH_HAVE_NETDEV_STATISTICS ---help--- - Add support for the IEEE802.15.4 6loWPAN network device built on + Add support for the IEEE802.15.4 6LoWPAN network device built on the common IEEE802.15.4 MAC. if IEEE802154_NETDEV @@ -157,12 +157,12 @@ endchoice # Work queue endif # IEEE802154_NETDEV config IEEE802154_LOOPBACK - bool "IEEE802154 6loWPAN Loopback" + bool "IEEE802154 6LoWPAN Loopback" default n depends on NET_6LOWPAN && NET_IPv6 select ARCH_HAVE_NETDEV_STATISTICS ---help--- - Add support for the IEEE802.15.4 6loWPAN Loopback test device. + Add support for the IEEE802.15.4 6LoWPAN Loopback test device. if IEEE802154_LOOPBACK