From 2c86194ef81768b27f4e88261d9d214a0e27173e Mon Sep 17 00:00:00 2001 From: Niclas Finne Date: Fri, 1 Sep 2017 15:29:00 +0200 Subject: [PATCH] Renamed core to os --- Makefile.include | 10 +-- arch/cpu/cc2538/dev/random.c | 2 +- arch/cpu/cc253x/dev/random.c | 2 +- arch/cpu/cc26xx-cc13xx/random.c | 2 +- arch/cpu/nrf52832/dev/random.c | 2 +- arch/platform/cc2538dk/Makefile.cc2538dk | 4 +- arch/platform/cooja-ip64/Makefile.cooja-ip64 | 2 +- arch/platform/cooja/Makefile.cooja | 4 +- arch/platform/jn516x/Makefile.jn516x | 4 +- arch/platform/jn516x/dev/dr1175/README.md | 15 ++-- arch/platform/jn516x/dev/dr1199/README.md | 8 +- arch/platform/native/Makefile.native | 4 +- arch/platform/nrf52dk/Makefile.nrf52dk | 4 +- .../openmote-cc2538/Makefile.openmote-cc2538 | 4 +- arch/platform/sky/Makefile.sky | 4 +- arch/platform/sky/doc/sky.txt | 4 +- .../srf06-cc26xx/Makefile.srf06-cc26xx | 4 +- arch/platform/zoul/Makefile.zoul | 6 +- .../zoul/remote-reva/Makefile.remote-reva | 2 +- .../zoul/remote-revb/Makefile.remote-revb | 2 +- doc/tutorial-raven.txt | 74 +++++++++---------- examples/ipv6/multicast/Makefile | 2 +- examples/ipv6/rpl-simple/Makefile | 2 +- examples/ipv6/rpl-tsch/Makefile | 2 +- examples/logging/README.md | 4 +- examples/logging/project-conf.h | 4 +- .../jn516x/rpl/border-router/Makefile | 8 +- .../jn516x/rpl/coap-dongle-node/Makefile | 2 +- .../jn516x/rpl/coap-dr1175-node/Makefile | 2 +- .../jn516x/rpl/coap-dr1199-node/Makefile | 2 +- .../jn516x/rpl/node/Makefile | 2 +- .../tsch/simple-sensor-network/node/Makefile | 2 +- .../rpl-border-router/Makefile | 6 +- .../tsch/tx-power-verification/node/Makefile | 4 +- .../rpl-border-router/Makefile | 8 +- .../jn516x/tsch/uart1-test-node/Makefile | 4 +- {core => os}/cfs/cfs-coffee.c | 0 {core => os}/cfs/cfs-coffee.h | 0 {core => os}/cfs/cfs-eeprom.c | 0 {core => os}/cfs/cfs-posix-dir.c | 0 {core => os}/cfs/cfs-posix.c | 0 {core => os}/cfs/cfs-ram.c | 0 {core => os}/cfs/cfs-xmem.c | 0 {core => os}/cfs/cfs.h | 0 {core => os}/contiki-default-conf.h | 0 {core => os}/contiki-lib.h | 0 {core => os}/contiki-net.h | 0 {core => os}/contiki.h | 0 {core => os}/dev/battery-sensor.h | 0 {core => os}/dev/button-sensor.h | 0 {core => os}/dev/eeprom.h | 0 {core => os}/dev/leds.c | 0 {core => os}/dev/leds.h | 0 {core => os}/dev/nullradio.c | 0 {core => os}/dev/nullradio.h | 0 {core => os}/dev/radio-sensor.h | 0 {core => os}/dev/radio.h | 0 {core => os}/dev/rom.h | 0 {core => os}/dev/serial-line.c | 0 {core => os}/dev/serial-line.h | 0 {core => os}/dev/slip.c | 0 {core => os}/dev/slip.h | 0 {core => os}/dev/spi.h | 0 {core => os}/dev/watchdog.h | 0 {core => os}/dev/xmem.h | 0 {core => os}/lib/aes-128.c | 0 {core => os}/lib/aes-128.h | 0 {core => os}/lib/assert.c | 0 {core => os}/lib/assert.h | 0 {core => os}/lib/ccm-star.c | 0 {core => os}/lib/ccm-star.h | 0 {core => os}/lib/crc16.c | 0 {core => os}/lib/crc16.h | 0 {core => os}/lib/fs/fat/00history.txt | 0 {core => os}/lib/fs/fat/README.md | 0 {core => os}/lib/fs/fat/diskio.h | 0 {core => os}/lib/fs/fat/ff.c | 0 {core => os}/lib/fs/fat/ff.h | 0 {core => os}/lib/fs/fat/integer.h | 0 {core => os}/lib/fs/fat/option/syscall.c | 0 {core => os}/lib/fs/fat/option/unicode.c | 0 .../lib/fs/fat/option/unicode/cc932.c | 0 .../lib/fs/fat/option/unicode/cc936.c | 0 .../lib/fs/fat/option/unicode/cc949.c | 0 .../lib/fs/fat/option/unicode/cc950.c | 0 .../lib/fs/fat/option/unicode/ccsbcs.c | 0 {core => os}/lib/heapmem.c | 0 {core => os}/lib/heapmem.h | 0 {core => os}/lib/ifft.c | 0 {core => os}/lib/ifft.h | 0 {core => os}/lib/list.c | 0 {core => os}/lib/list.h | 0 {core => os}/lib/memb.c | 0 {core => os}/lib/memb.h | 0 {core => os}/lib/newlib/syscalls.c | 0 {core => os}/lib/random.c | 0 {core => os}/lib/random.h | 0 {core => os}/lib/ringbuf.c | 0 {core => os}/lib/ringbuf.h | 0 {core => os}/lib/ringbufindex.c | 4 +- {core => os}/lib/ringbufindex.h | 0 {core => os}/lib/sensors.c | 0 {core => os}/lib/sensors.h | 0 {core => os}/lib/strncasecmp/strncasecmp.c | 0 {core => os}/lib/trickle-timer.c | 0 {core => os}/lib/trickle-timer.h | 0 {core => os}/net/ip/ip64-addr.c | 0 {core => os}/net/ip/ip64-addr.h | 0 {core => os}/net/ip/psock.c | 0 {core => os}/net/ip/psock.h | 0 {core => os}/net/ip/resolv.c | 0 {core => os}/net/ip/resolv.h | 0 {core => os}/net/ip/simple-udp.c | 0 {core => os}/net/ip/simple-udp.h | 0 {core => os}/net/ip/tcp-socket.c | 0 {core => os}/net/ip/tcp-socket.h | 0 {core => os}/net/ip/tcpip.c | 0 {core => os}/net/ip/tcpip.h | 0 {core => os}/net/ip/udp-socket.c | 0 {core => os}/net/ip/udp-socket.h | 0 {core => os}/net/ip/uip-arch.h | 0 {core => os}/net/ip/uip-debug.c | 0 {core => os}/net/ip/uip-debug.h | 0 {core => os}/net/ip/uip-nameserver.c | 0 {core => os}/net/ip/uip-nameserver.h | 0 {core => os}/net/ip/uip-packetqueue.c | 0 {core => os}/net/ip/uip-packetqueue.h | 0 {core => os}/net/ip/uip-udp-packet.c | 0 {core => os}/net/ip/uip-udp-packet.h | 0 {core => os}/net/ip/uip.h | 0 {core => os}/net/ip/uiplib.c | 0 {core => os}/net/ip/uiplib.h | 0 {core => os}/net/ip/uipopt.h | 0 {core => os}/net/ip64/README.md | 0 {core => os}/net/ip64/ip64-addrmap.c | 0 {core => os}/net/ip64/ip64-addrmap.h | 0 {core => os}/net/ip64/ip64-arp.c | 0 {core => os}/net/ip64/ip64-arp.h | 0 {core => os}/net/ip64/ip64-conf-example.h | 0 {core => os}/net/ip64/ip64-dhcpc.c | 0 {core => os}/net/ip64/ip64-dhcpc.h | 0 {core => os}/net/ip64/ip64-dns64.c | 0 {core => os}/net/ip64/ip64-dns64.h | 0 {core => os}/net/ip64/ip64-driver.h | 0 {core => os}/net/ip64/ip64-eth-interface.c | 0 {core => os}/net/ip64/ip64-eth-interface.h | 0 {core => os}/net/ip64/ip64-eth.c | 0 {core => os}/net/ip64/ip64-eth.h | 0 {core => os}/net/ip64/ip64-interface.h | 0 {core => os}/net/ip64/ip64-ipv4-dhcp.c | 0 {core => os}/net/ip64/ip64-ipv4-dhcp.h | 0 {core => os}/net/ip64/ip64-null-driver.c | 0 {core => os}/net/ip64/ip64-null-driver.h | 0 {core => os}/net/ip64/ip64-slip-interface.c | 0 {core => os}/net/ip64/ip64-slip-interface.h | 0 {core => os}/net/ip64/ip64-special-ports.c | 0 {core => os}/net/ip64/ip64-special-ports.h | 0 {core => os}/net/ip64/ip64.c | 0 {core => os}/net/ip64/ip64.h | 0 {core => os}/net/ipv6/multicast/README.md | 8 +- {core => os}/net/ipv6/multicast/esmrf.c | 0 {core => os}/net/ipv6/multicast/esmrf.h | 0 {core => os}/net/ipv6/multicast/roll-tm.c | 0 {core => os}/net/ipv6/multicast/roll-tm.h | 0 {core => os}/net/ipv6/multicast/smrf.c | 0 {core => os}/net/ipv6/multicast/smrf.h | 0 .../net/ipv6/multicast/uip-mcast6-engines.h | 0 .../net/ipv6/multicast/uip-mcast6-route.c | 0 .../net/ipv6/multicast/uip-mcast6-route.h | 0 .../net/ipv6/multicast/uip-mcast6-stats.c | 0 .../net/ipv6/multicast/uip-mcast6-stats.h | 0 {core => os}/net/ipv6/multicast/uip-mcast6.h | 2 +- {core => os}/net/ipv6/sicslowpan.c | 0 {core => os}/net/ipv6/sicslowpan.h | 0 {core => os}/net/ipv6/uip-ds6-nbr.c | 0 {core => os}/net/ipv6/uip-ds6-nbr.h | 0 {core => os}/net/ipv6/uip-ds6-route.c | 0 {core => os}/net/ipv6/uip-ds6-route.h | 0 {core => os}/net/ipv6/uip-ds6.c | 0 {core => os}/net/ipv6/uip-ds6.h | 0 {core => os}/net/ipv6/uip-icmp6.c | 0 {core => os}/net/ipv6/uip-icmp6.h | 0 {core => os}/net/ipv6/uip-nd6.c | 0 {core => os}/net/ipv6/uip-nd6.h | 0 {core => os}/net/ipv6/uip6.c | 0 {core => os}/net/ipv6/websocket-http-client.c | 0 {core => os}/net/ipv6/websocket-http-client.h | 0 {core => os}/net/ipv6/websocket.c | 0 {core => os}/net/ipv6/websocket.h | 0 {core => os}/net/link-stats.c | 0 {core => os}/net/link-stats.h | 2 +- {core => os}/net/linkaddr.c | 0 {core => os}/net/linkaddr.h | 0 {core => os}/net/mac/csma/csma-output.c | 0 {core => os}/net/mac/csma/csma-output.h | 0 {core => os}/net/mac/csma/csma.c | 0 {core => os}/net/mac/csma/csma.h | 0 {core => os}/net/mac/framer/frame802154.c | 0 {core => os}/net/mac/framer/frame802154.h | 0 {core => os}/net/mac/framer/frame802154e-ie.c | 0 {core => os}/net/mac/framer/frame802154e-ie.h | 0 {core => os}/net/mac/framer/framer-802154.c | 0 {core => os}/net/mac/framer/framer-802154.h | 0 {core => os}/net/mac/framer/framer.h | 0 {core => os}/net/mac/llsec802154.h | 0 {core => os}/net/mac/mac-sequence.c | 0 {core => os}/net/mac/mac-sequence.h | 0 {core => os}/net/mac/mac.c | 0 {core => os}/net/mac/mac.h | 0 {core => os}/net/mac/nullmac/nullmac.c | 0 {core => os}/net/mac/nullmac/nullmac.h | 0 {core => os}/net/mac/tsch/Makefile.tsch | 0 {core => os}/net/mac/tsch/README.md | 18 ++--- .../net/mac/tsch/tsch-adaptive-timesync.c | 0 .../net/mac/tsch/tsch-adaptive-timesync.h | 0 {core => os}/net/mac/tsch/tsch-asn.h | 0 {core => os}/net/mac/tsch/tsch-conf.h | 0 {core => os}/net/mac/tsch/tsch-log.c | 0 {core => os}/net/mac/tsch/tsch-log.h | 0 {core => os}/net/mac/tsch/tsch-packet.c | 0 {core => os}/net/mac/tsch/tsch-packet.h | 0 {core => os}/net/mac/tsch/tsch-private.h | 0 {core => os}/net/mac/tsch/tsch-queue.c | 0 {core => os}/net/mac/tsch/tsch-queue.h | 0 {core => os}/net/mac/tsch/tsch-rpl.c | 0 {core => os}/net/mac/tsch/tsch-rpl.h | 0 {core => os}/net/mac/tsch/tsch-schedule.c | 0 {core => os}/net/mac/tsch/tsch-schedule.h | 0 {core => os}/net/mac/tsch/tsch-security.c | 0 {core => os}/net/mac/tsch/tsch-security.h | 0 .../net/mac/tsch/tsch-slot-operation.c | 0 .../net/mac/tsch/tsch-slot-operation.h | 0 {core => os}/net/mac/tsch/tsch.c | 0 {core => os}/net/mac/tsch/tsch.h | 0 {core => os}/net/nbr-table.c | 0 {core => os}/net/nbr-table.h | 0 {core => os}/net/net-debug.c | 0 {core => os}/net/net-debug.h | 0 {core => os}/net/netstack.c | 0 {core => os}/net/netstack.h | 0 {core => os}/net/packetbuf.c | 0 {core => os}/net/packetbuf.h | 0 {core => os}/net/queuebuf.c | 0 {core => os}/net/queuebuf.h | 0 {core => os}/net/rpl-lite/rpl-conf.h | 0 {core => os}/net/rpl-lite/rpl-const.h | 0 {core => os}/net/rpl-lite/rpl-dag-root.c | 0 {core => os}/net/rpl-lite/rpl-dag-root.h | 0 {core => os}/net/rpl-lite/rpl-dag.c | 0 {core => os}/net/rpl-lite/rpl-dag.h | 0 {core => os}/net/rpl-lite/rpl-ext-header.c | 0 {core => os}/net/rpl-lite/rpl-ext-header.h | 0 {core => os}/net/rpl-lite/rpl-icmp6.c | 0 {core => os}/net/rpl-lite/rpl-icmp6.h | 0 {core => os}/net/rpl-lite/rpl-mrhof.c | 0 {core => os}/net/rpl-lite/rpl-nbr-policy.c | 0 {core => os}/net/rpl-lite/rpl-neighbor.c | 0 {core => os}/net/rpl-lite/rpl-neighbor.h | 0 {core => os}/net/rpl-lite/rpl-ns.c | 0 {core => os}/net/rpl-lite/rpl-ns.h | 0 {core => os}/net/rpl-lite/rpl-of0.c | 0 {core => os}/net/rpl-lite/rpl-timers.c | 0 {core => os}/net/rpl-lite/rpl-timers.h | 0 {core => os}/net/rpl-lite/rpl-types.h | 0 {core => os}/net/rpl-lite/rpl.c | 0 {core => os}/net/rpl-lite/rpl.h | 2 +- {core => os}/net/rpl/rpl-conf.h | 0 {core => os}/net/rpl/rpl-dag-root.c | 0 {core => os}/net/rpl/rpl-dag-root.h | 0 {core => os}/net/rpl/rpl-dag.c | 0 {core => os}/net/rpl/rpl-ext-header.c | 0 {core => os}/net/rpl/rpl-icmp6.c | 0 {core => os}/net/rpl/rpl-mrhof.c | 0 {core => os}/net/rpl/rpl-nbr-policy.c | 0 {core => os}/net/rpl/rpl-ns.c | 0 {core => os}/net/rpl/rpl-ns.h | 0 {core => os}/net/rpl/rpl-of0.c | 0 {core => os}/net/rpl/rpl-private.h | 0 {core => os}/net/rpl/rpl-timers.c | 0 {core => os}/net/rpl/rpl.c | 0 {core => os}/net/rpl/rpl.h | 0 {core => os}/sys/arg.c | 0 {core => os}/sys/arg.h | 0 {core => os}/sys/autostart.c | 0 {core => os}/sys/autostart.h | 0 {core => os}/sys/cc-gcc.h | 0 {core => os}/sys/cc.h | 0 {core => os}/sys/clock.h | 0 {core => os}/sys/compower.c | 0 {core => os}/sys/compower.h | 0 {core => os}/sys/ctimer.c | 0 {core => os}/sys/ctimer.h | 0 {core => os}/sys/energest.c | 0 {core => os}/sys/energest.h | 0 {core => os}/sys/etimer.c | 0 {core => os}/sys/etimer.h | 0 {core => os}/sys/lc-addrlabels.h | 0 {core => os}/sys/lc-switch.h | 0 {core => os}/sys/lc.h | 2 +- {core => os}/sys/log-conf.h | 0 {core => os}/sys/log.c | 0 {core => os}/sys/log.h | 0 {core => os}/sys/mt.c | 0 {core => os}/sys/mt.h | 0 {core => os}/sys/node-id.h | 0 {core => os}/sys/process.c | 0 {core => os}/sys/process.h | 0 {core => os}/sys/procinit.c | 0 {core => os}/sys/procinit.h | 0 {core => os}/sys/pt-sem.h | 0 {core => os}/sys/pt.h | 0 {core => os}/sys/rtimer.c | 0 {core => os}/sys/rtimer.h | 0 {core => os}/sys/stimer.c | 0 {core => os}/sys/stimer.h | 0 {core => os}/sys/subprocess.h | 0 {core => os}/sys/timer.c | 0 {core => os}/sys/timer.h | 0 regression-tests/13-ieee802154/README.md | 4 +- .../code-flush-nbr-queue/Makefile | 4 +- regression-tests/13-ieee802154/code/Makefile | 2 +- tools/wpcapslip/Makefile | 6 +- 322 files changed, 135 insertions(+), 136 deletions(-) rename {core => os}/cfs/cfs-coffee.c (100%) rename {core => os}/cfs/cfs-coffee.h (100%) rename {core => os}/cfs/cfs-eeprom.c (100%) rename {core => os}/cfs/cfs-posix-dir.c (100%) rename {core => os}/cfs/cfs-posix.c (100%) rename {core => os}/cfs/cfs-ram.c (100%) rename {core => os}/cfs/cfs-xmem.c (100%) rename {core => os}/cfs/cfs.h (100%) rename {core => os}/contiki-default-conf.h (100%) rename {core => os}/contiki-lib.h (100%) rename {core => os}/contiki-net.h (100%) rename {core => os}/contiki.h (100%) rename {core => os}/dev/battery-sensor.h (100%) rename {core => os}/dev/button-sensor.h (100%) rename {core => os}/dev/eeprom.h (100%) rename {core => os}/dev/leds.c (100%) rename {core => os}/dev/leds.h (100%) rename {core => os}/dev/nullradio.c (100%) rename {core => os}/dev/nullradio.h (100%) rename {core => os}/dev/radio-sensor.h (100%) rename {core => os}/dev/radio.h (100%) rename {core => os}/dev/rom.h (100%) rename {core => os}/dev/serial-line.c (100%) rename {core => os}/dev/serial-line.h (100%) rename {core => os}/dev/slip.c (100%) rename {core => os}/dev/slip.h (100%) rename {core => os}/dev/spi.h (100%) rename {core => os}/dev/watchdog.h (100%) rename {core => os}/dev/xmem.h (100%) rename {core => os}/lib/aes-128.c (100%) rename {core => os}/lib/aes-128.h (100%) rename {core => os}/lib/assert.c (100%) rename {core => os}/lib/assert.h (100%) rename {core => os}/lib/ccm-star.c (100%) rename {core => os}/lib/ccm-star.h (100%) rename {core => os}/lib/crc16.c (100%) rename {core => os}/lib/crc16.h (100%) rename {core => os}/lib/fs/fat/00history.txt (100%) rename {core => os}/lib/fs/fat/README.md (100%) rename {core => os}/lib/fs/fat/diskio.h (100%) rename {core => os}/lib/fs/fat/ff.c (100%) rename {core => os}/lib/fs/fat/ff.h (100%) rename {core => os}/lib/fs/fat/integer.h (100%) rename {core => os}/lib/fs/fat/option/syscall.c (100%) rename {core => os}/lib/fs/fat/option/unicode.c (100%) rename {core => os}/lib/fs/fat/option/unicode/cc932.c (100%) rename {core => os}/lib/fs/fat/option/unicode/cc936.c (100%) rename {core => os}/lib/fs/fat/option/unicode/cc949.c (100%) rename {core => os}/lib/fs/fat/option/unicode/cc950.c (100%) rename {core => os}/lib/fs/fat/option/unicode/ccsbcs.c (100%) rename {core => os}/lib/heapmem.c (100%) rename {core => os}/lib/heapmem.h (100%) rename {core => os}/lib/ifft.c (100%) rename {core => os}/lib/ifft.h (100%) rename {core => os}/lib/list.c (100%) rename {core => os}/lib/list.h (100%) rename {core => os}/lib/memb.c (100%) rename {core => os}/lib/memb.h (100%) rename {core => os}/lib/newlib/syscalls.c (100%) rename {core => os}/lib/random.c (100%) rename {core => os}/lib/random.h (100%) rename {core => os}/lib/ringbuf.c (100%) rename {core => os}/lib/ringbuf.h (100%) rename {core => os}/lib/ringbufindex.c (97%) rename {core => os}/lib/ringbufindex.h (100%) rename {core => os}/lib/sensors.c (100%) rename {core => os}/lib/sensors.h (100%) rename {core => os}/lib/strncasecmp/strncasecmp.c (100%) rename {core => os}/lib/trickle-timer.c (100%) rename {core => os}/lib/trickle-timer.h (100%) rename {core => os}/net/ip/ip64-addr.c (100%) rename {core => os}/net/ip/ip64-addr.h (100%) rename {core => os}/net/ip/psock.c (100%) rename {core => os}/net/ip/psock.h (100%) rename {core => os}/net/ip/resolv.c (100%) rename {core => os}/net/ip/resolv.h (100%) rename {core => os}/net/ip/simple-udp.c (100%) rename {core => os}/net/ip/simple-udp.h (100%) rename {core => os}/net/ip/tcp-socket.c (100%) rename {core => os}/net/ip/tcp-socket.h (100%) rename {core => os}/net/ip/tcpip.c (100%) rename {core => os}/net/ip/tcpip.h (100%) rename {core => os}/net/ip/udp-socket.c (100%) rename {core => os}/net/ip/udp-socket.h (100%) rename {core => os}/net/ip/uip-arch.h (100%) rename {core => os}/net/ip/uip-debug.c (100%) rename {core => os}/net/ip/uip-debug.h (100%) rename {core => os}/net/ip/uip-nameserver.c (100%) rename {core => os}/net/ip/uip-nameserver.h (100%) rename {core => os}/net/ip/uip-packetqueue.c (100%) rename {core => os}/net/ip/uip-packetqueue.h (100%) rename {core => os}/net/ip/uip-udp-packet.c (100%) rename {core => os}/net/ip/uip-udp-packet.h (100%) rename {core => os}/net/ip/uip.h (100%) rename {core => os}/net/ip/uiplib.c (100%) rename {core => os}/net/ip/uiplib.h (100%) rename {core => os}/net/ip/uipopt.h (100%) rename {core => os}/net/ip64/README.md (100%) rename {core => os}/net/ip64/ip64-addrmap.c (100%) rename {core => os}/net/ip64/ip64-addrmap.h (100%) rename {core => os}/net/ip64/ip64-arp.c (100%) rename {core => os}/net/ip64/ip64-arp.h (100%) rename {core => os}/net/ip64/ip64-conf-example.h (100%) rename {core => os}/net/ip64/ip64-dhcpc.c (100%) rename {core => os}/net/ip64/ip64-dhcpc.h (100%) rename {core => os}/net/ip64/ip64-dns64.c (100%) rename {core => os}/net/ip64/ip64-dns64.h (100%) rename {core => os}/net/ip64/ip64-driver.h (100%) rename {core => os}/net/ip64/ip64-eth-interface.c (100%) rename {core => os}/net/ip64/ip64-eth-interface.h (100%) rename {core => os}/net/ip64/ip64-eth.c (100%) rename {core => os}/net/ip64/ip64-eth.h (100%) rename {core => os}/net/ip64/ip64-interface.h (100%) rename {core => os}/net/ip64/ip64-ipv4-dhcp.c (100%) rename {core => os}/net/ip64/ip64-ipv4-dhcp.h (100%) rename {core => os}/net/ip64/ip64-null-driver.c (100%) rename {core => os}/net/ip64/ip64-null-driver.h (100%) rename {core => os}/net/ip64/ip64-slip-interface.c (100%) rename {core => os}/net/ip64/ip64-slip-interface.h (100%) rename {core => os}/net/ip64/ip64-special-ports.c (100%) rename {core => os}/net/ip64/ip64-special-ports.h (100%) rename {core => os}/net/ip64/ip64.c (100%) rename {core => os}/net/ip64/ip64.h (100%) rename {core => os}/net/ipv6/multicast/README.md (97%) rename {core => os}/net/ipv6/multicast/esmrf.c (100%) rename {core => os}/net/ipv6/multicast/esmrf.h (100%) rename {core => os}/net/ipv6/multicast/roll-tm.c (100%) rename {core => os}/net/ipv6/multicast/roll-tm.h (100%) rename {core => os}/net/ipv6/multicast/smrf.c (100%) rename {core => os}/net/ipv6/multicast/smrf.h (100%) rename {core => os}/net/ipv6/multicast/uip-mcast6-engines.h (100%) rename {core => os}/net/ipv6/multicast/uip-mcast6-route.c (100%) rename {core => os}/net/ipv6/multicast/uip-mcast6-route.h (100%) rename {core => os}/net/ipv6/multicast/uip-mcast6-stats.c (100%) rename {core => os}/net/ipv6/multicast/uip-mcast6-stats.h (100%) rename {core => os}/net/ipv6/multicast/uip-mcast6.h (98%) rename {core => os}/net/ipv6/sicslowpan.c (100%) rename {core => os}/net/ipv6/sicslowpan.h (100%) rename {core => os}/net/ipv6/uip-ds6-nbr.c (100%) rename {core => os}/net/ipv6/uip-ds6-nbr.h (100%) rename {core => os}/net/ipv6/uip-ds6-route.c (100%) rename {core => os}/net/ipv6/uip-ds6-route.h (100%) rename {core => os}/net/ipv6/uip-ds6.c (100%) rename {core => os}/net/ipv6/uip-ds6.h (100%) rename {core => os}/net/ipv6/uip-icmp6.c (100%) rename {core => os}/net/ipv6/uip-icmp6.h (100%) rename {core => os}/net/ipv6/uip-nd6.c (100%) rename {core => os}/net/ipv6/uip-nd6.h (100%) rename {core => os}/net/ipv6/uip6.c (100%) rename {core => os}/net/ipv6/websocket-http-client.c (100%) rename {core => os}/net/ipv6/websocket-http-client.h (100%) rename {core => os}/net/ipv6/websocket.c (100%) rename {core => os}/net/ipv6/websocket.h (100%) rename {core => os}/net/link-stats.c (100%) rename {core => os}/net/link-stats.h (99%) rename {core => os}/net/linkaddr.c (100%) rename {core => os}/net/linkaddr.h (100%) rename {core => os}/net/mac/csma/csma-output.c (100%) rename {core => os}/net/mac/csma/csma-output.h (100%) rename {core => os}/net/mac/csma/csma.c (100%) rename {core => os}/net/mac/csma/csma.h (100%) rename {core => os}/net/mac/framer/frame802154.c (100%) rename {core => os}/net/mac/framer/frame802154.h (100%) rename {core => os}/net/mac/framer/frame802154e-ie.c (100%) rename {core => os}/net/mac/framer/frame802154e-ie.h (100%) rename {core => os}/net/mac/framer/framer-802154.c (100%) rename {core => os}/net/mac/framer/framer-802154.h (100%) rename {core => os}/net/mac/framer/framer.h (100%) rename {core => os}/net/mac/llsec802154.h (100%) rename {core => os}/net/mac/mac-sequence.c (100%) rename {core => os}/net/mac/mac-sequence.h (100%) rename {core => os}/net/mac/mac.c (100%) rename {core => os}/net/mac/mac.h (100%) rename {core => os}/net/mac/nullmac/nullmac.c (100%) rename {core => os}/net/mac/nullmac/nullmac.h (100%) rename {core => os}/net/mac/tsch/Makefile.tsch (100%) rename {core => os}/net/mac/tsch/README.md (94%) rename {core => os}/net/mac/tsch/tsch-adaptive-timesync.c (100%) rename {core => os}/net/mac/tsch/tsch-adaptive-timesync.h (100%) rename {core => os}/net/mac/tsch/tsch-asn.h (100%) rename {core => os}/net/mac/tsch/tsch-conf.h (100%) rename {core => os}/net/mac/tsch/tsch-log.c (100%) rename {core => os}/net/mac/tsch/tsch-log.h (100%) rename {core => os}/net/mac/tsch/tsch-packet.c (100%) rename {core => os}/net/mac/tsch/tsch-packet.h (100%) rename {core => os}/net/mac/tsch/tsch-private.h (100%) rename {core => os}/net/mac/tsch/tsch-queue.c (100%) rename {core => os}/net/mac/tsch/tsch-queue.h (100%) rename {core => os}/net/mac/tsch/tsch-rpl.c (100%) rename {core => os}/net/mac/tsch/tsch-rpl.h (100%) rename {core => os}/net/mac/tsch/tsch-schedule.c (100%) rename {core => os}/net/mac/tsch/tsch-schedule.h (100%) rename {core => os}/net/mac/tsch/tsch-security.c (100%) rename {core => os}/net/mac/tsch/tsch-security.h (100%) rename {core => os}/net/mac/tsch/tsch-slot-operation.c (100%) rename {core => os}/net/mac/tsch/tsch-slot-operation.h (100%) rename {core => os}/net/mac/tsch/tsch.c (100%) rename {core => os}/net/mac/tsch/tsch.h (100%) rename {core => os}/net/nbr-table.c (100%) rename {core => os}/net/nbr-table.h (100%) rename {core => os}/net/net-debug.c (100%) rename {core => os}/net/net-debug.h (100%) rename {core => os}/net/netstack.c (100%) rename {core => os}/net/netstack.h (100%) rename {core => os}/net/packetbuf.c (100%) rename {core => os}/net/packetbuf.h (100%) rename {core => os}/net/queuebuf.c (100%) rename {core => os}/net/queuebuf.h (100%) rename {core => os}/net/rpl-lite/rpl-conf.h (100%) rename {core => os}/net/rpl-lite/rpl-const.h (100%) rename {core => os}/net/rpl-lite/rpl-dag-root.c (100%) rename {core => os}/net/rpl-lite/rpl-dag-root.h (100%) rename {core => os}/net/rpl-lite/rpl-dag.c (100%) rename {core => os}/net/rpl-lite/rpl-dag.h (100%) rename {core => os}/net/rpl-lite/rpl-ext-header.c (100%) rename {core => os}/net/rpl-lite/rpl-ext-header.h (100%) rename {core => os}/net/rpl-lite/rpl-icmp6.c (100%) rename {core => os}/net/rpl-lite/rpl-icmp6.h (100%) rename {core => os}/net/rpl-lite/rpl-mrhof.c (100%) rename {core => os}/net/rpl-lite/rpl-nbr-policy.c (100%) rename {core => os}/net/rpl-lite/rpl-neighbor.c (100%) rename {core => os}/net/rpl-lite/rpl-neighbor.h (100%) rename {core => os}/net/rpl-lite/rpl-ns.c (100%) rename {core => os}/net/rpl-lite/rpl-ns.h (100%) rename {core => os}/net/rpl-lite/rpl-of0.c (100%) rename {core => os}/net/rpl-lite/rpl-timers.c (100%) rename {core => os}/net/rpl-lite/rpl-timers.h (100%) rename {core => os}/net/rpl-lite/rpl-types.h (100%) rename {core => os}/net/rpl-lite/rpl.c (100%) rename {core => os}/net/rpl-lite/rpl.h (98%) rename {core => os}/net/rpl/rpl-conf.h (100%) rename {core => os}/net/rpl/rpl-dag-root.c (100%) rename {core => os}/net/rpl/rpl-dag-root.h (100%) rename {core => os}/net/rpl/rpl-dag.c (100%) rename {core => os}/net/rpl/rpl-ext-header.c (100%) rename {core => os}/net/rpl/rpl-icmp6.c (100%) rename {core => os}/net/rpl/rpl-mrhof.c (100%) rename {core => os}/net/rpl/rpl-nbr-policy.c (100%) rename {core => os}/net/rpl/rpl-ns.c (100%) rename {core => os}/net/rpl/rpl-ns.h (100%) rename {core => os}/net/rpl/rpl-of0.c (100%) rename {core => os}/net/rpl/rpl-private.h (100%) rename {core => os}/net/rpl/rpl-timers.c (100%) rename {core => os}/net/rpl/rpl.c (100%) rename {core => os}/net/rpl/rpl.h (100%) rename {core => os}/sys/arg.c (100%) rename {core => os}/sys/arg.h (100%) rename {core => os}/sys/autostart.c (100%) rename {core => os}/sys/autostart.h (100%) rename {core => os}/sys/cc-gcc.h (100%) rename {core => os}/sys/cc.h (100%) rename {core => os}/sys/clock.h (100%) rename {core => os}/sys/compower.c (100%) rename {core => os}/sys/compower.h (100%) rename {core => os}/sys/ctimer.c (100%) rename {core => os}/sys/ctimer.h (100%) rename {core => os}/sys/energest.c (100%) rename {core => os}/sys/energest.h (100%) rename {core => os}/sys/etimer.c (100%) rename {core => os}/sys/etimer.h (100%) rename {core => os}/sys/lc-addrlabels.h (100%) rename {core => os}/sys/lc-switch.h (100%) rename {core => os}/sys/lc.h (99%) rename {core => os}/sys/log-conf.h (100%) rename {core => os}/sys/log.c (100%) rename {core => os}/sys/log.h (100%) rename {core => os}/sys/mt.c (100%) rename {core => os}/sys/mt.h (100%) rename {core => os}/sys/node-id.h (100%) rename {core => os}/sys/process.c (100%) rename {core => os}/sys/process.h (100%) rename {core => os}/sys/procinit.c (100%) rename {core => os}/sys/procinit.h (100%) rename {core => os}/sys/pt-sem.h (100%) rename {core => os}/sys/pt.h (100%) rename {core => os}/sys/rtimer.c (100%) rename {core => os}/sys/rtimer.h (100%) rename {core => os}/sys/stimer.c (100%) rename {core => os}/sys/stimer.h (100%) rename {core => os}/sys/subprocess.h (100%) rename {core => os}/sys/timer.c (100%) rename {core => os}/sys/timer.h (100%) diff --git a/Makefile.include b/Makefile.include index bf7e7b804..3eb9fa43c 100644 --- 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)}} diff --git a/arch/cpu/cc2538/dev/random.c b/arch/cpu/cc2538/dev/random.c index 8c955aa8a..2c8b1923c 100644 --- 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" diff --git a/arch/cpu/cc253x/dev/random.c b/arch/cpu/cc253x/dev/random.c index cc99bbfcf..04575bbec 100644 --- 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 - diff --git a/arch/cpu/cc26xx-cc13xx/random.c b/arch/cpu/cc26xx-cc13xx/random.c index 3b13a82de..a3cc7f3a2 100644 --- 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" diff --git a/arch/cpu/nrf52832/dev/random.c b/arch/cpu/nrf52832/dev/random.c index d21bf18ff..60d886c10 100644 --- 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 diff --git a/arch/platform/cc2538dk/Makefile.cc2538dk b/arch/platform/cc2538dk/Makefile.cc2538dk index eebb6193e..85300a85f 100644 --- 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 \ - 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 diff --git a/arch/platform/cooja-ip64/Makefile.cooja-ip64 b/arch/platform/cooja-ip64/Makefile.cooja-ip64 index fd9e41d23..b5dbec101 100644 --- 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 \ diff --git a/arch/platform/cooja/Makefile.cooja b/arch/platform/cooja/Makefile.cooja index 01f87b900..8e7cee40a 100644 --- 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 \ - 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 diff --git a/arch/platform/jn516x/Makefile.jn516x b/arch/platform/jn516x/Makefile.jn516x index 930075e29..967518b2f 100644 --- 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 \ - 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) diff --git a/arch/platform/jn516x/dev/dr1175/README.md b/arch/platform/jn516x/dev/dr1175/README.md index 232e34768..bf57a0a0e 100644 --- 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 -NXP DR1175 board. This board is part of the NXP JN516X Evaluation Kit (see http://www.nxp.com/documents/leaflet/75017368.pdf). +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: leds.h: led on DR1175/DR1174: DR1174+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_BLUE Blue 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_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 diff --git a/arch/platform/jn516x/dev/dr1199/README.md b/arch/platform/jn516x/dev/dr1199/README.md index f70d7558c..83404a83b 100644 --- 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 code is specificaly for the JN516X platform, because it makes use of the platform\DK4 libraries +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. 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 diff --git a/arch/platform/native/Makefile.native b/arch/platform/native/Makefile.native index d17df0a36..aed67874e 100644 --- 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/ \ - 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 diff --git a/arch/platform/nrf52dk/Makefile.nrf52dk b/arch/platform/nrf52dk/Makefile.nrf52dk index 1fc6505fa..ed81ca622 100644 --- 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 \ - 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 diff --git a/arch/platform/openmote-cc2538/Makefile.openmote-cc2538 b/arch/platform/openmote-cc2538/Makefile.openmote-cc2538 index 108bd1841..05e6c5893 100644 --- 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 \ - 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 diff --git a/arch/platform/sky/Makefile.sky b/arch/platform/sky/Makefile.sky index 6812c2629..f4d7b41dc 100644 --- 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 \ - 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 diff --git a/arch/platform/sky/doc/sky.txt b/arch/platform/sky/doc/sky.txt index bc9393b51..e091a2770 100644 --- 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 -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 diff --git a/arch/platform/srf06-cc26xx/Makefile.srf06-cc26xx b/arch/platform/srf06-cc26xx/Makefile.srf06-cc26xx index 6a64aca2b..c52269403 100644 --- 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 \ - 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 diff --git a/arch/platform/zoul/Makefile.zoul b/arch/platform/zoul/Makefile.zoul index dbe9825b2..4a0214507 100644 --- 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 \ - 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 diff --git a/arch/platform/zoul/remote-reva/Makefile.remote-reva b/arch/platform/zoul/remote-reva/Makefile.remote-reva index 525364a20..6b4a80e75 100644 --- 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 diff --git a/arch/platform/zoul/remote-revb/Makefile.remote-revb b/arch/platform/zoul/remote-revb/Makefile.remote-revb index daf9fd367..d23362c32 100644 --- 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 diff --git a/doc/tutorial-raven.txt b/doc/tutorial-raven.txt index 1755da4ac..ad1db0d9c 100644 --- 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.
\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 -the RAVEN externally, check instructions in +This will enable power on batteries. If you want to power +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 Hardware connections
-\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 -JTAGICE JTAG connector to the JTAG pins corresponding to the +\li To program (load) each AVR, you will need to connect 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 To load the binary on each AVR in Windows
@@ -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. -fe80::0012:13ff:fe14:1516/64. Check this is the case by typing +usb0 should automatically get an IPv6 link local address, i.e. +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; - AdvValidLifetime 4294967295; + AdvPreferredLifetime 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 -interface (noted [interface index] in the following) and the -Ethernet interface (noted [ethernet interface index] in the +You now need to get the "interface index" of the USB Stick +interface (noted [interface index] in the following) and 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 -an IPv6 global address based on them. The PC global addresses +The PC sends router advertisements and the RAVEN Board configures +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 -Stick by setting the 8 first bytes of the EEPROM, following -the convention above. You can do this three ways. +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 +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 make version issues
-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.
@@ -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 Buying the hardware (part number ATAVRRZRAVEN and ATJTAGICE2)
\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 Contiki
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. Cygwin
\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 AVR Studio
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/ JTAGICE mkII Drivers
Plug the JTAGICE mkII in a USB port of a windows PC. Follow the diff --git a/examples/ipv6/multicast/Makefile b/examples/ipv6/multicast/Makefile index fc46db9b2..92508a6c5 100644 --- 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 diff --git a/examples/ipv6/rpl-simple/Makefile b/examples/ipv6/rpl-simple/Makefile index 87140d325..b4f000768 100644 --- 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) diff --git a/examples/ipv6/rpl-tsch/Makefile b/examples/ipv6/rpl-tsch/Makefile index 03173e2a1..e6d982156 100644 --- 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 diff --git a/examples/logging/README.md b/examples/logging/README.md index 7848e2f49..670a07117 100644 --- 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 -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. diff --git a/examples/logging/project-conf.h b/examples/logging/project-conf.h index c35835afb..ee8d3c00f 100644 --- 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 diff --git a/examples/platform-specific/jn516x/rpl/border-router/Makefile b/examples/platform-specific/jn516x/rpl/border-router/Makefile index edd5b1c65..5d6fb4d54 100644 --- 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) diff --git a/examples/platform-specific/jn516x/rpl/coap-dongle-node/Makefile b/examples/platform-specific/jn516x/rpl/coap-dongle-node/Makefile index b2eb9b0dd..b451b57f7 100644 --- 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\" diff --git a/examples/platform-specific/jn516x/rpl/coap-dr1175-node/Makefile b/examples/platform-specific/jn516x/rpl/coap-dr1175-node/Makefile index f634f9747..4cfefd20c 100644 --- 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\" diff --git a/examples/platform-specific/jn516x/rpl/coap-dr1199-node/Makefile b/examples/platform-specific/jn516x/rpl/coap-dr1199-node/Makefile index c1712e40a..5d0ffb1ee 100644 --- 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\" diff --git a/examples/platform-specific/jn516x/rpl/node/Makefile b/examples/platform-specific/jn516x/rpl/node/Makefile index 3389d64fe..75d8dd9ea 100644 --- 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\" diff --git a/examples/platform-specific/jn516x/tsch/simple-sensor-network/node/Makefile b/examples/platform-specific/jn516x/tsch/simple-sensor-network/node/Makefile index b9b9bf43b..9497a6311 100644 --- 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) diff --git 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 index d3ddf2943..555ca12f9 100644 --- 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) diff --git a/examples/platform-specific/jn516x/tsch/tx-power-verification/node/Makefile b/examples/platform-specific/jn516x/tsch/tx-power-verification/node/Makefile index 2b6b0cc5c..2a4435beb 100644 --- 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) diff --git 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 index 38b70a225..93870c2f4 100644 --- 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) diff --git a/examples/platform-specific/jn516x/tsch/uart1-test-node/Makefile b/examples/platform-specific/jn516x/tsch/uart1-test-node/Makefile index 124d7873a..1ebafafa7 100644 --- 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) diff --git a/core/cfs/cfs-coffee.c b/os/cfs/cfs-coffee.c similarity index 100% rename from core/cfs/cfs-coffee.c rename to os/cfs/cfs-coffee.c diff --git a/core/cfs/cfs-coffee.h b/os/cfs/cfs-coffee.h similarity index 100% rename from core/cfs/cfs-coffee.h rename to os/cfs/cfs-coffee.h diff --git a/core/cfs/cfs-eeprom.c b/os/cfs/cfs-eeprom.c similarity index 100% rename from core/cfs/cfs-eeprom.c rename to os/cfs/cfs-eeprom.c diff --git a/core/cfs/cfs-posix-dir.c b/os/cfs/cfs-posix-dir.c similarity index 100% rename from core/cfs/cfs-posix-dir.c rename to os/cfs/cfs-posix-dir.c diff --git a/core/cfs/cfs-posix.c b/os/cfs/cfs-posix.c similarity index 100% rename from core/cfs/cfs-posix.c rename to os/cfs/cfs-posix.c diff --git a/core/cfs/cfs-ram.c b/os/cfs/cfs-ram.c similarity index 100% rename from core/cfs/cfs-ram.c rename to os/cfs/cfs-ram.c diff --git a/core/cfs/cfs-xmem.c b/os/cfs/cfs-xmem.c similarity index 100% rename from core/cfs/cfs-xmem.c rename to os/cfs/cfs-xmem.c diff --git a/core/cfs/cfs.h b/os/cfs/cfs.h similarity index 100% rename from core/cfs/cfs.h rename to os/cfs/cfs.h diff --git a/core/contiki-default-conf.h b/os/contiki-default-conf.h similarity index 100% rename from core/contiki-default-conf.h rename to os/contiki-default-conf.h diff --git a/core/contiki-lib.h b/os/contiki-lib.h similarity index 100% rename from core/contiki-lib.h rename to os/contiki-lib.h diff --git a/core/contiki-net.h b/os/contiki-net.h similarity index 100% rename from core/contiki-net.h rename to os/contiki-net.h diff --git a/core/contiki.h b/os/contiki.h similarity index 100% rename from core/contiki.h rename to os/contiki.h diff --git a/core/dev/battery-sensor.h b/os/dev/battery-sensor.h similarity index 100% rename from core/dev/battery-sensor.h rename to os/dev/battery-sensor.h diff --git a/core/dev/button-sensor.h b/os/dev/button-sensor.h similarity index 100% rename from core/dev/button-sensor.h rename to os/dev/button-sensor.h diff --git a/core/dev/eeprom.h b/os/dev/eeprom.h similarity index 100% rename from core/dev/eeprom.h rename to os/dev/eeprom.h diff --git a/core/dev/leds.c b/os/dev/leds.c similarity index 100% rename from core/dev/leds.c rename to os/dev/leds.c diff --git a/core/dev/leds.h b/os/dev/leds.h similarity index 100% rename from core/dev/leds.h rename to os/dev/leds.h diff --git a/core/dev/nullradio.c b/os/dev/nullradio.c similarity index 100% rename from core/dev/nullradio.c rename to os/dev/nullradio.c diff --git a/core/dev/nullradio.h b/os/dev/nullradio.h similarity index 100% rename from core/dev/nullradio.h rename to os/dev/nullradio.h diff --git a/core/dev/radio-sensor.h b/os/dev/radio-sensor.h similarity index 100% rename from core/dev/radio-sensor.h rename to os/dev/radio-sensor.h diff --git a/core/dev/radio.h b/os/dev/radio.h similarity index 100% rename from core/dev/radio.h rename to os/dev/radio.h diff --git a/core/dev/rom.h b/os/dev/rom.h similarity index 100% rename from core/dev/rom.h rename to os/dev/rom.h diff --git a/core/dev/serial-line.c b/os/dev/serial-line.c similarity index 100% rename from core/dev/serial-line.c rename to os/dev/serial-line.c diff --git a/core/dev/serial-line.h b/os/dev/serial-line.h similarity index 100% rename from core/dev/serial-line.h rename to os/dev/serial-line.h diff --git a/core/dev/slip.c b/os/dev/slip.c similarity index 100% rename from core/dev/slip.c rename to os/dev/slip.c diff --git a/core/dev/slip.h b/os/dev/slip.h similarity index 100% rename from core/dev/slip.h rename to os/dev/slip.h diff --git a/core/dev/spi.h b/os/dev/spi.h similarity index 100% rename from core/dev/spi.h rename to os/dev/spi.h diff --git a/core/dev/watchdog.h b/os/dev/watchdog.h similarity index 100% rename from core/dev/watchdog.h rename to os/dev/watchdog.h diff --git a/core/dev/xmem.h b/os/dev/xmem.h similarity index 100% rename from core/dev/xmem.h rename to os/dev/xmem.h diff --git a/core/lib/aes-128.c b/os/lib/aes-128.c similarity index 100% rename from core/lib/aes-128.c rename to os/lib/aes-128.c diff --git a/core/lib/aes-128.h b/os/lib/aes-128.h similarity index 100% rename from core/lib/aes-128.h rename to os/lib/aes-128.h diff --git a/core/lib/assert.c b/os/lib/assert.c similarity index 100% rename from core/lib/assert.c rename to os/lib/assert.c diff --git a/core/lib/assert.h b/os/lib/assert.h similarity index 100% rename from core/lib/assert.h rename to os/lib/assert.h diff --git a/core/lib/ccm-star.c b/os/lib/ccm-star.c similarity index 100% rename from core/lib/ccm-star.c rename to os/lib/ccm-star.c diff --git a/core/lib/ccm-star.h b/os/lib/ccm-star.h similarity index 100% rename from core/lib/ccm-star.h rename to os/lib/ccm-star.h diff --git a/core/lib/crc16.c b/os/lib/crc16.c similarity index 100% rename from core/lib/crc16.c rename to os/lib/crc16.c diff --git a/core/lib/crc16.h b/os/lib/crc16.h similarity index 100% rename from core/lib/crc16.h rename to os/lib/crc16.h diff --git a/core/lib/fs/fat/00history.txt b/os/lib/fs/fat/00history.txt similarity index 100% rename from core/lib/fs/fat/00history.txt rename to os/lib/fs/fat/00history.txt diff --git a/core/lib/fs/fat/README.md b/os/lib/fs/fat/README.md similarity index 100% rename from core/lib/fs/fat/README.md rename to os/lib/fs/fat/README.md diff --git a/core/lib/fs/fat/diskio.h b/os/lib/fs/fat/diskio.h similarity index 100% rename from core/lib/fs/fat/diskio.h rename to os/lib/fs/fat/diskio.h diff --git a/core/lib/fs/fat/ff.c b/os/lib/fs/fat/ff.c similarity index 100% rename from core/lib/fs/fat/ff.c rename to os/lib/fs/fat/ff.c diff --git a/core/lib/fs/fat/ff.h b/os/lib/fs/fat/ff.h similarity index 100% rename from core/lib/fs/fat/ff.h rename to os/lib/fs/fat/ff.h diff --git a/core/lib/fs/fat/integer.h b/os/lib/fs/fat/integer.h similarity index 100% rename from core/lib/fs/fat/integer.h rename to os/lib/fs/fat/integer.h diff --git a/core/lib/fs/fat/option/syscall.c b/os/lib/fs/fat/option/syscall.c similarity index 100% rename from core/lib/fs/fat/option/syscall.c rename to os/lib/fs/fat/option/syscall.c diff --git a/core/lib/fs/fat/option/unicode.c b/os/lib/fs/fat/option/unicode.c similarity index 100% rename from core/lib/fs/fat/option/unicode.c rename to os/lib/fs/fat/option/unicode.c diff --git a/core/lib/fs/fat/option/unicode/cc932.c b/os/lib/fs/fat/option/unicode/cc932.c similarity index 100% rename from core/lib/fs/fat/option/unicode/cc932.c rename to os/lib/fs/fat/option/unicode/cc932.c diff --git a/core/lib/fs/fat/option/unicode/cc936.c b/os/lib/fs/fat/option/unicode/cc936.c similarity index 100% rename from core/lib/fs/fat/option/unicode/cc936.c rename to os/lib/fs/fat/option/unicode/cc936.c diff --git a/core/lib/fs/fat/option/unicode/cc949.c b/os/lib/fs/fat/option/unicode/cc949.c similarity index 100% rename from core/lib/fs/fat/option/unicode/cc949.c rename to os/lib/fs/fat/option/unicode/cc949.c diff --git a/core/lib/fs/fat/option/unicode/cc950.c b/os/lib/fs/fat/option/unicode/cc950.c similarity index 100% rename from core/lib/fs/fat/option/unicode/cc950.c rename to os/lib/fs/fat/option/unicode/cc950.c diff --git a/core/lib/fs/fat/option/unicode/ccsbcs.c b/os/lib/fs/fat/option/unicode/ccsbcs.c similarity index 100% rename from core/lib/fs/fat/option/unicode/ccsbcs.c rename to os/lib/fs/fat/option/unicode/ccsbcs.c diff --git a/core/lib/heapmem.c b/os/lib/heapmem.c similarity index 100% rename from core/lib/heapmem.c rename to os/lib/heapmem.c diff --git a/core/lib/heapmem.h b/os/lib/heapmem.h similarity index 100% rename from core/lib/heapmem.h rename to os/lib/heapmem.h diff --git a/core/lib/ifft.c b/os/lib/ifft.c similarity index 100% rename from core/lib/ifft.c rename to os/lib/ifft.c diff --git a/core/lib/ifft.h b/os/lib/ifft.h similarity index 100% rename from core/lib/ifft.h rename to os/lib/ifft.h diff --git a/core/lib/list.c b/os/lib/list.c similarity index 100% rename from core/lib/list.c rename to os/lib/list.c diff --git a/core/lib/list.h b/os/lib/list.h similarity index 100% rename from core/lib/list.h rename to os/lib/list.h diff --git a/core/lib/memb.c b/os/lib/memb.c similarity index 100% rename from core/lib/memb.c rename to os/lib/memb.c diff --git a/core/lib/memb.h b/os/lib/memb.h similarity index 100% rename from core/lib/memb.h rename to os/lib/memb.h diff --git a/core/lib/newlib/syscalls.c b/os/lib/newlib/syscalls.c similarity index 100% rename from core/lib/newlib/syscalls.c rename to os/lib/newlib/syscalls.c diff --git a/core/lib/random.c b/os/lib/random.c similarity index 100% rename from core/lib/random.c rename to os/lib/random.c diff --git a/core/lib/random.h b/os/lib/random.h similarity index 100% rename from core/lib/random.h rename to os/lib/random.h diff --git a/core/lib/ringbuf.c b/os/lib/ringbuf.c similarity index 100% rename from core/lib/ringbuf.c rename to os/lib/ringbuf.c diff --git a/core/lib/ringbuf.h b/os/lib/ringbuf.h similarity index 100% rename from core/lib/ringbuf.h rename to os/lib/ringbuf.h diff --git a/core/lib/ringbufindex.c b/os/lib/ringbufindex.c similarity index 97% rename from core/lib/ringbufindex.c rename to os/lib/ringbufindex.c index a30e85f74..cde992838 100644 --- a/core/lib/ringbufindex.c +++ b/os/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 - * based on Contiki's core/lib/ringbuf library by Adam Dunkels + * based on Contiki's os/lib/ringbuf library by Adam Dunkels */ #include diff --git a/core/lib/ringbufindex.h b/os/lib/ringbufindex.h similarity index 100% rename from core/lib/ringbufindex.h rename to os/lib/ringbufindex.h diff --git a/core/lib/sensors.c b/os/lib/sensors.c similarity index 100% rename from core/lib/sensors.c rename to os/lib/sensors.c diff --git a/core/lib/sensors.h b/os/lib/sensors.h similarity index 100% rename from core/lib/sensors.h rename to os/lib/sensors.h diff --git a/core/lib/strncasecmp/strncasecmp.c b/os/lib/strncasecmp/strncasecmp.c similarity index 100% rename from core/lib/strncasecmp/strncasecmp.c rename to os/lib/strncasecmp/strncasecmp.c diff --git a/core/lib/trickle-timer.c b/os/lib/trickle-timer.c similarity index 100% rename from core/lib/trickle-timer.c rename to os/lib/trickle-timer.c diff --git a/core/lib/trickle-timer.h b/os/lib/trickle-timer.h similarity index 100% rename from core/lib/trickle-timer.h rename to os/lib/trickle-timer.h diff --git a/core/net/ip/ip64-addr.c b/os/net/ip/ip64-addr.c similarity index 100% rename from core/net/ip/ip64-addr.c rename to os/net/ip/ip64-addr.c diff --git a/core/net/ip/ip64-addr.h b/os/net/ip/ip64-addr.h similarity index 100% rename from core/net/ip/ip64-addr.h rename to os/net/ip/ip64-addr.h diff --git a/core/net/ip/psock.c b/os/net/ip/psock.c similarity index 100% rename from core/net/ip/psock.c rename to os/net/ip/psock.c diff --git a/core/net/ip/psock.h b/os/net/ip/psock.h similarity index 100% rename from core/net/ip/psock.h rename to os/net/ip/psock.h diff --git a/core/net/ip/resolv.c b/os/net/ip/resolv.c similarity index 100% rename from core/net/ip/resolv.c rename to os/net/ip/resolv.c diff --git a/core/net/ip/resolv.h b/os/net/ip/resolv.h similarity index 100% rename from core/net/ip/resolv.h rename to os/net/ip/resolv.h diff --git a/core/net/ip/simple-udp.c b/os/net/ip/simple-udp.c similarity index 100% rename from core/net/ip/simple-udp.c rename to os/net/ip/simple-udp.c diff --git a/core/net/ip/simple-udp.h b/os/net/ip/simple-udp.h similarity index 100% rename from core/net/ip/simple-udp.h rename to os/net/ip/simple-udp.h diff --git a/core/net/ip/tcp-socket.c b/os/net/ip/tcp-socket.c similarity index 100% rename from core/net/ip/tcp-socket.c rename to os/net/ip/tcp-socket.c diff --git a/core/net/ip/tcp-socket.h b/os/net/ip/tcp-socket.h similarity index 100% rename from core/net/ip/tcp-socket.h rename to os/net/ip/tcp-socket.h diff --git a/core/net/ip/tcpip.c b/os/net/ip/tcpip.c similarity index 100% rename from core/net/ip/tcpip.c rename to os/net/ip/tcpip.c diff --git a/core/net/ip/tcpip.h b/os/net/ip/tcpip.h similarity index 100% rename from core/net/ip/tcpip.h rename to os/net/ip/tcpip.h diff --git a/core/net/ip/udp-socket.c b/os/net/ip/udp-socket.c similarity index 100% rename from core/net/ip/udp-socket.c rename to os/net/ip/udp-socket.c diff --git a/core/net/ip/udp-socket.h b/os/net/ip/udp-socket.h similarity index 100% rename from core/net/ip/udp-socket.h rename to os/net/ip/udp-socket.h diff --git a/core/net/ip/uip-arch.h b/os/net/ip/uip-arch.h similarity index 100% rename from core/net/ip/uip-arch.h rename to os/net/ip/uip-arch.h diff --git a/core/net/ip/uip-debug.c b/os/net/ip/uip-debug.c similarity index 100% rename from core/net/ip/uip-debug.c rename to os/net/ip/uip-debug.c diff --git a/core/net/ip/uip-debug.h b/os/net/ip/uip-debug.h similarity index 100% rename from core/net/ip/uip-debug.h rename to os/net/ip/uip-debug.h diff --git a/core/net/ip/uip-nameserver.c b/os/net/ip/uip-nameserver.c similarity index 100% rename from core/net/ip/uip-nameserver.c rename to os/net/ip/uip-nameserver.c diff --git a/core/net/ip/uip-nameserver.h b/os/net/ip/uip-nameserver.h similarity index 100% rename from core/net/ip/uip-nameserver.h rename to os/net/ip/uip-nameserver.h diff --git a/core/net/ip/uip-packetqueue.c b/os/net/ip/uip-packetqueue.c similarity index 100% rename from core/net/ip/uip-packetqueue.c rename to os/net/ip/uip-packetqueue.c diff --git a/core/net/ip/uip-packetqueue.h b/os/net/ip/uip-packetqueue.h similarity index 100% rename from core/net/ip/uip-packetqueue.h rename to os/net/ip/uip-packetqueue.h diff --git a/core/net/ip/uip-udp-packet.c b/os/net/ip/uip-udp-packet.c similarity index 100% rename from core/net/ip/uip-udp-packet.c rename to os/net/ip/uip-udp-packet.c diff --git a/core/net/ip/uip-udp-packet.h b/os/net/ip/uip-udp-packet.h similarity index 100% rename from core/net/ip/uip-udp-packet.h rename to os/net/ip/uip-udp-packet.h diff --git a/core/net/ip/uip.h b/os/net/ip/uip.h similarity index 100% rename from core/net/ip/uip.h rename to os/net/ip/uip.h diff --git a/core/net/ip/uiplib.c b/os/net/ip/uiplib.c similarity index 100% rename from core/net/ip/uiplib.c rename to os/net/ip/uiplib.c diff --git a/core/net/ip/uiplib.h b/os/net/ip/uiplib.h similarity index 100% rename from core/net/ip/uiplib.h rename to os/net/ip/uiplib.h diff --git a/core/net/ip/uipopt.h b/os/net/ip/uipopt.h similarity index 100% rename from core/net/ip/uipopt.h rename to os/net/ip/uipopt.h diff --git a/core/net/ip64/README.md b/os/net/ip64/README.md similarity index 100% rename from core/net/ip64/README.md rename to os/net/ip64/README.md diff --git a/core/net/ip64/ip64-addrmap.c b/os/net/ip64/ip64-addrmap.c similarity index 100% rename from core/net/ip64/ip64-addrmap.c rename to os/net/ip64/ip64-addrmap.c diff --git a/core/net/ip64/ip64-addrmap.h b/os/net/ip64/ip64-addrmap.h similarity index 100% rename from core/net/ip64/ip64-addrmap.h rename to os/net/ip64/ip64-addrmap.h diff --git a/core/net/ip64/ip64-arp.c b/os/net/ip64/ip64-arp.c similarity index 100% rename from core/net/ip64/ip64-arp.c rename to os/net/ip64/ip64-arp.c diff --git a/core/net/ip64/ip64-arp.h b/os/net/ip64/ip64-arp.h similarity index 100% rename from core/net/ip64/ip64-arp.h rename to os/net/ip64/ip64-arp.h diff --git a/core/net/ip64/ip64-conf-example.h b/os/net/ip64/ip64-conf-example.h similarity index 100% rename from core/net/ip64/ip64-conf-example.h rename to os/net/ip64/ip64-conf-example.h diff --git a/core/net/ip64/ip64-dhcpc.c b/os/net/ip64/ip64-dhcpc.c similarity index 100% rename from core/net/ip64/ip64-dhcpc.c rename to os/net/ip64/ip64-dhcpc.c diff --git a/core/net/ip64/ip64-dhcpc.h b/os/net/ip64/ip64-dhcpc.h similarity index 100% rename from core/net/ip64/ip64-dhcpc.h rename to os/net/ip64/ip64-dhcpc.h diff --git a/core/net/ip64/ip64-dns64.c b/os/net/ip64/ip64-dns64.c similarity index 100% rename from core/net/ip64/ip64-dns64.c rename to os/net/ip64/ip64-dns64.c diff --git a/core/net/ip64/ip64-dns64.h b/os/net/ip64/ip64-dns64.h similarity index 100% rename from core/net/ip64/ip64-dns64.h rename to os/net/ip64/ip64-dns64.h diff --git a/core/net/ip64/ip64-driver.h b/os/net/ip64/ip64-driver.h similarity index 100% rename from core/net/ip64/ip64-driver.h rename to os/net/ip64/ip64-driver.h diff --git a/core/net/ip64/ip64-eth-interface.c b/os/net/ip64/ip64-eth-interface.c similarity index 100% rename from core/net/ip64/ip64-eth-interface.c rename to os/net/ip64/ip64-eth-interface.c diff --git a/core/net/ip64/ip64-eth-interface.h b/os/net/ip64/ip64-eth-interface.h similarity index 100% rename from core/net/ip64/ip64-eth-interface.h rename to os/net/ip64/ip64-eth-interface.h diff --git a/core/net/ip64/ip64-eth.c b/os/net/ip64/ip64-eth.c similarity index 100% rename from core/net/ip64/ip64-eth.c rename to os/net/ip64/ip64-eth.c diff --git a/core/net/ip64/ip64-eth.h b/os/net/ip64/ip64-eth.h similarity index 100% rename from core/net/ip64/ip64-eth.h rename to os/net/ip64/ip64-eth.h diff --git a/core/net/ip64/ip64-interface.h b/os/net/ip64/ip64-interface.h similarity index 100% rename from core/net/ip64/ip64-interface.h rename to os/net/ip64/ip64-interface.h diff --git a/core/net/ip64/ip64-ipv4-dhcp.c b/os/net/ip64/ip64-ipv4-dhcp.c similarity index 100% rename from core/net/ip64/ip64-ipv4-dhcp.c rename to os/net/ip64/ip64-ipv4-dhcp.c diff --git a/core/net/ip64/ip64-ipv4-dhcp.h b/os/net/ip64/ip64-ipv4-dhcp.h similarity index 100% rename from core/net/ip64/ip64-ipv4-dhcp.h rename to os/net/ip64/ip64-ipv4-dhcp.h diff --git a/core/net/ip64/ip64-null-driver.c b/os/net/ip64/ip64-null-driver.c similarity index 100% rename from core/net/ip64/ip64-null-driver.c rename to os/net/ip64/ip64-null-driver.c diff --git a/core/net/ip64/ip64-null-driver.h b/os/net/ip64/ip64-null-driver.h similarity index 100% rename from core/net/ip64/ip64-null-driver.h rename to os/net/ip64/ip64-null-driver.h diff --git a/core/net/ip64/ip64-slip-interface.c b/os/net/ip64/ip64-slip-interface.c similarity index 100% rename from core/net/ip64/ip64-slip-interface.c rename to os/net/ip64/ip64-slip-interface.c diff --git a/core/net/ip64/ip64-slip-interface.h b/os/net/ip64/ip64-slip-interface.h similarity index 100% rename from core/net/ip64/ip64-slip-interface.h rename to os/net/ip64/ip64-slip-interface.h diff --git a/core/net/ip64/ip64-special-ports.c b/os/net/ip64/ip64-special-ports.c similarity index 100% rename from core/net/ip64/ip64-special-ports.c rename to os/net/ip64/ip64-special-ports.c diff --git a/core/net/ip64/ip64-special-ports.h b/os/net/ip64/ip64-special-ports.h similarity index 100% rename from core/net/ip64/ip64-special-ports.h rename to os/net/ip64/ip64-special-ports.h diff --git a/core/net/ip64/ip64.c b/os/net/ip64/ip64.c similarity index 100% rename from core/net/ip64/ip64.c rename to os/net/ip64/ip64.c diff --git a/core/net/ip64/ip64.h b/os/net/ip64/ip64.h similarity index 100% rename from core/net/ip64/ip64.h rename to os/net/ip64/ip64.h diff --git a/core/net/ipv6/multicast/README.md b/os/net/ipv6/multicast/README.md similarity index 97% rename from core/net/ipv6/multicast/README.md rename to os/net/ipv6/multicast/README.md index e65c39f6a..90523a37d 100644 --- a/core/net/ipv6/multicast/README.md +++ b/os/net/ipv6/multicast/README.md @@ -10,8 +10,8 @@ to contiki's uIPv6 engine. Currently, three modes are supported: * 'Enhanced Stateless Multicast RPL Forwarding' (ESMRF) - ESMRF is an enhanced version of the SMRF engine with the aim - of resolving the sending limitation of SMRF to allow any node + ESMRF is an enhanced version of the SMRF engine with the aim + of resolving the sending limitation of SMRF to allow any node within the DODAG to send multicast traffic up and down the RPL tree. ESMRF is documented here: http://dl.acm.org/citation.cfm?id=2753479 @@ -52,7 +52,7 @@ There is a cooja example demonstrating basic functionality How to Use ========== -Look in `core/net/ipv6/multicast/uip-mcast6-engines.h` for a list of supported +Look in `os/net/ipv6/multicast/uip-mcast6-engines.h` for a list of supported multicast engines. To turn on multicast support, add this line in your `project-` or `contiki-conf.h` @@ -68,7 +68,7 @@ To disable: You also need to make sure the multicast code gets built. Your example's (or platform's) Makefile should include this: - MODULES += core/net/ipv6/multicast + MODULES += os/net/ipv6/multicast How to extend ============= diff --git a/core/net/ipv6/multicast/esmrf.c b/os/net/ipv6/multicast/esmrf.c similarity index 100% rename from core/net/ipv6/multicast/esmrf.c rename to os/net/ipv6/multicast/esmrf.c diff --git a/core/net/ipv6/multicast/esmrf.h b/os/net/ipv6/multicast/esmrf.h similarity index 100% rename from core/net/ipv6/multicast/esmrf.h rename to os/net/ipv6/multicast/esmrf.h diff --git a/core/net/ipv6/multicast/roll-tm.c b/os/net/ipv6/multicast/roll-tm.c similarity index 100% rename from core/net/ipv6/multicast/roll-tm.c rename to os/net/ipv6/multicast/roll-tm.c diff --git a/core/net/ipv6/multicast/roll-tm.h b/os/net/ipv6/multicast/roll-tm.h similarity index 100% rename from core/net/ipv6/multicast/roll-tm.h rename to os/net/ipv6/multicast/roll-tm.h diff --git a/core/net/ipv6/multicast/smrf.c b/os/net/ipv6/multicast/smrf.c similarity index 100% rename from core/net/ipv6/multicast/smrf.c rename to os/net/ipv6/multicast/smrf.c diff --git a/core/net/ipv6/multicast/smrf.h b/os/net/ipv6/multicast/smrf.h similarity index 100% rename from core/net/ipv6/multicast/smrf.h rename to os/net/ipv6/multicast/smrf.h diff --git a/core/net/ipv6/multicast/uip-mcast6-engines.h b/os/net/ipv6/multicast/uip-mcast6-engines.h similarity index 100% rename from core/net/ipv6/multicast/uip-mcast6-engines.h rename to os/net/ipv6/multicast/uip-mcast6-engines.h diff --git a/core/net/ipv6/multicast/uip-mcast6-route.c b/os/net/ipv6/multicast/uip-mcast6-route.c similarity index 100% rename from core/net/ipv6/multicast/uip-mcast6-route.c rename to os/net/ipv6/multicast/uip-mcast6-route.c diff --git a/core/net/ipv6/multicast/uip-mcast6-route.h b/os/net/ipv6/multicast/uip-mcast6-route.h similarity index 100% rename from core/net/ipv6/multicast/uip-mcast6-route.h rename to os/net/ipv6/multicast/uip-mcast6-route.h diff --git a/core/net/ipv6/multicast/uip-mcast6-stats.c b/os/net/ipv6/multicast/uip-mcast6-stats.c similarity index 100% rename from core/net/ipv6/multicast/uip-mcast6-stats.c rename to os/net/ipv6/multicast/uip-mcast6-stats.c diff --git a/core/net/ipv6/multicast/uip-mcast6-stats.h b/os/net/ipv6/multicast/uip-mcast6-stats.h similarity index 100% rename from core/net/ipv6/multicast/uip-mcast6-stats.h rename to os/net/ipv6/multicast/uip-mcast6-stats.h diff --git a/core/net/ipv6/multicast/uip-mcast6.h b/os/net/ipv6/multicast/uip-mcast6.h similarity index 98% rename from core/net/ipv6/multicast/uip-mcast6.h rename to os/net/ipv6/multicast/uip-mcast6.h index 91accf41c..7a20ace82 100644 --- a/core/net/ipv6/multicast/uip-mcast6.h +++ b/os/net/ipv6/multicast/uip-mcast6.h @@ -144,7 +144,7 @@ struct uip_mcast6_driver { */ #define uip_mcast6_get_address_scope(a) ((a)->u8[1] & 0x0F) /*---------------------------------------------------------------------------*/ -/* Configure multicast and core/net to play nicely with the selected engine */ +/* Configure multicast and os/net to play nicely with the selected engine */ #if UIP_MCAST6_ENGINE /* Enable Multicast hooks in the uip6 core */ diff --git a/core/net/ipv6/sicslowpan.c b/os/net/ipv6/sicslowpan.c similarity index 100% rename from core/net/ipv6/sicslowpan.c rename to os/net/ipv6/sicslowpan.c diff --git a/core/net/ipv6/sicslowpan.h b/os/net/ipv6/sicslowpan.h similarity index 100% rename from core/net/ipv6/sicslowpan.h rename to os/net/ipv6/sicslowpan.h diff --git a/core/net/ipv6/uip-ds6-nbr.c b/os/net/ipv6/uip-ds6-nbr.c similarity index 100% rename from core/net/ipv6/uip-ds6-nbr.c rename to os/net/ipv6/uip-ds6-nbr.c diff --git a/core/net/ipv6/uip-ds6-nbr.h b/os/net/ipv6/uip-ds6-nbr.h similarity index 100% rename from core/net/ipv6/uip-ds6-nbr.h rename to os/net/ipv6/uip-ds6-nbr.h diff --git a/core/net/ipv6/uip-ds6-route.c b/os/net/ipv6/uip-ds6-route.c similarity index 100% rename from core/net/ipv6/uip-ds6-route.c rename to os/net/ipv6/uip-ds6-route.c diff --git a/core/net/ipv6/uip-ds6-route.h b/os/net/ipv6/uip-ds6-route.h similarity index 100% rename from core/net/ipv6/uip-ds6-route.h rename to os/net/ipv6/uip-ds6-route.h diff --git a/core/net/ipv6/uip-ds6.c b/os/net/ipv6/uip-ds6.c similarity index 100% rename from core/net/ipv6/uip-ds6.c rename to os/net/ipv6/uip-ds6.c diff --git a/core/net/ipv6/uip-ds6.h b/os/net/ipv6/uip-ds6.h similarity index 100% rename from core/net/ipv6/uip-ds6.h rename to os/net/ipv6/uip-ds6.h diff --git a/core/net/ipv6/uip-icmp6.c b/os/net/ipv6/uip-icmp6.c similarity index 100% rename from core/net/ipv6/uip-icmp6.c rename to os/net/ipv6/uip-icmp6.c diff --git a/core/net/ipv6/uip-icmp6.h b/os/net/ipv6/uip-icmp6.h similarity index 100% rename from core/net/ipv6/uip-icmp6.h rename to os/net/ipv6/uip-icmp6.h diff --git a/core/net/ipv6/uip-nd6.c b/os/net/ipv6/uip-nd6.c similarity index 100% rename from core/net/ipv6/uip-nd6.c rename to os/net/ipv6/uip-nd6.c diff --git a/core/net/ipv6/uip-nd6.h b/os/net/ipv6/uip-nd6.h similarity index 100% rename from core/net/ipv6/uip-nd6.h rename to os/net/ipv6/uip-nd6.h diff --git a/core/net/ipv6/uip6.c b/os/net/ipv6/uip6.c similarity index 100% rename from core/net/ipv6/uip6.c rename to os/net/ipv6/uip6.c diff --git a/core/net/ipv6/websocket-http-client.c b/os/net/ipv6/websocket-http-client.c similarity index 100% rename from core/net/ipv6/websocket-http-client.c rename to os/net/ipv6/websocket-http-client.c diff --git a/core/net/ipv6/websocket-http-client.h b/os/net/ipv6/websocket-http-client.h similarity index 100% rename from core/net/ipv6/websocket-http-client.h rename to os/net/ipv6/websocket-http-client.h diff --git a/core/net/ipv6/websocket.c b/os/net/ipv6/websocket.c similarity index 100% rename from core/net/ipv6/websocket.c rename to os/net/ipv6/websocket.c diff --git a/core/net/ipv6/websocket.h b/os/net/ipv6/websocket.h similarity index 100% rename from core/net/ipv6/websocket.h rename to os/net/ipv6/websocket.h diff --git a/core/net/link-stats.c b/os/net/link-stats.c similarity index 100% rename from core/net/link-stats.c rename to os/net/link-stats.c diff --git a/core/net/link-stats.h b/os/net/link-stats.h similarity index 99% rename from core/net/link-stats.h rename to os/net/link-stats.h index 38ca98902..cca15fd32 100644 --- a/core/net/link-stats.h +++ b/os/net/link-stats.h @@ -33,7 +33,7 @@ #ifndef LINK_STATS_H_ #define LINK_STATS_H_ -#include "core/net/linkaddr.h" +#include "net/linkaddr.h" /* ETX fixed point divisor. 128 is the value used by RPL (RFC 6551 and RFC 6719) */ #ifdef LINK_STATS_CONF_ETX_DIVISOR diff --git a/core/net/linkaddr.c b/os/net/linkaddr.c similarity index 100% rename from core/net/linkaddr.c rename to os/net/linkaddr.c diff --git a/core/net/linkaddr.h b/os/net/linkaddr.h similarity index 100% rename from core/net/linkaddr.h rename to os/net/linkaddr.h diff --git a/core/net/mac/csma/csma-output.c b/os/net/mac/csma/csma-output.c similarity index 100% rename from core/net/mac/csma/csma-output.c rename to os/net/mac/csma/csma-output.c diff --git a/core/net/mac/csma/csma-output.h b/os/net/mac/csma/csma-output.h similarity index 100% rename from core/net/mac/csma/csma-output.h rename to os/net/mac/csma/csma-output.h diff --git a/core/net/mac/csma/csma.c b/os/net/mac/csma/csma.c similarity index 100% rename from core/net/mac/csma/csma.c rename to os/net/mac/csma/csma.c diff --git a/core/net/mac/csma/csma.h b/os/net/mac/csma/csma.h similarity index 100% rename from core/net/mac/csma/csma.h rename to os/net/mac/csma/csma.h diff --git a/core/net/mac/framer/frame802154.c b/os/net/mac/framer/frame802154.c similarity index 100% rename from core/net/mac/framer/frame802154.c rename to os/net/mac/framer/frame802154.c diff --git a/core/net/mac/framer/frame802154.h b/os/net/mac/framer/frame802154.h similarity index 100% rename from core/net/mac/framer/frame802154.h rename to os/net/mac/framer/frame802154.h diff --git a/core/net/mac/framer/frame802154e-ie.c b/os/net/mac/framer/frame802154e-ie.c similarity index 100% rename from core/net/mac/framer/frame802154e-ie.c rename to os/net/mac/framer/frame802154e-ie.c diff --git a/core/net/mac/framer/frame802154e-ie.h b/os/net/mac/framer/frame802154e-ie.h similarity index 100% rename from core/net/mac/framer/frame802154e-ie.h rename to os/net/mac/framer/frame802154e-ie.h diff --git a/core/net/mac/framer/framer-802154.c b/os/net/mac/framer/framer-802154.c similarity index 100% rename from core/net/mac/framer/framer-802154.c rename to os/net/mac/framer/framer-802154.c diff --git a/core/net/mac/framer/framer-802154.h b/os/net/mac/framer/framer-802154.h similarity index 100% rename from core/net/mac/framer/framer-802154.h rename to os/net/mac/framer/framer-802154.h diff --git a/core/net/mac/framer/framer.h b/os/net/mac/framer/framer.h similarity index 100% rename from core/net/mac/framer/framer.h rename to os/net/mac/framer/framer.h diff --git a/core/net/mac/llsec802154.h b/os/net/mac/llsec802154.h similarity index 100% rename from core/net/mac/llsec802154.h rename to os/net/mac/llsec802154.h diff --git a/core/net/mac/mac-sequence.c b/os/net/mac/mac-sequence.c similarity index 100% rename from core/net/mac/mac-sequence.c rename to os/net/mac/mac-sequence.c diff --git a/core/net/mac/mac-sequence.h b/os/net/mac/mac-sequence.h similarity index 100% rename from core/net/mac/mac-sequence.h rename to os/net/mac/mac-sequence.h diff --git a/core/net/mac/mac.c b/os/net/mac/mac.c similarity index 100% rename from core/net/mac/mac.c rename to os/net/mac/mac.c diff --git a/core/net/mac/mac.h b/os/net/mac/mac.h similarity index 100% rename from core/net/mac/mac.h rename to os/net/mac/mac.h diff --git a/core/net/mac/nullmac/nullmac.c b/os/net/mac/nullmac/nullmac.c similarity index 100% rename from core/net/mac/nullmac/nullmac.c rename to os/net/mac/nullmac/nullmac.c diff --git a/core/net/mac/nullmac/nullmac.h b/os/net/mac/nullmac/nullmac.h similarity index 100% rename from core/net/mac/nullmac/nullmac.h rename to os/net/mac/nullmac/nullmac.h diff --git a/core/net/mac/tsch/Makefile.tsch b/os/net/mac/tsch/Makefile.tsch similarity index 100% rename from core/net/mac/tsch/Makefile.tsch rename to os/net/mac/tsch/Makefile.tsch diff --git a/core/net/mac/tsch/README.md b/os/net/mac/tsch/README.md similarity index 94% rename from core/net/mac/tsch/README.md rename to os/net/mac/tsch/README.md index 91bd603ca..ed54fa04a 100644 --- a/core/net/mac/tsch/README.md +++ b/os/net/mac/tsch/README.md @@ -22,7 +22,7 @@ The scheduler Orchestra is detailled in [*Orchestra: Robust Mesh Networks Throug This implementation includes: * Standard IEEE 802.15.4e-2012 frame version 2 * Standard TSCH joining procedure with Enhanced Beacons with the following Information Elements: - * TSCH synchronization (join priority and ASN) + * TSCH synchronization (join priority and ASN) * TSCH slotframe and link (basic schedule) * TSCH timeslot (timeslot timing template) * TSCH channel hopping sequence (hopping sequence template) @@ -57,17 +57,17 @@ also tested with Rime (currently only with 64-bit link-layer addresses). ## Code structure The IEEE 802.15.4e-2012 frame format is implemented in: -* `core/net/mac/frame802154.[ch]`: handling of frame version 2 -* `core/net/mac/frame802154-ie.[ch]`: handling of Information Elements +* `os/net/mac/frame802154.[ch]`: handling of frame version 2 +* `os/net/mac/frame802154-ie.[ch]`: handling of Information Elements TSCH is implemented in: -* `core/net/mac/tsch/tsch.[ch]`: TSCH management (association, keep-alive), processes handling pending +* `os/net/mac/tsch/tsch.[ch]`: TSCH management (association, keep-alive), processes handling pending outgoing and incoming packets, and interface with Contiki's upper layers as a MAC driver. TSCH does not require a RDC (nordc is recommended). * `tsch-slot-operation.[ch]`: TSCH low-level slot operation, fully interrupt-driven. Node wake up at every active slot (according to the slotframes and links installed), transmit or receive frames and ACKs. Received packets are stored in a ringbuf for latter upper-layer processing. Outgoing packets that are dequeued (because acknowledged -or dropped) are stored in another ringbuf for upper-layer processing. +or dropped) are stored in another ringbuf for upper-layer processing. * `tsch-asn.h`: TSCH macros for Absolute Slot Number (ASN) handling. * `tsch-packet.[ch]`: TSCH Enhanced ACK (EACK) and enhanced Beacon (EB) creation and parsing. * `tsch-queue.[ch]`: TSCH per-neighbor queue, neighbor state, and CSMA-CA. @@ -91,7 +91,7 @@ To add your own, we refer the reader to the next section. To add TSCH to your application, first include the TSCH module from your makefile with: -`MODULES += core/net/mac/tsch` +`MODULES += os/net/mac/tsch` Then, enable TSCH from your project conf with the following: @@ -131,7 +131,7 @@ On CC2420-based platforms, enable SFD timestamps with: #define CC2420_CONF_SFD_TIMESTAMPS 1 ``` -To configure TSCH, see the macros in `.h` files under `core/net/mac/tsch/` and redefine your own in your `project-conf.h`. +To configure TSCH, see the macros in `.h` files under `os/net/mac/tsch/` and redefine your own in your `project-conf.h`. ## Using TSCH with Security @@ -167,7 +167,7 @@ As an alternative, we provide Orchestra (under `apps/orchestra`), an autonomous Orchestra can be simply enabled and should work out-of-the-box with its default settings as long as RPL is also enabled. See `apps/orchestra/README.md` for more information. -Finally, one can also implement his own scheduler, centralized or distributed, based on the scheduling API provides in `core/net/mac/tsch/tsch-schedule.h`. +Finally, one can also implement his own scheduler, centralized or distributed, based on the scheduling API provides in `os/net/mac/tsch/tsch-schedule.h`. ## Porting TSCH to a new platform @@ -185,7 +185,7 @@ TSCH will check when initializing (in `tsch_init`) that the radio driver support * disable address filtering with `RADIO_RX_MODE_ADDRESS_FILTER` * disable auto-ack with `RADIO_RX_MODE_AUTOACK` * enable poll mode with `RADIO_RX_MODE_POLL_MODE` -* get and set Tx mode (`RADIO_PARAM_TX_MODE`) as follows: +* get and set Tx mode (`RADIO_PARAM_TX_MODE`) as follows: * disable CCA-before-sending with `RADIO_TX_MODE_SEND_ON_CCA` * set radio channel with `RADIO_PARAM_CHANNEL` * get last packet timestamp with `RADIO_PARAM_LAST_PACKET_TIMESTAMP` diff --git a/core/net/mac/tsch/tsch-adaptive-timesync.c b/os/net/mac/tsch/tsch-adaptive-timesync.c similarity index 100% rename from core/net/mac/tsch/tsch-adaptive-timesync.c rename to os/net/mac/tsch/tsch-adaptive-timesync.c diff --git a/core/net/mac/tsch/tsch-adaptive-timesync.h b/os/net/mac/tsch/tsch-adaptive-timesync.h similarity index 100% rename from core/net/mac/tsch/tsch-adaptive-timesync.h rename to os/net/mac/tsch/tsch-adaptive-timesync.h diff --git a/core/net/mac/tsch/tsch-asn.h b/os/net/mac/tsch/tsch-asn.h similarity index 100% rename from core/net/mac/tsch/tsch-asn.h rename to os/net/mac/tsch/tsch-asn.h diff --git a/core/net/mac/tsch/tsch-conf.h b/os/net/mac/tsch/tsch-conf.h similarity index 100% rename from core/net/mac/tsch/tsch-conf.h rename to os/net/mac/tsch/tsch-conf.h diff --git a/core/net/mac/tsch/tsch-log.c b/os/net/mac/tsch/tsch-log.c similarity index 100% rename from core/net/mac/tsch/tsch-log.c rename to os/net/mac/tsch/tsch-log.c diff --git a/core/net/mac/tsch/tsch-log.h b/os/net/mac/tsch/tsch-log.h similarity index 100% rename from core/net/mac/tsch/tsch-log.h rename to os/net/mac/tsch/tsch-log.h diff --git a/core/net/mac/tsch/tsch-packet.c b/os/net/mac/tsch/tsch-packet.c similarity index 100% rename from core/net/mac/tsch/tsch-packet.c rename to os/net/mac/tsch/tsch-packet.c diff --git a/core/net/mac/tsch/tsch-packet.h b/os/net/mac/tsch/tsch-packet.h similarity index 100% rename from core/net/mac/tsch/tsch-packet.h rename to os/net/mac/tsch/tsch-packet.h diff --git a/core/net/mac/tsch/tsch-private.h b/os/net/mac/tsch/tsch-private.h similarity index 100% rename from core/net/mac/tsch/tsch-private.h rename to os/net/mac/tsch/tsch-private.h diff --git a/core/net/mac/tsch/tsch-queue.c b/os/net/mac/tsch/tsch-queue.c similarity index 100% rename from core/net/mac/tsch/tsch-queue.c rename to os/net/mac/tsch/tsch-queue.c diff --git a/core/net/mac/tsch/tsch-queue.h b/os/net/mac/tsch/tsch-queue.h similarity index 100% rename from core/net/mac/tsch/tsch-queue.h rename to os/net/mac/tsch/tsch-queue.h diff --git a/core/net/mac/tsch/tsch-rpl.c b/os/net/mac/tsch/tsch-rpl.c similarity index 100% rename from core/net/mac/tsch/tsch-rpl.c rename to os/net/mac/tsch/tsch-rpl.c diff --git a/core/net/mac/tsch/tsch-rpl.h b/os/net/mac/tsch/tsch-rpl.h similarity index 100% rename from core/net/mac/tsch/tsch-rpl.h rename to os/net/mac/tsch/tsch-rpl.h diff --git a/core/net/mac/tsch/tsch-schedule.c b/os/net/mac/tsch/tsch-schedule.c similarity index 100% rename from core/net/mac/tsch/tsch-schedule.c rename to os/net/mac/tsch/tsch-schedule.c diff --git a/core/net/mac/tsch/tsch-schedule.h b/os/net/mac/tsch/tsch-schedule.h similarity index 100% rename from core/net/mac/tsch/tsch-schedule.h rename to os/net/mac/tsch/tsch-schedule.h diff --git a/core/net/mac/tsch/tsch-security.c b/os/net/mac/tsch/tsch-security.c similarity index 100% rename from core/net/mac/tsch/tsch-security.c rename to os/net/mac/tsch/tsch-security.c diff --git a/core/net/mac/tsch/tsch-security.h b/os/net/mac/tsch/tsch-security.h similarity index 100% rename from core/net/mac/tsch/tsch-security.h rename to os/net/mac/tsch/tsch-security.h diff --git a/core/net/mac/tsch/tsch-slot-operation.c b/os/net/mac/tsch/tsch-slot-operation.c similarity index 100% rename from core/net/mac/tsch/tsch-slot-operation.c rename to os/net/mac/tsch/tsch-slot-operation.c diff --git a/core/net/mac/tsch/tsch-slot-operation.h b/os/net/mac/tsch/tsch-slot-operation.h similarity index 100% rename from core/net/mac/tsch/tsch-slot-operation.h rename to os/net/mac/tsch/tsch-slot-operation.h diff --git a/core/net/mac/tsch/tsch.c b/os/net/mac/tsch/tsch.c similarity index 100% rename from core/net/mac/tsch/tsch.c rename to os/net/mac/tsch/tsch.c diff --git a/core/net/mac/tsch/tsch.h b/os/net/mac/tsch/tsch.h similarity index 100% rename from core/net/mac/tsch/tsch.h rename to os/net/mac/tsch/tsch.h diff --git a/core/net/nbr-table.c b/os/net/nbr-table.c similarity index 100% rename from core/net/nbr-table.c rename to os/net/nbr-table.c diff --git a/core/net/nbr-table.h b/os/net/nbr-table.h similarity index 100% rename from core/net/nbr-table.h rename to os/net/nbr-table.h diff --git a/core/net/net-debug.c b/os/net/net-debug.c similarity index 100% rename from core/net/net-debug.c rename to os/net/net-debug.c diff --git a/core/net/net-debug.h b/os/net/net-debug.h similarity index 100% rename from core/net/net-debug.h rename to os/net/net-debug.h diff --git a/core/net/netstack.c b/os/net/netstack.c similarity index 100% rename from core/net/netstack.c rename to os/net/netstack.c diff --git a/core/net/netstack.h b/os/net/netstack.h similarity index 100% rename from core/net/netstack.h rename to os/net/netstack.h diff --git a/core/net/packetbuf.c b/os/net/packetbuf.c similarity index 100% rename from core/net/packetbuf.c rename to os/net/packetbuf.c diff --git a/core/net/packetbuf.h b/os/net/packetbuf.h similarity index 100% rename from core/net/packetbuf.h rename to os/net/packetbuf.h diff --git a/core/net/queuebuf.c b/os/net/queuebuf.c similarity index 100% rename from core/net/queuebuf.c rename to os/net/queuebuf.c diff --git a/core/net/queuebuf.h b/os/net/queuebuf.h similarity index 100% rename from core/net/queuebuf.h rename to os/net/queuebuf.h diff --git a/core/net/rpl-lite/rpl-conf.h b/os/net/rpl-lite/rpl-conf.h similarity index 100% rename from core/net/rpl-lite/rpl-conf.h rename to os/net/rpl-lite/rpl-conf.h diff --git a/core/net/rpl-lite/rpl-const.h b/os/net/rpl-lite/rpl-const.h similarity index 100% rename from core/net/rpl-lite/rpl-const.h rename to os/net/rpl-lite/rpl-const.h diff --git a/core/net/rpl-lite/rpl-dag-root.c b/os/net/rpl-lite/rpl-dag-root.c similarity index 100% rename from core/net/rpl-lite/rpl-dag-root.c rename to os/net/rpl-lite/rpl-dag-root.c diff --git a/core/net/rpl-lite/rpl-dag-root.h b/os/net/rpl-lite/rpl-dag-root.h similarity index 100% rename from core/net/rpl-lite/rpl-dag-root.h rename to os/net/rpl-lite/rpl-dag-root.h diff --git a/core/net/rpl-lite/rpl-dag.c b/os/net/rpl-lite/rpl-dag.c similarity index 100% rename from core/net/rpl-lite/rpl-dag.c rename to os/net/rpl-lite/rpl-dag.c diff --git a/core/net/rpl-lite/rpl-dag.h b/os/net/rpl-lite/rpl-dag.h similarity index 100% rename from core/net/rpl-lite/rpl-dag.h rename to os/net/rpl-lite/rpl-dag.h diff --git a/core/net/rpl-lite/rpl-ext-header.c b/os/net/rpl-lite/rpl-ext-header.c similarity index 100% rename from core/net/rpl-lite/rpl-ext-header.c rename to os/net/rpl-lite/rpl-ext-header.c diff --git a/core/net/rpl-lite/rpl-ext-header.h b/os/net/rpl-lite/rpl-ext-header.h similarity index 100% rename from core/net/rpl-lite/rpl-ext-header.h rename to os/net/rpl-lite/rpl-ext-header.h diff --git a/core/net/rpl-lite/rpl-icmp6.c b/os/net/rpl-lite/rpl-icmp6.c similarity index 100% rename from core/net/rpl-lite/rpl-icmp6.c rename to os/net/rpl-lite/rpl-icmp6.c diff --git a/core/net/rpl-lite/rpl-icmp6.h b/os/net/rpl-lite/rpl-icmp6.h similarity index 100% rename from core/net/rpl-lite/rpl-icmp6.h rename to os/net/rpl-lite/rpl-icmp6.h diff --git a/core/net/rpl-lite/rpl-mrhof.c b/os/net/rpl-lite/rpl-mrhof.c similarity index 100% rename from core/net/rpl-lite/rpl-mrhof.c rename to os/net/rpl-lite/rpl-mrhof.c diff --git a/core/net/rpl-lite/rpl-nbr-policy.c b/os/net/rpl-lite/rpl-nbr-policy.c similarity index 100% rename from core/net/rpl-lite/rpl-nbr-policy.c rename to os/net/rpl-lite/rpl-nbr-policy.c diff --git a/core/net/rpl-lite/rpl-neighbor.c b/os/net/rpl-lite/rpl-neighbor.c similarity index 100% rename from core/net/rpl-lite/rpl-neighbor.c rename to os/net/rpl-lite/rpl-neighbor.c diff --git a/core/net/rpl-lite/rpl-neighbor.h b/os/net/rpl-lite/rpl-neighbor.h similarity index 100% rename from core/net/rpl-lite/rpl-neighbor.h rename to os/net/rpl-lite/rpl-neighbor.h diff --git a/core/net/rpl-lite/rpl-ns.c b/os/net/rpl-lite/rpl-ns.c similarity index 100% rename from core/net/rpl-lite/rpl-ns.c rename to os/net/rpl-lite/rpl-ns.c diff --git a/core/net/rpl-lite/rpl-ns.h b/os/net/rpl-lite/rpl-ns.h similarity index 100% rename from core/net/rpl-lite/rpl-ns.h rename to os/net/rpl-lite/rpl-ns.h diff --git a/core/net/rpl-lite/rpl-of0.c b/os/net/rpl-lite/rpl-of0.c similarity index 100% rename from core/net/rpl-lite/rpl-of0.c rename to os/net/rpl-lite/rpl-of0.c diff --git a/core/net/rpl-lite/rpl-timers.c b/os/net/rpl-lite/rpl-timers.c similarity index 100% rename from core/net/rpl-lite/rpl-timers.c rename to os/net/rpl-lite/rpl-timers.c diff --git a/core/net/rpl-lite/rpl-timers.h b/os/net/rpl-lite/rpl-timers.h similarity index 100% rename from core/net/rpl-lite/rpl-timers.h rename to os/net/rpl-lite/rpl-timers.h diff --git a/core/net/rpl-lite/rpl-types.h b/os/net/rpl-lite/rpl-types.h similarity index 100% rename from core/net/rpl-lite/rpl-types.h rename to os/net/rpl-lite/rpl-types.h diff --git a/core/net/rpl-lite/rpl.c b/os/net/rpl-lite/rpl.c similarity index 100% rename from core/net/rpl-lite/rpl.c rename to os/net/rpl-lite/rpl.c diff --git a/core/net/rpl-lite/rpl.h b/os/net/rpl-lite/rpl.h similarity index 98% rename from core/net/rpl-lite/rpl.h rename to os/net/rpl-lite/rpl.h index 9b95f951c..d4804a356 100644 --- a/core/net/rpl-lite/rpl.h +++ b/os/net/rpl-lite/rpl.h @@ -71,7 +71,7 @@ extern uip_ipaddr_t rpl_multicast_addr; * Called by lower layers after every packet transmission * * \param addr The link-layer addrress of the packet destination - * \param status The transmission status (see core/net/mac/mac.h) + * \param status The transmission status (see os/net/mac/mac.h) * \param numtx The total number of transmission attempts */ void rpl_link_callback(const linkaddr_t *addr, int status, int numtx); diff --git a/core/net/rpl/rpl-conf.h b/os/net/rpl/rpl-conf.h similarity index 100% rename from core/net/rpl/rpl-conf.h rename to os/net/rpl/rpl-conf.h diff --git a/core/net/rpl/rpl-dag-root.c b/os/net/rpl/rpl-dag-root.c similarity index 100% rename from core/net/rpl/rpl-dag-root.c rename to os/net/rpl/rpl-dag-root.c diff --git a/core/net/rpl/rpl-dag-root.h b/os/net/rpl/rpl-dag-root.h similarity index 100% rename from core/net/rpl/rpl-dag-root.h rename to os/net/rpl/rpl-dag-root.h diff --git a/core/net/rpl/rpl-dag.c b/os/net/rpl/rpl-dag.c similarity index 100% rename from core/net/rpl/rpl-dag.c rename to os/net/rpl/rpl-dag.c diff --git a/core/net/rpl/rpl-ext-header.c b/os/net/rpl/rpl-ext-header.c similarity index 100% rename from core/net/rpl/rpl-ext-header.c rename to os/net/rpl/rpl-ext-header.c diff --git a/core/net/rpl/rpl-icmp6.c b/os/net/rpl/rpl-icmp6.c similarity index 100% rename from core/net/rpl/rpl-icmp6.c rename to os/net/rpl/rpl-icmp6.c diff --git a/core/net/rpl/rpl-mrhof.c b/os/net/rpl/rpl-mrhof.c similarity index 100% rename from core/net/rpl/rpl-mrhof.c rename to os/net/rpl/rpl-mrhof.c diff --git a/core/net/rpl/rpl-nbr-policy.c b/os/net/rpl/rpl-nbr-policy.c similarity index 100% rename from core/net/rpl/rpl-nbr-policy.c rename to os/net/rpl/rpl-nbr-policy.c diff --git a/core/net/rpl/rpl-ns.c b/os/net/rpl/rpl-ns.c similarity index 100% rename from core/net/rpl/rpl-ns.c rename to os/net/rpl/rpl-ns.c diff --git a/core/net/rpl/rpl-ns.h b/os/net/rpl/rpl-ns.h similarity index 100% rename from core/net/rpl/rpl-ns.h rename to os/net/rpl/rpl-ns.h diff --git a/core/net/rpl/rpl-of0.c b/os/net/rpl/rpl-of0.c similarity index 100% rename from core/net/rpl/rpl-of0.c rename to os/net/rpl/rpl-of0.c diff --git a/core/net/rpl/rpl-private.h b/os/net/rpl/rpl-private.h similarity index 100% rename from core/net/rpl/rpl-private.h rename to os/net/rpl/rpl-private.h diff --git a/core/net/rpl/rpl-timers.c b/os/net/rpl/rpl-timers.c similarity index 100% rename from core/net/rpl/rpl-timers.c rename to os/net/rpl/rpl-timers.c diff --git a/core/net/rpl/rpl.c b/os/net/rpl/rpl.c similarity index 100% rename from core/net/rpl/rpl.c rename to os/net/rpl/rpl.c diff --git a/core/net/rpl/rpl.h b/os/net/rpl/rpl.h similarity index 100% rename from core/net/rpl/rpl.h rename to os/net/rpl/rpl.h diff --git a/core/sys/arg.c b/os/sys/arg.c similarity index 100% rename from core/sys/arg.c rename to os/sys/arg.c diff --git a/core/sys/arg.h b/os/sys/arg.h similarity index 100% rename from core/sys/arg.h rename to os/sys/arg.h diff --git a/core/sys/autostart.c b/os/sys/autostart.c similarity index 100% rename from core/sys/autostart.c rename to os/sys/autostart.c diff --git a/core/sys/autostart.h b/os/sys/autostart.h similarity index 100% rename from core/sys/autostart.h rename to os/sys/autostart.h diff --git a/core/sys/cc-gcc.h b/os/sys/cc-gcc.h similarity index 100% rename from core/sys/cc-gcc.h rename to os/sys/cc-gcc.h diff --git a/core/sys/cc.h b/os/sys/cc.h similarity index 100% rename from core/sys/cc.h rename to os/sys/cc.h diff --git a/core/sys/clock.h b/os/sys/clock.h similarity index 100% rename from core/sys/clock.h rename to os/sys/clock.h diff --git a/core/sys/compower.c b/os/sys/compower.c similarity index 100% rename from core/sys/compower.c rename to os/sys/compower.c diff --git a/core/sys/compower.h b/os/sys/compower.h similarity index 100% rename from core/sys/compower.h rename to os/sys/compower.h diff --git a/core/sys/ctimer.c b/os/sys/ctimer.c similarity index 100% rename from core/sys/ctimer.c rename to os/sys/ctimer.c diff --git a/core/sys/ctimer.h b/os/sys/ctimer.h similarity index 100% rename from core/sys/ctimer.h rename to os/sys/ctimer.h diff --git a/core/sys/energest.c b/os/sys/energest.c similarity index 100% rename from core/sys/energest.c rename to os/sys/energest.c diff --git a/core/sys/energest.h b/os/sys/energest.h similarity index 100% rename from core/sys/energest.h rename to os/sys/energest.h diff --git a/core/sys/etimer.c b/os/sys/etimer.c similarity index 100% rename from core/sys/etimer.c rename to os/sys/etimer.c diff --git a/core/sys/etimer.h b/os/sys/etimer.h similarity index 100% rename from core/sys/etimer.h rename to os/sys/etimer.h diff --git a/core/sys/lc-addrlabels.h b/os/sys/lc-addrlabels.h similarity index 100% rename from core/sys/lc-addrlabels.h rename to os/sys/lc-addrlabels.h diff --git a/core/sys/lc-switch.h b/os/sys/lc-switch.h similarity index 100% rename from core/sys/lc-switch.h rename to os/sys/lc-switch.h diff --git a/core/sys/lc.h b/os/sys/lc.h similarity index 99% rename from core/sys/lc.h rename to os/sys/lc.h index 6062a21e2..e174008e5 100644 --- a/core/sys/lc.h +++ b/os/sys/lc.h @@ -51,7 +51,7 @@ */ /** - * \file core/sys/lc.h + * \file os/sys/lc.h * Local continuations * \author * Adam Dunkels diff --git a/core/sys/log-conf.h b/os/sys/log-conf.h similarity index 100% rename from core/sys/log-conf.h rename to os/sys/log-conf.h diff --git a/core/sys/log.c b/os/sys/log.c similarity index 100% rename from core/sys/log.c rename to os/sys/log.c diff --git a/core/sys/log.h b/os/sys/log.h similarity index 100% rename from core/sys/log.h rename to os/sys/log.h diff --git a/core/sys/mt.c b/os/sys/mt.c similarity index 100% rename from core/sys/mt.c rename to os/sys/mt.c diff --git a/core/sys/mt.h b/os/sys/mt.h similarity index 100% rename from core/sys/mt.h rename to os/sys/mt.h diff --git a/core/sys/node-id.h b/os/sys/node-id.h similarity index 100% rename from core/sys/node-id.h rename to os/sys/node-id.h diff --git a/core/sys/process.c b/os/sys/process.c similarity index 100% rename from core/sys/process.c rename to os/sys/process.c diff --git a/core/sys/process.h b/os/sys/process.h similarity index 100% rename from core/sys/process.h rename to os/sys/process.h diff --git a/core/sys/procinit.c b/os/sys/procinit.c similarity index 100% rename from core/sys/procinit.c rename to os/sys/procinit.c diff --git a/core/sys/procinit.h b/os/sys/procinit.h similarity index 100% rename from core/sys/procinit.h rename to os/sys/procinit.h diff --git a/core/sys/pt-sem.h b/os/sys/pt-sem.h similarity index 100% rename from core/sys/pt-sem.h rename to os/sys/pt-sem.h diff --git a/core/sys/pt.h b/os/sys/pt.h similarity index 100% rename from core/sys/pt.h rename to os/sys/pt.h diff --git a/core/sys/rtimer.c b/os/sys/rtimer.c similarity index 100% rename from core/sys/rtimer.c rename to os/sys/rtimer.c diff --git a/core/sys/rtimer.h b/os/sys/rtimer.h similarity index 100% rename from core/sys/rtimer.h rename to os/sys/rtimer.h diff --git a/core/sys/stimer.c b/os/sys/stimer.c similarity index 100% rename from core/sys/stimer.c rename to os/sys/stimer.c diff --git a/core/sys/stimer.h b/os/sys/stimer.h similarity index 100% rename from core/sys/stimer.h rename to os/sys/stimer.h diff --git a/core/sys/subprocess.h b/os/sys/subprocess.h similarity index 100% rename from core/sys/subprocess.h rename to os/sys/subprocess.h diff --git a/core/sys/timer.c b/os/sys/timer.c similarity index 100% rename from core/sys/timer.c rename to os/sys/timer.c diff --git a/core/sys/timer.h b/os/sys/timer.h similarity index 100% rename from core/sys/timer.h rename to os/sys/timer.h diff --git a/regression-tests/13-ieee802154/README.md b/regression-tests/13-ieee802154/README.md index 438ec9e58..1073b2cdb 100644 --- a/regression-tests/13-ieee802154/README.md +++ b/regression-tests/13-ieee802154/README.md @@ -3,7 +3,7 @@ ## 01-panid-handling Test return values by `frame802154_has_panid()` in -[frame802154.c](../../core/net/mac/frame802154.c). +[frame802154.c](../../os/net/mac/frame802154.c). ### Test Code @@ -20,4 +20,4 @@ FAILED. ### References * https://standards.ieee.org/findstds/standard/802.15.4-2015.html -* https://github.com/contiki-os/contiki/pull/1914 \ No newline at end of file +* https://github.com/contiki-os/contiki/pull/1914 diff --git a/regression-tests/13-ieee802154/code-flush-nbr-queue/Makefile b/regression-tests/13-ieee802154/code-flush-nbr-queue/Makefile index 5c3708798..22aeaf344 100644 --- a/regression-tests/13-ieee802154/code-flush-nbr-queue/Makefile +++ b/regression-tests/13-ieee802154/code-flush-nbr-queue/Makefile @@ -1,8 +1,8 @@ -all: +all: CFLAGS += -D PROJECT_CONF_H=\"project-conf.h\" APPS += unit-test -MODULES += core/net/mac/tsch core/net/mac/tsch/sixtop +MODULES += os/net/mac/tsch os/net/mac/tsch/sixtop PROJECT_SOURCEFILES += common.c diff --git a/regression-tests/13-ieee802154/code/Makefile b/regression-tests/13-ieee802154/code/Makefile index 5f82fb4a5..c0f3d160c 100644 --- a/regression-tests/13-ieee802154/code/Makefile +++ b/regression-tests/13-ieee802154/code/Makefile @@ -1,7 +1,7 @@ all: test-panid-handling test-tcsh-create-packet APPS += unit-test -MODULES += core/net/mac/tsch +MODULES += os/net/mac/tsch CFLAGS += -D PROJECT_CONF_H=\"project-conf.h\" WITH_TSCH ?= 0 diff --git a/tools/wpcapslip/Makefile b/tools/wpcapslip/Makefile index fb11826eb..7780d5753 100644 --- a/tools/wpcapslip/Makefile +++ b/tools/wpcapslip/Makefile @@ -7,8 +7,8 @@ all: wpcapslip wpcapstdio Connect.class ConnectSocket.class %.class: %.java javac $*.java - -vpath %.c $(CONTIKI)/core/net + +vpath %.c $(CONTIKI)/os/net wpcapslip: wpcapslip.o wpcap.o tcpdump.o @@ -18,4 +18,4 @@ wpcapstdio: wpcapstdio.o wpcap.o tcpdump.o $(CC) $(LDFLAGS) $^ /lib/w32api/libws2_32.a /lib/w32api/libiphlpapi.a -o $@ clean: - rm -f *.class *.exe *.o \ No newline at end of file + rm -f *.class *.exe *.o