Renamed core to os

2017-09-01 15:29:00 +02:00 · 2017-09-01 15:29:00 +02:00 · 2c86194ef8
parent 25698b76f3
commit 2c86194ef8
322 changed files with 135 additions and 136 deletions
--- a/Makefile.include
+++ b/Makefile.include
@ -65,7 +65,7 @@ UPPERCASE = _ABCDEFGHIJKLMNOPQRSTUVWXYZ
 TARGET_UPPERCASE := ${strip ${shell echo $(TARGET) | sed y!$(LOWERCASE)!$(UPPERCASE)!}}
 CFLAGS += -DCONTIKI=1 -DCONTIKI_TARGET_$(TARGET_UPPERCASE)=1
-MODULES += core/sys core/dev core/lib
+MODULES += os/sys os/dev os/lib
 # Include IPv6, RPL
@ -82,16 +82,16 @@ ifeq ($(CONTIKI_WITH_IPV6),1)
  CFLAGS += -DNETSTACK_CONF_WITH_IPV6=1
  CONTIKI_WITH_RPL ?= 1
  CONTIKI_WITH_RPL_LITE ?= 1
-  MODULES += core/net/ipv6 core/net/ip
+  MODULES += os/net/ipv6 os/net/ip
 endif
 ifeq ($(CONTIKI_WITH_RPL),1)
    CFLAGS += -DUIP_CONF_IPV6_RPL=1
    ifeq ($(CONTIKI_WITH_RPL_LITE),1)
        CFLAGS += -DUIP_CONF_IPV6_RPL_LITE=1
-        MODULES += core/net/rpl-lite
+        MODULES += os/net/rpl-lite
    else
-        MODULES += core/net/rpl
+        MODULES += os/net/rpl
    endif
 else
    CFLAGS += -DUIP_CONF_IPV6_RPL=0
@ -99,7 +99,7 @@ endif
 CONTIKI_SOURCEFILES += $(CONTIKIFILES)
-CONTIKIDIRS += ${addprefix $(CONTIKI)/core/,dev lib net net/mac \
+CONTIKIDIRS += ${addprefix $(CONTIKI)/os/,dev lib net net/mac \
                 sys cfs . }
 oname = ${patsubst %.c,%.o,${patsubst %.S,%.o,$(1)}}
--- a/arch/cpu/cc2538/dev/random.c
+++ b/arch/cpu/cc2538/dev/random.c
@ -41,7 +41,7 @@
 * Random number generator routines exploiting the cc2538 hardware
 * capabilities.
 *
- * This file overrides core/lib/random.c.
+ * This file overrides os/lib/random.c.
 */
 #include "contiki.h"
 #include "dev/rfcore.h"
--- a/arch/cpu/cc253x/dev/random.c
+++ b/arch/cpu/cc253x/dev/random.c
@ -34,7 +34,7 @@
 *         Random number generator routines exploiting the cc2530 hardware
 *         capabilities.
 *
- *         This file overrides core/lib/random.c.
+ *         This file overrides os/lib/random.c.
 *
 * \author
 *         George Oikonomou - <oikonomou@users.sourceforge.net>
--- a/arch/cpu/cc26xx-cc13xx/random.c
+++ b/arch/cpu/cc26xx-cc13xx/random.c
@ -34,7 +34,7 @@
 *
 * \file
 *
- * This file overrides core/lib/random.c and calls SoC-specific RNG functions
+ * This file overrides os/lib/random.c and calls SoC-specific RNG functions
 */
 /*---------------------------------------------------------------------------*/
 #include "contiki.h"
--- a/arch/cpu/nrf52832/dev/random.c
+++ b/arch/cpu/nrf52832/dev/random.c
@ -41,7 +41,7 @@
 *         Random number generator routines exploiting the nRF52 hardware
 *         capabilities.
 *
- *         This file overrides core/lib/random.c.
+ *         This file overrides os/lib/random.c.
 *
 * \author
 *         Wojciech Bober <wojciech.bober@nordicsemi.no>
--- a/arch/platform/cc2538dk/Makefile.cc2538dk
+++ b/arch/platform/cc2538dk/Makefile.cc2538dk
@ -19,8 +19,8 @@ CLEAN += *.cc2538dk
 CONTIKI_CPU=$(CONTIKI)/arch/cpu/cc2538
 include $(CONTIKI_CPU)/Makefile.cc2538
-MODULES += core/net core/net/mac core/net/mac/framer \
+MODULES += os/net os/net/mac os/net/mac/framer \
-  core/net/mac/csma core/net/mac/nullmac
+  os/net/mac/csma os/net/mac/nullmac
 PYTHON = python
 BSL_FLAGS += -e -w -v
--- a/arch/platform/cooja-ip64/Makefile.cooja-ip64
+++ b/arch/platform/cooja-ip64/Makefile.cooja-ip64
@ -1,6 +1,6 @@
 COOJAPLATFORMDIR=$(CONTIKI)/arch/platform/cooja
-MODULES += core/net/ip64
+MODULES += os/net/ip64
 include $(COOJAPLATFORMDIR)/Makefile.cooja
 vpath %.c $(COOJAPLATFORMDIR) $(COOJAPLATFORMDIR)/dev \
--- a/arch/platform/cooja/Makefile.cooja
+++ b/arch/platform/cooja/Makefile.cooja
@ -77,8 +77,8 @@ CFLAGSNO += -Werror
 endif
 CFLAGS   += $(CFLAGSNO)
-MODULES += core/net core/net/mac core/net/mac/framer core/net/ip64-addr \
+MODULES += os/net os/net/mac os/net/mac/framer os/net/ip64-addr \
-  core/net/mac/csma core/net/mac/nullmac
+  os/net/mac/csma os/net/mac/nullmac
 ## Copied from Makefile.include, since Cooja overrides CFLAGS et al
 HAS_STACK = 0
--- a/arch/platform/jn516x/Makefile.jn516x
+++ b/arch/platform/jn516x/Makefile.jn516x
@ -143,8 +143,8 @@ endif
 CLEAN += *.jn516x
 CLEAN += *.jn516x.bin
-MODULES += core/net core/net/mac core/net/mac/framer \
+MODULES += os/net os/net/mac os/net/mac/framer \
-  core/net/mac/csma core/net/mac/nullmac
+  os/net/mac/csma os/net/mac/nullmac
 CONTIKI_TARGET_SOURCEFILES += $(ARCH)
 CONTIKI_SOURCEFILES        += $(CONTIKI_TARGET_SOURCEFILES)
--- a/arch/platform/jn516x/dev/dr1175/README.md
+++ b/arch/platform/jn516x/dev/dr1175/README.md
@ -1,17 +1,16 @@
-This directory contains the contiki driver for the sensors (light, humidity and temperature sensor) available on the 
+This directory contains the contiki driver for the sensors (light, humidity and temperature sensor) available on the
-NXP DR1175 board. This board is part of the NXP JN516X Evaluation Kit (see http://www.nxp.com/documents/leaflet/75017368.pdf). 
+NXP DR1175 board. This board is part of the NXP JN516X Evaluation Kit (see http://www.nxp.com/documents/leaflet/75017368.pdf).
-The dr1175 sensor code interfaces to the contiki `core/lib/sensors.c` framework.
+The dr1175 sensor code interfaces to the contiki `os/lib/sensors.c` framework.
-The code is specificaly for the JN516X platform, because it makes use of the platform\DK4 libraries 
+The code is specificaly for the JN516X platform, because it makes use of the platform\DK4 libraries of this JN516X SDK.
 of this JN516X SDK.
 `examples/jn516x/rpl/coap-dr1175-node.c` shows an example on using this contiki driver.
 Mapping of LEDs on JN516x DR1175/DR1174:
    leds.h:         led on DR1175/DR1174:
 DR1174+DR1175:
-    LEDS_RED        Red led in RGB-led with level control on DR1175    
+    LEDS_RED        Red led in RGB-led with level control on DR1175
-    LEDS_GREEN      Green led in RGB-led with level control on DR1175    
+    LEDS_GREEN      Green led in RGB-led with level control on DR1175
-    LEDS_BLUE       Blue led in RGB-led with level control on DR1175    
+    LEDS_BLUE       Blue led in RGB-led with level control on DR1175
    LEDS_WHITE      White power led with level control on DR1175
    LEDS_GP0        LEDS D3 on DR1174
    LEDS_GP1        LEDS D6 on DR1174
--- a/arch/platform/jn516x/dev/dr1199/README.md
+++ b/arch/platform/jn516x/dev/dr1199/README.md
@ -1,9 +1,9 @@
-This directory contains the contiki driver for the sensor (potentiometer) available on the 
+This directory contains the contiki driver for the sensor (potentiometer) available on the
 NXP DR1199 board. This board is part of the NXP JN516x Evaluation Kit (see http://www.nxp.com/documents/leaflet/75017368.pdf).
 The driver for the switches on the DR1199 are supported by `dev/dr1174` when compiled with the flag `SENSOR_BOARD_DR1199` set.
-The dr1199 sensor code interfaces to contiki `core/lib/sensors.c` framework.
+The dr1199 sensor code interfaces to contiki `os/lib/sensors.c` framework.
-The code is specificaly for the JN516X platform, because it makes use of the platform\DK4 libraries 
+The code is specificaly for the JN516X platform, because it makes use of the platform\DK4 libraries
 of this JN516X SDK.
 `examples/jn516x/rpl/coap-dr1199-node.c` shows an example on using this contiki driver.
 leds-arch.c implements the led driver for leds D3 and D6 on the DR1174 base-board and the DR1199 board.
@ -11,7 +11,7 @@ Mapping of LEDs on JN516x DR1199/DR1174:
    leds.h:          led on DR1174:
 DR1174+DR1199:
    leds.h          physical leds
-    LEDS_GREEN      LED D1 on DR1199                      
+    LEDS_GREEN      LED D1 on DR1199
    LEDS_BLUE       LED D2 on DR1199
    LEDS_RED        LED D3 on DR1199
    LEDS_GP0        LED D3 on DR1174
--- a/arch/platform/native/Makefile.native
+++ b/arch/platform/native/Makefile.native
@ -42,5 +42,5 @@ CURSES_LIBS ?= -lncurses
 TARGET_LIBFILES += $(CURSES_LIBS)
-MODULES+=core/net core/net/mac core/net/mac/framer core/net/ip64-addr/ \
+MODULES+=os/net os/net/mac os/net/mac/framer os/net/ip64-addr/ \
-  core/net/mac/csma core/net/mac/nullmac
+  os/net/mac/csma os/net/mac/nullmac
--- a/arch/platform/nrf52dk/Makefile.nrf52dk
+++ b/arch/platform/nrf52dk/Makefile.nrf52dk
@ -28,5 +28,5 @@ SMALL ?= 0
 CONTIKI_CPU=$(CONTIKI)/arch/cpu/nrf52832
 include $(CONTIKI_CPU)/Makefile.nrf52832
-MODULES += core/net core/net/mac core/net/mac/framer \
+MODULES += os/net os/net/mac os/net/mac/framer \
-  core/net/mac/csma core/net/mac/nullmac
+  os/net/mac/csma os/net/mac/nullmac
--- a/arch/platform/openmote-cc2538/Makefile.openmote-cc2538
+++ b/arch/platform/openmote-cc2538/Makefile.openmote-cc2538
@ -26,8 +26,8 @@ CLEAN += *.openmote-cc2538
 CONTIKI_CPU=$(CONTIKI)/arch/cpu/cc2538
 include $(CONTIKI_CPU)/Makefile.cc2538
-MODULES += core/net core/net/mac core/net/mac/framer \
+MODULES += os/net os/net/mac os/net/mac/framer \
-  core/net/mac/csma core/net/mac/nullmac
+  os/net/mac/csma os/net/mac/nullmac
 PYTHON = python
 BSL_FLAGS += -e --bootloader-invert-lines -w -v -b 450000
--- a/arch/platform/sky/Makefile.sky
+++ b/arch/platform/sky/Makefile.sky
@ -6,6 +6,6 @@ CONTIKI_TARGET_SOURCEFILES += contiki-sky-platform.c \
 include $(CONTIKI)/arch/platform/sky/Makefile.common
-MODULES += core/net/mac core/net/mac/framer core/net \
+MODULES += os/net/mac os/net/mac/framer os/net \
-           core/net/mac/csma core/net/mac/nullmac \
+           os/net/mac/csma os/net/mac/nullmac \
           arch/dev/cc2420 arch/dev/sht11 arch/dev/ds2411
--- a/arch/platform/sky/doc/sky.txt
+++ b/arch/platform/sky/doc/sky.txt
@ -24,8 +24,8 @@ in cpu/msp430/dev/uart1.c or platform/sky/slip_uart1.c, depending on
 weather or not the Tmote Sky is running TCP/IP or not.
 There are currently two CC2420 drivers in the Contiki source code,
-core/dev/simple-cc2420.c (a really simple CC2420 driver) and
+os/dev/simple-cc2420.c (a really simple CC2420 driver) and
-core/dev/cc2420.c (a more feature-rich CC2420 driver).
+os/dev/cc2420.c (a more feature-rich CC2420 driver).
 More information about the Tmote Sky, including data sheets, can be
 found at Moteiv's web site: http://www.moteiv.com
--- a/arch/platform/srf06-cc26xx/Makefile.srf06-cc26xx
+++ b/arch/platform/srf06-cc26xx/Makefile.srf06-cc26xx
@ -32,5 +32,5 @@ SMALL ?= 0
 CONTIKI_CPU=$(CONTIKI)/arch/cpu/cc26xx-cc13xx
 include $(CONTIKI_CPU)/Makefile.$(CPU_FAMILY)
-MODULES += core/net core/net/mac core/net/mac/framer \
+MODULES += os/net os/net/mac os/net/mac/framer \
-  core/net/mac/csma core/net/mac/nullmac
+  os/net/mac/csma os/net/mac/nullmac
--- a/arch/platform/zoul/Makefile.zoul
+++ b/arch/platform/zoul/Makefile.zoul
@ -45,12 +45,12 @@ CLEAN += *.zoul
 CONTIKI_CPU=$(CONTIKI)/arch/cpu/cc2538
 include $(CONTIKI_CPU)/Makefile.cc2538
-MODULES += core/net core/net/mac core/net/mac/framer \
+MODULES += os/net os/net/mac os/net/mac/framer \
-           core/net/mac/csma core/net/mac/nullmac \
+           os/net/mac/csma os/net/mac/nullmac \
           arch/dev/cc1200
 ifeq ($(WITH_IP64),1)
-  MODULES += core/net/ip64
+  MODULES += os/net/ip64
 endif
 BSL = $(CONTIKI)/tools/cc2538-bsl/cc2538-bsl.py
--- a/arch/platform/zoul/remote-reva/Makefile.remote-reva
+++ b/arch/platform/zoul/remote-reva/Makefile.remote-reva
@ -1,4 +1,4 @@
 MOTELIST_ZOLERTIA = remote
 BOARD_SOURCEFILES += board.c antenna-sw.c mmc-arch.c rtcc.c power-mgmt.c leds-arch.c
-MODULES += core/lib/fs/fat core/lib/fs/fat/option arch/platform/zoul/fs/fat arch/dev/disk/mmc
+MODULES += os/lib/fs/fat os/lib/fs/fat/option arch/platform/zoul/fs/fat arch/dev/disk/mmc
--- a/arch/platform/zoul/remote-revb/Makefile.remote-revb
+++ b/arch/platform/zoul/remote-revb/Makefile.remote-revb
@ -1,4 +1,4 @@
 MOTELIST_ZOLERTIA = remote
 BOARD_SOURCEFILES += board.c antenna-sw.c mmc-arch.c rtcc.c leds-res-arch.c power-mgmt.c
-MODULES += core/lib/fs/fat core/lib/fs/fat/option arch/platform/zoul/fs/fat arch/dev/disk/mmc
+MODULES += os/lib/fs/fat os/lib/fs/fat/option arch/platform/zoul/fs/fat arch/dev/disk/mmc
--- a/doc/tutorial-raven.txt
+++ b/doc/tutorial-raven.txt
@ -33,7 +33,7 @@ as well as instructions to run more advanced demos.
 To run the demo, you will need at least
 \li one AVR RAVEN board, which embeds an ATmega1284P and an
-ATmega3290P micro controller (MCU) as well as an AT86RF230 
+ATmega3290P micro controller (MCU) as well as an AT86RF230
 802.15.4 radio chip.
 \li one RZ USB stick, which embeds an AT90USB1287 MCU and
 an AT86RF230 802.15.4 radio chip.
@ -48,7 +48,7 @@ mkII.
 <HR>
 \section software Software requirements
 To install the demo you need:
-\li Contiki 2.3 or later source code, installed in a directory. In 
+\li Contiki 2.3 or later source code, installed in a directory. In
 the rest of this tutorial we assume the directory is c:/contiki
 \li Cygwin with "make" utility installed.
 \li AVR Studio 4.14 or later
@ -115,13 +115,13 @@ make
 \subsection installation_hw Installing the hardware
 To power the RAVEN, put the EXT/BAT jumper in BAT position.
-This will enable power on batteries. If you want to power 
+This will enable power on batteries. If you want to power
-the RAVEN externally, check instructions in 
+the RAVEN externally, check instructions in
 \ref advanced_externalboard.
-The RZ USB Stick needs to be plugged in the PC you will run 
+The RZ USB Stick needs to be plugged in the PC you will run
 the demo on. If you plan to run the demo on a Windows PC, you
-will need to install drivers once contiki is loaded on the 
+will need to install drivers once contiki is loaded on the
 stick. Until then, you can exit any driver installation popup.
 \subsection installation_loading Programming the boards
@ -131,16 +131,16 @@ stick. Until then, you can exit any driver installation popup.
 \li On the RZ USB Stick, load the binary on the AT90USB1287
 <b>Hardware connections</b><br>
-\li Connect the JTAG connectors to the JTAGICE as described in 
+\li Connect the JTAG connectors to the JTAGICE as described in
 the picture below.
 \image html tutorial-raven-jtag.jpg
 \li Connect the JTAGICE mkII to a Windows PC through USB.
-\li To program (load) each AVR, you will need to connect the 
+\li To program (load) each AVR, you will need to connect the
-JTAGICE JTAG connector to the JTAG pins corresponding to the 
+JTAGICE JTAG connector to the JTAG pins corresponding to the
 AVR you want to program, as shown in the picture below.
-\image html tutorial-raven-connections.jpg 
+\image html tutorial-raven-connections.jpg
 <b>To load the binary on each AVR in Windows</b><br>
@ -177,8 +177,8 @@ Note this programmed the fuses, EEPROM, and FLASH all at once.
 Plug the RZ USB Stick in the PC. It should appear as a USB
 network interface (e.g. usb0).
-usb0 should automatically get an IPv6 link local address, i.e. 
+usb0 should automatically get an IPv6 link local address, i.e.
-fe80::0012:13ff:fe14:1516/64. Check this is the case by typing 
+fe80::0012:13ff:fe14:1516/64. Check this is the case by typing
 \verbatim
 ifconfig
 \endverbatim
@ -214,8 +214,8 @@ interface usb0
    {
        AdvOnLink on;
        AdvAutonomous on;
-        AdvPreferredLifetime 4294967295; 
+        AdvPreferredLifetime 4294967295;
-        AdvValidLifetime 4294967295; 
+        AdvValidLifetime 4294967295;
    };
 };
 \endverbatim
@ -240,14 +240,14 @@ Plug the RZ USB Stick in the PC. A "new hardware installation"
 window should pop up. If it does not, go to "Control Panel"->
 "Add Hardware". Choose "Install the driver manually", then
 select the search path C:\\contiki\\cpu\\avr\\dev\\usb\\INF. Finish
-the installation. 
+the installation.
-You now need to get the "interface index" of the USB Stick 
+You now need to get the "interface index" of the USB Stick
-interface (noted [interface index] in the following) and the 
+interface (noted [interface index] in the following) and the
-Ethernet interface (noted [ethernet interface index] in the 
+Ethernet interface (noted [ethernet interface index] in the
 following).
-In a DOS or Cygwin shell, type 
+In a DOS or Cygwin shell, type
 \verbatim
 ipv6 if
 \endverbatim
@ -292,8 +292,8 @@ ipv6 rtu aaaa::/64 [interface index] publish
 \subsection running_raven Booting the RAVEN boards
 Reboot the RAVEN board.
-The PC sends router advertisements and the RAVEN Board configures 
+The PC sends router advertisements and the RAVEN Board configures
-an IPv6 global address based on them. The PC global addresses 
+an IPv6 global address based on them. The PC global addresses
 were set above. Communication is ready.
 \subsection running_ping1 Pinging the RAVEN board from the router
@ -349,7 +349,7 @@ with parity 8N1, no flow control
 \li The raven board will output debug messages to the terminal
 \note To enable specific debugging messages, edit the source
-file you are interested in (e.g. core/net/uip-nd6-io.c for
+file you are interested in (e.g. os/net/uip-nd6-io.c for
 Neighbor Discovery messages debug) and set the macro DEBUG to 1.
 Then recompile the code, load the new binary on the board and
 restart the RAVEN.
@ -386,9 +386,9 @@ Read the section below to change the MAC address on one device.
 \subsection advanced_eeprom Change a device MAC address
-You can change the MAC address of a RAVEN board or the RZ USB 
+You can change the MAC address of a RAVEN board or the RZ USB
-Stick by setting the 8 first bytes of the EEPROM, following 
+Stick by setting the 8 first bytes of the EEPROM, following
-the convention above. You can do this three ways. 
+the convention above. You can do this three ways.
 The first is to set EEPROM bytes directly in an AVR Studio project, in
 Debug mode
@ -402,19 +402,19 @@ the target processor.
 \li select EEPROM in the menu, then just type in the first 8 bytes
 the target MAC address
-The second is to reprogram the whole EEPROM individually from the 
+The second is to reprogram the whole EEPROM individually from the
 Flash and Fuses.
 \li Connect the JTAG pins of the JTAGICE into the JTAG connector of
 the target processor.
 \li In AVR Studio, click on "Tools"->"Program AVR"->"Auto Connect"
 \li Go to the "Program" tab
-\li In the "EEPROM" section, click on "Read" and save the EEPROM 
+\li In the "EEPROM" section, click on "Read" and save the EEPROM
 content in a file (in hex format)
-\li Edit this file with a text editor, change the value of the 
+\li Edit this file with a text editor, change the value of the
 first 8 bytes, save
 \li In the "EEPROM" section, check the path to the "Input Hex file"
-is the one to the file you just modified and click on "Program". 
+is the one to the file you just modified and click on "Program".
 The third is to modify the default value in the code:
@ -474,7 +474,7 @@ with
 #define SICSLOWPAN_CONF_COMPRESSION SICSLOWPAN_COMPRESSION_IPHC
 \endcode
-Recompile and load Contiki for both the RAVEN ATmega1284P and RZ USB 
+Recompile and load Contiki for both the RAVEN ATmega1284P and RZ USB
 Stick.
 If you capture packets being sent over the air (on the 802.15.4
@ -515,7 +515,7 @@ ip -6 address add fe80::0012:13ff:fe14:1516/64 scope link dev usb0
 \endverbatim
 <b>make version issues</b><br>
-You need to use the "make" executable from WinAVR. There 
+You need to use the "make" executable from WinAVR. There
 are compilation issues with GNU make coming with Cygwin.
 <HR>
@ -527,7 +527,7 @@ are compilation issues with GNU make coming with Cygwin.
 \li User interface on Raven:\ref lcdraven
 \li Wireless libraries for Atmel Radio: \ref wireless
 \li MAC for Atmel Radio:    \ref macdoc
-\li IPv6 Implementation: \ref uip6 
+\li IPv6 Implementation: \ref uip6
 \li 6lowpan Implementation: \ref sicslowpan
 \subsection annex_hardware Annex - Atmel products detailed documentation
@ -560,22 +560,22 @@ http://www.atmel.com/dyn/products/tools_card.asp?tool_id=3353
 <b>Buying the hardware (part number ATAVRRZRAVEN and ATJTAGICE2)</b><br>
 \li For the U.S. you can use http://www.atmel.com/contacts/distributor_check.asp
 \li Digikey http://www.digikey.com/
-\li Spoerle http://www.spoerle.com/en/products 
+\li Spoerle http://www.spoerle.com/en/products
 \li Lawicel http://www.lawicel-shop.se
 \subsection annex_software Software setup details
 <b>Contiki</b><br>
 Download Contiki code from http://www.sics.se/contiki and
-extract the source code. We assume the directory you extract 
+extract the source code. We assume the directory you extract
 to is c:/contiki.
 <b>Cygwin</b><br>
 \li Download Cygwin from http://www.cygwin.com
 \li Launch the setup executable
-\li Follow the instructions until you reach the Window "Cygwin 
+\li Follow the instructions until you reach the Window "Cygwin
 Setup - Select Packages"
-\li In this window, expand the "Devel" item and 
+\li In this window, expand the "Devel" item and
 <b>AVR Studio</b><br>
 Download and install AVR Studio from
@ -586,7 +586,7 @@ WinAVR which contains a number of AVR tools
 such as the avr-gcc compiler.
 Download and install WinAVR latest version from
-http://winavr.sourceforge.net/ 
+http://winavr.sourceforge.net/
 <b>JTAGICE mkII Drivers</b><br>
 Plug the JTAGICE mkII in a USB port of a windows PC. Follow the
--- a/examples/ipv6/multicast/Makefile
+++ b/examples/ipv6/multicast/Makefile
@ -5,7 +5,7 @@ all: $(CONTIKI_PROJECT)
 CONTIKI = ../../..
-MODULES += core/net/ipv6/multicast
+MODULES += os/net/ipv6/multicast
 CONTIKI_WITH_IPV6 = 1
 CONTIKI_WITH_RPL_LITE = 1
--- a/examples/ipv6/rpl-simple/Makefile
+++ b/examples/ipv6/rpl-simple/Makefile
@ -6,7 +6,7 @@ CFLAGS += -DPROJECT_CONF_H=\"project-conf.h\"
 WITH_TSCH ?= 0
 ifeq ($(WITH_TSCH),1)
-MODULES += core/net/mac/tsch
+MODULES += os/net/mac/tsch
 endif
 CFLAGS += -DWITH_TSCH=$(WITH_TSCH)
--- a/examples/ipv6/rpl-tsch/Makefile
+++ b/examples/ipv6/rpl-tsch/Makefile
@ -10,7 +10,7 @@ MAKE_WITH_SECURITY ?= 0 # force Security from command line
 MAKE_WITH_PERIODIC_ROUTES_PRINT ?= 0 # print #routes periodically, used for regression tests
 APPS += orchestra shell
-MODULES += core/net/mac/tsch
+MODULES += os/net/mac/tsch
 ifeq ($(MAKE_WITH_ORCHESTRA),1)
 CFLAGS += -DWITH_ORCHESTRA=1
--- a/examples/logging/README.md
+++ b/examples/logging/README.md
@ -1,6 +1,6 @@
 Logging
 ===========
-This example shows how to configure the logging system. See core/net/sys/log.h
+This example shows how to configure the logging system. See os/net/sys/log.h
-and core/net/sys/log-conf.h more information on logging. Edit project-conf.h
+and os/net/sys/log-conf.h more information on logging. Edit project-conf.h
 for configure debug levels for the different modules.
--- a/examples/logging/project-conf.h
+++ b/examples/logging/project-conf.h
@ -30,9 +30,9 @@
 #ifndef PROJECT_CONF_H_
 #define PROJECT_CONF_H_
-/* Set maximum debug level on all modules. See core/sys/log-conf.h for
+/* Set maximum debug level on all modules. See os/sys/log-conf.h for
 * a list of supported modules. The different log levels are defined in
- * core/sys/log.h:
+ * os/sys/log.h:
 *     LOG_LEVEL_NONE         No log
 *     LOG_LEVEL_ERR          Errors
 *     LOG_LEVEL_WARN         Warnings
--- a/examples/platform-specific/jn516x/rpl/border-router/Makefile
+++ b/examples/platform-specific/jn516x/rpl/border-router/Makefile
@ -1,5 +1,5 @@
 CONTIKI_PROJECT = border-router
-all: $(CONTIKI_PROJECT) 
+all: $(CONTIKI_PROJECT)
 TARGET ?= jn516x
@ -7,7 +7,7 @@ CONTIKI=../../../../..
 CONTIKI_WITH_IPV6 = 1
-MODULES += core/net/mac/tsch
+MODULES += os/net/mac/tsch
 PROJECTDIRS += .. ../tools
 PROJECT_SOURCEFILES += rpl-tools.c
 CFLAGS += -DPROJECT_CONF_H=\"project-conf.h\"
@ -23,10 +23,10 @@ include $(CONTIKI)/Makefile.include
 connect-router-sw:	$(CONTIKI)/tools/tunslip6
 	sudo $(CONTIKI)/tools/tunslip6 -X -B 1000000 $(PREFIX)
-#using hw flow control	
+#using hw flow control
 connect-router-hw:	$(CONTIKI)/tools/tunslip6
 	sudo $(CONTIKI)/tools/tunslip6 -H -B 1000000 $(PREFIX)
-#using no flow control	
+#using no flow control
 connect-router-no:	$(CONTIKI)/tools/tunslip6
 	sudo $(CONTIKI)/tools/tunslip6 -B 1000000 $(PREFIX)
--- a/examples/platform-specific/jn516x/rpl/coap-dongle-node/Makefile
+++ b/examples/platform-specific/jn516x/rpl/coap-dongle-node/Makefile
@ -8,7 +8,7 @@ CONTIKI=../../../../..
 CONTIKI_WITH_IPV6 = 1
-MODULES += core/net/mac/tsch
+MODULES += os/net/mac/tsch
 PROJECTDIRS += .. ../tools
 PROJECT_SOURCEFILES += rpl-tools.c
 CFLAGS += -DPROJECT_CONF_H=\"project-conf.h\"
--- a/examples/platform-specific/jn516x/rpl/coap-dr1175-node/Makefile
+++ b/examples/platform-specific/jn516x/rpl/coap-dr1175-node/Makefile
@ -8,7 +8,7 @@ CONTIKI=../../../../..
 CONTIKI_WITH_IPV6 = 1
-MODULES += core/net/mac/tsch
+MODULES += os/net/mac/tsch
 PROJECTDIRS += .. ../tools
 PROJECT_SOURCEFILES += rpl-tools.c
 CFLAGS += -DPROJECT_CONF_H=\"project-conf.h\"
--- a/examples/platform-specific/jn516x/rpl/coap-dr1199-node/Makefile
+++ b/examples/platform-specific/jn516x/rpl/coap-dr1199-node/Makefile
@ -8,7 +8,7 @@ CONTIKI=../../../../..
 CONTIKI_WITH_IPV6 = 1
-MODULES += core/net/mac/tsch
+MODULES += os/net/mac/tsch
 PROJECTDIRS += .. ../tools
 PROJECT_SOURCEFILES += rpl-tools.c
 CFLAGS += -DPROJECT_CONF_H=\"project-conf.h\"
--- a/examples/platform-specific/jn516x/rpl/node/Makefile
+++ b/examples/platform-specific/jn516x/rpl/node/Makefile
@ -7,7 +7,7 @@ CONTIKI=../../../../..
 CONTIKI_WITH_IPV6 = 1
-MODULES += core/net/mac/tsch
+MODULES += os/net/mac/tsch
 PROJECTDIRS += .. ../tools
 PROJECT_SOURCEFILES += rpl-tools.c
 CFLAGS += -DPROJECT_CONF_H=\"project-conf.h\"
--- a/examples/platform-specific/jn516x/tsch/simple-sensor-network/node/Makefile
+++ b/examples/platform-specific/jn516x/tsch/simple-sensor-network/node/Makefile
@ -18,7 +18,7 @@ APPS += json
 APPS += er-coap
 APPS += rest-engine
-MODULES += core/net/mac/tsch
+MODULES += os/net/mac/tsch
 all: $(CONTIKI_PROJECT)
--- a/examples/platform-specific/jn516x/tsch/simple-sensor-network/rpl-border-router/Makefile
+++ b/examples/platform-specific/jn516x/tsch/simple-sensor-network/rpl-border-router/Makefile
@ -20,7 +20,7 @@ APPS += json
 APPS += er-coap
 APPS += rest-engine
-MODULES += core/net/mac/tsch
+MODULES += os/net/mac/tsch
 all: $(CONTIKI_PROJECT)
 include $(CONTIKI)/Makefile.include
@ -37,11 +37,11 @@ connect-router:	$(CONTIKI)/tools/tunslip6
 connect-router-sw:	$(CONTIKI)/tools/tunslip6
 	sudo $(CONTIKI)/tools/tunslip6 -v1 -X -B 1000000 $(PREFIX)
-#using hw flow control	
+#using hw flow control
 connect-router-hw:	$(CONTIKI)/tools/tunslip6
 	sudo $(CONTIKI)/tools/tunslip6 -v1 -H -B 1000000 $(PREFIX)
-#using no flow control	
+#using no flow control
 connect-router-no:	$(CONTIKI)/tools/tunslip6
 	sudo $(CONTIKI)/tools/tunslip6 -v1 -B 1000000 $(PREFIX)
--- a/examples/platform-specific/jn516x/tsch/tx-power-verification/node/Makefile
+++ b/examples/platform-specific/jn516x/tsch/tx-power-verification/node/Makefile
@ -8,7 +8,7 @@ CONTIKI_WITH_IPV6 = 1
 CFLAGS += -DPROJECT_CONF_H=\"project-conf.h\"
 PROJECTDIRS += .. ../../tools
-PROJECT_SOURCEFILES += rpl-tools.c 
+PROJECT_SOURCEFILES += rpl-tools.c
 CFLAGS += -DWITH_COAP
 CFLAGS += -DREST=coap_rest_implementation
@ -18,7 +18,7 @@ APPS += json
 APPS += er-coap
 APPS += rest-engine
-MODULES += core/net/mac/tsch
+MODULES += os/net/mac/tsch
 all: $(CONTIKI_PROJECT)
--- a/examples/platform-specific/jn516x/tsch/tx-power-verification/rpl-border-router/Makefile
+++ b/examples/platform-specific/jn516x/tsch/tx-power-verification/rpl-border-router/Makefile
@ -11,7 +11,7 @@ CFLAGS += -DPROJECT_CONF_H=\"project-conf.h\"
 PROJECT_SOURCEFILES += slip-bridge.c slip.c
 PROJECTDIRS += .. ../../tools
-PROJECT_SOURCEFILES += rpl-tools.c 
+PROJECT_SOURCEFILES += rpl-tools.c
 CFLAGS += -DWITH_COAP
 CFLAGS += -DREST=coap_rest_implementation
@ -21,7 +21,7 @@ APPS += json
 APPS += er-coap
 APPS += rest-engine
-MODULES += core/net/mac/tsch
+MODULES += os/net/mac/tsch
 all: $(CONTIKI_PROJECT)
 include $(CONTIKI)/Makefile.include
@ -38,11 +38,11 @@ connect-router:	$(CONTIKI)/tools/tunslip6
 connect-router-sw:	$(CONTIKI)/tools/tunslip6
 	sudo $(CONTIKI)/tools/tunslip6 -v1 -X -B 1000000 $(PREFIX)
-#using hw flow control	
+#using hw flow control
 connect-router-hw:	$(CONTIKI)/tools/tunslip6
 	sudo $(CONTIKI)/tools/tunslip6 -v1 -H -B 1000000 $(PREFIX)
-#using no flow control	
+#using no flow control
 connect-router-no:	$(CONTIKI)/tools/tunslip6
 	sudo $(CONTIKI)/tools/tunslip6 -v1 -B 1000000 $(PREFIX)
--- a/examples/platform-specific/jn516x/tsch/uart1-test-node/Makefile
+++ b/examples/platform-specific/jn516x/tsch/uart1-test-node/Makefile
@ -8,7 +8,7 @@ CONTIKI=../../../../..
 CONTIKI_WITH_IPV6 = 1
 CFLAGS += -DPROJECT_CONF_H=\"project-conf.h\"
-PROJECTDIRS += .. ../tools 
+PROJECTDIRS += .. ../tools
 PROJECT_SOURCEFILES += rpl-tools.c
 CFLAGS += -DWITH_COAP
@ -19,7 +19,7 @@ APPS += json
 APPS += er-coap
 APPS += rest-engine
-MODULES += core/net/mac/tsch
+MODULES += os/net/mac/tsch
 all: $(CONTIKI_PROJECT)
--- a/core/cfs/cfs-coffee.c
+++ b/core/cfs/cfs-coffee.c
--- a/core/cfs/cfs-coffee.h
+++ b/core/cfs/cfs-coffee.h
--- a/core/cfs/cfs-eeprom.c
+++ b/core/cfs/cfs-eeprom.c
--- a/core/cfs/cfs-posix-dir.c
+++ b/core/cfs/cfs-posix-dir.c
--- a/core/cfs/cfs-posix.c
+++ b/core/cfs/cfs-posix.c
--- a/core/cfs/cfs-ram.c
+++ b/core/cfs/cfs-ram.c
--- a/core/cfs/cfs-xmem.c
+++ b/core/cfs/cfs-xmem.c
--- a/core/cfs/cfs.h
+++ b/core/cfs/cfs.h
--- a/core/contiki-default-conf.h
+++ b/core/contiki-default-conf.h
--- a/core/contiki-lib.h
+++ b/core/contiki-lib.h
--- a/core/contiki-net.h
+++ b/core/contiki-net.h
--- a/core/contiki.h
+++ b/core/contiki.h
--- a/core/dev/battery-sensor.h
+++ b/core/dev/battery-sensor.h
--- a/core/dev/button-sensor.h
+++ b/core/dev/button-sensor.h
--- a/core/dev/eeprom.h
+++ b/core/dev/eeprom.h
--- a/core/dev/leds.c
+++ b/core/dev/leds.c
--- a/core/dev/leds.h
+++ b/core/dev/leds.h
--- a/core/dev/nullradio.c
+++ b/core/dev/nullradio.c
--- a/core/dev/nullradio.h
+++ b/core/dev/nullradio.h
--- a/core/dev/radio-sensor.h
+++ b/core/dev/radio-sensor.h
--- a/core/dev/radio.h
+++ b/core/dev/radio.h
--- a/core/dev/rom.h
+++ b/core/dev/rom.h
--- a/core/dev/serial-line.c
+++ b/core/dev/serial-line.c
--- a/core/dev/serial-line.h
+++ b/core/dev/serial-line.h
--- a/core/dev/slip.c
+++ b/core/dev/slip.c
--- a/core/dev/slip.h
+++ b/core/dev/slip.h
--- a/core/dev/spi.h
+++ b/core/dev/spi.h
--- a/core/dev/watchdog.h
+++ b/core/dev/watchdog.h
--- a/core/dev/xmem.h
+++ b/core/dev/xmem.h
--- a/core/lib/aes-128.c
+++ b/core/lib/aes-128.c
--- a/core/lib/aes-128.h
+++ b/core/lib/aes-128.h
--- a/core/lib/assert.c
+++ b/core/lib/assert.c
--- a/core/lib/assert.h
+++ b/core/lib/assert.h
--- a/core/lib/ccm-star.c
+++ b/core/lib/ccm-star.c
--- a/core/lib/ccm-star.h
+++ b/core/lib/ccm-star.h
--- a/core/lib/crc16.c
+++ b/core/lib/crc16.c
--- a/core/lib/crc16.h
+++ b/core/lib/crc16.h
--- a/core/lib/fs/fat/00history.txt
+++ b/core/lib/fs/fat/00history.txt
--- a/core/lib/fs/fat/README.md
+++ b/core/lib/fs/fat/README.md
--- a/core/lib/fs/fat/diskio.h
+++ b/core/lib/fs/fat/diskio.h
--- a/core/lib/fs/fat/ff.c
+++ b/core/lib/fs/fat/ff.c
--- a/core/lib/fs/fat/ff.h
+++ b/core/lib/fs/fat/ff.h
--- a/core/lib/fs/fat/integer.h
+++ b/core/lib/fs/fat/integer.h
--- a/core/lib/fs/fat/option/syscall.c
+++ b/core/lib/fs/fat/option/syscall.c
--- a/core/lib/fs/fat/option/unicode.c
+++ b/core/lib/fs/fat/option/unicode.c
--- a/core/lib/fs/fat/option/unicode/cc932.c
+++ b/core/lib/fs/fat/option/unicode/cc932.c
--- a/core/lib/fs/fat/option/unicode/cc936.c
+++ b/core/lib/fs/fat/option/unicode/cc936.c
--- a/core/lib/fs/fat/option/unicode/cc949.c
+++ b/core/lib/fs/fat/option/unicode/cc949.c
--- a/core/lib/fs/fat/option/unicode/cc950.c
+++ b/core/lib/fs/fat/option/unicode/cc950.c
--- a/core/lib/fs/fat/option/unicode/ccsbcs.c
+++ b/core/lib/fs/fat/option/unicode/ccsbcs.c
--- a/core/lib/heapmem.c
+++ b/core/lib/heapmem.c
--- a/core/lib/heapmem.h
+++ b/core/lib/heapmem.h
--- a/core/lib/ifft.c
+++ b/core/lib/ifft.c
--- a/core/lib/ifft.h
+++ b/core/lib/ifft.h
--- a/core/lib/list.c
+++ b/core/lib/list.c
--- a/core/lib/list.h
+++ b/core/lib/list.h
--- a/core/lib/memb.c
+++ b/core/lib/memb.c
--- a/core/lib/memb.h
+++ b/core/lib/memb.h
--- a/core/lib/newlib/syscalls.c
+++ b/core/lib/newlib/syscalls.c
--- a/core/lib/random.c
+++ b/core/lib/random.c
--- a/core/lib/random.h
+++ b/core/lib/random.h
--- a/core/lib/ringbuf.c
+++ b/core/lib/ringbuf.c
--- a/core/lib/ringbuf.h
+++ b/core/lib/ringbuf.h
--- a/core/lib/ringbufindex.c
+++ b/core/lib/ringbufindex.c
@ -33,13 +33,13 @@
 /**
 * \file
 *         ringbufindex library. Implements basic support for ring buffers
- *         of any type, as opposed to the core/lib/ringbuf module which
+ *         of any type, as opposed to the os/lib/ringbuf module which
 *         is only for byte arrays. Simply returns index in the ringbuf
 *         rather than actual elements. The ringbuf size must be power of two.
 *         Like the original ringbuf, this module implements atomic put and get.
 * \author
 *         Simon Duquennoy <simonduq@sics.se>
- *         based on Contiki's core/lib/ringbuf library by Adam Dunkels
+ *         based on Contiki's os/lib/ringbuf library by Adam Dunkels
 */
 #include <string.h>
--- a/Show More
+++ b/Show More