Renamed core to os

This commit is contained in:
Niclas Finne 2017-09-01 15:29:00 +02:00
parent 25698b76f3
commit 2c86194ef8
322 changed files with 135 additions and 136 deletions

View File

@ -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)}}

View File

@ -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"

View File

@ -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>

View File

@ -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"

View File

@ -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>

View File

@ -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 \
core/net/mac/csma core/net/mac/nullmac
MODULES += os/net os/net/mac os/net/mac/framer \
os/net/mac/csma os/net/mac/nullmac
PYTHON = python
BSL_FLAGS += -e -w -v

View File

@ -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 \

View File

@ -77,8 +77,8 @@ CFLAGSNO += -Werror
endif
CFLAGS += $(CFLAGSNO)
MODULES += core/net core/net/mac core/net/mac/framer core/net/ip64-addr \
core/net/mac/csma core/net/mac/nullmac
MODULES += os/net os/net/mac os/net/mac/framer os/net/ip64-addr \
os/net/mac/csma os/net/mac/nullmac
## Copied from Makefile.include, since Cooja overrides CFLAGS et al
HAS_STACK = 0

View File

@ -143,8 +143,8 @@ endif
CLEAN += *.jn516x
CLEAN += *.jn516x.bin
MODULES += core/net core/net/mac core/net/mac/framer \
core/net/mac/csma core/net/mac/nullmac
MODULES += os/net os/net/mac os/net/mac/framer \
os/net/mac/csma os/net/mac/nullmac
CONTIKI_TARGET_SOURCEFILES += $(ARCH)
CONTIKI_SOURCEFILES += $(CONTIKI_TARGET_SOURCEFILES)

View File

@ -1,9 +1,8 @@
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).
The dr1175 sensor code interfaces to the contiki `core/lib/sensors.c` framework.
The code is specificaly for the JN516X platform, because it makes use of the platform\DK4 libraries
of this JN516X SDK.
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 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:

View File

@ -2,7 +2,7 @@ This directory contains the contiki driver for the sensor (potentiometer) availa
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
of this JN516X SDK.
`examples/jn516x/rpl/coap-dr1199-node.c` shows an example on using this contiki driver.

View File

@ -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/ \
core/net/mac/csma core/net/mac/nullmac
MODULES+=os/net os/net/mac os/net/mac/framer os/net/ip64-addr/ \
os/net/mac/csma os/net/mac/nullmac

View File

@ -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 \
core/net/mac/csma core/net/mac/nullmac
MODULES += os/net os/net/mac os/net/mac/framer \
os/net/mac/csma os/net/mac/nullmac

View File

@ -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 \
core/net/mac/csma core/net/mac/nullmac
MODULES += os/net os/net/mac os/net/mac/framer \
os/net/mac/csma os/net/mac/nullmac
PYTHON = python
BSL_FLAGS += -e --bootloader-invert-lines -w -v -b 450000

View File

@ -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 \
core/net/mac/csma core/net/mac/nullmac \
MODULES += os/net/mac os/net/mac/framer os/net \
os/net/mac/csma os/net/mac/nullmac \
arch/dev/cc2420 arch/dev/sht11 arch/dev/ds2411

View File

@ -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
core/dev/cc2420.c (a more feature-rich CC2420 driver).
os/dev/simple-cc2420.c (a really simple CC2420 driver) and
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

View File

@ -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 \
core/net/mac/csma core/net/mac/nullmac
MODULES += os/net os/net/mac os/net/mac/framer \
os/net/mac/csma os/net/mac/nullmac

View File

@ -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 \
core/net/mac/csma core/net/mac/nullmac \
MODULES += os/net os/net/mac os/net/mac/framer \
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

View File

@ -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

View File

@ -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

View File

@ -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.

View File

@ -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

View File

@ -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)

View File

@ -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

View File

@ -1,6 +1,6 @@
Logging
===========
This example shows how to configure the logging system. See core/net/sys/log.h
and core/net/sys/log-conf.h more information on logging. Edit project-conf.h
This example shows how to configure the logging system. See os/net/sys/log.h
and os/net/sys/log-conf.h more information on logging. Edit project-conf.h
for configure debug levels for the different modules.

View File

@ -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

View File

@ -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\"

View File

@ -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\"

View File

@ -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\"

View File

@ -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\"

View File

@ -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\"

View File

@ -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)

View File

@ -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

View File

@ -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)

View File

@ -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

View File

@ -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)

View File

@ -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>

Some files were not shown because too many files have changed in this diff Show More