diff --git a/.gitmodules b/.gitmodules
index 9dba7ddd6..b35332066 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -4,11 +4,11 @@
[submodule "tools/cc2538-bsl"]
path = tools/cc2538-bsl
url = https://github.com/JelmerT/cc2538-bsl.git
-[submodule "cpu/cc26xx-cc13xx/lib/cc26xxware"]
- path = cpu/cc26xx-cc13xx/lib/cc26xxware
+[submodule "drivers/cpu/cc26xx-cc13xx/lib/cc26xxware"]
+ path = drivers/cpu/cc26xx-cc13xx/lib/cc26xxware
url = https://github.com/contiki-os/cc26xxware.git
-[submodule "cpu/cc26xx-cc13xx/lib/cc13xxware"]
- path = cpu/cc26xx-cc13xx/lib/cc13xxware
+[submodule "drivers/cpu/cc26xx-cc13xx/lib/cc13xxware"]
+ path = drivers/cpu/cc26xx-cc13xx/lib/cc13xxware
url = https://github.com/contiki-os/cc13xxware.git
[submodule "tools/sensniff"]
path = tools/sensniff
diff --git a/Makefile.include b/Makefile.include
index 9e4c60a2b..25c263776 100644
--- a/Makefile.include
+++ b/Makefile.include
@@ -42,7 +42,7 @@ usage:
@echo "make MAKETARGETS... [TARGET=(TARGET)] [savetarget] [targets]"
targets:
- @ls -1 $(CONTIKI)/platform $(TARGETDIRS) | grep -v CVS
+ @ls -1 $(CONTIKI)/drivers/platform $(TARGETDIRS) | grep -v CVS
savetarget:
-@rm -f Makefile.target
@@ -116,7 +116,7 @@ uniq = $(if $1,$(firstword $1) $(call uniq,$(filter-out $(firstword $1),$1)))
ifdef APPS
APPDS = ${wildcard ${foreach DIR, $(APPDIRS), ${addprefix $(DIR)/, $(APPS)}}} \
${wildcard ${addprefix $(CONTIKI)/apps/, $(APPS)} \
- ${addprefix $(CONTIKI)/platform/$(TARGET)/apps/, $(APPS)} \
+ ${addprefix $(CONTIKI)/drivers/platform/$(TARGET)/apps/, $(APPS)} \
$(APPS)}
APPINCLUDES = ${foreach APP, $(APPS), ${wildcard ${foreach DIR, $(APPDS), $(DIR)/Makefile.$(APP)}}}
-include $(APPINCLUDES)
@@ -126,7 +126,7 @@ endif
### Include target makefile (TODO Unsafe?)
-target_makefile := $(wildcard $(CONTIKI)/platform/$(TARGET)/Makefile.$(TARGET) ${foreach TDIR, $(TARGETDIRS), $(TDIR)/$(TARGET)/Makefile.$(TARGET)})
+target_makefile := $(wildcard $(CONTIKI)/drivers/platform/$(TARGET)/Makefile.$(TARGET) ${foreach TDIR, $(TARGETDIRS), $(TDIR)/$(TARGET)/Makefile.$(TARGET)})
# Check if the target makefile exists, and create the object directory if necessary.
ifeq ($(strip $(target_makefile)),)
@@ -173,8 +173,9 @@ CONTIKI_TARGET_DIRS_CONCAT = ${addprefix ${dir $(target_makefile)}, \
$(CONTIKI_TARGET_DIRS)}
CONTIKI_CPU_DIRS_CONCAT = ${addprefix $(CONTIKI_CPU)/, \
$(CONTIKI_CPU_DIRS)}
+CONTIKI_DRIVERS_DIRS = ${addprefix $(CONTIKI)/, drivers}
-SOURCEDIRS = . $(PROJECTDIRS) $(CONTIKI_TARGET_DIRS_CONCAT) \
+SOURCEDIRS = . $(PROJECTDIRS) $(CONTIKI_TARGET_DIRS_CONCAT) $(CONTIKI_DRIVERS_DIRS) \
$(CONTIKI_CPU_DIRS_CONCAT) $(CONTIKIDIRS) $(APPDS) $(EXTERNALDIRS) ${dir $(target_makefile)}
vpath %.c $(SOURCEDIRS)
@@ -219,7 +220,7 @@ clean:
distclean: clean
-rm -f ${addsuffix .$(TARGET),$(CONTIKI_PROJECT)}
--include $(CONTIKI)/platform/$(TARGET)/Makefile.customrules-$(TARGET)
+-include $(CONTIKI)/drivers/platform/$(TARGET)/Makefile.customrules-$(TARGET)
ifndef CUSTOM_RULE_C_TO_CE
%.ce: %.c
diff --git a/cpu/arm/aducrf101/Common/RealView/startup_ADuCRF101.s b/cpu/arm/aducrf101/Common/RealView/startup_ADuCRF101.s
deleted file mode 100644
index 314f9cb0a..000000000
--- a/cpu/arm/aducrf101/Common/RealView/startup_ADuCRF101.s
+++ /dev/null
@@ -1,312 +0,0 @@
-; Copyright (c) 2014, Analog Devices, Inc. All rights reserved.
-;
-; Redistribution and use in source and binary forms, with or without
-; modification, are permitted (subject to the limitations in the
-; disclaimer below) provided that the following conditions are met:
-;
-; - Redistributions of source code must retain the above copyright
-; notice, this list of conditions and the following disclaimer.
-;
-; - Redistributions in binary form must reproduce the above copyright
-; notice, this list of conditions and the following disclaimer in the
-; documentation and/or other materials provided with the
-; distribution.
-;
-; - Neither the name of Analog Devices, Inc. nor the names of its
-; contributors may be used to endorse or promote products derived
-; from this software without specific prior written permission.
-;
-; NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE
-; GRANTED BY THIS LICENSE. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT
-; HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
-; WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-; MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-; DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-; LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-; CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-; SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-; BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-; WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-; OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-; IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-; Module : startup_ADuCRF101.s
-; Description : Cortex-M3 startup file - ADuCRF101 - RealView Version
-; Date : 14 January 2013
-; Version : v1.01
-; Changelog : v1.01 Added call to SystemInit
-; Changelog : v1.00 Initial
-
- IMPORT __use_no_semihosting_swi
-; Amount of memory (in bytes) allocated for Stack
-; Tailor this value to your application needs
-; Stack Configuration
-; Stack Size (in Bytes) <0x0-0xFFFFFFFF:8>
-;
-
-Stack_Size EQU 0x00000400
-
- AREA STACK, NOINIT, READWRITE, ALIGN=3
-Stack_Mem SPACE Stack_Size
-__initial_sp
-
-
-; Heap Configuration
-; Heap Size (in Bytes) <0x0-0xFFFFFFFF:8>
-;
-
-Heap_Size EQU 0x00000200
-
- AREA HEAP, NOINIT, READWRITE, ALIGN=3
-__heap_base
-Heap_Mem SPACE Heap_Size
-__heap_limit
-
- PRESERVE8
- THUMB
-
-
-; Vector Table Mapped to Address 0 at Reset
- AREA RESET, DATA, READONLY
- EXPORT __Vectors
- EXPORT __Vectors_End
- EXPORT __Vectors_Size
-
-__Vectors DCD __initial_sp ; Top of Stack
- DCD Reset_Handler ; Reset Handler
- DCD NMI_Handler ; The NMI handler
- DCD HardFault_Handler ; The hard fault handler
- DCD MemManage_Handler ; The MPU fault handler
- DCD BusFault_Handler ; The bus fault handler
- DCD UsageFault_Handler ; The usage fault handler
- DCD 0 ; Reserved
- DCD 0 ; Reserved
- DCD 0 ; Reserved
- DCD 0 ; Reserved
- DCD SVC_Handler ; SVCall handler
- DCD DebugMon_Handler ; Debug monitor handler
- DCD 0 ; Reserved
- DCD PendSV_Handler ; The PendSV handler
- DCD SysTick_Handler ; The SysTick handler
-
- ; External Interrupts
- DCD WakeUp_Int_Handler ; Wake Up Timer [ 0]
- DCD Ext_Int0_Handler ; External Interrupt 0 [ 1]
- DCD Ext_Int1_Handler ; External Interrupt 1 [ 2]
- DCD Ext_Int2_Handler ; External Interrupt 2 [ 3]
- DCD Ext_Int3_Handler ; External Interrupt 3 [ 4]
- DCD Ext_Int4_Handler ; External Interrupt 4 [ 5]
- DCD Ext_Int5_Handler ; External Interrupt 5 [ 6]
- DCD Ext_Int6_Handler ; External Interrupt 6 [ 7]
- DCD Ext_Int7_Handler ; External Interrupt 7 [ 8]
- DCD Ext_Int8_Handler ; External Interrupt 8 [ 9]
- DCD WDog_Tmr_Int_Handler ; Watchdog timer handler [10]
- DCD UnUsed_Handler ; Reserved [11]
- DCD GP_Tmr0_Int_Handler ; General purpose timer 0 [12]
- DCD GP_Tmr1_Int_Handler ; General purpose timer 1 [13]
- DCD ADC0_Int_Handler ; ADC Interrupt [14]
- DCD Flsh_Int_Handler ; Flash IRQ [15]
- DCD UART_Int_Handler ; UART0 [16]
- DCD SPI0_Int_Handler ; SPI 0 [17]
- DCD SPI1_Int_Handler ; SPI 1 [18]
- DCD I2C0_Slave_Int_Handler ; I2C0 Slave [19]
- DCD I2C0_Master_Int_Handler ; I2C0 Master [20]
- DCD UnUsed_Handler ; Reserved [21]
- DCD UnUsed_Handler ; Reserved [22]
- DCD DMA_Err_Int_Handler ; DMA Error interrupt [23]
- DCD DMA_SPI1_TX_Int_Handler ; DMA SPI1 TX [24]
- DCD DMA_SPI1_RX_Int_Handler ; DMA SPI1 RX [25]
- DCD DMA_UART_TX_Int_Handler ; DMA UART TX [26]
- DCD DMA_UART_RX_Int_Handler ; DMA UART RX [27]
- DCD DMA_I2C0_STX_Int_Handler ; DMA I2C0 Slave TX [28]
- DCD DMA_I2C0_SRX_Int_Handler ; DMA I2C0 Slave RX [29]
- DCD DMA_I2C0_MTX_Int_Handler ; DMA I2C0 Master TX [30]
- DCD DMA_I2C0_MRX_Int_Handler ; DMA I2C0 Master RX [31]
- DCD UnUsed_Handler ; Reserved [32]
- DCD UnUsed_Handler ; Reserved [33]
- DCD UnUsed_Handler ; Reserved [34]
- DCD DMA_ADC_Int_Handler ; DMA ADC [35]
- DCD DMA_SPI0_TX_Int_Handler ; DMA SPI0 TX [36]
- DCD DMA_SPI0_RX_Int_Handler ; DMA SPI0 RX [37]
- DCD PWMTrip_Int_Handler ; PWM Trip [38]
- DCD PWM0_Int_Handler ; PWM 0 [39]
- DCD PWM1_Int_Handler ; PWM 1 [40]
- DCD PWM2_Int_Handler ; PWM 2 [41]
- DCD PWM3_Int_Handler ; PWM 3 [42]
- DCD UnUsed_Handler ; Unused [43]
-__Vectors_End
-
-__Vectors_Size EQU __Vectors_End - __Vectors
-
- AREA |.text|, CODE, READONLY
-
-; Reset handler
-Reset_Handler PROC
- EXPORT Reset_Handler [WEAK]
- IMPORT SystemInit
- IMPORT __main
- LDR R0, =SystemInit ; Defined in system_ADuCRF101.c
- BLX R0
- LDR R0, =__main
- BX R0
- ENDP
-
-; Dummy Exception Handlers (infinite loops which can be modified)
-
-NMI_Handler PROC
- EXPORT NMI_Handler [WEAK]
- B .
- ENDP
-HardFault_Handler\
- PROC
- EXPORT HardFault_Handler [WEAK]
- B .
- ENDP
-MemManage_Handler\
- PROC
- EXPORT MemManage_Handler [WEAK]
- B .
- ENDP
-BusFault_Handler\
- PROC
- EXPORT BusFault_Handler [WEAK]
- B .
- ENDP
-UsageFault_Handler\
- PROC
- EXPORT UsageFault_Handler [WEAK]
- B .
- ENDP
-SVC_Handler PROC
- EXPORT SVC_Handler [WEAK]
- B .
- ENDP
-DebugMon_Handler\
- PROC
- EXPORT DebugMon_Handler [WEAK]
- B .
- ENDP
-PendSV_Handler PROC
- EXPORT PendSV_Handler [WEAK]
- B .
- ENDP
-SysTick_Handler PROC
- EXPORT SysTick_Handler [WEAK]
- B .
- ENDP
-
-Default_Handler PROC
-
- EXPORT WakeUp_Int_Handler [WEAK]
- EXPORT Ext_Int0_Handler [WEAK]
- EXPORT Ext_Int1_Handler [WEAK]
- EXPORT Ext_Int2_Handler [WEAK]
- EXPORT Ext_Int3_Handler [WEAK]
- EXPORT Ext_Int4_Handler [WEAK]
- EXPORT Ext_Int5_Handler [WEAK]
- EXPORT Ext_Int6_Handler [WEAK]
- EXPORT Ext_Int7_Handler [WEAK]
- EXPORT Ext_Int8_Handler [WEAK]
- EXPORT WDog_Tmr_Int_Handler [WEAK]
- EXPORT GP_Tmr0_Int_Handler [WEAK]
- EXPORT GP_Tmr1_Int_Handler [WEAK]
- EXPORT ADC0_Int_Handler [WEAK]
- EXPORT Flsh_Int_Handler [WEAK]
- EXPORT UART_Int_Handler [WEAK]
- EXPORT SPI0_Int_Handler [WEAK]
- EXPORT SPI1_Int_Handler [WEAK]
- EXPORT I2C0_Slave_Int_Handler [WEAK]
- EXPORT I2C0_Master_Int_Handler [WEAK]
- EXPORT DMA_Err_Int_Handler [WEAK]
- EXPORT DMA_SPI1_TX_Int_Handler [WEAK]
- EXPORT DMA_SPI1_RX_Int_Handler [WEAK]
- EXPORT DMA_UART_TX_Int_Handler [WEAK]
- EXPORT DMA_UART_RX_Int_Handler [WEAK]
- EXPORT DMA_I2C0_STX_Int_Handler [WEAK]
- EXPORT DMA_I2C0_SRX_Int_Handler [WEAK]
- EXPORT DMA_I2C0_MTX_Int_Handler [WEAK]
- EXPORT DMA_I2C0_MRX_Int_Handler [WEAK]
- EXPORT DMA_ADC_Int_Handler [WEAK]
- EXPORT DMA_SPI0_TX_Int_Handler [WEAK]
- EXPORT DMA_SPI0_RX_Int_Handler [WEAK]
- EXPORT PWMTrip_Int_Handler [WEAK]
- EXPORT PWM0_Int_Handler [WEAK]
- EXPORT PWM1_Int_Handler [WEAK]
- EXPORT PWM2_Int_Handler [WEAK]
- EXPORT PWM3_Int_Handler [WEAK]
- EXPORT UnUsed_Handler [WEAK]
-
-
-WakeUp_Int_Handler
-Ext_Int0_Handler
-Ext_Int1_Handler
-Ext_Int2_Handler
-Ext_Int3_Handler
-Ext_Int4_Handler
-Ext_Int5_Handler
-Ext_Int6_Handler
-Ext_Int7_Handler
-Ext_Int8_Handler
-WDog_Tmr_Int_Handler
-GP_Tmr0_Int_Handler
-GP_Tmr1_Int_Handler
-ADC0_Int_Handler
-Flsh_Int_Handler
-UART_Int_Handler
-SPI0_Int_Handler
-SPI1_Int_Handler
-I2C0_Slave_Int_Handler
-I2C0_Master_Int_Handler
-DMA_Err_Int_Handler
-DMA_SPI1_TX_Int_Handler
-DMA_SPI1_RX_Int_Handler
-DMA_UART_TX_Int_Handler
-DMA_UART_RX_Int_Handler
-DMA_I2C0_STX_Int_Handler
-DMA_I2C0_SRX_Int_Handler
-DMA_I2C0_MTX_Int_Handler
-DMA_I2C0_MRX_Int_Handler
-DMA_ADC_Int_Handler
-DMA_SPI0_TX_Int_Handler
-DMA_SPI0_RX_Int_Handler
-PWMTrip_Int_Handler
-PWM0_Int_Handler
-PWM1_Int_Handler
-PWM2_Int_Handler
-PWM3_Int_Handler
-UnUsed_Handler
-
- B .
-
- ENDP
-
- ALIGN
-
-;*******************************************************************************
-; User Stack and Heap initialization
-;*******************************************************************************
- IF :DEF:__MICROLIB
-
- EXPORT __initial_sp
- EXPORT __heap_base
- EXPORT __heap_limit
-
- ELSE
-
- IMPORT __use_two_region_memory
- EXPORT __user_initial_stackheap
-
-__user_initial_stackheap
-
- LDR R0, = Heap_Mem
- LDR R1, =(Stack_Mem + Stack_Size)
- LDR R2, = (Heap_Mem + Heap_Size)
- LDR R3, = Stack_Mem
- BX LR
-
- ALIGN
-
- ENDIF
-
- END
-
diff --git a/cpu/cc26xx-cc13xx/lib/cc13xxware b/cpu/cc26xx-cc13xx/lib/cc13xxware
deleted file mode 160000
index 0f44f949b..000000000
--- a/cpu/cc26xx-cc13xx/lib/cc13xxware
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 0f44f949b4a7862ae3273739279df6297a4a4e45
diff --git a/cpu/cc26xx-cc13xx/lib/cc26xxware b/cpu/cc26xx-cc13xx/lib/cc26xxware
deleted file mode 160000
index e816e3508..000000000
--- a/cpu/cc26xx-cc13xx/lib/cc26xxware
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit e816e3508b87744186acae2c5f792ad378836ae3
diff --git a/cpu/nrf52832/erase.jlink b/cpu/nrf52832/erase.jlink
deleted file mode 100644
index 5f08d8d86..000000000
--- a/cpu/nrf52832/erase.jlink
+++ /dev/null
@@ -1,2 +0,0 @@
-erase
-q
\ No newline at end of file
diff --git a/cpu/nrf52832/flash.jlink b/cpu/nrf52832/flash.jlink
deleted file mode 100644
index 787670d55..000000000
--- a/cpu/nrf52832/flash.jlink
+++ /dev/null
@@ -1,4 +0,0 @@
-loadfile #OUTPUT_FILENAME#
-r
-g
-q
\ No newline at end of file
diff --git a/doc/Makefile b/doc/Makefile
index ef248c0fd..985cc6f0f 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -1,4 +1,4 @@
-basedirs := core cpu platform apps
+basedirs := core drivers/cpu drivers/platform apps
manuals := $(shell find ./ -name "*.txt")
filetypes := -iwholename "*/doc/*.txt"
empty :=
diff --git a/cpu/arm/aducrf101/Common/ADuCRF101.h b/drivers/cpu/arm/aducrf101/Common/ADuCRF101.h
similarity index 100%
rename from cpu/arm/aducrf101/Common/ADuCRF101.h
rename to drivers/cpu/arm/aducrf101/Common/ADuCRF101.h
diff --git a/cpu/arm/aducrf101/Common/GCC/ADuCRF101.ld b/drivers/cpu/arm/aducrf101/Common/GCC/ADuCRF101.ld
similarity index 100%
rename from cpu/arm/aducrf101/Common/GCC/ADuCRF101.ld
rename to drivers/cpu/arm/aducrf101/Common/GCC/ADuCRF101.ld
diff --git a/cpu/arm/aducrf101/Common/GCC/crt0.S b/drivers/cpu/arm/aducrf101/Common/GCC/crt0.S
similarity index 100%
rename from cpu/arm/aducrf101/Common/GCC/crt0.S
rename to drivers/cpu/arm/aducrf101/Common/GCC/crt0.S
diff --git a/cpu/arm/aducrf101/Common/IAR/ADUCRF101.icf b/drivers/cpu/arm/aducrf101/Common/IAR/ADUCRF101.icf
similarity index 100%
rename from cpu/arm/aducrf101/Common/IAR/ADUCRF101.icf
rename to drivers/cpu/arm/aducrf101/Common/IAR/ADUCRF101.icf
diff --git a/cpu/arm/aducrf101/Common/IAR/Retarget.c b/drivers/cpu/arm/aducrf101/Common/IAR/Retarget.c
similarity index 100%
rename from cpu/arm/aducrf101/Common/IAR/Retarget.c
rename to drivers/cpu/arm/aducrf101/Common/IAR/Retarget.c
diff --git a/cpu/arm/aducrf101/Common/IAR/startup_ADuCRF101.S b/drivers/cpu/arm/aducrf101/Common/IAR/startup_ADuCRF101.S
similarity index 100%
rename from cpu/arm/aducrf101/Common/IAR/startup_ADuCRF101.S
rename to drivers/cpu/arm/aducrf101/Common/IAR/startup_ADuCRF101.S
diff --git a/cpu/arm/aducrf101/Common/RealView/Retarget.c b/drivers/cpu/arm/aducrf101/Common/RealView/Retarget.c
similarity index 100%
rename from cpu/arm/aducrf101/Common/RealView/Retarget.c
rename to drivers/cpu/arm/aducrf101/Common/RealView/Retarget.c
diff --git a/cpu/arm/aducrf101/Common/aducrf101-include.h b/drivers/cpu/arm/aducrf101/Common/aducrf101-include.h
similarity index 100%
rename from cpu/arm/aducrf101/Common/aducrf101-include.h
rename to drivers/cpu/arm/aducrf101/Common/aducrf101-include.h
diff --git a/cpu/arm/aducrf101/Common/defs.h b/drivers/cpu/arm/aducrf101/Common/defs.h
similarity index 100%
rename from cpu/arm/aducrf101/Common/defs.h
rename to drivers/cpu/arm/aducrf101/Common/defs.h
diff --git a/cpu/arm/aducrf101/Common/radioeng.c b/drivers/cpu/arm/aducrf101/Common/radioeng.c
similarity index 100%
rename from cpu/arm/aducrf101/Common/radioeng.c
rename to drivers/cpu/arm/aducrf101/Common/radioeng.c
diff --git a/cpu/arm/aducrf101/Common/radioeng.h b/drivers/cpu/arm/aducrf101/Common/radioeng.h
similarity index 100%
rename from cpu/arm/aducrf101/Common/radioeng.h
rename to drivers/cpu/arm/aducrf101/Common/radioeng.h
diff --git a/cpu/arm/aducrf101/Common/system_ADuCRF101.c b/drivers/cpu/arm/aducrf101/Common/system_ADuCRF101.c
similarity index 100%
rename from cpu/arm/aducrf101/Common/system_ADuCRF101.c
rename to drivers/cpu/arm/aducrf101/Common/system_ADuCRF101.c
diff --git a/cpu/arm/aducrf101/Common/system_ADuCRF101.h b/drivers/cpu/arm/aducrf101/Common/system_ADuCRF101.h
similarity index 100%
rename from cpu/arm/aducrf101/Common/system_ADuCRF101.h
rename to drivers/cpu/arm/aducrf101/Common/system_ADuCRF101.h
diff --git a/cpu/arm/aducrf101/Makefile.aducrf101 b/drivers/cpu/arm/aducrf101/Makefile.aducrf101
similarity index 98%
rename from cpu/arm/aducrf101/Makefile.aducrf101
rename to drivers/cpu/arm/aducrf101/Makefile.aducrf101
index a61c9f97f..48c01a7d5 100644
--- a/cpu/arm/aducrf101/Makefile.aducrf101
+++ b/drivers/cpu/arm/aducrf101/Makefile.aducrf101
@@ -34,7 +34,7 @@
# Author: Jim Paris
-CONTIKI_CPU = $(CONTIKI)/cpu/arm/aducrf101
+CONTIKI_CPU = $(CONTIKI)/drivers/cpu/arm/aducrf101
ifdef IAR
include $(CONTIKI_CPU)/Makefile.aducrf101.iar
diff --git a/cpu/arm/aducrf101/Makefile.aducrf101.gnu b/drivers/cpu/arm/aducrf101/Makefile.aducrf101.gnu
similarity index 100%
rename from cpu/arm/aducrf101/Makefile.aducrf101.gnu
rename to drivers/cpu/arm/aducrf101/Makefile.aducrf101.gnu
diff --git a/cpu/arm/aducrf101/Makefile.aducrf101.iar b/drivers/cpu/arm/aducrf101/Makefile.aducrf101.iar
similarity index 100%
rename from cpu/arm/aducrf101/Makefile.aducrf101.iar
rename to drivers/cpu/arm/aducrf101/Makefile.aducrf101.iar
diff --git a/cpu/arm/aducrf101/aducrf101-contiki.h b/drivers/cpu/arm/aducrf101/aducrf101-contiki.h
similarity index 100%
rename from cpu/arm/aducrf101/aducrf101-contiki.h
rename to drivers/cpu/arm/aducrf101/aducrf101-contiki.h
diff --git a/cpu/arm/aducrf101/clock.c b/drivers/cpu/arm/aducrf101/clock.c
similarity index 100%
rename from cpu/arm/aducrf101/clock.c
rename to drivers/cpu/arm/aducrf101/clock.c
diff --git a/cpu/arm/aducrf101/dev/radio.c b/drivers/cpu/arm/aducrf101/dev/radio.c
similarity index 100%
rename from cpu/arm/aducrf101/dev/radio.c
rename to drivers/cpu/arm/aducrf101/dev/radio.c
diff --git a/cpu/arm/aducrf101/dev/uart.c b/drivers/cpu/arm/aducrf101/dev/uart.c
similarity index 100%
rename from cpu/arm/aducrf101/dev/uart.c
rename to drivers/cpu/arm/aducrf101/dev/uart.c
diff --git a/cpu/arm/aducrf101/dev/uart.h b/drivers/cpu/arm/aducrf101/dev/uart.h
similarity index 100%
rename from cpu/arm/aducrf101/dev/uart.h
rename to drivers/cpu/arm/aducrf101/dev/uart.h
diff --git a/cpu/arm/aducrf101/dev/uart0.h b/drivers/cpu/arm/aducrf101/dev/uart0.h
similarity index 100%
rename from cpu/arm/aducrf101/dev/uart0.h
rename to drivers/cpu/arm/aducrf101/dev/uart0.h
diff --git a/cpu/arm/aducrf101/dev/uart1.h b/drivers/cpu/arm/aducrf101/dev/uart1.h
similarity index 100%
rename from cpu/arm/aducrf101/dev/uart1.h
rename to drivers/cpu/arm/aducrf101/dev/uart1.h
diff --git a/cpu/arm/aducrf101/dev/watchdog.c b/drivers/cpu/arm/aducrf101/dev/watchdog.c
similarity index 100%
rename from cpu/arm/aducrf101/dev/watchdog.c
rename to drivers/cpu/arm/aducrf101/dev/watchdog.c
diff --git a/cpu/arm/aducrf101/mtarch.h b/drivers/cpu/arm/aducrf101/mtarch.h
similarity index 100%
rename from cpu/arm/aducrf101/mtarch.h
rename to drivers/cpu/arm/aducrf101/mtarch.h
diff --git a/cpu/arm/aducrf101/rtimer-arch.c b/drivers/cpu/arm/aducrf101/rtimer-arch.c
similarity index 100%
rename from cpu/arm/aducrf101/rtimer-arch.c
rename to drivers/cpu/arm/aducrf101/rtimer-arch.c
diff --git a/cpu/arm/aducrf101/rtimer-arch.h b/drivers/cpu/arm/aducrf101/rtimer-arch.h
similarity index 100%
rename from cpu/arm/aducrf101/rtimer-arch.h
rename to drivers/cpu/arm/aducrf101/rtimer-arch.h
diff --git a/cpu/arm/aducrf101/slip-arch.c b/drivers/cpu/arm/aducrf101/slip-arch.c
similarity index 100%
rename from cpu/arm/aducrf101/slip-arch.c
rename to drivers/cpu/arm/aducrf101/slip-arch.c
diff --git a/cpu/arm/arm.txt b/drivers/cpu/arm/arm.txt
similarity index 100%
rename from cpu/arm/arm.txt
rename to drivers/cpu/arm/arm.txt
diff --git a/cpu/arm/at91sam7s/AT91SAM7S-ROM.ld b/drivers/cpu/arm/at91sam7s/AT91SAM7S-ROM.ld
similarity index 100%
rename from cpu/arm/at91sam7s/AT91SAM7S-ROM.ld
rename to drivers/cpu/arm/at91sam7s/AT91SAM7S-ROM.ld
diff --git a/cpu/arm/at91sam7s/AT91SAM7S128-ROM.ld b/drivers/cpu/arm/at91sam7s/AT91SAM7S128-ROM.ld
similarity index 100%
rename from cpu/arm/at91sam7s/AT91SAM7S128-ROM.ld
rename to drivers/cpu/arm/at91sam7s/AT91SAM7S128-ROM.ld
diff --git a/cpu/arm/at91sam7s/AT91SAM7S128.h b/drivers/cpu/arm/at91sam7s/AT91SAM7S128.h
similarity index 100%
rename from cpu/arm/at91sam7s/AT91SAM7S128.h
rename to drivers/cpu/arm/at91sam7s/AT91SAM7S128.h
diff --git a/cpu/arm/at91sam7s/AT91SAM7S256.h b/drivers/cpu/arm/at91sam7s/AT91SAM7S256.h
similarity index 100%
rename from cpu/arm/at91sam7s/AT91SAM7S256.h
rename to drivers/cpu/arm/at91sam7s/AT91SAM7S256.h
diff --git a/cpu/arm/at91sam7s/AT91SAM7S64-ROM.ld b/drivers/cpu/arm/at91sam7s/AT91SAM7S64-ROM.ld
similarity index 100%
rename from cpu/arm/at91sam7s/AT91SAM7S64-ROM.ld
rename to drivers/cpu/arm/at91sam7s/AT91SAM7S64-ROM.ld
diff --git a/cpu/arm/at91sam7s/AT91SAM7S64.h b/drivers/cpu/arm/at91sam7s/AT91SAM7S64.h
similarity index 100%
rename from cpu/arm/at91sam7s/AT91SAM7S64.h
rename to drivers/cpu/arm/at91sam7s/AT91SAM7S64.h
diff --git a/cpu/arm/at91sam7s/Makefile.at91sam7s b/drivers/cpu/arm/at91sam7s/Makefile.at91sam7s
similarity index 97%
rename from cpu/arm/at91sam7s/Makefile.at91sam7s
rename to drivers/cpu/arm/at91sam7s/Makefile.at91sam7s
index 805259e7c..ea6aba0fb 100644
--- a/cpu/arm/at91sam7s/Makefile.at91sam7s
+++ b/drivers/cpu/arm/at91sam7s/Makefile.at91sam7s
@@ -5,7 +5,7 @@ SUBTARGET = 64
### Code common for all ARM CPUs
-CONTIKI_CPU_ARM=$(CONTIKI)/cpu/arm/
+CONTIKI_CPU_ARM=$(CONTIKI)/drivers/cpu/arm/
CONTIKI_CPU_ARM_COMMON=$(CONTIKI_CPU_ARM)/common
### Defin the CPU directory
@@ -71,7 +71,7 @@ ARM_FLAGS=
CFLAGSNO = -I. -I$(CONTIKI)/core -I$(CONTIKI_CPU) \
-I$(CONTIKI_CPU)/dbg-io \
- -I$(CONTIKI)/platform/$(TARGET) \
+ -I$(CONTIKI)/drivers/platform/$(TARGET) \
${addprefix -I,$(APPDIRS)} \
-DWITH_ASCII -DMCK=$(MCK) \
-Wall $(ARCH_FLAGS) -g -D SUBTARGET=$(SUBTARGET)
diff --git a/cpu/arm/at91sam7s/builtins.awk b/drivers/cpu/arm/at91sam7s/builtins.awk
similarity index 100%
rename from cpu/arm/at91sam7s/builtins.awk
rename to drivers/cpu/arm/at91sam7s/builtins.awk
diff --git a/cpu/arm/at91sam7s/cfs-sdcard-arch.c b/drivers/cpu/arm/at91sam7s/cfs-sdcard-arch.c
similarity index 100%
rename from cpu/arm/at91sam7s/cfs-sdcard-arch.c
rename to drivers/cpu/arm/at91sam7s/cfs-sdcard-arch.c
diff --git a/cpu/arm/at91sam7s/clock.c b/drivers/cpu/arm/at91sam7s/clock.c
similarity index 100%
rename from cpu/arm/at91sam7s/clock.c
rename to drivers/cpu/arm/at91sam7s/clock.c
diff --git a/cpu/arm/at91sam7s/debug-uart.c b/drivers/cpu/arm/at91sam7s/debug-uart.c
similarity index 100%
rename from cpu/arm/at91sam7s/debug-uart.c
rename to drivers/cpu/arm/at91sam7s/debug-uart.c
diff --git a/cpu/arm/at91sam7s/debug-uart.h b/drivers/cpu/arm/at91sam7s/debug-uart.h
similarity index 100%
rename from cpu/arm/at91sam7s/debug-uart.h
rename to drivers/cpu/arm/at91sam7s/debug-uart.h
diff --git a/cpu/arm/at91sam7s/efs-sdcard-arch.c b/drivers/cpu/arm/at91sam7s/efs-sdcard-arch.c
similarity index 100%
rename from cpu/arm/at91sam7s/efs-sdcard-arch.c
rename to drivers/cpu/arm/at91sam7s/efs-sdcard-arch.c
diff --git a/cpu/arm/at91sam7s/interrupt-utils.c b/drivers/cpu/arm/at91sam7s/interrupt-utils.c
similarity index 100%
rename from cpu/arm/at91sam7s/interrupt-utils.c
rename to drivers/cpu/arm/at91sam7s/interrupt-utils.c
diff --git a/cpu/arm/at91sam7s/interrupt-utils.h b/drivers/cpu/arm/at91sam7s/interrupt-utils.h
similarity index 100%
rename from cpu/arm/at91sam7s/interrupt-utils.h
rename to drivers/cpu/arm/at91sam7s/interrupt-utils.h
diff --git a/cpu/arm/at91sam7s/io.h b/drivers/cpu/arm/at91sam7s/io.h
similarity index 100%
rename from cpu/arm/at91sam7s/io.h
rename to drivers/cpu/arm/at91sam7s/io.h
diff --git a/cpu/arm/at91sam7s/merge-rodata.ld b/drivers/cpu/arm/at91sam7s/merge-rodata.ld
similarity index 100%
rename from cpu/arm/at91sam7s/merge-rodata.ld
rename to drivers/cpu/arm/at91sam7s/merge-rodata.ld
diff --git a/cpu/arm/at91sam7s/newlib-syscalls.c b/drivers/cpu/arm/at91sam7s/newlib-syscalls.c
similarity index 100%
rename from cpu/arm/at91sam7s/newlib-syscalls.c
rename to drivers/cpu/arm/at91sam7s/newlib-syscalls.c
diff --git a/cpu/arm/at91sam7s/openocd/AT91SAM7x_init.script b/drivers/cpu/arm/at91sam7s/openocd/AT91SAM7x_init.script
similarity index 100%
rename from cpu/arm/at91sam7s/openocd/AT91SAM7x_init.script
rename to drivers/cpu/arm/at91sam7s/openocd/AT91SAM7x_init.script
diff --git a/cpu/arm/at91sam7s/openocd/arm7_wig.cfg b/drivers/cpu/arm/at91sam7s/openocd/arm7_wig.cfg
similarity index 100%
rename from cpu/arm/at91sam7s/openocd/arm7_wig.cfg
rename to drivers/cpu/arm/at91sam7s/openocd/arm7_wig.cfg
diff --git a/cpu/arm/at91sam7s/openocd/arm7_wig_flash.cfg b/drivers/cpu/arm/at91sam7s/openocd/arm7_wig_flash.cfg
similarity index 100%
rename from cpu/arm/at91sam7s/openocd/arm7_wig_flash.cfg
rename to drivers/cpu/arm/at91sam7s/openocd/arm7_wig_flash.cfg
diff --git a/cpu/arm/at91sam7s/openocd/arm7_wig_reset.cfg b/drivers/cpu/arm/at91sam7s/openocd/arm7_wig_reset.cfg
similarity index 100%
rename from cpu/arm/at91sam7s/openocd/arm7_wig_reset.cfg
rename to drivers/cpu/arm/at91sam7s/openocd/arm7_wig_reset.cfg
diff --git a/cpu/arm/at91sam7s/openocd/openocd_flash b/drivers/cpu/arm/at91sam7s/openocd/openocd_flash
similarity index 100%
rename from cpu/arm/at91sam7s/openocd/openocd_flash
rename to drivers/cpu/arm/at91sam7s/openocd/openocd_flash
diff --git a/cpu/arm/at91sam7s/openocd/openocd_reset b/drivers/cpu/arm/at91sam7s/openocd/openocd_reset
similarity index 100%
rename from cpu/arm/at91sam7s/openocd/openocd_reset
rename to drivers/cpu/arm/at91sam7s/openocd/openocd_reset
diff --git a/cpu/arm/at91sam7s/openocd/target/sam7s.cfg b/drivers/cpu/arm/at91sam7s/openocd/target/sam7s.cfg
similarity index 100%
rename from cpu/arm/at91sam7s/openocd/target/sam7s.cfg
rename to drivers/cpu/arm/at91sam7s/openocd/target/sam7s.cfg
diff --git a/cpu/arm/at91sam7s/pit-interrupt.h b/drivers/cpu/arm/at91sam7s/pit-interrupt.h
similarity index 100%
rename from cpu/arm/at91sam7s/pit-interrupt.h
rename to drivers/cpu/arm/at91sam7s/pit-interrupt.h
diff --git a/cpu/arm/at91sam7s/rtimer-arch-interrupt.c b/drivers/cpu/arm/at91sam7s/rtimer-arch-interrupt.c
similarity index 100%
rename from cpu/arm/at91sam7s/rtimer-arch-interrupt.c
rename to drivers/cpu/arm/at91sam7s/rtimer-arch-interrupt.c
diff --git a/cpu/arm/at91sam7s/rtimer-arch-interrupt.h b/drivers/cpu/arm/at91sam7s/rtimer-arch-interrupt.h
similarity index 100%
rename from cpu/arm/at91sam7s/rtimer-arch-interrupt.h
rename to drivers/cpu/arm/at91sam7s/rtimer-arch-interrupt.h
diff --git a/cpu/arm/at91sam7s/rtimer-arch.c b/drivers/cpu/arm/at91sam7s/rtimer-arch.c
similarity index 100%
rename from cpu/arm/at91sam7s/rtimer-arch.c
rename to drivers/cpu/arm/at91sam7s/rtimer-arch.c
diff --git a/cpu/arm/at91sam7s/rtimer-arch.h b/drivers/cpu/arm/at91sam7s/rtimer-arch.h
similarity index 100%
rename from cpu/arm/at91sam7s/rtimer-arch.h
rename to drivers/cpu/arm/at91sam7s/rtimer-arch.h
diff --git a/cpu/arm/at91sam7s/sdcard-arch.c b/drivers/cpu/arm/at91sam7s/sdcard-arch.c
similarity index 100%
rename from cpu/arm/at91sam7s/sdcard-arch.c
rename to drivers/cpu/arm/at91sam7s/sdcard-arch.c
diff --git a/cpu/arm/at91sam7s/startup-SAM7S-arm.c b/drivers/cpu/arm/at91sam7s/startup-SAM7S-arm.c
similarity index 100%
rename from cpu/arm/at91sam7s/startup-SAM7S-arm.c
rename to drivers/cpu/arm/at91sam7s/startup-SAM7S-arm.c
diff --git a/cpu/arm/at91sam7s/startup-SAM7S.c b/drivers/cpu/arm/at91sam7s/startup-SAM7S.c
similarity index 100%
rename from cpu/arm/at91sam7s/startup-SAM7S.c
rename to drivers/cpu/arm/at91sam7s/startup-SAM7S.c
diff --git a/cpu/arm/at91sam7s/sys-interrupt.c b/drivers/cpu/arm/at91sam7s/sys-interrupt.c
similarity index 100%
rename from cpu/arm/at91sam7s/sys-interrupt.c
rename to drivers/cpu/arm/at91sam7s/sys-interrupt.c
diff --git a/cpu/arm/at91sam7s/sys-interrupt.h b/drivers/cpu/arm/at91sam7s/sys-interrupt.h
similarity index 100%
rename from cpu/arm/at91sam7s/sys-interrupt.h
rename to drivers/cpu/arm/at91sam7s/sys-interrupt.h
diff --git a/cpu/arm/at91sam7s/uip-log.c b/drivers/cpu/arm/at91sam7s/uip-log.c
similarity index 100%
rename from cpu/arm/at91sam7s/uip-log.c
rename to drivers/cpu/arm/at91sam7s/uip-log.c
diff --git a/cpu/arm/at91sam7s/usb-arch.c b/drivers/cpu/arm/at91sam7s/usb-arch.c
similarity index 100%
rename from cpu/arm/at91sam7s/usb-arch.c
rename to drivers/cpu/arm/at91sam7s/usb-arch.c
diff --git a/cpu/arm/at91sam7s/usb-interrupt.c b/drivers/cpu/arm/at91sam7s/usb-interrupt.c
similarity index 100%
rename from cpu/arm/at91sam7s/usb-interrupt.c
rename to drivers/cpu/arm/at91sam7s/usb-interrupt.c
diff --git a/cpu/arm/at91sam7s/usb-interrupt.h b/drivers/cpu/arm/at91sam7s/usb-interrupt.h
similarity index 100%
rename from cpu/arm/at91sam7s/usb-interrupt.h
rename to drivers/cpu/arm/at91sam7s/usb-interrupt.h
diff --git a/cpu/arm/common/CMSIS/cmsis_armcc.h b/drivers/cpu/arm/common/CMSIS/cmsis_armcc.h
similarity index 100%
rename from cpu/arm/common/CMSIS/cmsis_armcc.h
rename to drivers/cpu/arm/common/CMSIS/cmsis_armcc.h
diff --git a/cpu/arm/common/CMSIS/cmsis_armcc_V6.h b/drivers/cpu/arm/common/CMSIS/cmsis_armcc_V6.h
similarity index 100%
rename from cpu/arm/common/CMSIS/cmsis_armcc_V6.h
rename to drivers/cpu/arm/common/CMSIS/cmsis_armcc_V6.h
diff --git a/cpu/arm/common/CMSIS/cmsis_gcc.h b/drivers/cpu/arm/common/CMSIS/cmsis_gcc.h
similarity index 100%
rename from cpu/arm/common/CMSIS/cmsis_gcc.h
rename to drivers/cpu/arm/common/CMSIS/cmsis_gcc.h
diff --git a/cpu/arm/common/CMSIS/core.txt b/drivers/cpu/arm/common/CMSIS/core.txt
similarity index 100%
rename from cpu/arm/common/CMSIS/core.txt
rename to drivers/cpu/arm/common/CMSIS/core.txt
diff --git a/cpu/arm/common/CMSIS/core_cm0.h b/drivers/cpu/arm/common/CMSIS/core_cm0.h
similarity index 100%
rename from cpu/arm/common/CMSIS/core_cm0.h
rename to drivers/cpu/arm/common/CMSIS/core_cm0.h
diff --git a/cpu/arm/common/CMSIS/core_cm0plus.h b/drivers/cpu/arm/common/CMSIS/core_cm0plus.h
similarity index 100%
rename from cpu/arm/common/CMSIS/core_cm0plus.h
rename to drivers/cpu/arm/common/CMSIS/core_cm0plus.h
diff --git a/cpu/arm/common/CMSIS/core_cm3.h b/drivers/cpu/arm/common/CMSIS/core_cm3.h
similarity index 100%
rename from cpu/arm/common/CMSIS/core_cm3.h
rename to drivers/cpu/arm/common/CMSIS/core_cm3.h
diff --git a/cpu/arm/common/CMSIS/core_cm4.h b/drivers/cpu/arm/common/CMSIS/core_cm4.h
similarity index 100%
rename from cpu/arm/common/CMSIS/core_cm4.h
rename to drivers/cpu/arm/common/CMSIS/core_cm4.h
diff --git a/cpu/arm/common/CMSIS/core_cm7.h b/drivers/cpu/arm/common/CMSIS/core_cm7.h
similarity index 100%
rename from cpu/arm/common/CMSIS/core_cm7.h
rename to drivers/cpu/arm/common/CMSIS/core_cm7.h
diff --git a/cpu/arm/common/CMSIS/core_cmFunc.h b/drivers/cpu/arm/common/CMSIS/core_cmFunc.h
similarity index 100%
rename from cpu/arm/common/CMSIS/core_cmFunc.h
rename to drivers/cpu/arm/common/CMSIS/core_cmFunc.h
diff --git a/cpu/arm/common/CMSIS/core_cmInstr.h b/drivers/cpu/arm/common/CMSIS/core_cmInstr.h
similarity index 100%
rename from cpu/arm/common/CMSIS/core_cmInstr.h
rename to drivers/cpu/arm/common/CMSIS/core_cmInstr.h
diff --git a/cpu/arm/common/CMSIS/core_cmSimd.h b/drivers/cpu/arm/common/CMSIS/core_cmSimd.h
similarity index 100%
rename from cpu/arm/common/CMSIS/core_cmSimd.h
rename to drivers/cpu/arm/common/CMSIS/core_cmSimd.h
diff --git a/cpu/arm/common/CMSIS/core_sc000.h b/drivers/cpu/arm/common/CMSIS/core_sc000.h
similarity index 100%
rename from cpu/arm/common/CMSIS/core_sc000.h
rename to drivers/cpu/arm/common/CMSIS/core_sc000.h
diff --git a/cpu/arm/common/CMSIS/core_sc300.h b/drivers/cpu/arm/common/CMSIS/core_sc300.h
similarity index 100%
rename from cpu/arm/common/CMSIS/core_sc300.h
rename to drivers/cpu/arm/common/CMSIS/core_sc300.h
diff --git a/cpu/arm/common/SD-card/Makefile.sdcard b/drivers/cpu/arm/common/SD-card/Makefile.sdcard
similarity index 100%
rename from cpu/arm/common/SD-card/Makefile.sdcard
rename to drivers/cpu/arm/common/SD-card/Makefile.sdcard
diff --git a/cpu/arm/common/SD-card/cfs-sdcard.c b/drivers/cpu/arm/common/SD-card/cfs-sdcard.c
similarity index 100%
rename from cpu/arm/common/SD-card/cfs-sdcard.c
rename to drivers/cpu/arm/common/SD-card/cfs-sdcard.c
diff --git a/cpu/arm/common/SD-card/config.h b/drivers/cpu/arm/common/SD-card/config.h
similarity index 100%
rename from cpu/arm/common/SD-card/config.h
rename to drivers/cpu/arm/common/SD-card/config.h
diff --git a/cpu/arm/common/SD-card/efs-sdcard.h b/drivers/cpu/arm/common/SD-card/efs-sdcard.h
similarity index 100%
rename from cpu/arm/common/SD-card/efs-sdcard.h
rename to drivers/cpu/arm/common/SD-card/efs-sdcard.h
diff --git a/cpu/arm/common/SD-card/efsl_spi.h b/drivers/cpu/arm/common/SD-card/efsl_spi.h
similarity index 100%
rename from cpu/arm/common/SD-card/efsl_spi.h
rename to drivers/cpu/arm/common/SD-card/efsl_spi.h
diff --git a/cpu/arm/common/SD-card/sdcard.h b/drivers/cpu/arm/common/SD-card/sdcard.h
similarity index 100%
rename from cpu/arm/common/SD-card/sdcard.h
rename to drivers/cpu/arm/common/SD-card/sdcard.h
diff --git a/cpu/arm/common/dbg-io/dbg-printf.c b/drivers/cpu/arm/common/dbg-io/dbg-printf.c
similarity index 100%
rename from cpu/arm/common/dbg-io/dbg-printf.c
rename to drivers/cpu/arm/common/dbg-io/dbg-printf.c
diff --git a/cpu/arm/common/dbg-io/dbg-putchar.c b/drivers/cpu/arm/common/dbg-io/dbg-putchar.c
similarity index 100%
rename from cpu/arm/common/dbg-io/dbg-putchar.c
rename to drivers/cpu/arm/common/dbg-io/dbg-putchar.c
diff --git a/cpu/arm/common/dbg-io/dbg-puts.c b/drivers/cpu/arm/common/dbg-io/dbg-puts.c
similarity index 100%
rename from cpu/arm/common/dbg-io/dbg-puts.c
rename to drivers/cpu/arm/common/dbg-io/dbg-puts.c
diff --git a/cpu/arm/common/dbg-io/dbg-snprintf.c b/drivers/cpu/arm/common/dbg-io/dbg-snprintf.c
similarity index 100%
rename from cpu/arm/common/dbg-io/dbg-snprintf.c
rename to drivers/cpu/arm/common/dbg-io/dbg-snprintf.c
diff --git a/cpu/arm/common/dbg-io/dbg-sprintf.c b/drivers/cpu/arm/common/dbg-io/dbg-sprintf.c
similarity index 100%
rename from cpu/arm/common/dbg-io/dbg-sprintf.c
rename to drivers/cpu/arm/common/dbg-io/dbg-sprintf.c
diff --git a/cpu/arm/common/dbg-io/strformat.c b/drivers/cpu/arm/common/dbg-io/strformat.c
similarity index 100%
rename from cpu/arm/common/dbg-io/strformat.c
rename to drivers/cpu/arm/common/dbg-io/strformat.c
diff --git a/cpu/arm/common/dbg-io/strformat.h b/drivers/cpu/arm/common/dbg-io/strformat.h
similarity index 100%
rename from cpu/arm/common/dbg-io/strformat.h
rename to drivers/cpu/arm/common/dbg-io/strformat.h
diff --git a/cpu/arm/common/sys/mtarch.c b/drivers/cpu/arm/common/sys/mtarch.c
similarity index 100%
rename from cpu/arm/common/sys/mtarch.c
rename to drivers/cpu/arm/common/sys/mtarch.c
diff --git a/cpu/arm/common/sys/mtarch.h b/drivers/cpu/arm/common/sys/mtarch.h
similarity index 100%
rename from cpu/arm/common/sys/mtarch.h
rename to drivers/cpu/arm/common/sys/mtarch.h
diff --git a/cpu/arm/common/usb/Makefile.usb b/drivers/cpu/arm/common/usb/Makefile.usb
similarity index 100%
rename from cpu/arm/common/usb/Makefile.usb
rename to drivers/cpu/arm/common/usb/Makefile.usb
diff --git a/cpu/arm/common/usb/cdc-acm/cdc-acm-descriptors.c b/drivers/cpu/arm/common/usb/cdc-acm/cdc-acm-descriptors.c
similarity index 100%
rename from cpu/arm/common/usb/cdc-acm/cdc-acm-descriptors.c
rename to drivers/cpu/arm/common/usb/cdc-acm/cdc-acm-descriptors.c
diff --git a/cpu/arm/common/usb/cdc-acm/cdc-acm-string-descriptors.xml b/drivers/cpu/arm/common/usb/cdc-acm/cdc-acm-string-descriptors.xml
similarity index 100%
rename from cpu/arm/common/usb/cdc-acm/cdc-acm-string-descriptors.xml
rename to drivers/cpu/arm/common/usb/cdc-acm/cdc-acm-string-descriptors.xml
diff --git a/cpu/arm/common/usb/cdc-acm/cdc-acm.c b/drivers/cpu/arm/common/usb/cdc-acm/cdc-acm.c
similarity index 100%
rename from cpu/arm/common/usb/cdc-acm/cdc-acm.c
rename to drivers/cpu/arm/common/usb/cdc-acm/cdc-acm.c
diff --git a/cpu/arm/common/usb/cdc-acm/cdc-acm.h b/drivers/cpu/arm/common/usb/cdc-acm/cdc-acm.h
similarity index 100%
rename from cpu/arm/common/usb/cdc-acm/cdc-acm.h
rename to drivers/cpu/arm/common/usb/cdc-acm/cdc-acm.h
diff --git a/cpu/arm/common/usb/cdc-acm/cdc.h b/drivers/cpu/arm/common/usb/cdc-acm/cdc.h
similarity index 100%
rename from cpu/arm/common/usb/cdc-acm/cdc.h
rename to drivers/cpu/arm/common/usb/cdc-acm/cdc.h
diff --git a/cpu/arm/common/usb/cdc-eth/cdc-eth-descriptors.c b/drivers/cpu/arm/common/usb/cdc-eth/cdc-eth-descriptors.c
similarity index 100%
rename from cpu/arm/common/usb/cdc-eth/cdc-eth-descriptors.c
rename to drivers/cpu/arm/common/usb/cdc-eth/cdc-eth-descriptors.c
diff --git a/cpu/arm/common/usb/cdc-eth/cdc-eth-string-descriptors.c b/drivers/cpu/arm/common/usb/cdc-eth/cdc-eth-string-descriptors.c
similarity index 100%
rename from cpu/arm/common/usb/cdc-eth/cdc-eth-string-descriptors.c
rename to drivers/cpu/arm/common/usb/cdc-eth/cdc-eth-string-descriptors.c
diff --git a/cpu/arm/common/usb/cdc-eth/cdc-eth.c b/drivers/cpu/arm/common/usb/cdc-eth/cdc-eth.c
similarity index 100%
rename from cpu/arm/common/usb/cdc-eth/cdc-eth.c
rename to drivers/cpu/arm/common/usb/cdc-eth/cdc-eth.c
diff --git a/cpu/arm/common/usb/cdc-eth/cdc-eth.h b/drivers/cpu/arm/common/usb/cdc-eth/cdc-eth.h
similarity index 100%
rename from cpu/arm/common/usb/cdc-eth/cdc-eth.h
rename to drivers/cpu/arm/common/usb/cdc-eth/cdc-eth.h
diff --git a/cpu/arm/common/usb/cdc-eth/dhcps.c b/drivers/cpu/arm/common/usb/cdc-eth/dhcps.c
similarity index 100%
rename from cpu/arm/common/usb/cdc-eth/dhcps.c
rename to drivers/cpu/arm/common/usb/cdc-eth/dhcps.c
diff --git a/cpu/arm/common/usb/cdc-eth/dhcps.h b/drivers/cpu/arm/common/usb/cdc-eth/dhcps.h
similarity index 100%
rename from cpu/arm/common/usb/cdc-eth/dhcps.h
rename to drivers/cpu/arm/common/usb/cdc-eth/dhcps.h
diff --git a/cpu/arm/common/usb/descriptors.h b/drivers/cpu/arm/common/usb/descriptors.h
similarity index 100%
rename from cpu/arm/common/usb/descriptors.h
rename to drivers/cpu/arm/common/usb/descriptors.h
diff --git a/cpu/arm/common/usb/msc/msc-descriptors.c b/drivers/cpu/arm/common/usb/msc/msc-descriptors.c
similarity index 100%
rename from cpu/arm/common/usb/msc/msc-descriptors.c
rename to drivers/cpu/arm/common/usb/msc/msc-descriptors.c
diff --git a/cpu/arm/common/usb/msc/msc-string-descriptors.xml b/drivers/cpu/arm/common/usb/msc/msc-string-descriptors.xml
similarity index 100%
rename from cpu/arm/common/usb/msc/msc-string-descriptors.xml
rename to drivers/cpu/arm/common/usb/msc/msc-string-descriptors.xml
diff --git a/cpu/arm/common/usb/msc/rbc_const.h b/drivers/cpu/arm/common/usb/msc/rbc_const.h
similarity index 100%
rename from cpu/arm/common/usb/msc/rbc_const.h
rename to drivers/cpu/arm/common/usb/msc/rbc_const.h
diff --git a/cpu/arm/common/usb/msc/rbc_struct.h b/drivers/cpu/arm/common/usb/msc/rbc_struct.h
similarity index 100%
rename from cpu/arm/common/usb/msc/rbc_struct.h
rename to drivers/cpu/arm/common/usb/msc/rbc_struct.h
diff --git a/cpu/arm/common/usb/msc/scsi_command.h b/drivers/cpu/arm/common/usb/msc/scsi_command.h
similarity index 100%
rename from cpu/arm/common/usb/msc/scsi_command.h
rename to drivers/cpu/arm/common/usb/msc/scsi_command.h
diff --git a/cpu/arm/common/usb/msc/scsi_sense.h b/drivers/cpu/arm/common/usb/msc/scsi_sense.h
similarity index 100%
rename from cpu/arm/common/usb/msc/scsi_sense.h
rename to drivers/cpu/arm/common/usb/msc/scsi_sense.h
diff --git a/cpu/arm/common/usb/msc/scsi_struct.h b/drivers/cpu/arm/common/usb/msc/scsi_struct.h
similarity index 100%
rename from cpu/arm/common/usb/msc/scsi_struct.h
rename to drivers/cpu/arm/common/usb/msc/scsi_struct.h
diff --git a/cpu/arm/common/usb/msc/spc2_const.h b/drivers/cpu/arm/common/usb/msc/spc2_const.h
similarity index 100%
rename from cpu/arm/common/usb/msc/spc2_const.h
rename to drivers/cpu/arm/common/usb/msc/spc2_const.h
diff --git a/cpu/arm/common/usb/msc/spc2_struct.h b/drivers/cpu/arm/common/usb/msc/spc2_struct.h
similarity index 100%
rename from cpu/arm/common/usb/msc/spc2_struct.h
rename to drivers/cpu/arm/common/usb/msc/spc2_struct.h
diff --git a/cpu/arm/common/usb/msc/usb-msc-bulk.c b/drivers/cpu/arm/common/usb/msc/usb-msc-bulk.c
similarity index 100%
rename from cpu/arm/common/usb/msc/usb-msc-bulk.c
rename to drivers/cpu/arm/common/usb/msc/usb-msc-bulk.c
diff --git a/cpu/arm/common/usb/msc/usb-msc-bulk.h b/drivers/cpu/arm/common/usb/msc/usb-msc-bulk.h
similarity index 100%
rename from cpu/arm/common/usb/msc/usb-msc-bulk.h
rename to drivers/cpu/arm/common/usb/msc/usb-msc-bulk.h
diff --git a/cpu/arm/common/usb/msc/usb-rbc.c b/drivers/cpu/arm/common/usb/msc/usb-rbc.c
similarity index 100%
rename from cpu/arm/common/usb/msc/usb-rbc.c
rename to drivers/cpu/arm/common/usb/msc/usb-rbc.c
diff --git a/cpu/arm/common/usb/string-descriptors.dtd b/drivers/cpu/arm/common/usb/string-descriptors.dtd
similarity index 100%
rename from cpu/arm/common/usb/string-descriptors.dtd
rename to drivers/cpu/arm/common/usb/string-descriptors.dtd
diff --git a/cpu/arm/common/usb/string-descriptors.h b/drivers/cpu/arm/common/usb/string-descriptors.h
similarity index 100%
rename from cpu/arm/common/usb/string-descriptors.h
rename to drivers/cpu/arm/common/usb/string-descriptors.h
diff --git a/cpu/arm/common/usb/string-descriptors.xslt b/drivers/cpu/arm/common/usb/string-descriptors.xslt
similarity index 100%
rename from cpu/arm/common/usb/string-descriptors.xslt
rename to drivers/cpu/arm/common/usb/string-descriptors.xslt
diff --git a/cpu/arm/common/usb/usb-api.h b/drivers/cpu/arm/common/usb/usb-api.h
similarity index 100%
rename from cpu/arm/common/usb/usb-api.h
rename to drivers/cpu/arm/common/usb/usb-api.h
diff --git a/cpu/arm/common/usb/usb-arch.h b/drivers/cpu/arm/common/usb/usb-arch.h
similarity index 100%
rename from cpu/arm/common/usb/usb-arch.h
rename to drivers/cpu/arm/common/usb/usb-arch.h
diff --git a/cpu/arm/common/usb/usb-core.c b/drivers/cpu/arm/common/usb/usb-core.c
similarity index 100%
rename from cpu/arm/common/usb/usb-core.c
rename to drivers/cpu/arm/common/usb/usb-core.c
diff --git a/cpu/arm/common/usb/usb-core.h b/drivers/cpu/arm/common/usb/usb-core.h
similarity index 100%
rename from cpu/arm/common/usb/usb-core.h
rename to drivers/cpu/arm/common/usb/usb-core.h
diff --git a/cpu/arm/common/usb/usb.h b/drivers/cpu/arm/common/usb/usb.h
similarity index 100%
rename from cpu/arm/common/usb/usb.h
rename to drivers/cpu/arm/common/usb/usb.h
diff --git a/cpu/arm/openocd/arm7_wig.cfg b/drivers/cpu/arm/openocd/arm7_wig.cfg
similarity index 100%
rename from cpu/arm/openocd/arm7_wig.cfg
rename to drivers/cpu/arm/openocd/arm7_wig.cfg
diff --git a/cpu/arm/openocd/target/stm32F10xxx.cfg b/drivers/cpu/arm/openocd/target/stm32F10xxx.cfg
similarity index 100%
rename from cpu/arm/openocd/target/stm32F10xxx.cfg
rename to drivers/cpu/arm/openocd/target/stm32F10xxx.cfg
diff --git a/cpu/cc2538/Makefile.cc2538 b/drivers/cpu/cc2538/Makefile.cc2538
similarity index 96%
rename from cpu/cc2538/Makefile.cc2538
rename to drivers/cpu/cc2538/Makefile.cc2538
index d0a345c02..ac3fff4ab 100644
--- a/cpu/cc2538/Makefile.cc2538
+++ b/drivers/cpu/cc2538/Makefile.cc2538
@@ -44,10 +44,10 @@ CLEAN += *.d *.elf *.hex
### CPU-dependent directories
CONTIKI_CPU_DIRS = ../arm/common/CMSIS . dev usb
-### Use the existing debug I/O in cpu/arm/common
+### Use the existing debug I/O in drivers/cpu/arm/common
CONTIKI_CPU_DIRS += ../arm/common/dbg-io
-### Use usb core from cpu/cc253x/usb/common
+### Use usb core from drivers/cpu/cc253x/usb/common
CONTIKI_CPU_DIRS += ../cc253x/usb/common ../cc253x/usb/common/cdc-acm
### CPU-dependent source files
@@ -79,7 +79,7 @@ CPU_STARTFILES = ${addprefix $(OBJECTDIR)/,${call oname, $(CPU_START_SOURCEFILES
CONTIKI_SOURCEFILES += $(CONTIKI_CPU_SOURCEFILES) $(DEBUG_IO_SOURCEFILES)
CONTIKI_SOURCEFILES += $(USB_CORE_SOURCEFILES) $(USB_ARCH_SOURCEFILES)
-MODULES += lib/newlib cpu/arm/common/sys
+MODULES += lib/newlib drivers/cpu/arm/common/sys
.SECONDEXPANSION:
diff --git a/cpu/cc2538/cc2538.lds b/drivers/cpu/cc2538/cc2538.lds
similarity index 100%
rename from cpu/cc2538/cc2538.lds
rename to drivers/cpu/cc2538/cc2538.lds
diff --git a/cpu/cc2538/cc2538_cm3.h b/drivers/cpu/cc2538/cc2538_cm3.h
similarity index 100%
rename from cpu/cc2538/cc2538_cm3.h
rename to drivers/cpu/cc2538/cc2538_cm3.h
diff --git a/cpu/cc2538/cfs-coffee-arch.c b/drivers/cpu/cc2538/cfs-coffee-arch.c
similarity index 100%
rename from cpu/cc2538/cfs-coffee-arch.c
rename to drivers/cpu/cc2538/cfs-coffee-arch.c
diff --git a/cpu/cc2538/cfs-coffee-arch.h b/drivers/cpu/cc2538/cfs-coffee-arch.h
similarity index 100%
rename from cpu/cc2538/cfs-coffee-arch.h
rename to drivers/cpu/cc2538/cfs-coffee-arch.h
diff --git a/cpu/cc2538/clock.c b/drivers/cpu/cc2538/clock.c
similarity index 100%
rename from cpu/cc2538/clock.c
rename to drivers/cpu/cc2538/clock.c
diff --git a/cpu/cc2538/cpu.h b/drivers/cpu/cc2538/cpu.h
similarity index 100%
rename from cpu/cc2538/cpu.h
rename to drivers/cpu/cc2538/cpu.h
diff --git a/cpu/cc2538/dbg.c b/drivers/cpu/cc2538/dbg.c
similarity index 100%
rename from cpu/cc2538/dbg.c
rename to drivers/cpu/cc2538/dbg.c
diff --git a/cpu/cc2538/dbg.h b/drivers/cpu/cc2538/dbg.h
similarity index 100%
rename from cpu/cc2538/dbg.h
rename to drivers/cpu/cc2538/dbg.h
diff --git a/cpu/cc2538/debug-uart.h b/drivers/cpu/cc2538/debug-uart.h
similarity index 100%
rename from cpu/cc2538/debug-uart.h
rename to drivers/cpu/cc2538/debug-uart.h
diff --git a/cpu/cc2538/dev/adc.c b/drivers/cpu/cc2538/dev/adc.c
similarity index 100%
rename from cpu/cc2538/dev/adc.c
rename to drivers/cpu/cc2538/dev/adc.c
diff --git a/cpu/cc2538/dev/adc.h b/drivers/cpu/cc2538/dev/adc.h
similarity index 100%
rename from cpu/cc2538/dev/adc.h
rename to drivers/cpu/cc2538/dev/adc.h
diff --git a/cpu/cc2538/dev/aes.c b/drivers/cpu/cc2538/dev/aes.c
similarity index 100%
rename from cpu/cc2538/dev/aes.c
rename to drivers/cpu/cc2538/dev/aes.c
diff --git a/cpu/cc2538/dev/aes.h b/drivers/cpu/cc2538/dev/aes.h
similarity index 100%
rename from cpu/cc2538/dev/aes.h
rename to drivers/cpu/cc2538/dev/aes.h
diff --git a/cpu/cc2538/dev/ana-regs.h b/drivers/cpu/cc2538/dev/ana-regs.h
similarity index 100%
rename from cpu/cc2538/dev/ana-regs.h
rename to drivers/cpu/cc2538/dev/ana-regs.h
diff --git a/cpu/cc2538/dev/bignum-driver.c b/drivers/cpu/cc2538/dev/bignum-driver.c
similarity index 100%
rename from cpu/cc2538/dev/bignum-driver.c
rename to drivers/cpu/cc2538/dev/bignum-driver.c
diff --git a/cpu/cc2538/dev/bignum-driver.h b/drivers/cpu/cc2538/dev/bignum-driver.h
similarity index 100%
rename from cpu/cc2538/dev/bignum-driver.h
rename to drivers/cpu/cc2538/dev/bignum-driver.h
diff --git a/cpu/cc2538/dev/cbc-mac.c b/drivers/cpu/cc2538/dev/cbc-mac.c
similarity index 100%
rename from cpu/cc2538/dev/cbc-mac.c
rename to drivers/cpu/cc2538/dev/cbc-mac.c
diff --git a/cpu/cc2538/dev/cbc-mac.h b/drivers/cpu/cc2538/dev/cbc-mac.h
similarity index 100%
rename from cpu/cc2538/dev/cbc-mac.h
rename to drivers/cpu/cc2538/dev/cbc-mac.h
diff --git a/cpu/cc2538/dev/cbc.c b/drivers/cpu/cc2538/dev/cbc.c
similarity index 100%
rename from cpu/cc2538/dev/cbc.c
rename to drivers/cpu/cc2538/dev/cbc.c
diff --git a/cpu/cc2538/dev/cbc.h b/drivers/cpu/cc2538/dev/cbc.h
similarity index 100%
rename from cpu/cc2538/dev/cbc.h
rename to drivers/cpu/cc2538/dev/cbc.h
diff --git a/cpu/cc2538/dev/cc2538-aes-128.c b/drivers/cpu/cc2538/dev/cc2538-aes-128.c
similarity index 100%
rename from cpu/cc2538/dev/cc2538-aes-128.c
rename to drivers/cpu/cc2538/dev/cc2538-aes-128.c
diff --git a/cpu/cc2538/dev/cc2538-aes-128.h b/drivers/cpu/cc2538/dev/cc2538-aes-128.h
similarity index 100%
rename from cpu/cc2538/dev/cc2538-aes-128.h
rename to drivers/cpu/cc2538/dev/cc2538-aes-128.h
diff --git a/cpu/cc2538/dev/cc2538-ccm-star.c b/drivers/cpu/cc2538/dev/cc2538-ccm-star.c
similarity index 100%
rename from cpu/cc2538/dev/cc2538-ccm-star.c
rename to drivers/cpu/cc2538/dev/cc2538-ccm-star.c
diff --git a/cpu/cc2538/dev/cc2538-ccm-star.h b/drivers/cpu/cc2538/dev/cc2538-ccm-star.h
similarity index 100%
rename from cpu/cc2538/dev/cc2538-ccm-star.h
rename to drivers/cpu/cc2538/dev/cc2538-ccm-star.h
diff --git a/cpu/cc2538/dev/cc2538-dev.h b/drivers/cpu/cc2538/dev/cc2538-dev.h
similarity index 100%
rename from cpu/cc2538/dev/cc2538-dev.h
rename to drivers/cpu/cc2538/dev/cc2538-dev.h
diff --git a/cpu/cc2538/dev/cc2538-rf.c b/drivers/cpu/cc2538/dev/cc2538-rf.c
similarity index 100%
rename from cpu/cc2538/dev/cc2538-rf.c
rename to drivers/cpu/cc2538/dev/cc2538-rf.c
diff --git a/cpu/cc2538/dev/cc2538-rf.h b/drivers/cpu/cc2538/dev/cc2538-rf.h
similarity index 100%
rename from cpu/cc2538/dev/cc2538-rf.h
rename to drivers/cpu/cc2538/dev/cc2538-rf.h
diff --git a/cpu/cc2538/dev/cc2538-sensors.h b/drivers/cpu/cc2538/dev/cc2538-sensors.h
similarity index 100%
rename from cpu/cc2538/dev/cc2538-sensors.h
rename to drivers/cpu/cc2538/dev/cc2538-sensors.h
diff --git a/cpu/cc2538/dev/cc2538-temp-sensor.c b/drivers/cpu/cc2538/dev/cc2538-temp-sensor.c
similarity index 100%
rename from cpu/cc2538/dev/cc2538-temp-sensor.c
rename to drivers/cpu/cc2538/dev/cc2538-temp-sensor.c
diff --git a/cpu/cc2538/dev/cc2538-temp-sensor.h b/drivers/cpu/cc2538/dev/cc2538-temp-sensor.h
similarity index 100%
rename from cpu/cc2538/dev/cc2538-temp-sensor.h
rename to drivers/cpu/cc2538/dev/cc2538-temp-sensor.h
diff --git a/cpu/cc2538/dev/ccm.c b/drivers/cpu/cc2538/dev/ccm.c
similarity index 100%
rename from cpu/cc2538/dev/ccm.c
rename to drivers/cpu/cc2538/dev/ccm.c
diff --git a/cpu/cc2538/dev/ccm.h b/drivers/cpu/cc2538/dev/ccm.h
similarity index 100%
rename from cpu/cc2538/dev/ccm.h
rename to drivers/cpu/cc2538/dev/ccm.h
diff --git a/cpu/cc2538/dev/cctest.h b/drivers/cpu/cc2538/dev/cctest.h
similarity index 100%
rename from cpu/cc2538/dev/cctest.h
rename to drivers/cpu/cc2538/dev/cctest.h
diff --git a/cpu/cc2538/dev/crypto.c b/drivers/cpu/cc2538/dev/crypto.c
similarity index 100%
rename from cpu/cc2538/dev/crypto.c
rename to drivers/cpu/cc2538/dev/crypto.c
diff --git a/cpu/cc2538/dev/crypto.h b/drivers/cpu/cc2538/dev/crypto.h
similarity index 100%
rename from cpu/cc2538/dev/crypto.h
rename to drivers/cpu/cc2538/dev/crypto.h
diff --git a/cpu/cc2538/dev/ctr.c b/drivers/cpu/cc2538/dev/ctr.c
similarity index 100%
rename from cpu/cc2538/dev/ctr.c
rename to drivers/cpu/cc2538/dev/ctr.c
diff --git a/cpu/cc2538/dev/ctr.h b/drivers/cpu/cc2538/dev/ctr.h
similarity index 100%
rename from cpu/cc2538/dev/ctr.h
rename to drivers/cpu/cc2538/dev/ctr.h
diff --git a/cpu/cc2538/dev/ecb.c b/drivers/cpu/cc2538/dev/ecb.c
similarity index 100%
rename from cpu/cc2538/dev/ecb.c
rename to drivers/cpu/cc2538/dev/ecb.c
diff --git a/cpu/cc2538/dev/ecb.h b/drivers/cpu/cc2538/dev/ecb.h
similarity index 100%
rename from cpu/cc2538/dev/ecb.h
rename to drivers/cpu/cc2538/dev/ecb.h
diff --git a/cpu/cc2538/dev/ecc-algorithm.c b/drivers/cpu/cc2538/dev/ecc-algorithm.c
similarity index 100%
rename from cpu/cc2538/dev/ecc-algorithm.c
rename to drivers/cpu/cc2538/dev/ecc-algorithm.c
diff --git a/cpu/cc2538/dev/ecc-algorithm.h b/drivers/cpu/cc2538/dev/ecc-algorithm.h
similarity index 100%
rename from cpu/cc2538/dev/ecc-algorithm.h
rename to drivers/cpu/cc2538/dev/ecc-algorithm.h
diff --git a/cpu/cc2538/dev/ecc-curve.c b/drivers/cpu/cc2538/dev/ecc-curve.c
similarity index 100%
rename from cpu/cc2538/dev/ecc-curve.c
rename to drivers/cpu/cc2538/dev/ecc-curve.c
diff --git a/cpu/cc2538/dev/ecc-curve.h b/drivers/cpu/cc2538/dev/ecc-curve.h
similarity index 100%
rename from cpu/cc2538/dev/ecc-curve.h
rename to drivers/cpu/cc2538/dev/ecc-curve.h
diff --git a/cpu/cc2538/dev/ecc-driver.c b/drivers/cpu/cc2538/dev/ecc-driver.c
similarity index 100%
rename from cpu/cc2538/dev/ecc-driver.c
rename to drivers/cpu/cc2538/dev/ecc-driver.c
diff --git a/cpu/cc2538/dev/ecc-driver.h b/drivers/cpu/cc2538/dev/ecc-driver.h
similarity index 100%
rename from cpu/cc2538/dev/ecc-driver.h
rename to drivers/cpu/cc2538/dev/ecc-driver.h
diff --git a/cpu/cc2538/dev/flash.h b/drivers/cpu/cc2538/dev/flash.h
similarity index 100%
rename from cpu/cc2538/dev/flash.h
rename to drivers/cpu/cc2538/dev/flash.h
diff --git a/cpu/cc2538/dev/gcm.c b/drivers/cpu/cc2538/dev/gcm.c
similarity index 100%
rename from cpu/cc2538/dev/gcm.c
rename to drivers/cpu/cc2538/dev/gcm.c
diff --git a/cpu/cc2538/dev/gcm.h b/drivers/cpu/cc2538/dev/gcm.h
similarity index 100%
rename from cpu/cc2538/dev/gcm.h
rename to drivers/cpu/cc2538/dev/gcm.h
diff --git a/cpu/cc2538/dev/gpio.c b/drivers/cpu/cc2538/dev/gpio.c
similarity index 100%
rename from cpu/cc2538/dev/gpio.c
rename to drivers/cpu/cc2538/dev/gpio.c
diff --git a/cpu/cc2538/dev/gpio.h b/drivers/cpu/cc2538/dev/gpio.h
similarity index 100%
rename from cpu/cc2538/dev/gpio.h
rename to drivers/cpu/cc2538/dev/gpio.h
diff --git a/cpu/cc2538/dev/gptimer.h b/drivers/cpu/cc2538/dev/gptimer.h
similarity index 100%
rename from cpu/cc2538/dev/gptimer.h
rename to drivers/cpu/cc2538/dev/gptimer.h
diff --git a/cpu/cc2538/dev/i2c.c b/drivers/cpu/cc2538/dev/i2c.c
similarity index 100%
rename from cpu/cc2538/dev/i2c.c
rename to drivers/cpu/cc2538/dev/i2c.c
diff --git a/cpu/cc2538/dev/i2c.h b/drivers/cpu/cc2538/dev/i2c.h
similarity index 100%
rename from cpu/cc2538/dev/i2c.h
rename to drivers/cpu/cc2538/dev/i2c.h
diff --git a/cpu/cc2538/dev/ioc.c b/drivers/cpu/cc2538/dev/ioc.c
similarity index 100%
rename from cpu/cc2538/dev/ioc.c
rename to drivers/cpu/cc2538/dev/ioc.c
diff --git a/cpu/cc2538/dev/ioc.h b/drivers/cpu/cc2538/dev/ioc.h
similarity index 100%
rename from cpu/cc2538/dev/ioc.h
rename to drivers/cpu/cc2538/dev/ioc.h
diff --git a/cpu/cc2538/dev/nvic.c b/drivers/cpu/cc2538/dev/nvic.c
similarity index 100%
rename from cpu/cc2538/dev/nvic.c
rename to drivers/cpu/cc2538/dev/nvic.c
diff --git a/cpu/cc2538/dev/nvic.h b/drivers/cpu/cc2538/dev/nvic.h
similarity index 100%
rename from cpu/cc2538/dev/nvic.h
rename to drivers/cpu/cc2538/dev/nvic.h
diff --git a/cpu/cc2538/dev/pka.c b/drivers/cpu/cc2538/dev/pka.c
similarity index 100%
rename from cpu/cc2538/dev/pka.c
rename to drivers/cpu/cc2538/dev/pka.c
diff --git a/cpu/cc2538/dev/pka.h b/drivers/cpu/cc2538/dev/pka.h
similarity index 100%
rename from cpu/cc2538/dev/pka.h
rename to drivers/cpu/cc2538/dev/pka.h
diff --git a/cpu/cc2538/dev/pwm.c b/drivers/cpu/cc2538/dev/pwm.c
similarity index 100%
rename from cpu/cc2538/dev/pwm.c
rename to drivers/cpu/cc2538/dev/pwm.c
diff --git a/cpu/cc2538/dev/pwm.h b/drivers/cpu/cc2538/dev/pwm.h
similarity index 100%
rename from cpu/cc2538/dev/pwm.h
rename to drivers/cpu/cc2538/dev/pwm.h
diff --git a/cpu/cc2538/dev/random.c b/drivers/cpu/cc2538/dev/random.c
similarity index 100%
rename from cpu/cc2538/dev/random.c
rename to drivers/cpu/cc2538/dev/random.c
diff --git a/cpu/cc2538/dev/rfcore-ffsm.h b/drivers/cpu/cc2538/dev/rfcore-ffsm.h
similarity index 100%
rename from cpu/cc2538/dev/rfcore-ffsm.h
rename to drivers/cpu/cc2538/dev/rfcore-ffsm.h
diff --git a/cpu/cc2538/dev/rfcore-sfr.h b/drivers/cpu/cc2538/dev/rfcore-sfr.h
similarity index 100%
rename from cpu/cc2538/dev/rfcore-sfr.h
rename to drivers/cpu/cc2538/dev/rfcore-sfr.h
diff --git a/cpu/cc2538/dev/rfcore-xreg.h b/drivers/cpu/cc2538/dev/rfcore-xreg.h
similarity index 100%
rename from cpu/cc2538/dev/rfcore-xreg.h
rename to drivers/cpu/cc2538/dev/rfcore-xreg.h
diff --git a/cpu/cc2538/dev/rfcore.h b/drivers/cpu/cc2538/dev/rfcore.h
similarity index 100%
rename from cpu/cc2538/dev/rfcore.h
rename to drivers/cpu/cc2538/dev/rfcore.h
diff --git a/cpu/cc2538/dev/rom-util.h b/drivers/cpu/cc2538/dev/rom-util.h
similarity index 100%
rename from cpu/cc2538/dev/rom-util.h
rename to drivers/cpu/cc2538/dev/rom-util.h
diff --git a/cpu/cc2538/dev/sha256.c b/drivers/cpu/cc2538/dev/sha256.c
similarity index 100%
rename from cpu/cc2538/dev/sha256.c
rename to drivers/cpu/cc2538/dev/sha256.c
diff --git a/cpu/cc2538/dev/sha256.h b/drivers/cpu/cc2538/dev/sha256.h
similarity index 100%
rename from cpu/cc2538/dev/sha256.h
rename to drivers/cpu/cc2538/dev/sha256.h
diff --git a/cpu/cc2538/dev/smwdthrosc.h b/drivers/cpu/cc2538/dev/smwdthrosc.h
similarity index 100%
rename from cpu/cc2538/dev/smwdthrosc.h
rename to drivers/cpu/cc2538/dev/smwdthrosc.h
diff --git a/cpu/cc2538/dev/soc-adc.h b/drivers/cpu/cc2538/dev/soc-adc.h
similarity index 100%
rename from cpu/cc2538/dev/soc-adc.h
rename to drivers/cpu/cc2538/dev/soc-adc.h
diff --git a/cpu/cc2538/dev/spi.c b/drivers/cpu/cc2538/dev/spi.c
similarity index 100%
rename from cpu/cc2538/dev/spi.c
rename to drivers/cpu/cc2538/dev/spi.c
diff --git a/cpu/cc2538/dev/ssi.h b/drivers/cpu/cc2538/dev/ssi.h
similarity index 100%
rename from cpu/cc2538/dev/ssi.h
rename to drivers/cpu/cc2538/dev/ssi.h
diff --git a/cpu/cc2538/dev/sys-ctrl.c b/drivers/cpu/cc2538/dev/sys-ctrl.c
similarity index 100%
rename from cpu/cc2538/dev/sys-ctrl.c
rename to drivers/cpu/cc2538/dev/sys-ctrl.c
diff --git a/cpu/cc2538/dev/sys-ctrl.h b/drivers/cpu/cc2538/dev/sys-ctrl.h
similarity index 100%
rename from cpu/cc2538/dev/sys-ctrl.h
rename to drivers/cpu/cc2538/dev/sys-ctrl.h
diff --git a/cpu/cc2538/dev/uart.c b/drivers/cpu/cc2538/dev/uart.c
similarity index 100%
rename from cpu/cc2538/dev/uart.c
rename to drivers/cpu/cc2538/dev/uart.c
diff --git a/cpu/cc2538/dev/uart.h b/drivers/cpu/cc2538/dev/uart.h
similarity index 100%
rename from cpu/cc2538/dev/uart.h
rename to drivers/cpu/cc2538/dev/uart.h
diff --git a/cpu/cc2538/dev/uart1.h b/drivers/cpu/cc2538/dev/uart1.h
similarity index 100%
rename from cpu/cc2538/dev/uart1.h
rename to drivers/cpu/cc2538/dev/uart1.h
diff --git a/cpu/cc2538/dev/udma.c b/drivers/cpu/cc2538/dev/udma.c
similarity index 100%
rename from cpu/cc2538/dev/udma.c
rename to drivers/cpu/cc2538/dev/udma.c
diff --git a/cpu/cc2538/dev/udma.h b/drivers/cpu/cc2538/dev/udma.h
similarity index 100%
rename from cpu/cc2538/dev/udma.h
rename to drivers/cpu/cc2538/dev/udma.h
diff --git a/cpu/cc2538/dev/usb-regs.h b/drivers/cpu/cc2538/dev/usb-regs.h
similarity index 100%
rename from cpu/cc2538/dev/usb-regs.h
rename to drivers/cpu/cc2538/dev/usb-regs.h
diff --git a/cpu/cc2538/dev/vdd3-sensor.c b/drivers/cpu/cc2538/dev/vdd3-sensor.c
similarity index 100%
rename from cpu/cc2538/dev/vdd3-sensor.c
rename to drivers/cpu/cc2538/dev/vdd3-sensor.c
diff --git a/cpu/cc2538/dev/vdd3-sensor.h b/drivers/cpu/cc2538/dev/vdd3-sensor.h
similarity index 100%
rename from cpu/cc2538/dev/vdd3-sensor.h
rename to drivers/cpu/cc2538/dev/vdd3-sensor.h
diff --git a/cpu/cc2538/dev/watchdog.c b/drivers/cpu/cc2538/dev/watchdog.c
similarity index 100%
rename from cpu/cc2538/dev/watchdog.c
rename to drivers/cpu/cc2538/dev/watchdog.c
diff --git a/cpu/cc2538/ieee-addr.c b/drivers/cpu/cc2538/ieee-addr.c
similarity index 100%
rename from cpu/cc2538/ieee-addr.c
rename to drivers/cpu/cc2538/ieee-addr.c
diff --git a/cpu/cc2538/ieee-addr.h b/drivers/cpu/cc2538/ieee-addr.h
similarity index 100%
rename from cpu/cc2538/ieee-addr.h
rename to drivers/cpu/cc2538/ieee-addr.h
diff --git a/cpu/cc2538/lpm.c b/drivers/cpu/cc2538/lpm.c
similarity index 100%
rename from cpu/cc2538/lpm.c
rename to drivers/cpu/cc2538/lpm.c
diff --git a/cpu/cc2538/lpm.h b/drivers/cpu/cc2538/lpm.h
similarity index 100%
rename from cpu/cc2538/lpm.h
rename to drivers/cpu/cc2538/lpm.h
diff --git a/cpu/cc2538/reg.h b/drivers/cpu/cc2538/reg.h
similarity index 100%
rename from cpu/cc2538/reg.h
rename to drivers/cpu/cc2538/reg.h
diff --git a/cpu/cc2538/rtimer-arch.c b/drivers/cpu/cc2538/rtimer-arch.c
similarity index 100%
rename from cpu/cc2538/rtimer-arch.c
rename to drivers/cpu/cc2538/rtimer-arch.c
diff --git a/cpu/cc2538/rtimer-arch.h b/drivers/cpu/cc2538/rtimer-arch.h
similarity index 100%
rename from cpu/cc2538/rtimer-arch.h
rename to drivers/cpu/cc2538/rtimer-arch.h
diff --git a/cpu/cc2538/slip-arch.c b/drivers/cpu/cc2538/slip-arch.c
similarity index 100%
rename from cpu/cc2538/slip-arch.c
rename to drivers/cpu/cc2538/slip-arch.c
diff --git a/cpu/cc2538/soc.c b/drivers/cpu/cc2538/soc.c
similarity index 100%
rename from cpu/cc2538/soc.c
rename to drivers/cpu/cc2538/soc.c
diff --git a/cpu/cc2538/soc.h b/drivers/cpu/cc2538/soc.h
similarity index 100%
rename from cpu/cc2538/soc.h
rename to drivers/cpu/cc2538/soc.h
diff --git a/cpu/cc2538/spi-arch.h b/drivers/cpu/cc2538/spi-arch.h
similarity index 100%
rename from cpu/cc2538/spi-arch.h
rename to drivers/cpu/cc2538/spi-arch.h
diff --git a/cpu/cc2538/startup-gcc.c b/drivers/cpu/cc2538/startup-gcc.c
similarity index 100%
rename from cpu/cc2538/startup-gcc.c
rename to drivers/cpu/cc2538/startup-gcc.c
diff --git a/cpu/cc2538/usb/cdc-acm-descriptors.c b/drivers/cpu/cc2538/usb/cdc-acm-descriptors.c
similarity index 100%
rename from cpu/cc2538/usb/cdc-acm-descriptors.c
rename to drivers/cpu/cc2538/usb/cdc-acm-descriptors.c
diff --git a/cpu/cc2538/usb/usb-arch.c b/drivers/cpu/cc2538/usb/usb-arch.c
similarity index 100%
rename from cpu/cc2538/usb/usb-arch.c
rename to drivers/cpu/cc2538/usb/usb-arch.c
diff --git a/cpu/cc2538/usb/usb-serial.c b/drivers/cpu/cc2538/usb/usb-serial.c
similarity index 100%
rename from cpu/cc2538/usb/usb-serial.c
rename to drivers/cpu/cc2538/usb/usb-serial.c
diff --git a/cpu/cc2538/usb/usb-serial.h b/drivers/cpu/cc2538/usb/usb-serial.h
similarity index 100%
rename from cpu/cc2538/usb/usb-serial.h
rename to drivers/cpu/cc2538/usb/usb-serial.h
diff --git a/cpu/cc253x/8051def.h b/drivers/cpu/cc253x/8051def.h
similarity index 100%
rename from cpu/cc253x/8051def.h
rename to drivers/cpu/cc253x/8051def.h
diff --git a/cpu/cc253x/Makefile.cc253x b/drivers/cpu/cc253x/Makefile.cc253x
similarity index 97%
rename from cpu/cc253x/Makefile.cc253x
rename to drivers/cpu/cc253x/Makefile.cc253x
index bd476ae50..b8d1b9176 100644
--- a/cpu/cc253x/Makefile.cc253x
+++ b/drivers/cpu/cc253x/Makefile.cc253x
@@ -121,7 +121,7 @@ CONTIKI_CASMOBJECTFILES = $(addprefix $(OBJECTDIR)/, \
$(CONTIKI_CASMFILES:.cS=.rel))
CONTIKI_PLATFORM_DIRS = $(PLATFORM_APPDIRS) \
- $(addprefix $(CONTIKI)/platform/$(TARGET)/, $(CONTIKI_TARGET_DIRS))
+ $(addprefix $(CONTIKI)/drivers/platform/$(TARGET)/, $(CONTIKI_TARGET_DIRS))
CONTIKI_CPU_DIRS_LIST = $(addprefix $(CONTIKI_CPU)/, \
$(CONTIKI_CPU_DIRS))
diff --git a/cpu/cc253x/Makefile.customrules-cc253x b/drivers/cpu/cc253x/Makefile.customrules-cc253x
similarity index 100%
rename from cpu/cc253x/Makefile.customrules-cc253x
rename to drivers/cpu/cc253x/Makefile.customrules-cc253x
diff --git a/cpu/cc253x/bank-alloc.py b/drivers/cpu/cc253x/bank-alloc.py
similarity index 100%
rename from cpu/cc253x/bank-alloc.py
rename to drivers/cpu/cc253x/bank-alloc.py
diff --git a/cpu/cc253x/cc253x.h b/drivers/cpu/cc253x/cc253x.h
similarity index 100%
rename from cpu/cc253x/cc253x.h
rename to drivers/cpu/cc253x/cc253x.h
diff --git a/cpu/cc253x/dev/cc2530-rf.c b/drivers/cpu/cc253x/dev/cc2530-rf.c
similarity index 100%
rename from cpu/cc253x/dev/cc2530-rf.c
rename to drivers/cpu/cc253x/dev/cc2530-rf.c
diff --git a/cpu/cc253x/dev/cc2530-rf.h b/drivers/cpu/cc253x/dev/cc2530-rf.h
similarity index 100%
rename from cpu/cc253x/dev/cc2530-rf.h
rename to drivers/cpu/cc253x/dev/cc2530-rf.h
diff --git a/cpu/cc253x/dev/clock-isr.h b/drivers/cpu/cc253x/dev/clock-isr.h
similarity index 100%
rename from cpu/cc253x/dev/clock-isr.h
rename to drivers/cpu/cc253x/dev/clock-isr.h
diff --git a/cpu/cc253x/dev/clock.c b/drivers/cpu/cc253x/dev/clock.c
similarity index 100%
rename from cpu/cc253x/dev/clock.c
rename to drivers/cpu/cc253x/dev/clock.c
diff --git a/cpu/cc253x/dev/dma.c b/drivers/cpu/cc253x/dev/dma.c
similarity index 100%
rename from cpu/cc253x/dev/dma.c
rename to drivers/cpu/cc253x/dev/dma.c
diff --git a/cpu/cc253x/dev/dma.h b/drivers/cpu/cc253x/dev/dma.h
similarity index 100%
rename from cpu/cc253x/dev/dma.h
rename to drivers/cpu/cc253x/dev/dma.h
diff --git a/cpu/cc253x/dev/dma_intr.c b/drivers/cpu/cc253x/dev/dma_intr.c
similarity index 100%
rename from cpu/cc253x/dev/dma_intr.c
rename to drivers/cpu/cc253x/dev/dma_intr.c
diff --git a/cpu/cc253x/dev/lpm.h b/drivers/cpu/cc253x/dev/lpm.h
similarity index 100%
rename from cpu/cc253x/dev/lpm.h
rename to drivers/cpu/cc253x/dev/lpm.h
diff --git a/cpu/cc253x/dev/port.h b/drivers/cpu/cc253x/dev/port.h
similarity index 100%
rename from cpu/cc253x/dev/port.h
rename to drivers/cpu/cc253x/dev/port.h
diff --git a/cpu/cc253x/dev/port2-intr.c b/drivers/cpu/cc253x/dev/port2-intr.c
similarity index 100%
rename from cpu/cc253x/dev/port2-intr.c
rename to drivers/cpu/cc253x/dev/port2-intr.c
diff --git a/cpu/cc253x/dev/port2.c b/drivers/cpu/cc253x/dev/port2.c
similarity index 100%
rename from cpu/cc253x/dev/port2.c
rename to drivers/cpu/cc253x/dev/port2.c
diff --git a/cpu/cc253x/dev/port2.h b/drivers/cpu/cc253x/dev/port2.h
similarity index 100%
rename from cpu/cc253x/dev/port2.h
rename to drivers/cpu/cc253x/dev/port2.h
diff --git a/cpu/cc253x/dev/random.c b/drivers/cpu/cc253x/dev/random.c
similarity index 100%
rename from cpu/cc253x/dev/random.c
rename to drivers/cpu/cc253x/dev/random.c
diff --git a/cpu/cc253x/dev/uart-intr.c b/drivers/cpu/cc253x/dev/uart-intr.c
similarity index 100%
rename from cpu/cc253x/dev/uart-intr.c
rename to drivers/cpu/cc253x/dev/uart-intr.c
diff --git a/cpu/cc253x/dev/uart.h b/drivers/cpu/cc253x/dev/uart.h
similarity index 100%
rename from cpu/cc253x/dev/uart.h
rename to drivers/cpu/cc253x/dev/uart.h
diff --git a/cpu/cc253x/dev/uart0.c b/drivers/cpu/cc253x/dev/uart0.c
similarity index 100%
rename from cpu/cc253x/dev/uart0.c
rename to drivers/cpu/cc253x/dev/uart0.c
diff --git a/cpu/cc253x/dev/uart0.h b/drivers/cpu/cc253x/dev/uart0.h
similarity index 100%
rename from cpu/cc253x/dev/uart0.h
rename to drivers/cpu/cc253x/dev/uart0.h
diff --git a/cpu/cc253x/dev/uart1.c b/drivers/cpu/cc253x/dev/uart1.c
similarity index 100%
rename from cpu/cc253x/dev/uart1.c
rename to drivers/cpu/cc253x/dev/uart1.c
diff --git a/cpu/cc253x/dev/uart1.h b/drivers/cpu/cc253x/dev/uart1.h
similarity index 100%
rename from cpu/cc253x/dev/uart1.h
rename to drivers/cpu/cc253x/dev/uart1.h
diff --git a/cpu/cc253x/dev/watchdog.c b/drivers/cpu/cc253x/dev/watchdog.c
similarity index 100%
rename from cpu/cc253x/dev/watchdog.c
rename to drivers/cpu/cc253x/dev/watchdog.c
diff --git a/cpu/cc253x/mtarch.h b/drivers/cpu/cc253x/mtarch.h
similarity index 100%
rename from cpu/cc253x/mtarch.h
rename to drivers/cpu/cc253x/mtarch.h
diff --git a/cpu/cc253x/rtimer-arch.c b/drivers/cpu/cc253x/rtimer-arch.c
similarity index 100%
rename from cpu/cc253x/rtimer-arch.c
rename to drivers/cpu/cc253x/rtimer-arch.c
diff --git a/cpu/cc253x/rtimer-arch.h b/drivers/cpu/cc253x/rtimer-arch.h
similarity index 100%
rename from cpu/cc253x/rtimer-arch.h
rename to drivers/cpu/cc253x/rtimer-arch.h
diff --git a/cpu/cc253x/segment.rules b/drivers/cpu/cc253x/segment.rules
similarity index 100%
rename from cpu/cc253x/segment.rules
rename to drivers/cpu/cc253x/segment.rules
diff --git a/cpu/cc253x/sfr-bits.h b/drivers/cpu/cc253x/sfr-bits.h
similarity index 100%
rename from cpu/cc253x/sfr-bits.h
rename to drivers/cpu/cc253x/sfr-bits.h
diff --git a/cpu/cc253x/soc.c b/drivers/cpu/cc253x/soc.c
similarity index 100%
rename from cpu/cc253x/soc.c
rename to drivers/cpu/cc253x/soc.c
diff --git a/cpu/cc253x/soc.h b/drivers/cpu/cc253x/soc.h
similarity index 100%
rename from cpu/cc253x/soc.h
rename to drivers/cpu/cc253x/soc.h
diff --git a/cpu/cc253x/stack.c b/drivers/cpu/cc253x/stack.c
similarity index 100%
rename from cpu/cc253x/stack.c
rename to drivers/cpu/cc253x/stack.c
diff --git a/cpu/cc253x/stack.h b/drivers/cpu/cc253x/stack.h
similarity index 100%
rename from cpu/cc253x/stack.h
rename to drivers/cpu/cc253x/stack.h
diff --git a/cpu/cc253x/usb/Makefile.usb b/drivers/cpu/cc253x/usb/Makefile.usb
similarity index 100%
rename from cpu/cc253x/usb/Makefile.usb
rename to drivers/cpu/cc253x/usb/Makefile.usb
diff --git a/cpu/cc253x/usb/cdc-acm-descriptors.c b/drivers/cpu/cc253x/usb/cdc-acm-descriptors.c
similarity index 100%
rename from cpu/cc253x/usb/cdc-acm-descriptors.c
rename to drivers/cpu/cc253x/usb/cdc-acm-descriptors.c
diff --git a/cpu/cc253x/usb/common/cdc-acm/cdc-acm.c b/drivers/cpu/cc253x/usb/common/cdc-acm/cdc-acm.c
similarity index 100%
rename from cpu/cc253x/usb/common/cdc-acm/cdc-acm.c
rename to drivers/cpu/cc253x/usb/common/cdc-acm/cdc-acm.c
diff --git a/cpu/cc253x/usb/common/cdc-acm/cdc-acm.h b/drivers/cpu/cc253x/usb/common/cdc-acm/cdc-acm.h
similarity index 100%
rename from cpu/cc253x/usb/common/cdc-acm/cdc-acm.h
rename to drivers/cpu/cc253x/usb/common/cdc-acm/cdc-acm.h
diff --git a/cpu/cc253x/usb/common/cdc-acm/cdc.h b/drivers/cpu/cc253x/usb/common/cdc-acm/cdc.h
similarity index 100%
rename from cpu/cc253x/usb/common/cdc-acm/cdc.h
rename to drivers/cpu/cc253x/usb/common/cdc-acm/cdc.h
diff --git a/cpu/cc253x/usb/common/descriptors.h b/drivers/cpu/cc253x/usb/common/descriptors.h
similarity index 100%
rename from cpu/cc253x/usb/common/descriptors.h
rename to drivers/cpu/cc253x/usb/common/descriptors.h
diff --git a/cpu/cc253x/usb/common/string-descriptors.h b/drivers/cpu/cc253x/usb/common/string-descriptors.h
similarity index 100%
rename from cpu/cc253x/usb/common/string-descriptors.h
rename to drivers/cpu/cc253x/usb/common/string-descriptors.h
diff --git a/cpu/cc253x/usb/common/usb-api.h b/drivers/cpu/cc253x/usb/common/usb-api.h
similarity index 100%
rename from cpu/cc253x/usb/common/usb-api.h
rename to drivers/cpu/cc253x/usb/common/usb-api.h
diff --git a/cpu/cc253x/usb/common/usb-arch.h b/drivers/cpu/cc253x/usb/common/usb-arch.h
similarity index 100%
rename from cpu/cc253x/usb/common/usb-arch.h
rename to drivers/cpu/cc253x/usb/common/usb-arch.h
diff --git a/cpu/cc253x/usb/common/usb-core.c b/drivers/cpu/cc253x/usb/common/usb-core.c
similarity index 100%
rename from cpu/cc253x/usb/common/usb-core.c
rename to drivers/cpu/cc253x/usb/common/usb-core.c
diff --git a/cpu/cc253x/usb/common/usb-core.h b/drivers/cpu/cc253x/usb/common/usb-core.h
similarity index 100%
rename from cpu/cc253x/usb/common/usb-core.h
rename to drivers/cpu/cc253x/usb/common/usb-core.h
diff --git a/cpu/cc253x/usb/common/usb.h b/drivers/cpu/cc253x/usb/common/usb.h
similarity index 100%
rename from cpu/cc253x/usb/common/usb.h
rename to drivers/cpu/cc253x/usb/common/usb.h
diff --git a/cpu/cc253x/usb/usb-arch.c b/drivers/cpu/cc253x/usb/usb-arch.c
similarity index 100%
rename from cpu/cc253x/usb/usb-arch.c
rename to drivers/cpu/cc253x/usb/usb-arch.c
diff --git a/cpu/cc26xx-cc13xx/Makefile.cc13xx b/drivers/cpu/cc26xx-cc13xx/Makefile.cc13xx
similarity index 100%
rename from cpu/cc26xx-cc13xx/Makefile.cc13xx
rename to drivers/cpu/cc26xx-cc13xx/Makefile.cc13xx
diff --git a/cpu/cc26xx-cc13xx/Makefile.cc26xx b/drivers/cpu/cc26xx-cc13xx/Makefile.cc26xx
similarity index 100%
rename from cpu/cc26xx-cc13xx/Makefile.cc26xx
rename to drivers/cpu/cc26xx-cc13xx/Makefile.cc26xx
diff --git a/cpu/cc26xx-cc13xx/Makefile.cc26xx-cc13xx b/drivers/cpu/cc26xx-cc13xx/Makefile.cc26xx-cc13xx
similarity index 98%
rename from cpu/cc26xx-cc13xx/Makefile.cc26xx-cc13xx
rename to drivers/cpu/cc26xx-cc13xx/Makefile.cc26xx-cc13xx
index e281ed828..a7244f69b 100644
--- a/cpu/cc26xx-cc13xx/Makefile.cc26xx-cc13xx
+++ b/drivers/cpu/cc26xx-cc13xx/Makefile.cc26xx-cc13xx
@@ -8,7 +8,7 @@ NM = arm-none-eabi-nm
SIZE = arm-none-eabi-size
SREC_CAT = srec_cat
-CPU_ABS_PATH = cpu/cc26xx-cc13xx
+CPU_ABS_PATH = drivers/cpu/cc26xx-cc13xx
TI_XXWARE = $(CONTIKI_CPU)/$(TI_XXWARE_PATH)
### cc26xxware sources under driverlib will be added to the MODULES list
@@ -63,7 +63,7 @@ CLEAN += *.d *.elf *.hex
### CPU-dependent directories
CONTIKI_CPU_DIRS = . dev rf-core rf-core/api $(TI_XXWARE_STARTUP_DIR)
-### Use the existing debug I/O in cpu/arm/common
+### Use the existing debug I/O in drivers/cpu/arm/common
CONTIKI_CPU_DIRS += ../arm/common/dbg-io
### CPU-dependent source files
diff --git a/cpu/cc26xx-cc13xx/cc26xx.ld b/drivers/cpu/cc26xx-cc13xx/cc26xx.ld
similarity index 100%
rename from cpu/cc26xx-cc13xx/cc26xx.ld
rename to drivers/cpu/cc26xx-cc13xx/cc26xx.ld
diff --git a/cpu/cc26xx-cc13xx/clock.c b/drivers/cpu/cc26xx-cc13xx/clock.c
similarity index 100%
rename from cpu/cc26xx-cc13xx/clock.c
rename to drivers/cpu/cc26xx-cc13xx/clock.c
diff --git a/cpu/cc26xx-cc13xx/dbg.h b/drivers/cpu/cc26xx-cc13xx/dbg.h
similarity index 100%
rename from cpu/cc26xx-cc13xx/dbg.h
rename to drivers/cpu/cc26xx-cc13xx/dbg.h
diff --git a/cpu/cc26xx-cc13xx/debug-uart.h b/drivers/cpu/cc26xx-cc13xx/debug-uart.h
similarity index 100%
rename from cpu/cc26xx-cc13xx/debug-uart.h
rename to drivers/cpu/cc26xx-cc13xx/debug-uart.h
diff --git a/cpu/cc26xx-cc13xx/dev/adc-sensor.c b/drivers/cpu/cc26xx-cc13xx/dev/adc-sensor.c
similarity index 100%
rename from cpu/cc26xx-cc13xx/dev/adc-sensor.c
rename to drivers/cpu/cc26xx-cc13xx/dev/adc-sensor.c
diff --git a/cpu/cc26xx-cc13xx/dev/adc-sensor.h b/drivers/cpu/cc26xx-cc13xx/dev/adc-sensor.h
similarity index 100%
rename from cpu/cc26xx-cc13xx/dev/adc-sensor.h
rename to drivers/cpu/cc26xx-cc13xx/dev/adc-sensor.h
diff --git a/cpu/cc26xx-cc13xx/dev/aux-ctrl.c b/drivers/cpu/cc26xx-cc13xx/dev/aux-ctrl.c
similarity index 100%
rename from cpu/cc26xx-cc13xx/dev/aux-ctrl.c
rename to drivers/cpu/cc26xx-cc13xx/dev/aux-ctrl.c
diff --git a/cpu/cc26xx-cc13xx/dev/aux-ctrl.h b/drivers/cpu/cc26xx-cc13xx/dev/aux-ctrl.h
similarity index 100%
rename from cpu/cc26xx-cc13xx/dev/aux-ctrl.h
rename to drivers/cpu/cc26xx-cc13xx/dev/aux-ctrl.h
diff --git a/cpu/cc26xx-cc13xx/dev/batmon-sensor.c b/drivers/cpu/cc26xx-cc13xx/dev/batmon-sensor.c
similarity index 100%
rename from cpu/cc26xx-cc13xx/dev/batmon-sensor.c
rename to drivers/cpu/cc26xx-cc13xx/dev/batmon-sensor.c
diff --git a/cpu/cc26xx-cc13xx/dev/batmon-sensor.h b/drivers/cpu/cc26xx-cc13xx/dev/batmon-sensor.h
similarity index 100%
rename from cpu/cc26xx-cc13xx/dev/batmon-sensor.h
rename to drivers/cpu/cc26xx-cc13xx/dev/batmon-sensor.h
diff --git a/cpu/cc26xx-cc13xx/dev/cc26xx-uart.c b/drivers/cpu/cc26xx-cc13xx/dev/cc26xx-uart.c
similarity index 100%
rename from cpu/cc26xx-cc13xx/dev/cc26xx-uart.c
rename to drivers/cpu/cc26xx-cc13xx/dev/cc26xx-uart.c
diff --git a/cpu/cc26xx-cc13xx/dev/cc26xx-uart.h b/drivers/cpu/cc26xx-cc13xx/dev/cc26xx-uart.h
similarity index 100%
rename from cpu/cc26xx-cc13xx/dev/cc26xx-uart.h
rename to drivers/cpu/cc26xx-cc13xx/dev/cc26xx-uart.h
diff --git a/cpu/cc26xx-cc13xx/dev/contiki-watchdog.c b/drivers/cpu/cc26xx-cc13xx/dev/contiki-watchdog.c
similarity index 100%
rename from cpu/cc26xx-cc13xx/dev/contiki-watchdog.c
rename to drivers/cpu/cc26xx-cc13xx/dev/contiki-watchdog.c
diff --git a/cpu/cc26xx-cc13xx/dev/gpio-interrupt.c b/drivers/cpu/cc26xx-cc13xx/dev/gpio-interrupt.c
similarity index 100%
rename from cpu/cc26xx-cc13xx/dev/gpio-interrupt.c
rename to drivers/cpu/cc26xx-cc13xx/dev/gpio-interrupt.c
diff --git a/cpu/cc26xx-cc13xx/dev/gpio-interrupt.h b/drivers/cpu/cc26xx-cc13xx/dev/gpio-interrupt.h
similarity index 100%
rename from cpu/cc26xx-cc13xx/dev/gpio-interrupt.h
rename to drivers/cpu/cc26xx-cc13xx/dev/gpio-interrupt.h
diff --git a/cpu/cc26xx-cc13xx/dev/oscillators.c b/drivers/cpu/cc26xx-cc13xx/dev/oscillators.c
similarity index 100%
rename from cpu/cc26xx-cc13xx/dev/oscillators.c
rename to drivers/cpu/cc26xx-cc13xx/dev/oscillators.c
diff --git a/cpu/cc26xx-cc13xx/dev/oscillators.h b/drivers/cpu/cc26xx-cc13xx/dev/oscillators.h
similarity index 100%
rename from cpu/cc26xx-cc13xx/dev/oscillators.h
rename to drivers/cpu/cc26xx-cc13xx/dev/oscillators.h
diff --git a/cpu/cc26xx-cc13xx/dev/soc-rtc.c b/drivers/cpu/cc26xx-cc13xx/dev/soc-rtc.c
similarity index 100%
rename from cpu/cc26xx-cc13xx/dev/soc-rtc.c
rename to drivers/cpu/cc26xx-cc13xx/dev/soc-rtc.c
diff --git a/cpu/cc26xx-cc13xx/dev/soc-rtc.h b/drivers/cpu/cc26xx-cc13xx/dev/soc-rtc.h
similarity index 100%
rename from cpu/cc26xx-cc13xx/dev/soc-rtc.h
rename to drivers/cpu/cc26xx-cc13xx/dev/soc-rtc.h
diff --git a/cpu/cc26xx-cc13xx/dev/soc-trng.c b/drivers/cpu/cc26xx-cc13xx/dev/soc-trng.c
similarity index 100%
rename from cpu/cc26xx-cc13xx/dev/soc-trng.c
rename to drivers/cpu/cc26xx-cc13xx/dev/soc-trng.c
diff --git a/cpu/cc26xx-cc13xx/dev/soc-trng.h b/drivers/cpu/cc26xx-cc13xx/dev/soc-trng.h
similarity index 100%
rename from cpu/cc26xx-cc13xx/dev/soc-trng.h
rename to drivers/cpu/cc26xx-cc13xx/dev/soc-trng.h
diff --git a/cpu/cc26xx-cc13xx/dev/uart1.h b/drivers/cpu/cc26xx-cc13xx/dev/uart1.h
similarity index 100%
rename from cpu/cc26xx-cc13xx/dev/uart1.h
rename to drivers/cpu/cc26xx-cc13xx/dev/uart1.h
diff --git a/cpu/cc26xx-cc13xx/fault-handlers.c b/drivers/cpu/cc26xx-cc13xx/fault-handlers.c
similarity index 100%
rename from cpu/cc26xx-cc13xx/fault-handlers.c
rename to drivers/cpu/cc26xx-cc13xx/fault-handlers.c
diff --git a/cpu/cc26xx-cc13xx/ieee-addr.c b/drivers/cpu/cc26xx-cc13xx/ieee-addr.c
similarity index 100%
rename from cpu/cc26xx-cc13xx/ieee-addr.c
rename to drivers/cpu/cc26xx-cc13xx/ieee-addr.c
diff --git a/cpu/cc26xx-cc13xx/ieee-addr.h b/drivers/cpu/cc26xx-cc13xx/ieee-addr.h
similarity index 100%
rename from cpu/cc26xx-cc13xx/ieee-addr.h
rename to drivers/cpu/cc26xx-cc13xx/ieee-addr.h
diff --git a/drivers/cpu/cc26xx-cc13xx/lib/cc13xxware b/drivers/cpu/cc26xx-cc13xx/lib/cc13xxware
new file mode 160000
index 000000000..f4800b7af
--- /dev/null
+++ b/drivers/cpu/cc26xx-cc13xx/lib/cc13xxware
@@ -0,0 +1 @@
+Subproject commit f4800b7af65e78fd45e0a1f72648abf70a9fe567
diff --git a/drivers/cpu/cc26xx-cc13xx/lib/cc26xxware b/drivers/cpu/cc26xx-cc13xx/lib/cc26xxware
new file mode 160000
index 000000000..40916ad11
--- /dev/null
+++ b/drivers/cpu/cc26xx-cc13xx/lib/cc26xxware
@@ -0,0 +1 @@
+Subproject commit 40916ad11efdcac76775b9b18cebc8d0c37c48f2
diff --git a/cpu/cc26xx-cc13xx/lpm.c b/drivers/cpu/cc26xx-cc13xx/lpm.c
similarity index 100%
rename from cpu/cc26xx-cc13xx/lpm.c
rename to drivers/cpu/cc26xx-cc13xx/lpm.c
diff --git a/cpu/cc26xx-cc13xx/lpm.h b/drivers/cpu/cc26xx-cc13xx/lpm.h
similarity index 100%
rename from cpu/cc26xx-cc13xx/lpm.h
rename to drivers/cpu/cc26xx-cc13xx/lpm.h
diff --git a/cpu/cc26xx-cc13xx/mtarch.h b/drivers/cpu/cc26xx-cc13xx/mtarch.h
similarity index 100%
rename from cpu/cc26xx-cc13xx/mtarch.h
rename to drivers/cpu/cc26xx-cc13xx/mtarch.h
diff --git a/cpu/cc26xx-cc13xx/putchar.c b/drivers/cpu/cc26xx-cc13xx/putchar.c
similarity index 100%
rename from cpu/cc26xx-cc13xx/putchar.c
rename to drivers/cpu/cc26xx-cc13xx/putchar.c
diff --git a/cpu/cc26xx-cc13xx/random.c b/drivers/cpu/cc26xx-cc13xx/random.c
similarity index 100%
rename from cpu/cc26xx-cc13xx/random.c
rename to drivers/cpu/cc26xx-cc13xx/random.c
diff --git a/cpu/cc26xx-cc13xx/rf-core/api/ieee_cmd.h b/drivers/cpu/cc26xx-cc13xx/rf-core/api/ieee_cmd.h
similarity index 100%
rename from cpu/cc26xx-cc13xx/rf-core/api/ieee_cmd.h
rename to drivers/cpu/cc26xx-cc13xx/rf-core/api/ieee_cmd.h
diff --git a/cpu/cc26xx-cc13xx/rf-core/api/ieee_mailbox.h b/drivers/cpu/cc26xx-cc13xx/rf-core/api/ieee_mailbox.h
similarity index 100%
rename from cpu/cc26xx-cc13xx/rf-core/api/ieee_mailbox.h
rename to drivers/cpu/cc26xx-cc13xx/rf-core/api/ieee_mailbox.h
diff --git a/cpu/cc26xx-cc13xx/rf-core/dot-15-4g.h b/drivers/cpu/cc26xx-cc13xx/rf-core/dot-15-4g.h
similarity index 100%
rename from cpu/cc26xx-cc13xx/rf-core/dot-15-4g.h
rename to drivers/cpu/cc26xx-cc13xx/rf-core/dot-15-4g.h
diff --git a/cpu/cc26xx-cc13xx/rf-core/ieee-mode.c b/drivers/cpu/cc26xx-cc13xx/rf-core/ieee-mode.c
similarity index 100%
rename from cpu/cc26xx-cc13xx/rf-core/ieee-mode.c
rename to drivers/cpu/cc26xx-cc13xx/rf-core/ieee-mode.c
diff --git a/cpu/cc26xx-cc13xx/rf-core/prop-mode-tx-power.c b/drivers/cpu/cc26xx-cc13xx/rf-core/prop-mode-tx-power.c
similarity index 100%
rename from cpu/cc26xx-cc13xx/rf-core/prop-mode-tx-power.c
rename to drivers/cpu/cc26xx-cc13xx/rf-core/prop-mode-tx-power.c
diff --git a/cpu/cc26xx-cc13xx/rf-core/prop-mode.c b/drivers/cpu/cc26xx-cc13xx/rf-core/prop-mode.c
similarity index 100%
rename from cpu/cc26xx-cc13xx/rf-core/prop-mode.c
rename to drivers/cpu/cc26xx-cc13xx/rf-core/prop-mode.c
diff --git a/cpu/cc26xx-cc13xx/rf-core/prop-mode.h b/drivers/cpu/cc26xx-cc13xx/rf-core/prop-mode.h
similarity index 100%
rename from cpu/cc26xx-cc13xx/rf-core/prop-mode.h
rename to drivers/cpu/cc26xx-cc13xx/rf-core/prop-mode.h
diff --git a/cpu/cc26xx-cc13xx/rf-core/rf-ble.c b/drivers/cpu/cc26xx-cc13xx/rf-core/rf-ble.c
similarity index 100%
rename from cpu/cc26xx-cc13xx/rf-core/rf-ble.c
rename to drivers/cpu/cc26xx-cc13xx/rf-core/rf-ble.c
diff --git a/cpu/cc26xx-cc13xx/rf-core/rf-ble.h b/drivers/cpu/cc26xx-cc13xx/rf-core/rf-ble.h
similarity index 100%
rename from cpu/cc26xx-cc13xx/rf-core/rf-ble.h
rename to drivers/cpu/cc26xx-cc13xx/rf-core/rf-ble.h
diff --git a/cpu/cc26xx-cc13xx/rf-core/rf-core.c b/drivers/cpu/cc26xx-cc13xx/rf-core/rf-core.c
similarity index 100%
rename from cpu/cc26xx-cc13xx/rf-core/rf-core.c
rename to drivers/cpu/cc26xx-cc13xx/rf-core/rf-core.c
diff --git a/cpu/cc26xx-cc13xx/rf-core/rf-core.h b/drivers/cpu/cc26xx-cc13xx/rf-core/rf-core.h
similarity index 100%
rename from cpu/cc26xx-cc13xx/rf-core/rf-core.h
rename to drivers/cpu/cc26xx-cc13xx/rf-core/rf-core.h
diff --git a/cpu/cc26xx-cc13xx/rf-core/rf-switch.h b/drivers/cpu/cc26xx-cc13xx/rf-core/rf-switch.h
similarity index 100%
rename from cpu/cc26xx-cc13xx/rf-core/rf-switch.h
rename to drivers/cpu/cc26xx-cc13xx/rf-core/rf-switch.h
diff --git a/cpu/cc26xx-cc13xx/rf-core/smartrf-settings.c b/drivers/cpu/cc26xx-cc13xx/rf-core/smartrf-settings.c
similarity index 100%
rename from cpu/cc26xx-cc13xx/rf-core/smartrf-settings.c
rename to drivers/cpu/cc26xx-cc13xx/rf-core/smartrf-settings.c
diff --git a/cpu/cc26xx-cc13xx/rf-core/smartrf-settings.h b/drivers/cpu/cc26xx-cc13xx/rf-core/smartrf-settings.h
similarity index 100%
rename from cpu/cc26xx-cc13xx/rf-core/smartrf-settings.h
rename to drivers/cpu/cc26xx-cc13xx/rf-core/smartrf-settings.h
diff --git a/cpu/cc26xx-cc13xx/rtimer-arch.c b/drivers/cpu/cc26xx-cc13xx/rtimer-arch.c
similarity index 100%
rename from cpu/cc26xx-cc13xx/rtimer-arch.c
rename to drivers/cpu/cc26xx-cc13xx/rtimer-arch.c
diff --git a/cpu/cc26xx-cc13xx/rtimer-arch.h b/drivers/cpu/cc26xx-cc13xx/rtimer-arch.h
similarity index 100%
rename from cpu/cc26xx-cc13xx/rtimer-arch.h
rename to drivers/cpu/cc26xx-cc13xx/rtimer-arch.h
diff --git a/cpu/cc26xx-cc13xx/slip-arch.c b/drivers/cpu/cc26xx-cc13xx/slip-arch.c
similarity index 100%
rename from cpu/cc26xx-cc13xx/slip-arch.c
rename to drivers/cpu/cc26xx-cc13xx/slip-arch.c
diff --git a/cpu/cc26xx-cc13xx/ti-lib-rom.h b/drivers/cpu/cc26xx-cc13xx/ti-lib-rom.h
similarity index 100%
rename from cpu/cc26xx-cc13xx/ti-lib-rom.h
rename to drivers/cpu/cc26xx-cc13xx/ti-lib-rom.h
diff --git a/cpu/cc26xx-cc13xx/ti-lib.h b/drivers/cpu/cc26xx-cc13xx/ti-lib.h
similarity index 100%
rename from cpu/cc26xx-cc13xx/ti-lib.h
rename to drivers/cpu/cc26xx-cc13xx/ti-lib.h
diff --git a/cpu/msp430/Makefile.msp430 b/drivers/cpu/msp430/Makefile.msp430
similarity index 99%
rename from cpu/msp430/Makefile.msp430
rename to drivers/cpu/msp430/Makefile.msp430
index 6fa42b75d..72bcd09fc 100644
--- a/cpu/msp430/Makefile.msp430
+++ b/drivers/cpu/msp430/Makefile.msp430
@@ -9,7 +9,7 @@ CFLAGS += -gstabs+
.SUFFIXES:
### Define the CPU directory
-CONTIKI_CPU=$(CONTIKI)/cpu/msp430
+CONTIKI_CPU=$(CONTIKI)/drivers/cpu/msp430
### Define the source files we have in the MSP430 port
diff --git a/cpu/msp430/button.c b/drivers/cpu/msp430/button.c
similarity index 100%
rename from cpu/msp430/button.c
rename to drivers/cpu/msp430/button.c
diff --git a/cpu/msp430/cc2420-arch-sfd.c b/drivers/cpu/msp430/cc2420-arch-sfd.c
similarity index 100%
rename from cpu/msp430/cc2420-arch-sfd.c
rename to drivers/cpu/msp430/cc2420-arch-sfd.c
diff --git a/cpu/msp430/cc2420-arch-sfd.h b/drivers/cpu/msp430/cc2420-arch-sfd.h
similarity index 100%
rename from cpu/msp430/cc2420-arch-sfd.h
rename to drivers/cpu/msp430/cc2420-arch-sfd.h
diff --git a/cpu/msp430/cc2420-arch.c b/drivers/cpu/msp430/cc2420-arch.c
similarity index 100%
rename from cpu/msp430/cc2420-arch.c
rename to drivers/cpu/msp430/cc2420-arch.c
diff --git a/cpu/msp430/cc2520-arch-sfd.c b/drivers/cpu/msp430/cc2520-arch-sfd.c
similarity index 100%
rename from cpu/msp430/cc2520-arch-sfd.c
rename to drivers/cpu/msp430/cc2520-arch-sfd.c
diff --git a/cpu/msp430/cc2520-arch-sfd.h b/drivers/cpu/msp430/cc2520-arch-sfd.h
similarity index 100%
rename from cpu/msp430/cc2520-arch-sfd.h
rename to drivers/cpu/msp430/cc2520-arch-sfd.h
diff --git a/cpu/msp430/cc2520-arch.c b/drivers/cpu/msp430/cc2520-arch.c
similarity index 100%
rename from cpu/msp430/cc2520-arch.c
rename to drivers/cpu/msp430/cc2520-arch.c
diff --git a/cpu/msp430/dev/button.h b/drivers/cpu/msp430/dev/button.h
similarity index 100%
rename from cpu/msp430/dev/button.h
rename to drivers/cpu/msp430/dev/button.h
diff --git a/cpu/msp430/dev/flash.h b/drivers/cpu/msp430/dev/flash.h
similarity index 100%
rename from cpu/msp430/dev/flash.h
rename to drivers/cpu/msp430/dev/flash.h
diff --git a/cpu/msp430/dev/hwconf.h b/drivers/cpu/msp430/dev/hwconf.h
similarity index 100%
rename from cpu/msp430/dev/hwconf.h
rename to drivers/cpu/msp430/dev/hwconf.h
diff --git a/cpu/msp430/dev/lpm.h b/drivers/cpu/msp430/dev/lpm.h
similarity index 100%
rename from cpu/msp430/dev/lpm.h
rename to drivers/cpu/msp430/dev/lpm.h
diff --git a/cpu/msp430/dev/uart0-putchar.c b/drivers/cpu/msp430/dev/uart0-putchar.c
similarity index 100%
rename from cpu/msp430/dev/uart0-putchar.c
rename to drivers/cpu/msp430/dev/uart0-putchar.c
diff --git a/cpu/msp430/dev/uart0.h b/drivers/cpu/msp430/dev/uart0.h
similarity index 100%
rename from cpu/msp430/dev/uart0.h
rename to drivers/cpu/msp430/dev/uart0.h
diff --git a/cpu/msp430/dev/uart1-putchar.c b/drivers/cpu/msp430/dev/uart1-putchar.c
similarity index 100%
rename from cpu/msp430/dev/uart1-putchar.c
rename to drivers/cpu/msp430/dev/uart1-putchar.c
diff --git a/cpu/msp430/dev/uart1.h b/drivers/cpu/msp430/dev/uart1.h
similarity index 100%
rename from cpu/msp430/dev/uart1.h
rename to drivers/cpu/msp430/dev/uart1.h
diff --git a/cpu/msp430/f1xxx/clock.c b/drivers/cpu/msp430/f1xxx/clock.c
similarity index 100%
rename from cpu/msp430/f1xxx/clock.c
rename to drivers/cpu/msp430/f1xxx/clock.c
diff --git a/cpu/msp430/f1xxx/msp430.c b/drivers/cpu/msp430/f1xxx/msp430.c
similarity index 100%
rename from cpu/msp430/f1xxx/msp430.c
rename to drivers/cpu/msp430/f1xxx/msp430.c
diff --git a/cpu/msp430/f1xxx/rtimer-arch.c b/drivers/cpu/msp430/f1xxx/rtimer-arch.c
similarity index 100%
rename from cpu/msp430/f1xxx/rtimer-arch.c
rename to drivers/cpu/msp430/f1xxx/rtimer-arch.c
diff --git a/cpu/msp430/f1xxx/spi.c b/drivers/cpu/msp430/f1xxx/spi.c
similarity index 100%
rename from cpu/msp430/f1xxx/spi.c
rename to drivers/cpu/msp430/f1xxx/spi.c
diff --git a/cpu/msp430/f1xxx/uart1.c b/drivers/cpu/msp430/f1xxx/uart1.c
similarity index 100%
rename from cpu/msp430/f1xxx/uart1.c
rename to drivers/cpu/msp430/f1xxx/uart1.c
diff --git a/cpu/msp430/f2xxx/msp430.c b/drivers/cpu/msp430/f2xxx/msp430.c
similarity index 100%
rename from cpu/msp430/f2xxx/msp430.c
rename to drivers/cpu/msp430/f2xxx/msp430.c
diff --git a/cpu/msp430/f2xxx/spi.c b/drivers/cpu/msp430/f2xxx/spi.c
similarity index 100%
rename from cpu/msp430/f2xxx/spi.c
rename to drivers/cpu/msp430/f2xxx/spi.c
diff --git a/cpu/msp430/f2xxx/uart0.c b/drivers/cpu/msp430/f2xxx/uart0.c
similarity index 100%
rename from cpu/msp430/f2xxx/uart0.c
rename to drivers/cpu/msp430/f2xxx/uart0.c
diff --git a/cpu/msp430/f2xxx/uart1.c b/drivers/cpu/msp430/f2xxx/uart1.c
similarity index 100%
rename from cpu/msp430/f2xxx/uart1.c
rename to drivers/cpu/msp430/f2xxx/uart1.c
diff --git a/cpu/msp430/f5xxx/clock.c b/drivers/cpu/msp430/f5xxx/clock.c
similarity index 100%
rename from cpu/msp430/f5xxx/clock.c
rename to drivers/cpu/msp430/f5xxx/clock.c
diff --git a/cpu/msp430/f5xxx/msp430.c b/drivers/cpu/msp430/f5xxx/msp430.c
similarity index 100%
rename from cpu/msp430/f5xxx/msp430.c
rename to drivers/cpu/msp430/f5xxx/msp430.c
diff --git a/cpu/msp430/f5xxx/rtimer-arch.c b/drivers/cpu/msp430/f5xxx/rtimer-arch.c
similarity index 100%
rename from cpu/msp430/f5xxx/rtimer-arch.c
rename to drivers/cpu/msp430/f5xxx/rtimer-arch.c
diff --git a/cpu/msp430/f5xxx/spi.c b/drivers/cpu/msp430/f5xxx/spi.c
similarity index 100%
rename from cpu/msp430/f5xxx/spi.c
rename to drivers/cpu/msp430/f5xxx/spi.c
diff --git a/cpu/msp430/f5xxx/uart0.c b/drivers/cpu/msp430/f5xxx/uart0.c
similarity index 100%
rename from cpu/msp430/f5xxx/uart0.c
rename to drivers/cpu/msp430/f5xxx/uart0.c
diff --git a/cpu/msp430/f5xxx/uart1.c b/drivers/cpu/msp430/f5xxx/uart1.c
similarity index 100%
rename from cpu/msp430/f5xxx/uart1.c
rename to drivers/cpu/msp430/f5xxx/uart1.c
diff --git a/cpu/msp430/flash.c b/drivers/cpu/msp430/flash.c
similarity index 100%
rename from cpu/msp430/flash.c
rename to drivers/cpu/msp430/flash.c
diff --git a/cpu/msp430/isr_compat.h b/drivers/cpu/msp430/isr_compat.h
similarity index 100%
rename from cpu/msp430/isr_compat.h
rename to drivers/cpu/msp430/isr_compat.h
diff --git a/cpu/msp430/leds-arch.c b/drivers/cpu/msp430/leds-arch.c
similarity index 100%
rename from cpu/msp430/leds-arch.c
rename to drivers/cpu/msp430/leds-arch.c
diff --git a/cpu/msp430/lpm.c b/drivers/cpu/msp430/lpm.c
similarity index 100%
rename from cpu/msp430/lpm.c
rename to drivers/cpu/msp430/lpm.c
diff --git a/cpu/msp430/minileds.c b/drivers/cpu/msp430/minileds.c
similarity index 100%
rename from cpu/msp430/minileds.c
rename to drivers/cpu/msp430/minileds.c
diff --git a/cpu/msp430/msp430def.h b/drivers/cpu/msp430/msp430def.h
similarity index 100%
rename from cpu/msp430/msp430def.h
rename to drivers/cpu/msp430/msp430def.h
diff --git a/cpu/msp430/mtarch.c b/drivers/cpu/msp430/mtarch.c
similarity index 100%
rename from cpu/msp430/mtarch.c
rename to drivers/cpu/msp430/mtarch.c
diff --git a/cpu/msp430/mtarch.h b/drivers/cpu/msp430/mtarch.h
similarity index 100%
rename from cpu/msp430/mtarch.h
rename to drivers/cpu/msp430/mtarch.h
diff --git a/cpu/msp430/rom.c b/drivers/cpu/msp430/rom.c
similarity index 100%
rename from cpu/msp430/rom.c
rename to drivers/cpu/msp430/rom.c
diff --git a/cpu/msp430/rtimer-arch.h b/drivers/cpu/msp430/rtimer-arch.h
similarity index 100%
rename from cpu/msp430/rtimer-arch.h
rename to drivers/cpu/msp430/rtimer-arch.h
diff --git a/cpu/msp430/slip_uart0.c b/drivers/cpu/msp430/slip_uart0.c
similarity index 100%
rename from cpu/msp430/slip_uart0.c
rename to drivers/cpu/msp430/slip_uart0.c
diff --git a/cpu/msp430/slip_uart1.c b/drivers/cpu/msp430/slip_uart1.c
similarity index 100%
rename from cpu/msp430/slip_uart1.c
rename to drivers/cpu/msp430/slip_uart1.c
diff --git a/cpu/msp430/uip-ipchksum.c b/drivers/cpu/msp430/uip-ipchksum.c
similarity index 100%
rename from cpu/msp430/uip-ipchksum.c
rename to drivers/cpu/msp430/uip-ipchksum.c
diff --git a/cpu/msp430/watchdog.c b/drivers/cpu/msp430/watchdog.c
similarity index 100%
rename from cpu/msp430/watchdog.c
rename to drivers/cpu/msp430/watchdog.c
diff --git a/cpu/native/Makefile.native b/drivers/cpu/native/Makefile.native
similarity index 96%
rename from cpu/native/Makefile.native
rename to drivers/cpu/native/Makefile.native
index f74f5fa14..705077e97 100644
--- a/cpu/native/Makefile.native
+++ b/drivers/cpu/native/Makefile.native
@@ -32,4 +32,4 @@ endif
### Compilation rules
%.so: $(OBJECTDIR)/%.o
- $(LD) -shared -o $@ $^
+ $(LD) -shared -o $@ $^
\ No newline at end of file
diff --git a/cpu/native/dev/eeprom.c b/drivers/cpu/native/dev/eeprom.c
similarity index 100%
rename from cpu/native/dev/eeprom.c
rename to drivers/cpu/native/dev/eeprom.c
diff --git a/cpu/native/dev/uart1.h b/drivers/cpu/native/dev/uart1.h
similarity index 100%
rename from cpu/native/dev/uart1.h
rename to drivers/cpu/native/dev/uart1.h
diff --git a/cpu/native/mtarch.c b/drivers/cpu/native/mtarch.c
similarity index 100%
rename from cpu/native/mtarch.c
rename to drivers/cpu/native/mtarch.c
diff --git a/cpu/native/mtarch.h b/drivers/cpu/native/mtarch.h
similarity index 100%
rename from cpu/native/mtarch.h
rename to drivers/cpu/native/mtarch.h
diff --git a/cpu/native/net/README-WPCAP.md b/drivers/cpu/native/net/README-WPCAP.md
similarity index 100%
rename from cpu/native/net/README-WPCAP.md
rename to drivers/cpu/native/net/README-WPCAP.md
diff --git a/cpu/native/net/linuxradio-drv.c b/drivers/cpu/native/net/linuxradio-drv.c
similarity index 100%
rename from cpu/native/net/linuxradio-drv.c
rename to drivers/cpu/native/net/linuxradio-drv.c
diff --git a/cpu/native/net/linuxradio-drv.h b/drivers/cpu/native/net/linuxradio-drv.h
similarity index 100%
rename from cpu/native/net/linuxradio-drv.h
rename to drivers/cpu/native/net/linuxradio-drv.h
diff --git a/cpu/native/net/tapdev-drv.c b/drivers/cpu/native/net/tapdev-drv.c
similarity index 100%
rename from cpu/native/net/tapdev-drv.c
rename to drivers/cpu/native/net/tapdev-drv.c
diff --git a/cpu/native/net/tapdev-drv.h b/drivers/cpu/native/net/tapdev-drv.h
similarity index 100%
rename from cpu/native/net/tapdev-drv.h
rename to drivers/cpu/native/net/tapdev-drv.h
diff --git a/cpu/native/net/tapdev.c b/drivers/cpu/native/net/tapdev.c
similarity index 100%
rename from cpu/native/net/tapdev.c
rename to drivers/cpu/native/net/tapdev.c
diff --git a/cpu/native/net/tapdev.h b/drivers/cpu/native/net/tapdev.h
similarity index 100%
rename from cpu/native/net/tapdev.h
rename to drivers/cpu/native/net/tapdev.h
diff --git a/cpu/native/net/tapdev6.c b/drivers/cpu/native/net/tapdev6.c
similarity index 100%
rename from cpu/native/net/tapdev6.c
rename to drivers/cpu/native/net/tapdev6.c
diff --git a/cpu/native/net/tapdev6.h b/drivers/cpu/native/net/tapdev6.h
similarity index 100%
rename from cpu/native/net/tapdev6.h
rename to drivers/cpu/native/net/tapdev6.h
diff --git a/cpu/native/net/wpcap-drv.c b/drivers/cpu/native/net/wpcap-drv.c
similarity index 100%
rename from cpu/native/net/wpcap-drv.c
rename to drivers/cpu/native/net/wpcap-drv.c
diff --git a/cpu/native/net/wpcap-drv.h b/drivers/cpu/native/net/wpcap-drv.h
similarity index 100%
rename from cpu/native/net/wpcap-drv.h
rename to drivers/cpu/native/net/wpcap-drv.h
diff --git a/cpu/native/net/wpcap.c b/drivers/cpu/native/net/wpcap.c
similarity index 100%
rename from cpu/native/net/wpcap.c
rename to drivers/cpu/native/net/wpcap.c
diff --git a/cpu/native/net/wpcap.h b/drivers/cpu/native/net/wpcap.h
similarity index 100%
rename from cpu/native/net/wpcap.h
rename to drivers/cpu/native/net/wpcap.h
diff --git a/cpu/native/rtimer-arch.c b/drivers/cpu/native/rtimer-arch.c
similarity index 100%
rename from cpu/native/rtimer-arch.c
rename to drivers/cpu/native/rtimer-arch.c
diff --git a/cpu/native/rtimer-arch.h b/drivers/cpu/native/rtimer-arch.h
similarity index 100%
rename from cpu/native/rtimer-arch.h
rename to drivers/cpu/native/rtimer-arch.h
diff --git a/cpu/native/watchdog.c b/drivers/cpu/native/watchdog.c
similarity index 100%
rename from cpu/native/watchdog.c
rename to drivers/cpu/native/watchdog.c
diff --git a/cpu/nrf52832/Makefile.nrf52832 b/drivers/cpu/nrf52832/Makefile.nrf52832
similarity index 100%
rename from cpu/nrf52832/Makefile.nrf52832
rename to drivers/cpu/nrf52832/Makefile.nrf52832
diff --git a/cpu/nrf52832/ble/ble-core.c b/drivers/cpu/nrf52832/ble/ble-core.c
similarity index 100%
rename from cpu/nrf52832/ble/ble-core.c
rename to drivers/cpu/nrf52832/ble/ble-core.c
diff --git a/cpu/nrf52832/ble/ble-core.h b/drivers/cpu/nrf52832/ble/ble-core.h
similarity index 100%
rename from cpu/nrf52832/ble/ble-core.h
rename to drivers/cpu/nrf52832/ble/ble-core.h
diff --git a/cpu/nrf52832/ble/ble-mac.c b/drivers/cpu/nrf52832/ble/ble-mac.c
similarity index 100%
rename from cpu/nrf52832/ble/ble-mac.c
rename to drivers/cpu/nrf52832/ble/ble-mac.c
diff --git a/cpu/nrf52832/ble/ble-mac.h b/drivers/cpu/nrf52832/ble/ble-mac.h
similarity index 100%
rename from cpu/nrf52832/ble/ble-mac.h
rename to drivers/cpu/nrf52832/ble/ble-mac.h
diff --git a/cpu/nrf52832/dev/clock.c b/drivers/cpu/nrf52832/dev/clock.c
similarity index 100%
rename from cpu/nrf52832/dev/clock.c
rename to drivers/cpu/nrf52832/dev/clock.c
diff --git a/cpu/nrf52832/dev/lpm.h b/drivers/cpu/nrf52832/dev/lpm.h
similarity index 100%
rename from cpu/nrf52832/dev/lpm.h
rename to drivers/cpu/nrf52832/dev/lpm.h
diff --git a/cpu/nrf52832/dev/random.c b/drivers/cpu/nrf52832/dev/random.c
similarity index 100%
rename from cpu/nrf52832/dev/random.c
rename to drivers/cpu/nrf52832/dev/random.c
diff --git a/cpu/nrf52832/dev/uart0.c b/drivers/cpu/nrf52832/dev/uart0.c
similarity index 100%
rename from cpu/nrf52832/dev/uart0.c
rename to drivers/cpu/nrf52832/dev/uart0.c
diff --git a/cpu/nrf52832/dev/uart0.h b/drivers/cpu/nrf52832/dev/uart0.h
similarity index 100%
rename from cpu/nrf52832/dev/uart0.h
rename to drivers/cpu/nrf52832/dev/uart0.h
diff --git a/cpu/nrf52832/dev/watchdog.c b/drivers/cpu/nrf52832/dev/watchdog.c
similarity index 100%
rename from cpu/nrf52832/dev/watchdog.c
rename to drivers/cpu/nrf52832/dev/watchdog.c
diff --git a/cpu/nrf52832/ld/nrf52-pca10036-sd.ld b/drivers/cpu/nrf52832/ld/nrf52-pca10036-sd.ld
similarity index 100%
rename from cpu/nrf52832/ld/nrf52-pca10036-sd.ld
rename to drivers/cpu/nrf52832/ld/nrf52-pca10036-sd.ld
diff --git a/cpu/nrf52832/ld/nrf52-pca10040-sd.ld b/drivers/cpu/nrf52832/ld/nrf52-pca10040-sd.ld
similarity index 100%
rename from cpu/nrf52832/ld/nrf52-pca10040-sd.ld
rename to drivers/cpu/nrf52832/ld/nrf52-pca10040-sd.ld
diff --git a/cpu/nrf52832/ld/nrf52.ld b/drivers/cpu/nrf52832/ld/nrf52.ld
similarity index 100%
rename from cpu/nrf52832/ld/nrf52.ld
rename to drivers/cpu/nrf52832/ld/nrf52.ld
diff --git a/cpu/nrf52832/mtarch.h b/drivers/cpu/nrf52832/mtarch.h
similarity index 100%
rename from cpu/nrf52832/mtarch.h
rename to drivers/cpu/nrf52832/mtarch.h
diff --git a/cpu/nrf52832/putchar.c b/drivers/cpu/nrf52832/putchar.c
similarity index 100%
rename from cpu/nrf52832/putchar.c
rename to drivers/cpu/nrf52832/putchar.c
diff --git a/cpu/nrf52832/rtimer-arch.c b/drivers/cpu/nrf52832/rtimer-arch.c
similarity index 100%
rename from cpu/nrf52832/rtimer-arch.c
rename to drivers/cpu/nrf52832/rtimer-arch.c
diff --git a/cpu/nrf52832/rtimer-arch.h b/drivers/cpu/nrf52832/rtimer-arch.h
similarity index 100%
rename from cpu/nrf52832/rtimer-arch.h
rename to drivers/cpu/nrf52832/rtimer-arch.h
diff --git a/cpu/x86/Makefile.x86_common b/drivers/cpu/x86/Makefile.x86_common
similarity index 100%
rename from cpu/x86/Makefile.x86_common
rename to drivers/cpu/x86/Makefile.x86_common
diff --git a/cpu/x86/Makefile.x86_quarkX1000 b/drivers/cpu/x86/Makefile.x86_quarkX1000
similarity index 91%
rename from cpu/x86/Makefile.x86_quarkX1000
rename to drivers/cpu/x86/Makefile.x86_quarkX1000
index 1a8d3ac8e..860c55b05 100644
--- a/cpu/x86/Makefile.x86_quarkX1000
+++ b/drivers/cpu/x86/Makefile.x86_quarkX1000
@@ -1,7 +1,7 @@
# See mm/README.md for a description of available settings:
X86_CONF_PROT_DOMAINS ?= none
-include $(CONTIKI)/cpu/x86/Makefile.x86_common
+include $(CONTIKI)/drivers/cpu/x86/Makefile.x86_common
CONTIKI_CPU_DIRS += drivers/legacy_pc drivers/quarkX1000 init/legacy_pc net mm
@@ -32,7 +32,7 @@ X86_CONF_SYSCALLS_INT = 1
X86_CONF_MULTI_SEG = 1
else
$(error Unrecognized setting for X86_CONF_PROT_DOMAINS: \
- $(X86_CONF_PROT_DOMAINS). See cpu/x86/mm/README.md for \
+ $(X86_CONF_PROT_DOMAINS). See drivers/cpu/x86/mm/README.md for \
descriptions of available settings)
endif
@@ -57,7 +57,7 @@ endif
endif
CFLAGS += -m32 -march=i586 -mtune=i586
-LDFLAGS += -m32 -Xlinker -T -Xlinker $(CONTIKI)/cpu/x86/quarkX1000$(LINKERSCRIPT_SFX).ld
+LDFLAGS += -m32 -Xlinker -T -Xlinker $(CONTIKI)/drivers/cpu/x86/quarkX1000$(LINKERSCRIPT_SFX).ld
# The C compiler is used to invoke the assembler, so the CFLAGS should be
# passed to it on the command line:
ASFLAGS = -c $(CFLAGS)
@@ -65,7 +65,7 @@ ASFLAGS = -c $(CFLAGS)
ifeq ($(X86_CONF_RESTRICT_DMA),1)
CONTIKI_SOURCEFILES += imr-conf.c
CFLAGS += -DX86_CONF_RESTRICT_DMA
-LDFLAGS += -Xlinker -T -Xlinker $(CONTIKI)/cpu/x86/quarkX1000_dma.ld
+LDFLAGS += -Xlinker -T -Xlinker $(CONTIKI)/drivers/cpu/x86/quarkX1000_dma.ld
endif
### UEFI support
diff --git a/cpu/x86/bootstrap_quarkX1000.S b/drivers/cpu/x86/bootstrap_quarkX1000.S
similarity index 100%
rename from cpu/x86/bootstrap_quarkX1000.S
rename to drivers/cpu/x86/bootstrap_quarkX1000.S
diff --git a/cpu/x86/dma.h b/drivers/cpu/x86/dma.h
similarity index 100%
rename from cpu/x86/dma.h
rename to drivers/cpu/x86/dma.h
diff --git a/cpu/x86/drivers/legacy_pc/nmi.c b/drivers/cpu/x86/drivers/legacy_pc/nmi.c
similarity index 100%
rename from cpu/x86/drivers/legacy_pc/nmi.c
rename to drivers/cpu/x86/drivers/legacy_pc/nmi.c
diff --git a/cpu/x86/drivers/legacy_pc/nmi.h b/drivers/cpu/x86/drivers/legacy_pc/nmi.h
similarity index 100%
rename from cpu/x86/drivers/legacy_pc/nmi.h
rename to drivers/cpu/x86/drivers/legacy_pc/nmi.h
diff --git a/cpu/x86/drivers/legacy_pc/pci.c b/drivers/cpu/x86/drivers/legacy_pc/pci.c
similarity index 100%
rename from cpu/x86/drivers/legacy_pc/pci.c
rename to drivers/cpu/x86/drivers/legacy_pc/pci.c
diff --git a/cpu/x86/drivers/legacy_pc/pci.h b/drivers/cpu/x86/drivers/legacy_pc/pci.h
similarity index 100%
rename from cpu/x86/drivers/legacy_pc/pci.h
rename to drivers/cpu/x86/drivers/legacy_pc/pci.h
diff --git a/cpu/x86/drivers/legacy_pc/pic.c b/drivers/cpu/x86/drivers/legacy_pc/pic.c
similarity index 100%
rename from cpu/x86/drivers/legacy_pc/pic.c
rename to drivers/cpu/x86/drivers/legacy_pc/pic.c
diff --git a/cpu/x86/drivers/legacy_pc/pic.h b/drivers/cpu/x86/drivers/legacy_pc/pic.h
similarity index 100%
rename from cpu/x86/drivers/legacy_pc/pic.h
rename to drivers/cpu/x86/drivers/legacy_pc/pic.h
diff --git a/cpu/x86/drivers/legacy_pc/pit.c b/drivers/cpu/x86/drivers/legacy_pc/pit.c
similarity index 100%
rename from cpu/x86/drivers/legacy_pc/pit.c
rename to drivers/cpu/x86/drivers/legacy_pc/pit.c
diff --git a/cpu/x86/drivers/legacy_pc/pit.h b/drivers/cpu/x86/drivers/legacy_pc/pit.h
similarity index 100%
rename from cpu/x86/drivers/legacy_pc/pit.h
rename to drivers/cpu/x86/drivers/legacy_pc/pit.h
diff --git a/cpu/x86/drivers/legacy_pc/rtc.c b/drivers/cpu/x86/drivers/legacy_pc/rtc.c
similarity index 100%
rename from cpu/x86/drivers/legacy_pc/rtc.c
rename to drivers/cpu/x86/drivers/legacy_pc/rtc.c
diff --git a/cpu/x86/drivers/legacy_pc/rtc.h b/drivers/cpu/x86/drivers/legacy_pc/rtc.h
similarity index 100%
rename from cpu/x86/drivers/legacy_pc/rtc.h
rename to drivers/cpu/x86/drivers/legacy_pc/rtc.h
diff --git a/cpu/x86/drivers/legacy_pc/shared-isr.c b/drivers/cpu/x86/drivers/legacy_pc/shared-isr.c
similarity index 100%
rename from cpu/x86/drivers/legacy_pc/shared-isr.c
rename to drivers/cpu/x86/drivers/legacy_pc/shared-isr.c
diff --git a/cpu/x86/drivers/legacy_pc/shared-isr.h b/drivers/cpu/x86/drivers/legacy_pc/shared-isr.h
similarity index 100%
rename from cpu/x86/drivers/legacy_pc/shared-isr.h
rename to drivers/cpu/x86/drivers/legacy_pc/shared-isr.h
diff --git a/cpu/x86/drivers/legacy_pc/uart-16x50.c b/drivers/cpu/x86/drivers/legacy_pc/uart-16x50.c
similarity index 100%
rename from cpu/x86/drivers/legacy_pc/uart-16x50.c
rename to drivers/cpu/x86/drivers/legacy_pc/uart-16x50.c
diff --git a/cpu/x86/drivers/legacy_pc/uart-16x50.h b/drivers/cpu/x86/drivers/legacy_pc/uart-16x50.h
similarity index 100%
rename from cpu/x86/drivers/legacy_pc/uart-16x50.h
rename to drivers/cpu/x86/drivers/legacy_pc/uart-16x50.h
diff --git a/cpu/x86/drivers/quarkX1000/eth.c b/drivers/cpu/x86/drivers/quarkX1000/eth.c
similarity index 100%
rename from cpu/x86/drivers/quarkX1000/eth.c
rename to drivers/cpu/x86/drivers/quarkX1000/eth.c
diff --git a/cpu/x86/drivers/quarkX1000/eth.h b/drivers/cpu/x86/drivers/quarkX1000/eth.h
similarity index 100%
rename from cpu/x86/drivers/quarkX1000/eth.h
rename to drivers/cpu/x86/drivers/quarkX1000/eth.h
diff --git a/cpu/x86/drivers/quarkX1000/gpio.c b/drivers/cpu/x86/drivers/quarkX1000/gpio.c
similarity index 100%
rename from cpu/x86/drivers/quarkX1000/gpio.c
rename to drivers/cpu/x86/drivers/quarkX1000/gpio.c
diff --git a/cpu/x86/drivers/quarkX1000/gpio.h b/drivers/cpu/x86/drivers/quarkX1000/gpio.h
similarity index 100%
rename from cpu/x86/drivers/quarkX1000/gpio.h
rename to drivers/cpu/x86/drivers/quarkX1000/gpio.h
diff --git a/cpu/x86/drivers/quarkX1000/i2c-registers.h b/drivers/cpu/x86/drivers/quarkX1000/i2c-registers.h
similarity index 100%
rename from cpu/x86/drivers/quarkX1000/i2c-registers.h
rename to drivers/cpu/x86/drivers/quarkX1000/i2c-registers.h
diff --git a/cpu/x86/drivers/quarkX1000/i2c.c b/drivers/cpu/x86/drivers/quarkX1000/i2c.c
similarity index 100%
rename from cpu/x86/drivers/quarkX1000/i2c.c
rename to drivers/cpu/x86/drivers/quarkX1000/i2c.c
diff --git a/cpu/x86/drivers/quarkX1000/i2c.h b/drivers/cpu/x86/drivers/quarkX1000/i2c.h
similarity index 100%
rename from cpu/x86/drivers/quarkX1000/i2c.h
rename to drivers/cpu/x86/drivers/quarkX1000/i2c.h
diff --git a/cpu/x86/drivers/quarkX1000/imr-conf.c b/drivers/cpu/x86/drivers/quarkX1000/imr-conf.c
similarity index 100%
rename from cpu/x86/drivers/quarkX1000/imr-conf.c
rename to drivers/cpu/x86/drivers/quarkX1000/imr-conf.c
diff --git a/cpu/x86/drivers/quarkX1000/imr-conf.h b/drivers/cpu/x86/drivers/quarkX1000/imr-conf.h
similarity index 100%
rename from cpu/x86/drivers/quarkX1000/imr-conf.h
rename to drivers/cpu/x86/drivers/quarkX1000/imr-conf.h
diff --git a/cpu/x86/drivers/quarkX1000/imr.c b/drivers/cpu/x86/drivers/quarkX1000/imr.c
similarity index 100%
rename from cpu/x86/drivers/quarkX1000/imr.c
rename to drivers/cpu/x86/drivers/quarkX1000/imr.c
diff --git a/cpu/x86/drivers/quarkX1000/imr.h b/drivers/cpu/x86/drivers/quarkX1000/imr.h
similarity index 100%
rename from cpu/x86/drivers/quarkX1000/imr.h
rename to drivers/cpu/x86/drivers/quarkX1000/imr.h
diff --git a/cpu/x86/drivers/quarkX1000/msg-bus.c b/drivers/cpu/x86/drivers/quarkX1000/msg-bus.c
similarity index 100%
rename from cpu/x86/drivers/quarkX1000/msg-bus.c
rename to drivers/cpu/x86/drivers/quarkX1000/msg-bus.c
diff --git a/cpu/x86/drivers/quarkX1000/msg-bus.h b/drivers/cpu/x86/drivers/quarkX1000/msg-bus.h
similarity index 100%
rename from cpu/x86/drivers/quarkX1000/msg-bus.h
rename to drivers/cpu/x86/drivers/quarkX1000/msg-bus.h
diff --git a/cpu/x86/drivers/quarkX1000/uart.c b/drivers/cpu/x86/drivers/quarkX1000/uart.c
similarity index 100%
rename from cpu/x86/drivers/quarkX1000/uart.c
rename to drivers/cpu/x86/drivers/quarkX1000/uart.c
diff --git a/cpu/x86/drivers/quarkX1000/uart.h b/drivers/cpu/x86/drivers/quarkX1000/uart.h
similarity index 100%
rename from cpu/x86/drivers/quarkX1000/uart.h
rename to drivers/cpu/x86/drivers/quarkX1000/uart.h
diff --git a/cpu/x86/helpers.S b/drivers/cpu/x86/helpers.S
similarity index 100%
rename from cpu/x86/helpers.S
rename to drivers/cpu/x86/helpers.S
diff --git a/cpu/x86/helpers.h b/drivers/cpu/x86/helpers.h
similarity index 100%
rename from cpu/x86/helpers.h
rename to drivers/cpu/x86/helpers.h
diff --git a/cpu/x86/init/common/cpu.c b/drivers/cpu/x86/init/common/cpu.c
similarity index 100%
rename from cpu/x86/init/common/cpu.c
rename to drivers/cpu/x86/init/common/cpu.c
diff --git a/cpu/x86/init/common/cpu.h b/drivers/cpu/x86/init/common/cpu.h
similarity index 100%
rename from cpu/x86/init/common/cpu.h
rename to drivers/cpu/x86/init/common/cpu.h
diff --git a/cpu/x86/init/common/gdt.c b/drivers/cpu/x86/init/common/gdt.c
similarity index 100%
rename from cpu/x86/init/common/gdt.c
rename to drivers/cpu/x86/init/common/gdt.c
diff --git a/cpu/x86/init/common/gdt.h b/drivers/cpu/x86/init/common/gdt.h
similarity index 100%
rename from cpu/x86/init/common/gdt.h
rename to drivers/cpu/x86/init/common/gdt.h
diff --git a/cpu/x86/init/common/idt.c b/drivers/cpu/x86/init/common/idt.c
similarity index 100%
rename from cpu/x86/init/common/idt.c
rename to drivers/cpu/x86/init/common/idt.c
diff --git a/cpu/x86/init/common/idt.h b/drivers/cpu/x86/init/common/idt.h
similarity index 100%
rename from cpu/x86/init/common/idt.h
rename to drivers/cpu/x86/init/common/idt.h
diff --git a/cpu/x86/init/common/interrupt.h b/drivers/cpu/x86/init/common/interrupt.h
similarity index 100%
rename from cpu/x86/init/common/interrupt.h
rename to drivers/cpu/x86/init/common/interrupt.h
diff --git a/cpu/x86/init/common/irq.h b/drivers/cpu/x86/init/common/irq.h
similarity index 100%
rename from cpu/x86/init/common/irq.h
rename to drivers/cpu/x86/init/common/irq.h
diff --git a/cpu/x86/init/legacy_pc/irq.c b/drivers/cpu/x86/init/legacy_pc/irq.c
similarity index 100%
rename from cpu/x86/init/legacy_pc/irq.c
rename to drivers/cpu/x86/init/legacy_pc/irq.c
diff --git a/cpu/x86/mm/README.md b/drivers/cpu/x86/mm/README.md
similarity index 100%
rename from cpu/x86/mm/README.md
rename to drivers/cpu/x86/mm/README.md
diff --git a/cpu/x86/mm/gdt-layout.h b/drivers/cpu/x86/mm/gdt-layout.h
similarity index 100%
rename from cpu/x86/mm/gdt-layout.h
rename to drivers/cpu/x86/mm/gdt-layout.h
diff --git a/cpu/x86/mm/ldt-layout.h b/drivers/cpu/x86/mm/ldt-layout.h
similarity index 100%
rename from cpu/x86/mm/ldt-layout.h
rename to drivers/cpu/x86/mm/ldt-layout.h
diff --git a/cpu/x86/mm/multi-segment.c b/drivers/cpu/x86/mm/multi-segment.c
similarity index 100%
rename from cpu/x86/mm/multi-segment.c
rename to drivers/cpu/x86/mm/multi-segment.c
diff --git a/cpu/x86/mm/multi-segment.h b/drivers/cpu/x86/mm/multi-segment.h
similarity index 100%
rename from cpu/x86/mm/multi-segment.h
rename to drivers/cpu/x86/mm/multi-segment.h
diff --git a/cpu/x86/mm/paging-prot-domains.c b/drivers/cpu/x86/mm/paging-prot-domains.c
similarity index 100%
rename from cpu/x86/mm/paging-prot-domains.c
rename to drivers/cpu/x86/mm/paging-prot-domains.c
diff --git a/cpu/x86/mm/paging-prot-domains.h b/drivers/cpu/x86/mm/paging-prot-domains.h
similarity index 100%
rename from cpu/x86/mm/paging-prot-domains.h
rename to drivers/cpu/x86/mm/paging-prot-domains.h
diff --git a/cpu/x86/mm/paging.h b/drivers/cpu/x86/mm/paging.h
similarity index 100%
rename from cpu/x86/mm/paging.h
rename to drivers/cpu/x86/mm/paging.h
diff --git a/cpu/x86/mm/prot-domains.c b/drivers/cpu/x86/mm/prot-domains.c
similarity index 100%
rename from cpu/x86/mm/prot-domains.c
rename to drivers/cpu/x86/mm/prot-domains.c
diff --git a/cpu/x86/mm/prot-domains.h b/drivers/cpu/x86/mm/prot-domains.h
similarity index 100%
rename from cpu/x86/mm/prot-domains.h
rename to drivers/cpu/x86/mm/prot-domains.h
diff --git a/cpu/x86/mm/segmentation.h b/drivers/cpu/x86/mm/segmentation.h
similarity index 100%
rename from cpu/x86/mm/segmentation.h
rename to drivers/cpu/x86/mm/segmentation.h
diff --git a/cpu/x86/mm/stacks.c b/drivers/cpu/x86/mm/stacks.c
similarity index 100%
rename from cpu/x86/mm/stacks.c
rename to drivers/cpu/x86/mm/stacks.c
diff --git a/cpu/x86/mm/stacks.h b/drivers/cpu/x86/mm/stacks.h
similarity index 100%
rename from cpu/x86/mm/stacks.h
rename to drivers/cpu/x86/mm/stacks.h
diff --git a/cpu/x86/mm/swseg-prot-domains.c b/drivers/cpu/x86/mm/swseg-prot-domains.c
similarity index 100%
rename from cpu/x86/mm/swseg-prot-domains.c
rename to drivers/cpu/x86/mm/swseg-prot-domains.c
diff --git a/cpu/x86/mm/swseg-prot-domains.h b/drivers/cpu/x86/mm/swseg-prot-domains.h
similarity index 100%
rename from cpu/x86/mm/swseg-prot-domains.h
rename to drivers/cpu/x86/mm/swseg-prot-domains.h
diff --git a/cpu/x86/mm/syscalls-int-asm.S b/drivers/cpu/x86/mm/syscalls-int-asm.S
similarity index 100%
rename from cpu/x86/mm/syscalls-int-asm.S
rename to drivers/cpu/x86/mm/syscalls-int-asm.S
diff --git a/cpu/x86/mm/syscalls-int.c b/drivers/cpu/x86/mm/syscalls-int.c
similarity index 100%
rename from cpu/x86/mm/syscalls-int.c
rename to drivers/cpu/x86/mm/syscalls-int.c
diff --git a/cpu/x86/mm/syscalls-int.h b/drivers/cpu/x86/mm/syscalls-int.h
similarity index 100%
rename from cpu/x86/mm/syscalls-int.h
rename to drivers/cpu/x86/mm/syscalls-int.h
diff --git a/cpu/x86/mm/syscalls.h b/drivers/cpu/x86/mm/syscalls.h
similarity index 100%
rename from cpu/x86/mm/syscalls.h
rename to drivers/cpu/x86/mm/syscalls.h
diff --git a/cpu/x86/mm/tss-prot-domains-asm.S b/drivers/cpu/x86/mm/tss-prot-domains-asm.S
similarity index 100%
rename from cpu/x86/mm/tss-prot-domains-asm.S
rename to drivers/cpu/x86/mm/tss-prot-domains-asm.S
diff --git a/cpu/x86/mm/tss-prot-domains.c b/drivers/cpu/x86/mm/tss-prot-domains.c
similarity index 100%
rename from cpu/x86/mm/tss-prot-domains.c
rename to drivers/cpu/x86/mm/tss-prot-domains.c
diff --git a/cpu/x86/mm/tss-prot-domains.h b/drivers/cpu/x86/mm/tss-prot-domains.h
similarity index 100%
rename from cpu/x86/mm/tss-prot-domains.h
rename to drivers/cpu/x86/mm/tss-prot-domains.h
diff --git a/cpu/x86/mm/tss.c b/drivers/cpu/x86/mm/tss.c
similarity index 100%
rename from cpu/x86/mm/tss.c
rename to drivers/cpu/x86/mm/tss.c
diff --git a/cpu/x86/mm/tss.h b/drivers/cpu/x86/mm/tss.h
similarity index 100%
rename from cpu/x86/mm/tss.h
rename to drivers/cpu/x86/mm/tss.h
diff --git a/cpu/x86/quarkX1000.ld b/drivers/cpu/x86/quarkX1000.ld
similarity index 100%
rename from cpu/x86/quarkX1000.ld
rename to drivers/cpu/x86/quarkX1000.ld
diff --git a/cpu/x86/quarkX1000_dma.ld b/drivers/cpu/x86/quarkX1000_dma.ld
similarity index 100%
rename from cpu/x86/quarkX1000_dma.ld
rename to drivers/cpu/x86/quarkX1000_dma.ld
diff --git a/cpu/x86/quarkX1000_multi_seg.ld b/drivers/cpu/x86/quarkX1000_multi_seg.ld
similarity index 100%
rename from cpu/x86/quarkX1000_multi_seg.ld
rename to drivers/cpu/x86/quarkX1000_multi_seg.ld
diff --git a/cpu/x86/quarkX1000_paging.ld b/drivers/cpu/x86/quarkX1000_paging.ld
similarity index 100%
rename from cpu/x86/quarkX1000_paging.ld
rename to drivers/cpu/x86/quarkX1000_paging.ld
diff --git a/cpu/x86/startup.h b/drivers/cpu/x86/startup.h
similarity index 100%
rename from cpu/x86/startup.h
rename to drivers/cpu/x86/startup.h
diff --git a/cpu/x86/uefi/bootstrap_uefi.c b/drivers/cpu/x86/uefi/bootstrap_uefi.c
similarity index 100%
rename from cpu/x86/uefi/bootstrap_uefi.c
rename to drivers/cpu/x86/uefi/bootstrap_uefi.c
diff --git a/cpu/x86/uefi/build_uefi.sh b/drivers/cpu/x86/uefi/build_uefi.sh
old mode 100755
new mode 100644
similarity index 100%
rename from cpu/x86/uefi/build_uefi.sh
rename to drivers/cpu/x86/uefi/build_uefi.sh
diff --git a/dev/bme280/README.bme280 b/drivers/dev/bme280/README.bme280
similarity index 100%
rename from dev/bme280/README.bme280
rename to drivers/dev/bme280/README.bme280
diff --git a/dev/bme280/bme280-arch.h b/drivers/dev/bme280/bme280-arch.h
similarity index 100%
rename from dev/bme280/bme280-arch.h
rename to drivers/dev/bme280/bme280-arch.h
diff --git a/dev/bme280/bme280-sensor.c b/drivers/dev/bme280/bme280-sensor.c
similarity index 100%
rename from dev/bme280/bme280-sensor.c
rename to drivers/dev/bme280/bme280-sensor.c
diff --git a/dev/bme280/bme280-sensor.h b/drivers/dev/bme280/bme280-sensor.h
similarity index 100%
rename from dev/bme280/bme280-sensor.h
rename to drivers/dev/bme280/bme280-sensor.h
diff --git a/dev/bme280/bme280.c b/drivers/dev/bme280/bme280.c
similarity index 100%
rename from dev/bme280/bme280.c
rename to drivers/dev/bme280/bme280.c
diff --git a/dev/bme280/bme280.h b/drivers/dev/bme280/bme280.h
similarity index 100%
rename from dev/bme280/bme280.h
rename to drivers/dev/bme280/bme280.h
diff --git a/dev/cc1200/cc1200-802154g-863-870-fsk-50kbps.c b/drivers/dev/cc1200/cc1200-802154g-863-870-fsk-50kbps.c
similarity index 100%
rename from dev/cc1200/cc1200-802154g-863-870-fsk-50kbps.c
rename to drivers/dev/cc1200/cc1200-802154g-863-870-fsk-50kbps.c
diff --git a/dev/cc1200/cc1200-868-fsk-1-2kbps.c b/drivers/dev/cc1200/cc1200-868-fsk-1-2kbps.c
similarity index 100%
rename from dev/cc1200/cc1200-868-fsk-1-2kbps.c
rename to drivers/dev/cc1200/cc1200-868-fsk-1-2kbps.c
diff --git a/dev/cc1200/cc1200-arch.h b/drivers/dev/cc1200/cc1200-arch.h
similarity index 100%
rename from dev/cc1200/cc1200-arch.h
rename to drivers/dev/cc1200/cc1200-arch.h
diff --git a/dev/cc1200/cc1200-conf.h b/drivers/dev/cc1200/cc1200-conf.h
similarity index 100%
rename from dev/cc1200/cc1200-conf.h
rename to drivers/dev/cc1200/cc1200-conf.h
diff --git a/dev/cc1200/cc1200-const.h b/drivers/dev/cc1200/cc1200-const.h
similarity index 100%
rename from dev/cc1200/cc1200-const.h
rename to drivers/dev/cc1200/cc1200-const.h
diff --git a/dev/cc1200/cc1200-rf-cfg.h b/drivers/dev/cc1200/cc1200-rf-cfg.h
similarity index 100%
rename from dev/cc1200/cc1200-rf-cfg.h
rename to drivers/dev/cc1200/cc1200-rf-cfg.h
diff --git a/dev/cc1200/cc1200.c b/drivers/dev/cc1200/cc1200.c
similarity index 100%
rename from dev/cc1200/cc1200.c
rename to drivers/dev/cc1200/cc1200.c
diff --git a/dev/cc2420/cc2420.c b/drivers/dev/cc2420/cc2420.c
similarity index 100%
rename from dev/cc2420/cc2420.c
rename to drivers/dev/cc2420/cc2420.c
diff --git a/dev/cc2420/cc2420.h b/drivers/dev/cc2420/cc2420.h
similarity index 100%
rename from dev/cc2420/cc2420.h
rename to drivers/dev/cc2420/cc2420.h
diff --git a/dev/cc2420/cc2420_const.h b/drivers/dev/cc2420/cc2420_const.h
similarity index 100%
rename from dev/cc2420/cc2420_const.h
rename to drivers/dev/cc2420/cc2420_const.h
diff --git a/dev/cc2520/cc2520.c b/drivers/dev/cc2520/cc2520.c
similarity index 100%
rename from dev/cc2520/cc2520.c
rename to drivers/dev/cc2520/cc2520.c
diff --git a/dev/cc2520/cc2520.h b/drivers/dev/cc2520/cc2520.h
similarity index 100%
rename from dev/cc2520/cc2520.h
rename to drivers/dev/cc2520/cc2520.h
diff --git a/dev/cc2520/cc2520_const.h b/drivers/dev/cc2520/cc2520_const.h
similarity index 100%
rename from dev/cc2520/cc2520_const.h
rename to drivers/dev/cc2520/cc2520_const.h
diff --git a/dev/disk/disk.h b/drivers/dev/disk/disk.h
similarity index 100%
rename from dev/disk/disk.h
rename to drivers/dev/disk/disk.h
diff --git a/dev/disk/mmc/mmc-arch.h b/drivers/dev/disk/mmc/mmc-arch.h
similarity index 100%
rename from dev/disk/mmc/mmc-arch.h
rename to drivers/dev/disk/mmc/mmc-arch.h
diff --git a/dev/disk/mmc/mmc.c b/drivers/dev/disk/mmc/mmc.c
similarity index 100%
rename from dev/disk/mmc/mmc.c
rename to drivers/dev/disk/mmc/mmc.c
diff --git a/dev/disk/mmc/mmc.h b/drivers/dev/disk/mmc/mmc.h
similarity index 100%
rename from dev/disk/mmc/mmc.h
rename to drivers/dev/disk/mmc/mmc.h
diff --git a/dev/ds2411/ds2411.c b/drivers/dev/ds2411/ds2411.c
similarity index 100%
rename from dev/ds2411/ds2411.c
rename to drivers/dev/ds2411/ds2411.c
diff --git a/dev/ds2411/ds2411.h b/drivers/dev/ds2411/ds2411.h
similarity index 100%
rename from dev/ds2411/ds2411.h
rename to drivers/dev/ds2411/ds2411.h
diff --git a/dev/enc28j60/enc28j60-ip64-driver.c b/drivers/dev/enc28j60/enc28j60-ip64-driver.c
similarity index 100%
rename from dev/enc28j60/enc28j60-ip64-driver.c
rename to drivers/dev/enc28j60/enc28j60-ip64-driver.c
diff --git a/dev/enc28j60/enc28j60-ip64-driver.h b/drivers/dev/enc28j60/enc28j60-ip64-driver.h
similarity index 100%
rename from dev/enc28j60/enc28j60-ip64-driver.h
rename to drivers/dev/enc28j60/enc28j60-ip64-driver.h
diff --git a/dev/enc28j60/enc28j60.c b/drivers/dev/enc28j60/enc28j60.c
similarity index 100%
rename from dev/enc28j60/enc28j60.c
rename to drivers/dev/enc28j60/enc28j60.c
diff --git a/dev/enc28j60/enc28j60.h b/drivers/dev/enc28j60/enc28j60.h
similarity index 100%
rename from dev/enc28j60/enc28j60.h
rename to drivers/dev/enc28j60/enc28j60.h
diff --git a/dev/sht11/sht11-sensor.c b/drivers/dev/sht11/sht11-sensor.c
similarity index 100%
rename from dev/sht11/sht11-sensor.c
rename to drivers/dev/sht11/sht11-sensor.c
diff --git a/dev/sht11/sht11-sensor.h b/drivers/dev/sht11/sht11-sensor.h
similarity index 100%
rename from dev/sht11/sht11-sensor.h
rename to drivers/dev/sht11/sht11-sensor.h
diff --git a/dev/sht11/sht11.c b/drivers/dev/sht11/sht11.c
similarity index 100%
rename from dev/sht11/sht11.c
rename to drivers/dev/sht11/sht11.c
diff --git a/dev/sht11/sht11.h b/drivers/dev/sht11/sht11.h
similarity index 100%
rename from dev/sht11/sht11.h
rename to drivers/dev/sht11/sht11.h
diff --git a/platform/cc2538dk/Makefile.cc2538dk b/drivers/platform/cc2538dk/Makefile.cc2538dk
similarity index 96%
rename from platform/cc2538dk/Makefile.cc2538dk
rename to drivers/platform/cc2538dk/Makefile.cc2538dk
index 96c5e40b7..d0127ea41 100644
--- a/platform/cc2538dk/Makefile.cc2538dk
+++ b/drivers/platform/cc2538dk/Makefile.cc2538dk
@@ -21,7 +21,7 @@ ifndef SMALL
endif
### Define the CPU directory
-CONTIKI_CPU=$(CONTIKI)/cpu/cc2538
+CONTIKI_CPU=$(CONTIKI)/drivers/cpu/cc2538
include $(CONTIKI_CPU)/Makefile.cc2538
MODULES += core/net core/net/mac
diff --git a/platform/cc2538dk/README.md b/drivers/platform/cc2538dk/README.md
similarity index 100%
rename from platform/cc2538dk/README.md
rename to drivers/platform/cc2538dk/README.md
diff --git a/platform/cc2538dk/contiki-conf.h b/drivers/platform/cc2538dk/contiki-conf.h
similarity index 100%
rename from platform/cc2538dk/contiki-conf.h
rename to drivers/platform/cc2538dk/contiki-conf.h
diff --git a/platform/cc2538dk/contiki-main.c b/drivers/platform/cc2538dk/contiki-main.c
similarity index 100%
rename from platform/cc2538dk/contiki-main.c
rename to drivers/platform/cc2538dk/contiki-main.c
diff --git a/platform/cc2538dk/dev/als-sensor.c b/drivers/platform/cc2538dk/dev/als-sensor.c
similarity index 100%
rename from platform/cc2538dk/dev/als-sensor.c
rename to drivers/platform/cc2538dk/dev/als-sensor.c
diff --git a/platform/cc2538dk/dev/als-sensor.h b/drivers/platform/cc2538dk/dev/als-sensor.h
similarity index 100%
rename from platform/cc2538dk/dev/als-sensor.h
rename to drivers/platform/cc2538dk/dev/als-sensor.h
diff --git a/platform/cc2538dk/dev/board.h b/drivers/platform/cc2538dk/dev/board.h
similarity index 100%
rename from platform/cc2538dk/dev/board.h
rename to drivers/platform/cc2538dk/dev/board.h
diff --git a/platform/cc2538dk/dev/button-sensor.c b/drivers/platform/cc2538dk/dev/button-sensor.c
similarity index 100%
rename from platform/cc2538dk/dev/button-sensor.c
rename to drivers/platform/cc2538dk/dev/button-sensor.c
diff --git a/platform/cc2538dk/dev/button-sensor.h b/drivers/platform/cc2538dk/dev/button-sensor.h
similarity index 100%
rename from platform/cc2538dk/dev/button-sensor.h
rename to drivers/platform/cc2538dk/dev/button-sensor.h
diff --git a/platform/cc2538dk/dev/leds-arch.c b/drivers/platform/cc2538dk/dev/leds-arch.c
similarity index 100%
rename from platform/cc2538dk/dev/leds-arch.c
rename to drivers/platform/cc2538dk/dev/leds-arch.c
diff --git a/platform/cc2538dk/dev/smartrf-sensors.c b/drivers/platform/cc2538dk/dev/smartrf-sensors.c
similarity index 100%
rename from platform/cc2538dk/dev/smartrf-sensors.c
rename to drivers/platform/cc2538dk/dev/smartrf-sensors.c
diff --git a/platform/cooja-ip64/Makefile.cooja-ip64 b/drivers/platform/cooja-ip64/Makefile.cooja-ip64
similarity index 88%
rename from platform/cooja-ip64/Makefile.cooja-ip64
rename to drivers/platform/cooja-ip64/Makefile.cooja-ip64
index d86077c57..352f5cd55 100644
--- a/platform/cooja-ip64/Makefile.cooja-ip64
+++ b/drivers/platform/cooja-ip64/Makefile.cooja-ip64
@@ -1,4 +1,4 @@
-COOJAPLATFORMDIR=$(CONTIKI)/platform/cooja
+COOJAPLATFORMDIR=$(CONTIKI)/drivers/platform/cooja
MODULES += core/net/ip64
include $(COOJAPLATFORMDIR)/Makefile.cooja
diff --git a/platform/cooja-ip64/Makefile.customrules-cooja-ip64 b/drivers/platform/cooja-ip64/Makefile.customrules-cooja-ip64
similarity index 100%
rename from platform/cooja-ip64/Makefile.customrules-cooja-ip64
rename to drivers/platform/cooja-ip64/Makefile.customrules-cooja-ip64
diff --git a/platform/cooja-ip64/contiki-cooja-ip64-main.c b/drivers/platform/cooja-ip64/contiki-cooja-ip64-main.c
similarity index 100%
rename from platform/cooja-ip64/contiki-cooja-ip64-main.c
rename to drivers/platform/cooja-ip64/contiki-cooja-ip64-main.c
diff --git a/platform/cooja-ip64/ip64-conf.h b/drivers/platform/cooja-ip64/ip64-conf.h
similarity index 100%
rename from platform/cooja-ip64/ip64-conf.h
rename to drivers/platform/cooja-ip64/ip64-conf.h
diff --git a/platform/cooja-ip64/subplatform-conf.h b/drivers/platform/cooja-ip64/subplatform-conf.h
similarity index 100%
rename from platform/cooja-ip64/subplatform-conf.h
rename to drivers/platform/cooja-ip64/subplatform-conf.h
diff --git a/platform/cooja/Makefile.cooja b/drivers/platform/cooja/Makefile.cooja
similarity index 96%
rename from platform/cooja/Makefile.cooja
rename to drivers/platform/cooja/Makefile.cooja
index 88cda46df..d759b3e5d 100644
--- a/platform/cooja/Makefile.cooja
+++ b/drivers/platform/cooja/Makefile.cooja
@@ -41,7 +41,7 @@ JNILIB = $(OBJECTDIR)/$(LIBNAME).$(TARGET)
CONTIKI_APP_OBJ = $(CONTIKI_APP).co
### COOJA platform sources
-COOJA = $(CONTIKI)/platform/$(TARGET)
+COOJA = $(CONTIKI)/drivers/platform/$(TARGET)
CONTIKI_TARGET_DIRS = . dev lib sys cfs net
# (COOJA_SOURCEDIRS contains additional sources dirs set from simulator)
@@ -67,7 +67,7 @@ CONTIKI_SOURCEFILES += $(CONTIKI_TARGET_SOURCEFILES)
.SUFFIXES:
### Define the CPU directory
-CONTIKI_CPU=$(CONTIKI)/cpu/x86
+CONTIKI_CPU=$(CONTIKI)/drivers/cpu/x86
### Compiler arguments
#CC = gcc
diff --git a/platform/cooja/Makefile.customrules-cooja b/drivers/platform/cooja/Makefile.customrules-cooja
old mode 100755
new mode 100644
similarity index 100%
rename from platform/cooja/Makefile.customrules-cooja
rename to drivers/platform/cooja/Makefile.customrules-cooja
diff --git a/platform/cooja/cfs/cfs-cooja.c b/drivers/platform/cooja/cfs/cfs-cooja.c
similarity index 100%
rename from platform/cooja/cfs/cfs-cooja.c
rename to drivers/platform/cooja/cfs/cfs-cooja.c
diff --git a/platform/cooja/contiki-conf.h b/drivers/platform/cooja/contiki-conf.h
similarity index 100%
rename from platform/cooja/contiki-conf.h
rename to drivers/platform/cooja/contiki-conf.h
diff --git a/platform/cooja/contiki-cooja-main.c b/drivers/platform/cooja/contiki-cooja-main.c
similarity index 100%
rename from platform/cooja/contiki-cooja-main.c
rename to drivers/platform/cooja/contiki-cooja-main.c
diff --git a/platform/cooja/dev/beep.c b/drivers/platform/cooja/dev/beep.c
similarity index 100%
rename from platform/cooja/dev/beep.c
rename to drivers/platform/cooja/dev/beep.c
diff --git a/platform/cooja/dev/beep.h b/drivers/platform/cooja/dev/beep.h
similarity index 100%
rename from platform/cooja/dev/beep.h
rename to drivers/platform/cooja/dev/beep.h
diff --git a/platform/cooja/dev/button-sensor.c b/drivers/platform/cooja/dev/button-sensor.c
similarity index 100%
rename from platform/cooja/dev/button-sensor.c
rename to drivers/platform/cooja/dev/button-sensor.c
diff --git a/platform/cooja/dev/button-sensor.h b/drivers/platform/cooja/dev/button-sensor.h
similarity index 100%
rename from platform/cooja/dev/button-sensor.h
rename to drivers/platform/cooja/dev/button-sensor.h
diff --git a/platform/cooja/dev/cooja-radio.c b/drivers/platform/cooja/dev/cooja-radio.c
similarity index 100%
rename from platform/cooja/dev/cooja-radio.c
rename to drivers/platform/cooja/dev/cooja-radio.c
diff --git a/platform/cooja/dev/cooja-radio.h b/drivers/platform/cooja/dev/cooja-radio.h
similarity index 100%
rename from platform/cooja/dev/cooja-radio.h
rename to drivers/platform/cooja/dev/cooja-radio.h
diff --git a/platform/cooja/dev/eeprom.c b/drivers/platform/cooja/dev/eeprom.c
similarity index 100%
rename from platform/cooja/dev/eeprom.c
rename to drivers/platform/cooja/dev/eeprom.c
diff --git a/platform/cooja/dev/ip.c b/drivers/platform/cooja/dev/ip.c
similarity index 100%
rename from platform/cooja/dev/ip.c
rename to drivers/platform/cooja/dev/ip.c
diff --git a/platform/cooja/dev/ip.h b/drivers/platform/cooja/dev/ip.h
similarity index 100%
rename from platform/cooja/dev/ip.h
rename to drivers/platform/cooja/dev/ip.h
diff --git a/platform/cooja/dev/leds-arch.c b/drivers/platform/cooja/dev/leds-arch.c
similarity index 100%
rename from platform/cooja/dev/leds-arch.c
rename to drivers/platform/cooja/dev/leds-arch.c
diff --git a/platform/cooja/dev/moteid.c b/drivers/platform/cooja/dev/moteid.c
similarity index 100%
rename from platform/cooja/dev/moteid.c
rename to drivers/platform/cooja/dev/moteid.c
diff --git a/platform/cooja/dev/moteid.h b/drivers/platform/cooja/dev/moteid.h
similarity index 100%
rename from platform/cooja/dev/moteid.h
rename to drivers/platform/cooja/dev/moteid.h
diff --git a/platform/cooja/dev/pir-sensor.c b/drivers/platform/cooja/dev/pir-sensor.c
similarity index 100%
rename from platform/cooja/dev/pir-sensor.c
rename to drivers/platform/cooja/dev/pir-sensor.c
diff --git a/platform/cooja/dev/pir-sensor.h b/drivers/platform/cooja/dev/pir-sensor.h
similarity index 100%
rename from platform/cooja/dev/pir-sensor.h
rename to drivers/platform/cooja/dev/pir-sensor.h
diff --git a/platform/cooja/dev/rs232.c b/drivers/platform/cooja/dev/rs232.c
similarity index 100%
rename from platform/cooja/dev/rs232.c
rename to drivers/platform/cooja/dev/rs232.c
diff --git a/platform/cooja/dev/rs232.h b/drivers/platform/cooja/dev/rs232.h
similarity index 100%
rename from platform/cooja/dev/rs232.h
rename to drivers/platform/cooja/dev/rs232.h
diff --git a/platform/cooja/dev/uart1.h b/drivers/platform/cooja/dev/uart1.h
similarity index 100%
rename from platform/cooja/dev/uart1.h
rename to drivers/platform/cooja/dev/uart1.h
diff --git a/platform/cooja/dev/vib-sensor.c b/drivers/platform/cooja/dev/vib-sensor.c
similarity index 100%
rename from platform/cooja/dev/vib-sensor.c
rename to drivers/platform/cooja/dev/vib-sensor.c
diff --git a/platform/cooja/dev/vib-sensor.h b/drivers/platform/cooja/dev/vib-sensor.h
similarity index 100%
rename from platform/cooja/dev/vib-sensor.h
rename to drivers/platform/cooja/dev/vib-sensor.h
diff --git a/platform/cooja/dev/watchdog.c b/drivers/platform/cooja/dev/watchdog.c
similarity index 100%
rename from platform/cooja/dev/watchdog.c
rename to drivers/platform/cooja/dev/watchdog.c
diff --git a/platform/cooja/lib/simEnvChange.c b/drivers/platform/cooja/lib/simEnvChange.c
similarity index 100%
rename from platform/cooja/lib/simEnvChange.c
rename to drivers/platform/cooja/lib/simEnvChange.c
diff --git a/platform/cooja/lib/simEnvChange.h b/drivers/platform/cooja/lib/simEnvChange.h
similarity index 100%
rename from platform/cooja/lib/simEnvChange.h
rename to drivers/platform/cooja/lib/simEnvChange.h
diff --git a/platform/cooja/mtarch.c b/drivers/platform/cooja/mtarch.c
similarity index 100%
rename from platform/cooja/mtarch.c
rename to drivers/platform/cooja/mtarch.c
diff --git a/platform/cooja/mtarch.h b/drivers/platform/cooja/mtarch.h
similarity index 100%
rename from platform/cooja/mtarch.h
rename to drivers/platform/cooja/mtarch.h
diff --git a/platform/cooja/net/init-net.h b/drivers/platform/cooja/net/init-net.h
similarity index 100%
rename from platform/cooja/net/init-net.h
rename to drivers/platform/cooja/net/init-net.h
diff --git a/platform/cooja/net/radio-uip-uaodv.c b/drivers/platform/cooja/net/radio-uip-uaodv.c
similarity index 100%
rename from platform/cooja/net/radio-uip-uaodv.c
rename to drivers/platform/cooja/net/radio-uip-uaodv.c
diff --git a/platform/cooja/net/radio-uip-uaodv.h b/drivers/platform/cooja/net/radio-uip-uaodv.h
similarity index 100%
rename from platform/cooja/net/radio-uip-uaodv.h
rename to drivers/platform/cooja/net/radio-uip-uaodv.h
diff --git a/platform/cooja/net/uip-driver.c b/drivers/platform/cooja/net/uip-driver.c
similarity index 100%
rename from platform/cooja/net/uip-driver.c
rename to drivers/platform/cooja/net/uip-driver.c
diff --git a/platform/cooja/net/uip-driver.h b/drivers/platform/cooja/net/uip-driver.h
similarity index 100%
rename from platform/cooja/net/uip-driver.h
rename to drivers/platform/cooja/net/uip-driver.h
diff --git a/platform/cooja/netstack-conf-example.h b/drivers/platform/cooja/netstack-conf-example.h
similarity index 100%
rename from platform/cooja/netstack-conf-example.h
rename to drivers/platform/cooja/netstack-conf-example.h
diff --git a/platform/cooja/rtimer-arch.c b/drivers/platform/cooja/rtimer-arch.c
similarity index 100%
rename from platform/cooja/rtimer-arch.c
rename to drivers/platform/cooja/rtimer-arch.c
diff --git a/platform/cooja/rtimer-arch.h b/drivers/platform/cooja/rtimer-arch.h
similarity index 100%
rename from platform/cooja/rtimer-arch.h
rename to drivers/platform/cooja/rtimer-arch.h
diff --git a/platform/cooja/slip-arch.c b/drivers/platform/cooja/slip-arch.c
similarity index 100%
rename from platform/cooja/slip-arch.c
rename to drivers/platform/cooja/slip-arch.c
diff --git a/platform/cooja/sys/clock.c b/drivers/platform/cooja/sys/clock.c
similarity index 100%
rename from platform/cooja/sys/clock.c
rename to drivers/platform/cooja/sys/clock.c
diff --git a/platform/cooja/sys/cooja_mt.c b/drivers/platform/cooja/sys/cooja_mt.c
similarity index 100%
rename from platform/cooja/sys/cooja_mt.c
rename to drivers/platform/cooja/sys/cooja_mt.c
diff --git a/platform/cooja/sys/cooja_mt.h b/drivers/platform/cooja/sys/cooja_mt.h
similarity index 100%
rename from platform/cooja/sys/cooja_mt.h
rename to drivers/platform/cooja/sys/cooja_mt.h
diff --git a/platform/cooja/sys/cooja_mtarch.c b/drivers/platform/cooja/sys/cooja_mtarch.c
similarity index 100%
rename from platform/cooja/sys/cooja_mtarch.c
rename to drivers/platform/cooja/sys/cooja_mtarch.c
diff --git a/platform/cooja/sys/cooja_mtarch.h b/drivers/platform/cooja/sys/cooja_mtarch.h
similarity index 100%
rename from platform/cooja/sys/cooja_mtarch.h
rename to drivers/platform/cooja/sys/cooja_mtarch.h
diff --git a/platform/cooja/sys/log.c b/drivers/platform/cooja/sys/log.c
similarity index 100%
rename from platform/cooja/sys/log.c
rename to drivers/platform/cooja/sys/log.c
diff --git a/platform/cooja/sys/node-id.h b/drivers/platform/cooja/sys/node-id.h
similarity index 100%
rename from platform/cooja/sys/node-id.h
rename to drivers/platform/cooja/sys/node-id.h
diff --git a/platform/cooja/testapps/hello-world.c b/drivers/platform/cooja/testapps/hello-world.c
similarity index 100%
rename from platform/cooja/testapps/hello-world.c
rename to drivers/platform/cooja/testapps/hello-world.c
diff --git a/platform/cooja/testapps/testbutton.c b/drivers/platform/cooja/testapps/testbutton.c
similarity index 100%
rename from platform/cooja/testapps/testbutton.c
rename to drivers/platform/cooja/testapps/testbutton.c
diff --git a/platform/cooja/testapps/testcfs.c b/drivers/platform/cooja/testapps/testcfs.c
similarity index 100%
rename from platform/cooja/testapps/testcfs.c
rename to drivers/platform/cooja/testapps/testcfs.c
diff --git a/platform/cooja/testapps/testctimer.c b/drivers/platform/cooja/testapps/testctimer.c
similarity index 100%
rename from platform/cooja/testapps/testctimer.c
rename to drivers/platform/cooja/testapps/testctimer.c
diff --git a/platform/cooja/testapps/testetimer.c b/drivers/platform/cooja/testapps/testetimer.c
similarity index 100%
rename from platform/cooja/testapps/testetimer.c
rename to drivers/platform/cooja/testapps/testetimer.c
diff --git a/platform/cooja/testapps/testsensors.c b/drivers/platform/cooja/testapps/testsensors.c
similarity index 100%
rename from platform/cooja/testapps/testsensors.c
rename to drivers/platform/cooja/testapps/testsensors.c
diff --git a/platform/cooja/testapps/testserial.c b/drivers/platform/cooja/testapps/testserial.c
similarity index 100%
rename from platform/cooja/testapps/testserial.c
rename to drivers/platform/cooja/testapps/testserial.c
diff --git a/platform/cooja/testapps/testuaodv.c b/drivers/platform/cooja/testapps/testuaodv.c
similarity index 100%
rename from platform/cooja/testapps/testuaodv.c
rename to drivers/platform/cooja/testapps/testuaodv.c
diff --git a/platform/cooja/testapps/testuip.c b/drivers/platform/cooja/testapps/testuip.c
similarity index 100%
rename from platform/cooja/testapps/testuip.c
rename to drivers/platform/cooja/testapps/testuip.c
diff --git a/platform/galileo/Makefile.customrules-galileo b/drivers/platform/galileo/Makefile.customrules-galileo
similarity index 96%
rename from platform/galileo/Makefile.customrules-galileo
rename to drivers/platform/galileo/Makefile.customrules-galileo
index b141ee211..0fa62301c 100644
--- a/platform/galileo/Makefile.customrules-galileo
+++ b/drivers/platform/galileo/Makefile.customrules-galileo
@@ -1,5 +1,5 @@
GDB ?= gdb
-OPENOCD_SCRIPTS = $(CONTIKI)/platform/galileo/bsp/openocd-scripts
+OPENOCD_SCRIPTS = $(CONTIKI)/drivers/platform/galileo/bsp/openocd-scripts
.PHONY: debug $(CONTIKI_PROJECT)
diff --git a/platform/galileo/Makefile.galileo b/drivers/platform/galileo/Makefile.galileo
similarity index 88%
rename from platform/galileo/Makefile.galileo
rename to drivers/platform/galileo/Makefile.galileo
index 35a4ad825..f4effcbd2 100644
--- a/platform/galileo/Makefile.galileo
+++ b/drivers/platform/galileo/Makefile.galileo
@@ -1,4 +1,4 @@
-BSP_PATH=$(CONTIKI)/platform/galileo/bsp
+BSP_PATH=$(CONTIKI)/drivers/platform/galileo/bsp
LIBC_PATH=$(BSP_PATH)/libc
LIBC=$(LIBC_PATH)/i586-elf
LIBGCC_PATH = /usr/lib/gcc/$(shell gcc -dumpmachine)/$(shell gcc -dumpversion)
@@ -23,8 +23,8 @@ endif
PROJECT_SOURCEFILES += newlib-syscalls.c
-CONTIKI_CPU=$(CONTIKI)/cpu/x86
-include $(CONTIKI)/cpu/x86/Makefile.x86_quarkX1000
+CONTIKI_CPU=$(CONTIKI)/drivers/cpu/x86
+include $(CONTIKI)/drivers/cpu/x86/Makefile.x86_quarkX1000
CFLAGS += -fno-stack-protector -I$(LIBC)/include
ifeq (clang,$(findstring clang,$(CC)))
diff --git a/platform/galileo/README.md b/drivers/platform/galileo/README.md
similarity index 100%
rename from platform/galileo/README.md
rename to drivers/platform/galileo/README.md
diff --git a/platform/galileo/bsp/docker/Dockerfile b/drivers/platform/galileo/bsp/docker/Dockerfile
similarity index 100%
rename from platform/galileo/bsp/docker/Dockerfile
rename to drivers/platform/galileo/bsp/docker/Dockerfile
diff --git a/platform/galileo/bsp/grub/build_grub.sh b/drivers/platform/galileo/bsp/grub/build_grub.sh
old mode 100755
new mode 100644
similarity index 100%
rename from platform/galileo/bsp/grub/build_grub.sh
rename to drivers/platform/galileo/bsp/grub/build_grub.sh
diff --git a/platform/galileo/bsp/libc/build_newlib.sh b/drivers/platform/galileo/bsp/libc/build_newlib.sh
old mode 100755
new mode 100644
similarity index 100%
rename from platform/galileo/bsp/libc/build_newlib.sh
rename to drivers/platform/galileo/bsp/libc/build_newlib.sh
diff --git a/platform/galileo/bsp/libc/patches/large64_files.patch b/drivers/platform/galileo/bsp/libc/patches/large64_files.patch
similarity index 100%
rename from platform/galileo/bsp/libc/patches/large64_files.patch
rename to drivers/platform/galileo/bsp/libc/patches/large64_files.patch
diff --git a/platform/galileo/bsp/libc/patches/newlib_add_i586_elf.patch b/drivers/platform/galileo/bsp/libc/patches/newlib_add_i586_elf.patch
similarity index 100%
rename from platform/galileo/bsp/libc/patches/newlib_add_i586_elf.patch
rename to drivers/platform/galileo/bsp/libc/patches/newlib_add_i586_elf.patch
diff --git a/platform/galileo/bsp/libc/patches/stdio_strengthen_syms.patch b/drivers/platform/galileo/bsp/libc/patches/stdio_strengthen_syms.patch
similarity index 100%
rename from platform/galileo/bsp/libc/patches/stdio_strengthen_syms.patch
rename to drivers/platform/galileo/bsp/libc/patches/stdio_strengthen_syms.patch
diff --git a/platform/galileo/bsp/openocd-scripts/debug.cfg b/drivers/platform/galileo/bsp/openocd-scripts/debug.cfg
similarity index 100%
rename from platform/galileo/bsp/openocd-scripts/debug.cfg
rename to drivers/platform/galileo/bsp/openocd-scripts/debug.cfg
diff --git a/platform/galileo/contiki-conf.h b/drivers/platform/galileo/contiki-conf.h
similarity index 100%
rename from platform/galileo/contiki-conf.h
rename to drivers/platform/galileo/contiki-conf.h
diff --git a/platform/galileo/contiki-main.c b/drivers/platform/galileo/contiki-main.c
similarity index 100%
rename from platform/galileo/contiki-main.c
rename to drivers/platform/galileo/contiki-main.c
diff --git a/platform/galileo/core/sys/clock.c b/drivers/platform/galileo/core/sys/clock.c
similarity index 100%
rename from platform/galileo/core/sys/clock.c
rename to drivers/platform/galileo/core/sys/clock.c
diff --git a/platform/galileo/core/sys/mtarch.h b/drivers/platform/galileo/core/sys/mtarch.h
similarity index 100%
rename from platform/galileo/core/sys/mtarch.h
rename to drivers/platform/galileo/core/sys/mtarch.h
diff --git a/platform/galileo/core/sys/rtimer-arch.c b/drivers/platform/galileo/core/sys/rtimer-arch.c
similarity index 100%
rename from platform/galileo/core/sys/rtimer-arch.c
rename to drivers/platform/galileo/core/sys/rtimer-arch.c
diff --git a/platform/galileo/core/sys/rtimer-arch.h b/drivers/platform/galileo/core/sys/rtimer-arch.h
similarity index 100%
rename from platform/galileo/core/sys/rtimer-arch.h
rename to drivers/platform/galileo/core/sys/rtimer-arch.h
diff --git a/platform/galileo/drivers/cy8c9540a.c b/drivers/platform/galileo/drivers/cy8c9540a.c
similarity index 100%
rename from platform/galileo/drivers/cy8c9540a.c
rename to drivers/platform/galileo/drivers/cy8c9540a.c
diff --git a/platform/galileo/drivers/cy8c9540a.h b/drivers/platform/galileo/drivers/cy8c9540a.h
similarity index 100%
rename from platform/galileo/drivers/cy8c9540a.h
rename to drivers/platform/galileo/drivers/cy8c9540a.h
diff --git a/platform/galileo/drivers/galileo-gen1-pinmux.c b/drivers/platform/galileo/drivers/galileo-gen1-pinmux.c
similarity index 100%
rename from platform/galileo/drivers/galileo-gen1-pinmux.c
rename to drivers/platform/galileo/drivers/galileo-gen1-pinmux.c
diff --git a/platform/galileo/drivers/galileo-gen2-pinmux.c b/drivers/platform/galileo/drivers/galileo-gen2-pinmux.c
similarity index 100%
rename from platform/galileo/drivers/galileo-gen2-pinmux.c
rename to drivers/platform/galileo/drivers/galileo-gen2-pinmux.c
diff --git a/platform/galileo/drivers/galileo-gpio.c b/drivers/platform/galileo/drivers/galileo-gpio.c
similarity index 100%
rename from platform/galileo/drivers/galileo-gpio.c
rename to drivers/platform/galileo/drivers/galileo-gpio.c
diff --git a/platform/galileo/drivers/galileo-gpio.h b/drivers/platform/galileo/drivers/galileo-gpio.h
similarity index 100%
rename from platform/galileo/drivers/galileo-gpio.h
rename to drivers/platform/galileo/drivers/galileo-gpio.h
diff --git a/platform/galileo/drivers/galileo-pinmux.h b/drivers/platform/galileo/drivers/galileo-pinmux.h
similarity index 100%
rename from platform/galileo/drivers/galileo-pinmux.h
rename to drivers/platform/galileo/drivers/galileo-pinmux.h
diff --git a/platform/galileo/drivers/gpio-pcal9535a.c b/drivers/platform/galileo/drivers/gpio-pcal9535a.c
similarity index 100%
rename from platform/galileo/drivers/gpio-pcal9535a.c
rename to drivers/platform/galileo/drivers/gpio-pcal9535a.c
diff --git a/platform/galileo/drivers/gpio-pcal9535a.h b/drivers/platform/galileo/drivers/gpio-pcal9535a.h
similarity index 100%
rename from platform/galileo/drivers/gpio-pcal9535a.h
rename to drivers/platform/galileo/drivers/gpio-pcal9535a.h
diff --git a/platform/galileo/drivers/pwm-pca9685.c b/drivers/platform/galileo/drivers/pwm-pca9685.c
similarity index 100%
rename from platform/galileo/drivers/pwm-pca9685.c
rename to drivers/platform/galileo/drivers/pwm-pca9685.c
diff --git a/platform/galileo/drivers/pwm-pca9685.h b/drivers/platform/galileo/drivers/pwm-pca9685.h
similarity index 100%
rename from platform/galileo/drivers/pwm-pca9685.h
rename to drivers/platform/galileo/drivers/pwm-pca9685.h
diff --git a/platform/galileo/net/eth-conf.c b/drivers/platform/galileo/net/eth-conf.c
similarity index 100%
rename from platform/galileo/net/eth-conf.c
rename to drivers/platform/galileo/net/eth-conf.c
diff --git a/platform/galileo/net/eth-conf.h b/drivers/platform/galileo/net/eth-conf.h
similarity index 100%
rename from platform/galileo/net/eth-conf.h
rename to drivers/platform/galileo/net/eth-conf.h
diff --git a/platform/galileo/net/eth-proc.c b/drivers/platform/galileo/net/eth-proc.c
similarity index 100%
rename from platform/galileo/net/eth-proc.c
rename to drivers/platform/galileo/net/eth-proc.c
diff --git a/platform/galileo/net/eth-proc.h b/drivers/platform/galileo/net/eth-proc.h
similarity index 100%
rename from platform/galileo/net/eth-proc.h
rename to drivers/platform/galileo/net/eth-proc.h
diff --git a/platform/galileo/newlib-syscalls.c b/drivers/platform/galileo/newlib-syscalls.c
similarity index 100%
rename from platform/galileo/newlib-syscalls.c
rename to drivers/platform/galileo/newlib-syscalls.c
diff --git a/platform/jn516x/App_Stack_Size.ld b/drivers/platform/jn516x/App_Stack_Size.ld
similarity index 100%
rename from platform/jn516x/App_Stack_Size.ld
rename to drivers/platform/jn516x/App_Stack_Size.ld
diff --git a/platform/jn516x/Makefile.jn516x b/drivers/platform/jn516x/Makefile.jn516x
similarity index 100%
rename from platform/jn516x/Makefile.jn516x
rename to drivers/platform/jn516x/Makefile.jn516x
diff --git a/platform/jn516x/README.md b/drivers/platform/jn516x/README.md
similarity index 100%
rename from platform/jn516x/README.md
rename to drivers/platform/jn516x/README.md
diff --git a/platform/jn516x/contiki-conf.h b/drivers/platform/jn516x/contiki-conf.h
similarity index 100%
rename from platform/jn516x/contiki-conf.h
rename to drivers/platform/jn516x/contiki-conf.h
diff --git a/platform/jn516x/contiki-jn516x-main.c b/drivers/platform/jn516x/contiki-jn516x-main.c
similarity index 100%
rename from platform/jn516x/contiki-jn516x-main.c
rename to drivers/platform/jn516x/contiki-jn516x-main.c
diff --git a/platform/jn516x/dev/clock.c b/drivers/platform/jn516x/dev/clock.c
similarity index 100%
rename from platform/jn516x/dev/clock.c
rename to drivers/platform/jn516x/dev/clock.c
diff --git a/platform/jn516x/dev/dongle/README.md b/drivers/platform/jn516x/dev/dongle/README.md
similarity index 100%
rename from platform/jn516x/dev/dongle/README.md
rename to drivers/platform/jn516x/dev/dongle/README.md
diff --git a/platform/jn516x/dev/dongle/leds-arch.c b/drivers/platform/jn516x/dev/dongle/leds-arch.c
similarity index 100%
rename from platform/jn516x/dev/dongle/leds-arch.c
rename to drivers/platform/jn516x/dev/dongle/leds-arch.c
diff --git a/platform/jn516x/dev/dr1174/README.md b/drivers/platform/jn516x/dev/dr1174/README.md
similarity index 100%
rename from platform/jn516x/dev/dr1174/README.md
rename to drivers/platform/jn516x/dev/dr1174/README.md
diff --git a/platform/jn516x/dev/dr1174/button-sensor.c b/drivers/platform/jn516x/dev/dr1174/button-sensor.c
similarity index 100%
rename from platform/jn516x/dev/dr1174/button-sensor.c
rename to drivers/platform/jn516x/dev/dr1174/button-sensor.c
diff --git a/platform/jn516x/dev/dr1174/button-sensor.h b/drivers/platform/jn516x/dev/dr1174/button-sensor.h
similarity index 100%
rename from platform/jn516x/dev/dr1174/button-sensor.h
rename to drivers/platform/jn516x/dev/dr1174/button-sensor.h
diff --git a/platform/jn516x/dev/dr1174/leds-arch.c b/drivers/platform/jn516x/dev/dr1174/leds-arch.c
similarity index 100%
rename from platform/jn516x/dev/dr1174/leds-arch.c
rename to drivers/platform/jn516x/dev/dr1174/leds-arch.c
diff --git a/platform/jn516x/dev/dr1175/README.md b/drivers/platform/jn516x/dev/dr1175/README.md
similarity index 100%
rename from platform/jn516x/dev/dr1175/README.md
rename to drivers/platform/jn516x/dev/dr1175/README.md
diff --git a/platform/jn516x/dev/dr1175/ht-sensor.c b/drivers/platform/jn516x/dev/dr1175/ht-sensor.c
similarity index 100%
rename from platform/jn516x/dev/dr1175/ht-sensor.c
rename to drivers/platform/jn516x/dev/dr1175/ht-sensor.c
diff --git a/platform/jn516x/dev/dr1175/ht-sensor.h b/drivers/platform/jn516x/dev/dr1175/ht-sensor.h
similarity index 100%
rename from platform/jn516x/dev/dr1175/ht-sensor.h
rename to drivers/platform/jn516x/dev/dr1175/ht-sensor.h
diff --git a/platform/jn516x/dev/dr1175/leds-arch-1175.c b/drivers/platform/jn516x/dev/dr1175/leds-arch-1175.c
similarity index 100%
rename from platform/jn516x/dev/dr1175/leds-arch-1175.c
rename to drivers/platform/jn516x/dev/dr1175/leds-arch-1175.c
diff --git a/platform/jn516x/dev/dr1175/leds-arch-1175.h b/drivers/platform/jn516x/dev/dr1175/leds-arch-1175.h
similarity index 100%
rename from platform/jn516x/dev/dr1175/leds-arch-1175.h
rename to drivers/platform/jn516x/dev/dr1175/leds-arch-1175.h
diff --git a/platform/jn516x/dev/dr1175/light-sensor.c b/drivers/platform/jn516x/dev/dr1175/light-sensor.c
similarity index 100%
rename from platform/jn516x/dev/dr1175/light-sensor.c
rename to drivers/platform/jn516x/dev/dr1175/light-sensor.c
diff --git a/platform/jn516x/dev/dr1175/light-sensor.h b/drivers/platform/jn516x/dev/dr1175/light-sensor.h
similarity index 100%
rename from platform/jn516x/dev/dr1175/light-sensor.h
rename to drivers/platform/jn516x/dev/dr1175/light-sensor.h
diff --git a/platform/jn516x/dev/dr1199/README.md b/drivers/platform/jn516x/dev/dr1199/README.md
similarity index 100%
rename from platform/jn516x/dev/dr1199/README.md
rename to drivers/platform/jn516x/dev/dr1199/README.md
diff --git a/platform/jn516x/dev/dr1199/leds-arch-1199.c b/drivers/platform/jn516x/dev/dr1199/leds-arch-1199.c
similarity index 100%
rename from platform/jn516x/dev/dr1199/leds-arch-1199.c
rename to drivers/platform/jn516x/dev/dr1199/leds-arch-1199.c
diff --git a/platform/jn516x/dev/dr1199/leds-arch-1199.h b/drivers/platform/jn516x/dev/dr1199/leds-arch-1199.h
similarity index 100%
rename from platform/jn516x/dev/dr1199/leds-arch-1199.h
rename to drivers/platform/jn516x/dev/dr1199/leds-arch-1199.h
diff --git a/platform/jn516x/dev/dr1199/pot-sensor.c b/drivers/platform/jn516x/dev/dr1199/pot-sensor.c
similarity index 100%
rename from platform/jn516x/dev/dr1199/pot-sensor.c
rename to drivers/platform/jn516x/dev/dr1199/pot-sensor.c
diff --git a/platform/jn516x/dev/dr1199/pot-sensor.h b/drivers/platform/jn516x/dev/dr1199/pot-sensor.h
similarity index 100%
rename from platform/jn516x/dev/dr1199/pot-sensor.h
rename to drivers/platform/jn516x/dev/dr1199/pot-sensor.h
diff --git a/platform/jn516x/dev/exceptions.c b/drivers/platform/jn516x/dev/exceptions.c
similarity index 100%
rename from platform/jn516x/dev/exceptions.c
rename to drivers/platform/jn516x/dev/exceptions.c
diff --git a/platform/jn516x/dev/exceptions.h b/drivers/platform/jn516x/dev/exceptions.h
similarity index 100%
rename from platform/jn516x/dev/exceptions.h
rename to drivers/platform/jn516x/dev/exceptions.h
diff --git a/platform/jn516x/dev/jn516x-ccm-star.c b/drivers/platform/jn516x/dev/jn516x-ccm-star.c
similarity index 100%
rename from platform/jn516x/dev/jn516x-ccm-star.c
rename to drivers/platform/jn516x/dev/jn516x-ccm-star.c
diff --git a/platform/jn516x/dev/leds-extension.c b/drivers/platform/jn516x/dev/leds-extension.c
similarity index 100%
rename from platform/jn516x/dev/leds-extension.c
rename to drivers/platform/jn516x/dev/leds-extension.c
diff --git a/platform/jn516x/dev/leds-extension.h b/drivers/platform/jn516x/dev/leds-extension.h
similarity index 100%
rename from platform/jn516x/dev/leds-extension.h
rename to drivers/platform/jn516x/dev/leds-extension.h
diff --git a/platform/jn516x/dev/micromac-radio.c b/drivers/platform/jn516x/dev/micromac-radio.c
similarity index 100%
rename from platform/jn516x/dev/micromac-radio.c
rename to drivers/platform/jn516x/dev/micromac-radio.c
diff --git a/platform/jn516x/dev/micromac-radio.h b/drivers/platform/jn516x/dev/micromac-radio.h
similarity index 100%
rename from platform/jn516x/dev/micromac-radio.h
rename to drivers/platform/jn516x/dev/micromac-radio.h
diff --git a/platform/jn516x/dev/mtarch.c b/drivers/platform/jn516x/dev/mtarch.c
similarity index 100%
rename from platform/jn516x/dev/mtarch.c
rename to drivers/platform/jn516x/dev/mtarch.c
diff --git a/platform/jn516x/dev/mtarch.h b/drivers/platform/jn516x/dev/mtarch.h
similarity index 100%
rename from platform/jn516x/dev/mtarch.h
rename to drivers/platform/jn516x/dev/mtarch.h
diff --git a/platform/jn516x/dev/node-id.c b/drivers/platform/jn516x/dev/node-id.c
similarity index 100%
rename from platform/jn516x/dev/node-id.c
rename to drivers/platform/jn516x/dev/node-id.c
diff --git a/platform/jn516x/dev/rtimer-arch-slow.c b/drivers/platform/jn516x/dev/rtimer-arch-slow.c
similarity index 100%
rename from platform/jn516x/dev/rtimer-arch-slow.c
rename to drivers/platform/jn516x/dev/rtimer-arch-slow.c
diff --git a/platform/jn516x/dev/rtimer-arch.c b/drivers/platform/jn516x/dev/rtimer-arch.c
similarity index 100%
rename from platform/jn516x/dev/rtimer-arch.c
rename to drivers/platform/jn516x/dev/rtimer-arch.c
diff --git a/platform/jn516x/dev/rtimer-arch.h b/drivers/platform/jn516x/dev/rtimer-arch.h
similarity index 100%
rename from platform/jn516x/dev/rtimer-arch.h
rename to drivers/platform/jn516x/dev/rtimer-arch.h
diff --git a/platform/jn516x/dev/slip_uart0.c b/drivers/platform/jn516x/dev/slip_uart0.c
similarity index 100%
rename from platform/jn516x/dev/slip_uart0.c
rename to drivers/platform/jn516x/dev/slip_uart0.c
diff --git a/platform/jn516x/dev/uart-driver.c b/drivers/platform/jn516x/dev/uart-driver.c
similarity index 100%
rename from platform/jn516x/dev/uart-driver.c
rename to drivers/platform/jn516x/dev/uart-driver.c
diff --git a/platform/jn516x/dev/uart-driver.h b/drivers/platform/jn516x/dev/uart-driver.h
similarity index 100%
rename from platform/jn516x/dev/uart-driver.h
rename to drivers/platform/jn516x/dev/uart-driver.h
diff --git a/platform/jn516x/dev/uart0.c b/drivers/platform/jn516x/dev/uart0.c
similarity index 100%
rename from platform/jn516x/dev/uart0.c
rename to drivers/platform/jn516x/dev/uart0.c
diff --git a/platform/jn516x/dev/uart0.h b/drivers/platform/jn516x/dev/uart0.h
similarity index 100%
rename from platform/jn516x/dev/uart0.h
rename to drivers/platform/jn516x/dev/uart0.h
diff --git a/platform/jn516x/dev/uart1.c b/drivers/platform/jn516x/dev/uart1.c
similarity index 100%
rename from platform/jn516x/dev/uart1.c
rename to drivers/platform/jn516x/dev/uart1.c
diff --git a/platform/jn516x/dev/uart1.h b/drivers/platform/jn516x/dev/uart1.h
similarity index 100%
rename from platform/jn516x/dev/uart1.h
rename to drivers/platform/jn516x/dev/uart1.h
diff --git a/platform/jn516x/dev/watchdog.c b/drivers/platform/jn516x/dev/watchdog.c
similarity index 100%
rename from platform/jn516x/dev/watchdog.c
rename to drivers/platform/jn516x/dev/watchdog.c
diff --git a/platform/jn516x/lib/log.c b/drivers/platform/jn516x/lib/log.c
similarity index 100%
rename from platform/jn516x/lib/log.c
rename to drivers/platform/jn516x/lib/log.c
diff --git a/platform/jn516x/lib/slip.c b/drivers/platform/jn516x/lib/slip.c
similarity index 100%
rename from platform/jn516x/lib/slip.c
rename to drivers/platform/jn516x/lib/slip.c
diff --git a/platform/jn516x/lib/sprintf.c b/drivers/platform/jn516x/lib/sprintf.c
similarity index 100%
rename from platform/jn516x/lib/sprintf.c
rename to drivers/platform/jn516x/lib/sprintf.c
diff --git a/platform/jn516x/platform-conf.h b/drivers/platform/jn516x/platform-conf.h
similarity index 100%
rename from platform/jn516x/platform-conf.h
rename to drivers/platform/jn516x/platform-conf.h
diff --git a/platform/native/Makefile.native b/drivers/platform/native/Makefile.native
similarity index 91%
rename from platform/native/Makefile.native
rename to drivers/platform/native/Makefile.native
index 2a00df896..7adfe22fc 100644
--- a/platform/native/Makefile.native
+++ b/drivers/platform/native/Makefile.native
@@ -31,8 +31,8 @@ CONTIKI_SOURCEFILES += $(CONTIKI_TARGET_SOURCEFILES)
.SUFFIXES:
### Define the CPU directory
-CONTIKI_CPU=$(CONTIKI)/cpu/native
-include $(CONTIKI)/cpu/native/Makefile.native
+CONTIKI_CPU=$(CONTIKI)/drivers/cpu/native
+include $(CONTIKI)/drivers/cpu/native/Makefile.native
ifeq ($(HOST_OS),Windows)
CFLAGS += -I/usr/include/ncurses
diff --git a/platform/native/cfs-coffee-arch.h b/drivers/platform/native/cfs-coffee-arch.h
similarity index 100%
rename from platform/native/cfs-coffee-arch.h
rename to drivers/platform/native/cfs-coffee-arch.h
diff --git a/platform/native/clock.c b/drivers/platform/native/clock.c
similarity index 100%
rename from platform/native/clock.c
rename to drivers/platform/native/clock.c
diff --git a/platform/native/contiki-conf.h b/drivers/platform/native/contiki-conf.h
similarity index 100%
rename from platform/native/contiki-conf.h
rename to drivers/platform/native/contiki-conf.h
diff --git a/platform/native/contiki-main.c b/drivers/platform/native/contiki-main.c
similarity index 100%
rename from platform/native/contiki-main.c
rename to drivers/platform/native/contiki-main.c
diff --git a/platform/native/dev/beep.c b/drivers/platform/native/dev/beep.c
similarity index 100%
rename from platform/native/dev/beep.c
rename to drivers/platform/native/dev/beep.c
diff --git a/platform/native/dev/beep.h b/drivers/platform/native/dev/beep.h
similarity index 100%
rename from platform/native/dev/beep.h
rename to drivers/platform/native/dev/beep.h
diff --git a/platform/native/dev/button-sensor.c b/drivers/platform/native/dev/button-sensor.c
similarity index 100%
rename from platform/native/dev/button-sensor.c
rename to drivers/platform/native/dev/button-sensor.c
diff --git a/platform/native/dev/button-sensor.h b/drivers/platform/native/dev/button-sensor.h
similarity index 100%
rename from platform/native/dev/button-sensor.h
rename to drivers/platform/native/dev/button-sensor.h
diff --git a/platform/native/dev/dummy-sensors.c b/drivers/platform/native/dev/dummy-sensors.c
similarity index 100%
rename from platform/native/dev/dummy-sensors.c
rename to drivers/platform/native/dev/dummy-sensors.c
diff --git a/platform/native/dev/irq.c b/drivers/platform/native/dev/irq.c
similarity index 100%
rename from platform/native/dev/irq.c
rename to drivers/platform/native/dev/irq.c
diff --git a/platform/native/dev/leds-arch.c b/drivers/platform/native/dev/leds-arch.c
similarity index 100%
rename from platform/native/dev/leds-arch.c
rename to drivers/platform/native/dev/leds-arch.c
diff --git a/platform/native/dev/pir-sensor.c b/drivers/platform/native/dev/pir-sensor.c
similarity index 100%
rename from platform/native/dev/pir-sensor.c
rename to drivers/platform/native/dev/pir-sensor.c
diff --git a/platform/native/dev/pir-sensor.h b/drivers/platform/native/dev/pir-sensor.h
similarity index 100%
rename from platform/native/dev/pir-sensor.h
rename to drivers/platform/native/dev/pir-sensor.h
diff --git a/platform/native/dev/temperature-sensor.h b/drivers/platform/native/dev/temperature-sensor.h
similarity index 100%
rename from platform/native/dev/temperature-sensor.h
rename to drivers/platform/native/dev/temperature-sensor.h
diff --git a/platform/native/dev/vib-sensor.c b/drivers/platform/native/dev/vib-sensor.c
similarity index 100%
rename from platform/native/dev/vib-sensor.c
rename to drivers/platform/native/dev/vib-sensor.c
diff --git a/platform/native/dev/vib-sensor.h b/drivers/platform/native/dev/vib-sensor.h
similarity index 100%
rename from platform/native/dev/vib-sensor.h
rename to drivers/platform/native/dev/vib-sensor.h
diff --git a/platform/native/dev/xmem.c b/drivers/platform/native/dev/xmem.c
similarity index 100%
rename from platform/native/dev/xmem.c
rename to drivers/platform/native/dev/xmem.c
diff --git a/platform/nrf52dk/Makefile.nrf52dk b/drivers/platform/nrf52dk/Makefile.nrf52dk
similarity index 84%
rename from platform/nrf52dk/Makefile.nrf52dk
rename to drivers/platform/nrf52dk/Makefile.nrf52dk
index ce9f31bac..1cecc4dc2 100644
--- a/platform/nrf52dk/Makefile.nrf52dk
+++ b/drivers/platform/nrf52dk/Makefile.nrf52dk
@@ -3,13 +3,13 @@ ifndef CONTIKI
endif
### Include the board-specific makefile
-PLATFORM_ROOT_DIR = $(CONTIKI)/platform/$(TARGET)
+PLATFORM_ROOT_DIR = $(CONTIKI)/drivers/platform/$(TARGET)
CONTIKI_TARGET_DIRS += . dev config
CONTIKI_SOURCEFILES += contiki-main.c leds-arch.c nrf52dk-sensors.c button-sensor.c temperature-sensor.c
ifeq ($(NRF52_USE_RTT),1)
-### Use the existing debug I/O in cpu/arm/common
+### Use the existing debug I/O in drivers/cpu/arm/common
CONTIKI_TARGET_DIRS += rtt
CONTIKI_SOURCEFILES += rtt-printf.c segger-rtt.c segger-rtt-printf.c
else
@@ -28,7 +28,7 @@ ifndef SMALL
endif
### Define the CPU directory and pull in the correct CPU makefile.
-CONTIKI_CPU=$(CONTIKI)/cpu/nrf52832
+CONTIKI_CPU=$(CONTIKI)/drivers/cpu/nrf52832
include $(CONTIKI_CPU)/Makefile.nrf52832
MODULES += core/net core/net/mac
diff --git a/platform/nrf52dk/README-BLE-6LoWPAN.md b/drivers/platform/nrf52dk/README-BLE-6LoWPAN.md
similarity index 100%
rename from platform/nrf52dk/README-BLE-6LoWPAN.md
rename to drivers/platform/nrf52dk/README-BLE-6LoWPAN.md
diff --git a/platform/nrf52dk/README.md b/drivers/platform/nrf52dk/README.md
similarity index 100%
rename from platform/nrf52dk/README.md
rename to drivers/platform/nrf52dk/README.md
diff --git a/platform/nrf52dk/config/nrf_drv_config.h b/drivers/platform/nrf52dk/config/nrf_drv_config.h
similarity index 100%
rename from platform/nrf52dk/config/nrf_drv_config.h
rename to drivers/platform/nrf52dk/config/nrf_drv_config.h
diff --git a/platform/nrf52dk/config/pstorage_platform.h b/drivers/platform/nrf52dk/config/pstorage_platform.h
similarity index 100%
rename from platform/nrf52dk/config/pstorage_platform.h
rename to drivers/platform/nrf52dk/config/pstorage_platform.h
diff --git a/platform/nrf52dk/contiki-conf.h b/drivers/platform/nrf52dk/contiki-conf.h
similarity index 100%
rename from platform/nrf52dk/contiki-conf.h
rename to drivers/platform/nrf52dk/contiki-conf.h
diff --git a/platform/nrf52dk/contiki-main.c b/drivers/platform/nrf52dk/contiki-main.c
similarity index 100%
rename from platform/nrf52dk/contiki-main.c
rename to drivers/platform/nrf52dk/contiki-main.c
diff --git a/platform/nrf52dk/dbg-io/dbg.c b/drivers/platform/nrf52dk/dbg-io/dbg.c
similarity index 100%
rename from platform/nrf52dk/dbg-io/dbg.c
rename to drivers/platform/nrf52dk/dbg-io/dbg.c
diff --git a/platform/nrf52dk/dbg-io/dbg.h b/drivers/platform/nrf52dk/dbg-io/dbg.h
similarity index 100%
rename from platform/nrf52dk/dbg-io/dbg.h
rename to drivers/platform/nrf52dk/dbg-io/dbg.h
diff --git a/platform/nrf52dk/dbg-io/debug-uart.h b/drivers/platform/nrf52dk/dbg-io/debug-uart.h
similarity index 100%
rename from platform/nrf52dk/dbg-io/debug-uart.h
rename to drivers/platform/nrf52dk/dbg-io/debug-uart.h
diff --git a/platform/nrf52dk/dev/button-sensor.c b/drivers/platform/nrf52dk/dev/button-sensor.c
similarity index 100%
rename from platform/nrf52dk/dev/button-sensor.c
rename to drivers/platform/nrf52dk/dev/button-sensor.c
diff --git a/platform/nrf52dk/dev/button-sensor.h b/drivers/platform/nrf52dk/dev/button-sensor.h
similarity index 100%
rename from platform/nrf52dk/dev/button-sensor.h
rename to drivers/platform/nrf52dk/dev/button-sensor.h
diff --git a/platform/nrf52dk/dev/leds-arch.c b/drivers/platform/nrf52dk/dev/leds-arch.c
similarity index 100%
rename from platform/nrf52dk/dev/leds-arch.c
rename to drivers/platform/nrf52dk/dev/leds-arch.c
diff --git a/platform/nrf52dk/dev/nrf52dk-sensors.c b/drivers/platform/nrf52dk/dev/nrf52dk-sensors.c
similarity index 100%
rename from platform/nrf52dk/dev/nrf52dk-sensors.c
rename to drivers/platform/nrf52dk/dev/nrf52dk-sensors.c
diff --git a/platform/nrf52dk/dev/temperature-sensor.c b/drivers/platform/nrf52dk/dev/temperature-sensor.c
similarity index 100%
rename from platform/nrf52dk/dev/temperature-sensor.c
rename to drivers/platform/nrf52dk/dev/temperature-sensor.c
diff --git a/platform/nrf52dk/dev/temperature-sensor.h b/drivers/platform/nrf52dk/dev/temperature-sensor.h
similarity index 100%
rename from platform/nrf52dk/dev/temperature-sensor.h
rename to drivers/platform/nrf52dk/dev/temperature-sensor.h
diff --git a/platform/nrf52dk/platform-conf.h b/drivers/platform/nrf52dk/platform-conf.h
similarity index 100%
rename from platform/nrf52dk/platform-conf.h
rename to drivers/platform/nrf52dk/platform-conf.h
diff --git a/platform/nrf52dk/rtt/rtt-printf.c b/drivers/platform/nrf52dk/rtt/rtt-printf.c
similarity index 100%
rename from platform/nrf52dk/rtt/rtt-printf.c
rename to drivers/platform/nrf52dk/rtt/rtt-printf.c
diff --git a/platform/nrf52dk/rtt/segger-rtt-conf.h b/drivers/platform/nrf52dk/rtt/segger-rtt-conf.h
similarity index 100%
rename from platform/nrf52dk/rtt/segger-rtt-conf.h
rename to drivers/platform/nrf52dk/rtt/segger-rtt-conf.h
diff --git a/platform/nrf52dk/rtt/segger-rtt-printf.c b/drivers/platform/nrf52dk/rtt/segger-rtt-printf.c
similarity index 100%
rename from platform/nrf52dk/rtt/segger-rtt-printf.c
rename to drivers/platform/nrf52dk/rtt/segger-rtt-printf.c
diff --git a/platform/nrf52dk/rtt/segger-rtt.c b/drivers/platform/nrf52dk/rtt/segger-rtt.c
similarity index 100%
rename from platform/nrf52dk/rtt/segger-rtt.c
rename to drivers/platform/nrf52dk/rtt/segger-rtt.c
diff --git a/platform/nrf52dk/rtt/segger-rtt.h b/drivers/platform/nrf52dk/rtt/segger-rtt.h
similarity index 100%
rename from platform/nrf52dk/rtt/segger-rtt.h
rename to drivers/platform/nrf52dk/rtt/segger-rtt.h
diff --git a/platform/openmote-cc2538/Makefile.openmote-cc2538 b/drivers/platform/openmote-cc2538/Makefile.openmote-cc2538
similarity index 93%
rename from platform/openmote-cc2538/Makefile.openmote-cc2538
rename to drivers/platform/openmote-cc2538/Makefile.openmote-cc2538
index 24f32477e..b0b581b5d 100644
--- a/platform/openmote-cc2538/Makefile.openmote-cc2538
+++ b/drivers/platform/openmote-cc2538/Makefile.openmote-cc2538
@@ -11,7 +11,7 @@ endif
### Configure the build for the board and pull in board-specific sources
CONTIKI_TARGET_DIRS += . dev
-PLATFORM_ROOT_DIR = $(CONTIKI)/platform/$(TARGET)
+PLATFORM_ROOT_DIR = $(CONTIKI)/drivers/platform/$(TARGET)
### Include
CONTIKI_TARGET_SOURCEFILES += contiki-main.c board.c
@@ -28,7 +28,7 @@ ifndef SMALL
endif
### Define the CPU directory
-CONTIKI_CPU=$(CONTIKI)/cpu/cc2538
+CONTIKI_CPU=$(CONTIKI)/drivers/cpu/cc2538
include $(CONTIKI_CPU)/Makefile.cc2538
MODULES += core/net core/net/mac
diff --git a/platform/openmote-cc2538/README.md b/drivers/platform/openmote-cc2538/README.md
similarity index 100%
rename from platform/openmote-cc2538/README.md
rename to drivers/platform/openmote-cc2538/README.md
diff --git a/platform/openmote-cc2538/board.c b/drivers/platform/openmote-cc2538/board.c
similarity index 100%
rename from platform/openmote-cc2538/board.c
rename to drivers/platform/openmote-cc2538/board.c
diff --git a/platform/openmote-cc2538/board.h b/drivers/platform/openmote-cc2538/board.h
similarity index 100%
rename from platform/openmote-cc2538/board.h
rename to drivers/platform/openmote-cc2538/board.h
diff --git a/platform/openmote-cc2538/contiki-conf.h b/drivers/platform/openmote-cc2538/contiki-conf.h
similarity index 100%
rename from platform/openmote-cc2538/contiki-conf.h
rename to drivers/platform/openmote-cc2538/contiki-conf.h
diff --git a/platform/openmote-cc2538/contiki-main.c b/drivers/platform/openmote-cc2538/contiki-main.c
similarity index 100%
rename from platform/openmote-cc2538/contiki-main.c
rename to drivers/platform/openmote-cc2538/contiki-main.c
diff --git a/platform/openmote-cc2538/dev/adxl346.c b/drivers/platform/openmote-cc2538/dev/adxl346.c
similarity index 100%
rename from platform/openmote-cc2538/dev/adxl346.c
rename to drivers/platform/openmote-cc2538/dev/adxl346.c
diff --git a/platform/openmote-cc2538/dev/adxl346.h b/drivers/platform/openmote-cc2538/dev/adxl346.h
similarity index 100%
rename from platform/openmote-cc2538/dev/adxl346.h
rename to drivers/platform/openmote-cc2538/dev/adxl346.h
diff --git a/platform/openmote-cc2538/dev/antenna.c b/drivers/platform/openmote-cc2538/dev/antenna.c
similarity index 100%
rename from platform/openmote-cc2538/dev/antenna.c
rename to drivers/platform/openmote-cc2538/dev/antenna.c
diff --git a/platform/openmote-cc2538/dev/antenna.h b/drivers/platform/openmote-cc2538/dev/antenna.h
similarity index 100%
rename from platform/openmote-cc2538/dev/antenna.h
rename to drivers/platform/openmote-cc2538/dev/antenna.h
diff --git a/platform/openmote-cc2538/dev/button-sensor.c b/drivers/platform/openmote-cc2538/dev/button-sensor.c
similarity index 100%
rename from platform/openmote-cc2538/dev/button-sensor.c
rename to drivers/platform/openmote-cc2538/dev/button-sensor.c
diff --git a/platform/openmote-cc2538/dev/button-sensor.h b/drivers/platform/openmote-cc2538/dev/button-sensor.h
similarity index 100%
rename from platform/openmote-cc2538/dev/button-sensor.h
rename to drivers/platform/openmote-cc2538/dev/button-sensor.h
diff --git a/platform/openmote-cc2538/dev/leds-arch.c b/drivers/platform/openmote-cc2538/dev/leds-arch.c
similarity index 100%
rename from platform/openmote-cc2538/dev/leds-arch.c
rename to drivers/platform/openmote-cc2538/dev/leds-arch.c
diff --git a/platform/openmote-cc2538/dev/max44009.c b/drivers/platform/openmote-cc2538/dev/max44009.c
similarity index 100%
rename from platform/openmote-cc2538/dev/max44009.c
rename to drivers/platform/openmote-cc2538/dev/max44009.c
diff --git a/platform/openmote-cc2538/dev/max44009.h b/drivers/platform/openmote-cc2538/dev/max44009.h
similarity index 100%
rename from platform/openmote-cc2538/dev/max44009.h
rename to drivers/platform/openmote-cc2538/dev/max44009.h
diff --git a/platform/openmote-cc2538/dev/openmote-sensors.c b/drivers/platform/openmote-cc2538/dev/openmote-sensors.c
similarity index 100%
rename from platform/openmote-cc2538/dev/openmote-sensors.c
rename to drivers/platform/openmote-cc2538/dev/openmote-sensors.c
diff --git a/platform/openmote-cc2538/dev/openmote-sensors.h b/drivers/platform/openmote-cc2538/dev/openmote-sensors.h
similarity index 100%
rename from platform/openmote-cc2538/dev/openmote-sensors.h
rename to drivers/platform/openmote-cc2538/dev/openmote-sensors.h
diff --git a/platform/openmote-cc2538/dev/sht21.c b/drivers/platform/openmote-cc2538/dev/sht21.c
similarity index 100%
rename from platform/openmote-cc2538/dev/sht21.c
rename to drivers/platform/openmote-cc2538/dev/sht21.c
diff --git a/platform/openmote-cc2538/dev/sht21.h b/drivers/platform/openmote-cc2538/dev/sht21.h
similarity index 100%
rename from platform/openmote-cc2538/dev/sht21.h
rename to drivers/platform/openmote-cc2538/dev/sht21.h
diff --git a/platform/openmote-cc2538/dev/tps62730.c b/drivers/platform/openmote-cc2538/dev/tps62730.c
similarity index 100%
rename from platform/openmote-cc2538/dev/tps62730.c
rename to drivers/platform/openmote-cc2538/dev/tps62730.c
diff --git a/platform/openmote-cc2538/dev/tps62730.h b/drivers/platform/openmote-cc2538/dev/tps62730.h
similarity index 100%
rename from platform/openmote-cc2538/dev/tps62730.h
rename to drivers/platform/openmote-cc2538/dev/tps62730.h
diff --git a/platform/sky/Makefile.common b/drivers/platform/sky/Makefile.common
similarity index 99%
rename from platform/sky/Makefile.common
rename to drivers/platform/sky/Makefile.common
index 973d75c24..2a894e310 100644
--- a/platform/sky/Makefile.common
+++ b/drivers/platform/sky/Makefile.common
@@ -18,7 +18,7 @@ endif
CONTIKI_TARGET_SOURCEFILES += $(ARCH) $(UIPDRIVERS)
MCU=msp430f1611
-include $(CONTIKI)/cpu/msp430/Makefile.msp430
+include $(CONTIKI)/drivers/cpu/msp430/Makefile.msp430
ifdef IAR
diff --git a/platform/sky/Makefile.sky b/drivers/platform/sky/Makefile.sky
similarity index 69%
rename from platform/sky/Makefile.sky
rename to drivers/platform/sky/Makefile.sky
index 6ed373d26..9aa54d26f 100644
--- a/platform/sky/Makefile.sky
+++ b/drivers/platform/sky/Makefile.sky
@@ -8,8 +8,8 @@ ifndef SMALL
SMALL=1
endif
-include $(CONTIKI)/platform/sky/Makefile.common
+include $(CONTIKI)/drivers/platform/sky/Makefile.common
MODULES += core/net/mac \
core/net \
- dev/cc2420 dev/sht11 dev/ds2411
+ drivers/dev/cc2420 drivers/dev/sht11 drivers/dev/ds2411
diff --git a/platform/sky/apps/blink.c b/drivers/platform/sky/apps/blink.c
similarity index 100%
rename from platform/sky/apps/blink.c
rename to drivers/platform/sky/apps/blink.c
diff --git a/platform/sky/apps/burn-nodeid.c b/drivers/platform/sky/apps/burn-nodeid.c
similarity index 100%
rename from platform/sky/apps/burn-nodeid.c
rename to drivers/platform/sky/apps/burn-nodeid.c
diff --git a/platform/sky/apps/fader.c b/drivers/platform/sky/apps/fader.c
similarity index 100%
rename from platform/sky/apps/fader.c
rename to drivers/platform/sky/apps/fader.c
diff --git a/platform/sky/cfs-coffee-arch.h b/drivers/platform/sky/cfs-coffee-arch.h
similarity index 100%
rename from platform/sky/cfs-coffee-arch.h
rename to drivers/platform/sky/cfs-coffee-arch.h
diff --git a/platform/sky/contiki-conf.h b/drivers/platform/sky/contiki-conf.h
similarity index 100%
rename from platform/sky/contiki-conf.h
rename to drivers/platform/sky/contiki-conf.h
diff --git a/platform/sky/contiki-sky-main.c b/drivers/platform/sky/contiki-sky-main.c
similarity index 100%
rename from platform/sky/contiki-sky-main.c
rename to drivers/platform/sky/contiki-sky-main.c
diff --git a/platform/sky/contiki-sky-platform.c b/drivers/platform/sky/contiki-sky-platform.c
similarity index 100%
rename from platform/sky/contiki-sky-platform.c
rename to drivers/platform/sky/contiki-sky-platform.c
diff --git a/platform/sky/dev/battery-sensor.c b/drivers/platform/sky/dev/battery-sensor.c
similarity index 100%
rename from platform/sky/dev/battery-sensor.c
rename to drivers/platform/sky/dev/battery-sensor.c
diff --git a/platform/sky/dev/button-sensor.c b/drivers/platform/sky/dev/button-sensor.c
similarity index 100%
rename from platform/sky/dev/button-sensor.c
rename to drivers/platform/sky/dev/button-sensor.c
diff --git a/platform/sky/dev/i2c.c b/drivers/platform/sky/dev/i2c.c
similarity index 100%
rename from platform/sky/dev/i2c.c
rename to drivers/platform/sky/dev/i2c.c
diff --git a/platform/sky/dev/i2c.h b/drivers/platform/sky/dev/i2c.h
similarity index 100%
rename from platform/sky/dev/i2c.h
rename to drivers/platform/sky/dev/i2c.h
diff --git a/platform/sky/dev/light-sensor.c b/drivers/platform/sky/dev/light-sensor.c
similarity index 100%
rename from platform/sky/dev/light-sensor.c
rename to drivers/platform/sky/dev/light-sensor.c
diff --git a/platform/sky/dev/light-sensor.h b/drivers/platform/sky/dev/light-sensor.h
similarity index 100%
rename from platform/sky/dev/light-sensor.h
rename to drivers/platform/sky/dev/light-sensor.h
diff --git a/platform/sky/dev/radio-sensor.c b/drivers/platform/sky/dev/radio-sensor.c
similarity index 100%
rename from platform/sky/dev/radio-sensor.c
rename to drivers/platform/sky/dev/radio-sensor.c
diff --git a/platform/sky/dev/sht11-arch.h b/drivers/platform/sky/dev/sht11-arch.h
similarity index 100%
rename from platform/sky/dev/sht11-arch.h
rename to drivers/platform/sky/dev/sht11-arch.h
diff --git a/platform/sky/dev/sky-sensors.c b/drivers/platform/sky/dev/sky-sensors.c
similarity index 100%
rename from platform/sky/dev/sky-sensors.c
rename to drivers/platform/sky/dev/sky-sensors.c
diff --git a/platform/sky/dev/sky-sensors.h b/drivers/platform/sky/dev/sky-sensors.h
similarity index 100%
rename from platform/sky/dev/sky-sensors.h
rename to drivers/platform/sky/dev/sky-sensors.h
diff --git a/platform/sky/dev/temperature-sensor.c b/drivers/platform/sky/dev/temperature-sensor.c
similarity index 100%
rename from platform/sky/dev/temperature-sensor.c
rename to drivers/platform/sky/dev/temperature-sensor.c
diff --git a/platform/sky/dev/temperature-sensor.h b/drivers/platform/sky/dev/temperature-sensor.h
similarity index 100%
rename from platform/sky/dev/temperature-sensor.h
rename to drivers/platform/sky/dev/temperature-sensor.h
diff --git a/platform/sky/dev/xmem.c b/drivers/platform/sky/dev/xmem.c
similarity index 100%
rename from platform/sky/dev/xmem.c
rename to drivers/platform/sky/dev/xmem.c
diff --git a/platform/sky/doc/sky.txt b/drivers/platform/sky/doc/sky.txt
similarity index 100%
rename from platform/sky/doc/sky.txt
rename to drivers/platform/sky/doc/sky.txt
diff --git a/platform/sky/node-id.c b/drivers/platform/sky/node-id.c
similarity index 100%
rename from platform/sky/node-id.c
rename to drivers/platform/sky/node-id.c
diff --git a/platform/sky/platform-conf.h b/drivers/platform/sky/platform-conf.h
similarity index 100%
rename from platform/sky/platform-conf.h
rename to drivers/platform/sky/platform-conf.h
diff --git a/platform/srf06-cc26xx/Makefile.srf06-cc26xx b/drivers/platform/srf06-cc26xx/Makefile.srf06-cc26xx
similarity index 89%
rename from platform/srf06-cc26xx/Makefile.srf06-cc26xx
rename to drivers/platform/srf06-cc26xx/Makefile.srf06-cc26xx
index 2057bee23..e5676619d 100644
--- a/platform/srf06-cc26xx/Makefile.srf06-cc26xx
+++ b/drivers/platform/srf06-cc26xx/Makefile.srf06-cc26xx
@@ -12,7 +12,7 @@ endif
CONTIKI_TARGET_DIRS += .
### Include the board-specific makefile
-PLATFORM_ROOT_DIR = $(CONTIKI)/platform/$(TARGET)
+PLATFORM_ROOT_DIR = $(CONTIKI)/drivers/platform/$(TARGET)
-include $(PLATFORM_ROOT_DIR)/$(BOARD)/Makefile.$(notdir $(BOARD))
CONTIKI_TARGET_SOURCEFILES += contiki-main.c
@@ -31,7 +31,7 @@ endif
### Define the CPU directory and pull in the correct CPU makefile. This will
### be defined by one of the makefiles included above and it can be either
### Makefile.cc26xx or Makefile.cc13xx
-CONTIKI_CPU=$(CONTIKI)/cpu/cc26xx-cc13xx
+CONTIKI_CPU=$(CONTIKI)/drivers/cpu/cc26xx-cc13xx
include $(CONTIKI_CPU)/Makefile.$(CPU_FAMILY)
MODULES += core/net core/net/mac
diff --git a/platform/srf06-cc26xx/README.md b/drivers/platform/srf06-cc26xx/README.md
similarity index 100%
rename from platform/srf06-cc26xx/README.md
rename to drivers/platform/srf06-cc26xx/README.md
diff --git a/platform/srf06-cc26xx/common/board-spi.c b/drivers/platform/srf06-cc26xx/common/board-spi.c
similarity index 100%
rename from platform/srf06-cc26xx/common/board-spi.c
rename to drivers/platform/srf06-cc26xx/common/board-spi.c
diff --git a/platform/srf06-cc26xx/common/board-spi.h b/drivers/platform/srf06-cc26xx/common/board-spi.h
similarity index 100%
rename from platform/srf06-cc26xx/common/board-spi.h
rename to drivers/platform/srf06-cc26xx/common/board-spi.h
diff --git a/platform/srf06-cc26xx/common/ext-flash.c b/drivers/platform/srf06-cc26xx/common/ext-flash.c
similarity index 100%
rename from platform/srf06-cc26xx/common/ext-flash.c
rename to drivers/platform/srf06-cc26xx/common/ext-flash.c
diff --git a/platform/srf06-cc26xx/common/ext-flash.h b/drivers/platform/srf06-cc26xx/common/ext-flash.h
similarity index 100%
rename from platform/srf06-cc26xx/common/ext-flash.h
rename to drivers/platform/srf06-cc26xx/common/ext-flash.h
diff --git a/platform/srf06-cc26xx/contiki-conf.h b/drivers/platform/srf06-cc26xx/contiki-conf.h
similarity index 100%
rename from platform/srf06-cc26xx/contiki-conf.h
rename to drivers/platform/srf06-cc26xx/contiki-conf.h
diff --git a/platform/srf06-cc26xx/contiki-main.c b/drivers/platform/srf06-cc26xx/contiki-main.c
similarity index 100%
rename from platform/srf06-cc26xx/contiki-main.c
rename to drivers/platform/srf06-cc26xx/contiki-main.c
diff --git a/platform/srf06-cc26xx/launchpad/Makefile.launchpad b/drivers/platform/srf06-cc26xx/launchpad/Makefile.launchpad
similarity index 100%
rename from platform/srf06-cc26xx/launchpad/Makefile.launchpad
rename to drivers/platform/srf06-cc26xx/launchpad/Makefile.launchpad
diff --git a/platform/srf06-cc26xx/launchpad/board-peripherals.h b/drivers/platform/srf06-cc26xx/launchpad/board-peripherals.h
similarity index 100%
rename from platform/srf06-cc26xx/launchpad/board-peripherals.h
rename to drivers/platform/srf06-cc26xx/launchpad/board-peripherals.h
diff --git a/platform/srf06-cc26xx/launchpad/board.c b/drivers/platform/srf06-cc26xx/launchpad/board.c
similarity index 100%
rename from platform/srf06-cc26xx/launchpad/board.c
rename to drivers/platform/srf06-cc26xx/launchpad/board.c
diff --git a/platform/srf06-cc26xx/launchpad/button-sensor.c b/drivers/platform/srf06-cc26xx/launchpad/button-sensor.c
similarity index 100%
rename from platform/srf06-cc26xx/launchpad/button-sensor.c
rename to drivers/platform/srf06-cc26xx/launchpad/button-sensor.c
diff --git a/platform/srf06-cc26xx/launchpad/button-sensor.h b/drivers/platform/srf06-cc26xx/launchpad/button-sensor.h
similarity index 100%
rename from platform/srf06-cc26xx/launchpad/button-sensor.h
rename to drivers/platform/srf06-cc26xx/launchpad/button-sensor.h
diff --git a/platform/srf06-cc26xx/launchpad/cc1310/Makefile.cc1310 b/drivers/platform/srf06-cc26xx/launchpad/cc1310/Makefile.cc1310
similarity index 100%
rename from platform/srf06-cc26xx/launchpad/cc1310/Makefile.cc1310
rename to drivers/platform/srf06-cc26xx/launchpad/cc1310/Makefile.cc1310
diff --git a/platform/srf06-cc26xx/launchpad/cc1310/board.h b/drivers/platform/srf06-cc26xx/launchpad/cc1310/board.h
similarity index 100%
rename from platform/srf06-cc26xx/launchpad/cc1310/board.h
rename to drivers/platform/srf06-cc26xx/launchpad/cc1310/board.h
diff --git a/platform/srf06-cc26xx/launchpad/cc1350/Makefile.cc1350 b/drivers/platform/srf06-cc26xx/launchpad/cc1350/Makefile.cc1350
similarity index 100%
rename from platform/srf06-cc26xx/launchpad/cc1350/Makefile.cc1350
rename to drivers/platform/srf06-cc26xx/launchpad/cc1350/Makefile.cc1350
diff --git a/platform/srf06-cc26xx/launchpad/cc1350/board.h b/drivers/platform/srf06-cc26xx/launchpad/cc1350/board.h
similarity index 100%
rename from platform/srf06-cc26xx/launchpad/cc1350/board.h
rename to drivers/platform/srf06-cc26xx/launchpad/cc1350/board.h
diff --git a/platform/srf06-cc26xx/launchpad/cc1350/rf-switch.c b/drivers/platform/srf06-cc26xx/launchpad/cc1350/rf-switch.c
similarity index 100%
rename from platform/srf06-cc26xx/launchpad/cc1350/rf-switch.c
rename to drivers/platform/srf06-cc26xx/launchpad/cc1350/rf-switch.c
diff --git a/platform/srf06-cc26xx/launchpad/cc1350/tx-power-driver.c b/drivers/platform/srf06-cc26xx/launchpad/cc1350/tx-power-driver.c
similarity index 100%
rename from platform/srf06-cc26xx/launchpad/cc1350/tx-power-driver.c
rename to drivers/platform/srf06-cc26xx/launchpad/cc1350/tx-power-driver.c
diff --git a/platform/srf06-cc26xx/launchpad/cc2650/Makefile.cc2650 b/drivers/platform/srf06-cc26xx/launchpad/cc2650/Makefile.cc2650
similarity index 100%
rename from platform/srf06-cc26xx/launchpad/cc2650/Makefile.cc2650
rename to drivers/platform/srf06-cc26xx/launchpad/cc2650/Makefile.cc2650
diff --git a/platform/srf06-cc26xx/launchpad/cc2650/board.h b/drivers/platform/srf06-cc26xx/launchpad/cc2650/board.h
similarity index 100%
rename from platform/srf06-cc26xx/launchpad/cc2650/board.h
rename to drivers/platform/srf06-cc26xx/launchpad/cc2650/board.h
diff --git a/platform/srf06-cc26xx/launchpad/launchpad-sensors.c b/drivers/platform/srf06-cc26xx/launchpad/launchpad-sensors.c
similarity index 100%
rename from platform/srf06-cc26xx/launchpad/launchpad-sensors.c
rename to drivers/platform/srf06-cc26xx/launchpad/launchpad-sensors.c
diff --git a/platform/srf06-cc26xx/launchpad/leds-arch.c b/drivers/platform/srf06-cc26xx/launchpad/leds-arch.c
similarity index 100%
rename from platform/srf06-cc26xx/launchpad/leds-arch.c
rename to drivers/platform/srf06-cc26xx/launchpad/leds-arch.c
diff --git a/platform/srf06-cc26xx/sensortag/Makefile.sensortag b/drivers/platform/srf06-cc26xx/sensortag/Makefile.sensortag
similarity index 100%
rename from platform/srf06-cc26xx/sensortag/Makefile.sensortag
rename to drivers/platform/srf06-cc26xx/sensortag/Makefile.sensortag
diff --git a/platform/srf06-cc26xx/sensortag/bmp-280-sensor.c b/drivers/platform/srf06-cc26xx/sensortag/bmp-280-sensor.c
similarity index 100%
rename from platform/srf06-cc26xx/sensortag/bmp-280-sensor.c
rename to drivers/platform/srf06-cc26xx/sensortag/bmp-280-sensor.c
diff --git a/platform/srf06-cc26xx/sensortag/bmp-280-sensor.h b/drivers/platform/srf06-cc26xx/sensortag/bmp-280-sensor.h
similarity index 100%
rename from platform/srf06-cc26xx/sensortag/bmp-280-sensor.h
rename to drivers/platform/srf06-cc26xx/sensortag/bmp-280-sensor.h
diff --git a/platform/srf06-cc26xx/sensortag/board-i2c.c b/drivers/platform/srf06-cc26xx/sensortag/board-i2c.c
similarity index 100%
rename from platform/srf06-cc26xx/sensortag/board-i2c.c
rename to drivers/platform/srf06-cc26xx/sensortag/board-i2c.c
diff --git a/platform/srf06-cc26xx/sensortag/board-i2c.h b/drivers/platform/srf06-cc26xx/sensortag/board-i2c.h
similarity index 100%
rename from platform/srf06-cc26xx/sensortag/board-i2c.h
rename to drivers/platform/srf06-cc26xx/sensortag/board-i2c.h
diff --git a/platform/srf06-cc26xx/sensortag/board-peripherals.h b/drivers/platform/srf06-cc26xx/sensortag/board-peripherals.h
similarity index 100%
rename from platform/srf06-cc26xx/sensortag/board-peripherals.h
rename to drivers/platform/srf06-cc26xx/sensortag/board-peripherals.h
diff --git a/platform/srf06-cc26xx/sensortag/board.c b/drivers/platform/srf06-cc26xx/sensortag/board.c
similarity index 100%
rename from platform/srf06-cc26xx/sensortag/board.c
rename to drivers/platform/srf06-cc26xx/sensortag/board.c
diff --git a/platform/srf06-cc26xx/sensortag/button-sensor.c b/drivers/platform/srf06-cc26xx/sensortag/button-sensor.c
similarity index 100%
rename from platform/srf06-cc26xx/sensortag/button-sensor.c
rename to drivers/platform/srf06-cc26xx/sensortag/button-sensor.c
diff --git a/platform/srf06-cc26xx/sensortag/button-sensor.h b/drivers/platform/srf06-cc26xx/sensortag/button-sensor.h
similarity index 100%
rename from platform/srf06-cc26xx/sensortag/button-sensor.h
rename to drivers/platform/srf06-cc26xx/sensortag/button-sensor.h
diff --git a/platform/srf06-cc26xx/sensortag/buzzer.c b/drivers/platform/srf06-cc26xx/sensortag/buzzer.c
similarity index 100%
rename from platform/srf06-cc26xx/sensortag/buzzer.c
rename to drivers/platform/srf06-cc26xx/sensortag/buzzer.c
diff --git a/platform/srf06-cc26xx/sensortag/buzzer.h b/drivers/platform/srf06-cc26xx/sensortag/buzzer.h
similarity index 100%
rename from platform/srf06-cc26xx/sensortag/buzzer.h
rename to drivers/platform/srf06-cc26xx/sensortag/buzzer.h
diff --git a/platform/srf06-cc26xx/sensortag/cc1350/Makefile.cc1350 b/drivers/platform/srf06-cc26xx/sensortag/cc1350/Makefile.cc1350
similarity index 100%
rename from platform/srf06-cc26xx/sensortag/cc1350/Makefile.cc1350
rename to drivers/platform/srf06-cc26xx/sensortag/cc1350/Makefile.cc1350
diff --git a/platform/srf06-cc26xx/sensortag/cc1350/board.h b/drivers/platform/srf06-cc26xx/sensortag/cc1350/board.h
similarity index 100%
rename from platform/srf06-cc26xx/sensortag/cc1350/board.h
rename to drivers/platform/srf06-cc26xx/sensortag/cc1350/board.h
diff --git a/platform/srf06-cc26xx/sensortag/cc1350/leds-arch.c b/drivers/platform/srf06-cc26xx/sensortag/cc1350/leds-arch.c
similarity index 100%
rename from platform/srf06-cc26xx/sensortag/cc1350/leds-arch.c
rename to drivers/platform/srf06-cc26xx/sensortag/cc1350/leds-arch.c
diff --git a/platform/srf06-cc26xx/sensortag/cc2650/Makefile.cc2650 b/drivers/platform/srf06-cc26xx/sensortag/cc2650/Makefile.cc2650
similarity index 100%
rename from platform/srf06-cc26xx/sensortag/cc2650/Makefile.cc2650
rename to drivers/platform/srf06-cc26xx/sensortag/cc2650/Makefile.cc2650
diff --git a/platform/srf06-cc26xx/sensortag/cc2650/board.h b/drivers/platform/srf06-cc26xx/sensortag/cc2650/board.h
similarity index 100%
rename from platform/srf06-cc26xx/sensortag/cc2650/board.h
rename to drivers/platform/srf06-cc26xx/sensortag/cc2650/board.h
diff --git a/platform/srf06-cc26xx/sensortag/cc2650/leds-arch.c b/drivers/platform/srf06-cc26xx/sensortag/cc2650/leds-arch.c
similarity index 100%
rename from platform/srf06-cc26xx/sensortag/cc2650/leds-arch.c
rename to drivers/platform/srf06-cc26xx/sensortag/cc2650/leds-arch.c
diff --git a/platform/srf06-cc26xx/sensortag/hdc-1000-sensor.c b/drivers/platform/srf06-cc26xx/sensortag/hdc-1000-sensor.c
similarity index 100%
rename from platform/srf06-cc26xx/sensortag/hdc-1000-sensor.c
rename to drivers/platform/srf06-cc26xx/sensortag/hdc-1000-sensor.c
diff --git a/platform/srf06-cc26xx/sensortag/hdc-1000-sensor.h b/drivers/platform/srf06-cc26xx/sensortag/hdc-1000-sensor.h
old mode 100755
new mode 100644
similarity index 100%
rename from platform/srf06-cc26xx/sensortag/hdc-1000-sensor.h
rename to drivers/platform/srf06-cc26xx/sensortag/hdc-1000-sensor.h
diff --git a/platform/srf06-cc26xx/sensortag/mpu-9250-sensor.c b/drivers/platform/srf06-cc26xx/sensortag/mpu-9250-sensor.c
similarity index 100%
rename from platform/srf06-cc26xx/sensortag/mpu-9250-sensor.c
rename to drivers/platform/srf06-cc26xx/sensortag/mpu-9250-sensor.c
diff --git a/platform/srf06-cc26xx/sensortag/mpu-9250-sensor.h b/drivers/platform/srf06-cc26xx/sensortag/mpu-9250-sensor.h
similarity index 100%
rename from platform/srf06-cc26xx/sensortag/mpu-9250-sensor.h
rename to drivers/platform/srf06-cc26xx/sensortag/mpu-9250-sensor.h
diff --git a/platform/srf06-cc26xx/sensortag/opt-3001-sensor.c b/drivers/platform/srf06-cc26xx/sensortag/opt-3001-sensor.c
similarity index 100%
rename from platform/srf06-cc26xx/sensortag/opt-3001-sensor.c
rename to drivers/platform/srf06-cc26xx/sensortag/opt-3001-sensor.c
diff --git a/platform/srf06-cc26xx/sensortag/opt-3001-sensor.h b/drivers/platform/srf06-cc26xx/sensortag/opt-3001-sensor.h
similarity index 100%
rename from platform/srf06-cc26xx/sensortag/opt-3001-sensor.h
rename to drivers/platform/srf06-cc26xx/sensortag/opt-3001-sensor.h
diff --git a/platform/srf06-cc26xx/sensortag/reed-relay.c b/drivers/platform/srf06-cc26xx/sensortag/reed-relay.c
similarity index 100%
rename from platform/srf06-cc26xx/sensortag/reed-relay.c
rename to drivers/platform/srf06-cc26xx/sensortag/reed-relay.c
diff --git a/platform/srf06-cc26xx/sensortag/reed-relay.h b/drivers/platform/srf06-cc26xx/sensortag/reed-relay.h
similarity index 100%
rename from platform/srf06-cc26xx/sensortag/reed-relay.h
rename to drivers/platform/srf06-cc26xx/sensortag/reed-relay.h
diff --git a/platform/srf06-cc26xx/sensortag/sensor-common.c b/drivers/platform/srf06-cc26xx/sensortag/sensor-common.c
similarity index 100%
rename from platform/srf06-cc26xx/sensortag/sensor-common.c
rename to drivers/platform/srf06-cc26xx/sensortag/sensor-common.c
diff --git a/platform/srf06-cc26xx/sensortag/sensor-common.h b/drivers/platform/srf06-cc26xx/sensortag/sensor-common.h
similarity index 100%
rename from platform/srf06-cc26xx/sensortag/sensor-common.h
rename to drivers/platform/srf06-cc26xx/sensortag/sensor-common.h
diff --git a/platform/srf06-cc26xx/sensortag/sensortag-sensors.c b/drivers/platform/srf06-cc26xx/sensortag/sensortag-sensors.c
similarity index 100%
rename from platform/srf06-cc26xx/sensortag/sensortag-sensors.c
rename to drivers/platform/srf06-cc26xx/sensortag/sensortag-sensors.c
diff --git a/platform/srf06-cc26xx/sensortag/tmp-007-sensor.c b/drivers/platform/srf06-cc26xx/sensortag/tmp-007-sensor.c
similarity index 100%
rename from platform/srf06-cc26xx/sensortag/tmp-007-sensor.c
rename to drivers/platform/srf06-cc26xx/sensortag/tmp-007-sensor.c
diff --git a/platform/srf06-cc26xx/sensortag/tmp-007-sensor.h b/drivers/platform/srf06-cc26xx/sensortag/tmp-007-sensor.h
similarity index 100%
rename from platform/srf06-cc26xx/sensortag/tmp-007-sensor.h
rename to drivers/platform/srf06-cc26xx/sensortag/tmp-007-sensor.h
diff --git a/platform/srf06-cc26xx/srf06/Makefile.srf06 b/drivers/platform/srf06-cc26xx/srf06/Makefile.srf06
similarity index 100%
rename from platform/srf06-cc26xx/srf06/Makefile.srf06
rename to drivers/platform/srf06-cc26xx/srf06/Makefile.srf06
diff --git a/platform/srf06-cc26xx/srf06/als-sensor.c b/drivers/platform/srf06-cc26xx/srf06/als-sensor.c
similarity index 100%
rename from platform/srf06-cc26xx/srf06/als-sensor.c
rename to drivers/platform/srf06-cc26xx/srf06/als-sensor.c
diff --git a/platform/srf06-cc26xx/srf06/als-sensor.h b/drivers/platform/srf06-cc26xx/srf06/als-sensor.h
similarity index 100%
rename from platform/srf06-cc26xx/srf06/als-sensor.h
rename to drivers/platform/srf06-cc26xx/srf06/als-sensor.h
diff --git a/platform/srf06-cc26xx/srf06/board-peripherals.h b/drivers/platform/srf06-cc26xx/srf06/board-peripherals.h
similarity index 100%
rename from platform/srf06-cc26xx/srf06/board-peripherals.h
rename to drivers/platform/srf06-cc26xx/srf06/board-peripherals.h
diff --git a/platform/srf06-cc26xx/srf06/board.c b/drivers/platform/srf06-cc26xx/srf06/board.c
similarity index 100%
rename from platform/srf06-cc26xx/srf06/board.c
rename to drivers/platform/srf06-cc26xx/srf06/board.c
diff --git a/platform/srf06-cc26xx/srf06/button-sensor.c b/drivers/platform/srf06-cc26xx/srf06/button-sensor.c
similarity index 100%
rename from platform/srf06-cc26xx/srf06/button-sensor.c
rename to drivers/platform/srf06-cc26xx/srf06/button-sensor.c
diff --git a/platform/srf06-cc26xx/srf06/button-sensor.h b/drivers/platform/srf06-cc26xx/srf06/button-sensor.h
similarity index 100%
rename from platform/srf06-cc26xx/srf06/button-sensor.h
rename to drivers/platform/srf06-cc26xx/srf06/button-sensor.h
diff --git a/platform/srf06-cc26xx/srf06/cc13xx/Makefile.cc13xx b/drivers/platform/srf06-cc26xx/srf06/cc13xx/Makefile.cc13xx
similarity index 100%
rename from platform/srf06-cc26xx/srf06/cc13xx/Makefile.cc13xx
rename to drivers/platform/srf06-cc26xx/srf06/cc13xx/Makefile.cc13xx
diff --git a/platform/srf06-cc26xx/srf06/cc13xx/board.h b/drivers/platform/srf06-cc26xx/srf06/cc13xx/board.h
similarity index 100%
rename from platform/srf06-cc26xx/srf06/cc13xx/board.h
rename to drivers/platform/srf06-cc26xx/srf06/cc13xx/board.h
diff --git a/platform/srf06-cc26xx/srf06/cc26xx/Makefile.cc26xx b/drivers/platform/srf06-cc26xx/srf06/cc26xx/Makefile.cc26xx
similarity index 100%
rename from platform/srf06-cc26xx/srf06/cc26xx/Makefile.cc26xx
rename to drivers/platform/srf06-cc26xx/srf06/cc26xx/Makefile.cc26xx
diff --git a/platform/srf06-cc26xx/srf06/cc26xx/board.h b/drivers/platform/srf06-cc26xx/srf06/cc26xx/board.h
similarity index 100%
rename from platform/srf06-cc26xx/srf06/cc26xx/board.h
rename to drivers/platform/srf06-cc26xx/srf06/cc26xx/board.h
diff --git a/platform/srf06-cc26xx/srf06/leds-arch.c b/drivers/platform/srf06-cc26xx/srf06/leds-arch.c
similarity index 100%
rename from platform/srf06-cc26xx/srf06/leds-arch.c
rename to drivers/platform/srf06-cc26xx/srf06/leds-arch.c
diff --git a/platform/srf06-cc26xx/srf06/srf06-sensors.c b/drivers/platform/srf06-cc26xx/srf06/srf06-sensors.c
similarity index 100%
rename from platform/srf06-cc26xx/srf06/srf06-sensors.c
rename to drivers/platform/srf06-cc26xx/srf06/srf06-sensors.c
diff --git a/platform/wismote/Makefile.wismote b/drivers/platform/wismote/Makefile.wismote
similarity index 92%
rename from platform/wismote/Makefile.wismote
rename to drivers/platform/wismote/Makefile.wismote
index d4896abbc..9d1d6fc3b 100644
--- a/platform/wismote/Makefile.wismote
+++ b/drivers/platform/wismote/Makefile.wismote
@@ -31,7 +31,7 @@ MCU=msp430f5437
# Platform has a MSP430X MCU with 20-bit support
CPU_HAS_MSP430X=1
-include $(CONTIKI)/cpu/msp430/Makefile.msp430
+include $(CONTIKI)/drivers/cpu/msp430/Makefile.msp430
ifdef IAR
LDFLAGSNO += -xm "$(IAR_PATH)/lib/dlib/dl430xsfn.r43" -f "$(IAR_PATH)/config/lnk430f5437.xcl"
@@ -48,4 +48,4 @@ endif
msp430flasher -n msp430x5437 -w $< -v -z [VCC]
MODULES += core/net core/net/mac \
- dev/cc2520 dev/sht11
+ drivers/dev/cc2520 drivers/dev/sht11
diff --git a/platform/wismote/apps/burn-nodeid.c b/drivers/platform/wismote/apps/burn-nodeid.c
similarity index 100%
rename from platform/wismote/apps/burn-nodeid.c
rename to drivers/platform/wismote/apps/burn-nodeid.c
diff --git a/platform/wismote/cfs-coffee-arch.h b/drivers/platform/wismote/cfs-coffee-arch.h
similarity index 100%
rename from platform/wismote/cfs-coffee-arch.h
rename to drivers/platform/wismote/cfs-coffee-arch.h
diff --git a/platform/wismote/contiki-conf.h b/drivers/platform/wismote/contiki-conf.h
similarity index 100%
rename from platform/wismote/contiki-conf.h
rename to drivers/platform/wismote/contiki-conf.h
diff --git a/platform/wismote/contiki-wismote-main.c b/drivers/platform/wismote/contiki-wismote-main.c
similarity index 100%
rename from platform/wismote/contiki-wismote-main.c
rename to drivers/platform/wismote/contiki-wismote-main.c
diff --git a/platform/wismote/contiki-wismote-platform.c b/drivers/platform/wismote/contiki-wismote-platform.c
similarity index 100%
rename from platform/wismote/contiki-wismote-platform.c
rename to drivers/platform/wismote/contiki-wismote-platform.c
diff --git a/platform/wismote/dev/acc-sensor.c b/drivers/platform/wismote/dev/acc-sensor.c
similarity index 100%
rename from platform/wismote/dev/acc-sensor.c
rename to drivers/platform/wismote/dev/acc-sensor.c
diff --git a/platform/wismote/dev/acc-sensor.h b/drivers/platform/wismote/dev/acc-sensor.h
similarity index 100%
rename from platform/wismote/dev/acc-sensor.h
rename to drivers/platform/wismote/dev/acc-sensor.h
diff --git a/platform/wismote/dev/battery-sensor.c b/drivers/platform/wismote/dev/battery-sensor.c
similarity index 100%
rename from platform/wismote/dev/battery-sensor.c
rename to drivers/platform/wismote/dev/battery-sensor.c
diff --git a/platform/wismote/dev/button-sensor.c b/drivers/platform/wismote/dev/button-sensor.c
similarity index 100%
rename from platform/wismote/dev/button-sensor.c
rename to drivers/platform/wismote/dev/button-sensor.c
diff --git a/platform/wismote/dev/ext-sensor.c b/drivers/platform/wismote/dev/ext-sensor.c
similarity index 100%
rename from platform/wismote/dev/ext-sensor.c
rename to drivers/platform/wismote/dev/ext-sensor.c
diff --git a/platform/wismote/dev/ext-sensor.h b/drivers/platform/wismote/dev/ext-sensor.h
similarity index 100%
rename from platform/wismote/dev/ext-sensor.h
rename to drivers/platform/wismote/dev/ext-sensor.h
diff --git a/platform/wismote/dev/i2c.c b/drivers/platform/wismote/dev/i2c.c
similarity index 100%
rename from platform/wismote/dev/i2c.c
rename to drivers/platform/wismote/dev/i2c.c
diff --git a/platform/wismote/dev/i2c.h b/drivers/platform/wismote/dev/i2c.h
similarity index 100%
rename from platform/wismote/dev/i2c.h
rename to drivers/platform/wismote/dev/i2c.h
diff --git a/platform/wismote/dev/light-sensor.c b/drivers/platform/wismote/dev/light-sensor.c
similarity index 100%
rename from platform/wismote/dev/light-sensor.c
rename to drivers/platform/wismote/dev/light-sensor.c
diff --git a/platform/wismote/dev/light-sensor.h b/drivers/platform/wismote/dev/light-sensor.h
similarity index 100%
rename from platform/wismote/dev/light-sensor.h
rename to drivers/platform/wismote/dev/light-sensor.h
diff --git a/platform/wismote/dev/radio-sensor.c b/drivers/platform/wismote/dev/radio-sensor.c
similarity index 100%
rename from platform/wismote/dev/radio-sensor.c
rename to drivers/platform/wismote/dev/radio-sensor.c
diff --git a/platform/wismote/dev/sht11-arch.h b/drivers/platform/wismote/dev/sht11-arch.h
similarity index 100%
rename from platform/wismote/dev/sht11-arch.h
rename to drivers/platform/wismote/dev/sht11-arch.h
diff --git a/platform/wismote/dev/sht15.c b/drivers/platform/wismote/dev/sht15.c
similarity index 100%
rename from platform/wismote/dev/sht15.c
rename to drivers/platform/wismote/dev/sht15.c
diff --git a/platform/wismote/dev/sht15.h b/drivers/platform/wismote/dev/sht15.h
similarity index 100%
rename from platform/wismote/dev/sht15.h
rename to drivers/platform/wismote/dev/sht15.h
diff --git a/platform/wismote/dev/sky-sensors.c b/drivers/platform/wismote/dev/sky-sensors.c
similarity index 100%
rename from platform/wismote/dev/sky-sensors.c
rename to drivers/platform/wismote/dev/sky-sensors.c
diff --git a/platform/wismote/dev/sky-sensors.h b/drivers/platform/wismote/dev/sky-sensors.h
similarity index 100%
rename from platform/wismote/dev/sky-sensors.h
rename to drivers/platform/wismote/dev/sky-sensors.h
diff --git a/platform/wismote/dev/xmem.c b/drivers/platform/wismote/dev/xmem.c
similarity index 100%
rename from platform/wismote/dev/xmem.c
rename to drivers/platform/wismote/dev/xmem.c
diff --git a/platform/wismote/flash.c b/drivers/platform/wismote/flash.c
similarity index 100%
rename from platform/wismote/flash.c
rename to drivers/platform/wismote/flash.c
diff --git a/platform/wismote/leds-arch.c b/drivers/platform/wismote/leds-arch.c
similarity index 100%
rename from platform/wismote/leds-arch.c
rename to drivers/platform/wismote/leds-arch.c
diff --git a/platform/wismote/node-id.c b/drivers/platform/wismote/node-id.c
similarity index 100%
rename from platform/wismote/node-id.c
rename to drivers/platform/wismote/node-id.c
diff --git a/platform/wismote/platform-conf.h b/drivers/platform/wismote/platform-conf.h
similarity index 100%
rename from platform/wismote/platform-conf.h
rename to drivers/platform/wismote/platform-conf.h
diff --git a/platform/z1/Makefile.common b/drivers/platform/z1/Makefile.common
similarity index 98%
rename from platform/z1/Makefile.common
rename to drivers/platform/z1/Makefile.common
index 485601164..464ee8a3b 100644
--- a/platform/z1/Makefile.common
+++ b/drivers/platform/z1/Makefile.common
@@ -33,7 +33,7 @@ MCU=msp430f2617
# Platform has a MSP430X MCU with 20-bit support
CPU_HAS_MSP430X=1
-include $(CONTIKI)/cpu/msp430/Makefile.msp430
+include $(CONTIKI)/drivers/cpu/msp430/Makefile.msp430
# Add LDFLAGS after IAR_PATH is set
ifdef IAR
diff --git a/platform/z1/Makefile.z1 b/drivers/platform/z1/Makefile.z1
similarity index 57%
rename from platform/z1/Makefile.z1
rename to drivers/platform/z1/Makefile.z1
index b6746b5f8..19f41e0d3 100644
--- a/platform/z1/Makefile.z1
+++ b/drivers/platform/z1/Makefile.z1
@@ -3,12 +3,12 @@
CONTIKI_TARGET_SOURCEFILES += contiki-z1-platform.c
CLEAN += *.z1
-include $(CONTIKI)/platform/z1/Makefile.common
+include $(CONTIKI)/drivers/platform/z1/Makefile.common
ifeq ($(ZOLERTIA_Z1SP),1)
-include $(CONTIKI)/platform/z1/Makefile.z1sp
+include $(CONTIKI)/drivers/platform/z1/Makefile.z1sp
endif
MODULES += core/net \
core/net/mac \
- dev/cc2420
+ drivers/dev/cc2420
diff --git a/platform/z1/Makefile.z1sp b/drivers/platform/z1/Makefile.z1sp
similarity index 100%
rename from platform/z1/Makefile.z1sp
rename to drivers/platform/z1/Makefile.z1sp
diff --git a/platform/z1/README.z1sp b/drivers/platform/z1/README.z1sp
similarity index 100%
rename from platform/z1/README.z1sp
rename to drivers/platform/z1/README.z1sp
diff --git a/platform/z1/apps/blink.c b/drivers/platform/z1/apps/blink.c
similarity index 100%
rename from platform/z1/apps/blink.c
rename to drivers/platform/z1/apps/blink.c
diff --git a/platform/z1/apps/burn-nodeid.c b/drivers/platform/z1/apps/burn-nodeid.c
similarity index 100%
rename from platform/z1/apps/burn-nodeid.c
rename to drivers/platform/z1/apps/burn-nodeid.c
diff --git a/platform/z1/apps/fader.c b/drivers/platform/z1/apps/fader.c
similarity index 100%
rename from platform/z1/apps/fader.c
rename to drivers/platform/z1/apps/fader.c
diff --git a/platform/z1/cfs-coffee-arch.h b/drivers/platform/z1/cfs-coffee-arch.h
similarity index 100%
rename from platform/z1/cfs-coffee-arch.h
rename to drivers/platform/z1/cfs-coffee-arch.h
diff --git a/platform/z1/contiki-conf.h b/drivers/platform/z1/contiki-conf.h
similarity index 100%
rename from platform/z1/contiki-conf.h
rename to drivers/platform/z1/contiki-conf.h
diff --git a/platform/z1/contiki-z1-main.c b/drivers/platform/z1/contiki-z1-main.c
similarity index 100%
rename from platform/z1/contiki-z1-main.c
rename to drivers/platform/z1/contiki-z1-main.c
diff --git a/platform/z1/contiki-z1-platform.c b/drivers/platform/z1/contiki-z1-platform.c
similarity index 100%
rename from platform/z1/contiki-z1-platform.c
rename to drivers/platform/z1/contiki-z1-platform.c
diff --git a/platform/z1/dev/adxl345.c b/drivers/platform/z1/dev/adxl345.c
similarity index 100%
rename from platform/z1/dev/adxl345.c
rename to drivers/platform/z1/dev/adxl345.c
diff --git a/platform/z1/dev/adxl345.h b/drivers/platform/z1/dev/adxl345.h
similarity index 100%
rename from platform/z1/dev/adxl345.h
rename to drivers/platform/z1/dev/adxl345.h
diff --git a/platform/z1/dev/battery-sensor.c b/drivers/platform/z1/dev/battery-sensor.c
similarity index 100%
rename from platform/z1/dev/battery-sensor.c
rename to drivers/platform/z1/dev/battery-sensor.c
diff --git a/platform/z1/dev/button-sensor.c b/drivers/platform/z1/dev/button-sensor.c
similarity index 100%
rename from platform/z1/dev/button-sensor.c
rename to drivers/platform/z1/dev/button-sensor.c
diff --git a/platform/z1/dev/cc2420-arch.c b/drivers/platform/z1/dev/cc2420-arch.c
similarity index 100%
rename from platform/z1/dev/cc2420-arch.c
rename to drivers/platform/z1/dev/cc2420-arch.c
diff --git a/platform/z1/dev/i2cmaster.c b/drivers/platform/z1/dev/i2cmaster.c
similarity index 100%
rename from platform/z1/dev/i2cmaster.c
rename to drivers/platform/z1/dev/i2cmaster.c
diff --git a/platform/z1/dev/i2cmaster.h b/drivers/platform/z1/dev/i2cmaster.h
similarity index 100%
rename from platform/z1/dev/i2cmaster.h
rename to drivers/platform/z1/dev/i2cmaster.h
diff --git a/platform/z1/dev/light-sensor.c b/drivers/platform/z1/dev/light-sensor.c
similarity index 100%
rename from platform/z1/dev/light-sensor.c
rename to drivers/platform/z1/dev/light-sensor.c
diff --git a/platform/z1/dev/light-sensor.h b/drivers/platform/z1/dev/light-sensor.h
similarity index 100%
rename from platform/z1/dev/light-sensor.h
rename to drivers/platform/z1/dev/light-sensor.h
diff --git a/platform/z1/dev/light-ziglet.c b/drivers/platform/z1/dev/light-ziglet.c
similarity index 100%
rename from platform/z1/dev/light-ziglet.c
rename to drivers/platform/z1/dev/light-ziglet.c
diff --git a/platform/z1/dev/light-ziglet.h b/drivers/platform/z1/dev/light-ziglet.h
similarity index 100%
rename from platform/z1/dev/light-ziglet.h
rename to drivers/platform/z1/dev/light-ziglet.h
diff --git a/platform/z1/dev/potentiometer-sensor.c b/drivers/platform/z1/dev/potentiometer-sensor.c
similarity index 100%
rename from platform/z1/dev/potentiometer-sensor.c
rename to drivers/platform/z1/dev/potentiometer-sensor.c
diff --git a/platform/z1/dev/potentiometer-sensor.h b/drivers/platform/z1/dev/potentiometer-sensor.h
similarity index 100%
rename from platform/z1/dev/potentiometer-sensor.h
rename to drivers/platform/z1/dev/potentiometer-sensor.h
diff --git a/platform/z1/dev/radio-sensor.c b/drivers/platform/z1/dev/radio-sensor.c
similarity index 100%
rename from platform/z1/dev/radio-sensor.c
rename to drivers/platform/z1/dev/radio-sensor.c
diff --git a/platform/z1/dev/reed-sensor.c b/drivers/platform/z1/dev/reed-sensor.c
similarity index 100%
rename from platform/z1/dev/reed-sensor.c
rename to drivers/platform/z1/dev/reed-sensor.c
diff --git a/platform/z1/dev/reed-sensor.h b/drivers/platform/z1/dev/reed-sensor.h
similarity index 100%
rename from platform/z1/dev/reed-sensor.h
rename to drivers/platform/z1/dev/reed-sensor.h
diff --git a/platform/z1/dev/relay-phidget.c b/drivers/platform/z1/dev/relay-phidget.c
similarity index 100%
rename from platform/z1/dev/relay-phidget.c
rename to drivers/platform/z1/dev/relay-phidget.c
diff --git a/platform/z1/dev/relay-phidget.h b/drivers/platform/z1/dev/relay-phidget.h
similarity index 100%
rename from platform/z1/dev/relay-phidget.h
rename to drivers/platform/z1/dev/relay-phidget.h
diff --git a/platform/z1/dev/sht11-arch.h b/drivers/platform/z1/dev/sht11-arch.h
similarity index 100%
rename from platform/z1/dev/sht11-arch.h
rename to drivers/platform/z1/dev/sht11-arch.h
diff --git a/platform/z1/dev/sht25.c b/drivers/platform/z1/dev/sht25.c
similarity index 100%
rename from platform/z1/dev/sht25.c
rename to drivers/platform/z1/dev/sht25.c
diff --git a/platform/z1/dev/sht25.h b/drivers/platform/z1/dev/sht25.h
similarity index 100%
rename from platform/z1/dev/sht25.h
rename to drivers/platform/z1/dev/sht25.h
diff --git a/platform/z1/dev/sky-sensors.c b/drivers/platform/z1/dev/sky-sensors.c
similarity index 100%
rename from platform/z1/dev/sky-sensors.c
rename to drivers/platform/z1/dev/sky-sensors.c
diff --git a/platform/z1/dev/sky-sensors.h b/drivers/platform/z1/dev/sky-sensors.h
similarity index 100%
rename from platform/z1/dev/sky-sensors.h
rename to drivers/platform/z1/dev/sky-sensors.h
diff --git a/platform/z1/dev/temperature-sensor.c b/drivers/platform/z1/dev/temperature-sensor.c
similarity index 100%
rename from platform/z1/dev/temperature-sensor.c
rename to drivers/platform/z1/dev/temperature-sensor.c
diff --git a/platform/z1/dev/temperature-sensor.h b/drivers/platform/z1/dev/temperature-sensor.h
similarity index 100%
rename from platform/z1/dev/temperature-sensor.h
rename to drivers/platform/z1/dev/temperature-sensor.h
diff --git a/platform/z1/dev/tlc59116.c b/drivers/platform/z1/dev/tlc59116.c
similarity index 100%
rename from platform/z1/dev/tlc59116.c
rename to drivers/platform/z1/dev/tlc59116.c
diff --git a/platform/z1/dev/tlc59116.h b/drivers/platform/z1/dev/tlc59116.h
similarity index 100%
rename from platform/z1/dev/tlc59116.h
rename to drivers/platform/z1/dev/tlc59116.h
diff --git a/platform/z1/dev/tmp102.c b/drivers/platform/z1/dev/tmp102.c
similarity index 100%
rename from platform/z1/dev/tmp102.c
rename to drivers/platform/z1/dev/tmp102.c
diff --git a/platform/z1/dev/tmp102.h b/drivers/platform/z1/dev/tmp102.h
similarity index 100%
rename from platform/z1/dev/tmp102.h
rename to drivers/platform/z1/dev/tmp102.h
diff --git a/platform/z1/dev/xmem.c b/drivers/platform/z1/dev/xmem.c
similarity index 100%
rename from platform/z1/dev/xmem.c
rename to drivers/platform/z1/dev/xmem.c
diff --git a/platform/z1/dev/z1-phidgets.c b/drivers/platform/z1/dev/z1-phidgets.c
similarity index 100%
rename from platform/z1/dev/z1-phidgets.c
rename to drivers/platform/z1/dev/z1-phidgets.c
diff --git a/platform/z1/dev/z1-phidgets.h b/drivers/platform/z1/dev/z1-phidgets.h
similarity index 100%
rename from platform/z1/dev/z1-phidgets.h
rename to drivers/platform/z1/dev/z1-phidgets.h
diff --git a/platform/z1/dev/z1-sensors.c b/drivers/platform/z1/dev/z1-sensors.c
similarity index 100%
rename from platform/z1/dev/z1-sensors.c
rename to drivers/platform/z1/dev/z1-sensors.c
diff --git a/platform/z1/node-id.c b/drivers/platform/z1/node-id.c
similarity index 100%
rename from platform/z1/node-id.c
rename to drivers/platform/z1/node-id.c
diff --git a/platform/z1/platform-conf.h b/drivers/platform/z1/platform-conf.h
similarity index 100%
rename from platform/z1/platform-conf.h
rename to drivers/platform/z1/platform-conf.h
diff --git a/platform/zoul/Makefile.zoul b/drivers/platform/zoul/Makefile.zoul
similarity index 96%
rename from platform/zoul/Makefile.zoul
rename to drivers/platform/zoul/Makefile.zoul
index 8ac92ccd7..9f53ba641 100644
--- a/platform/zoul/Makefile.zoul
+++ b/drivers/platform/zoul/Makefile.zoul
@@ -26,7 +26,7 @@ CFLAGS += -DDATE="\"`date +"%02u %02d %02m %02y %02H %02M %02S"`\""
### Configure the build for the board and pull in board-specific sources
CONTIKI_TARGET_DIRS += . dev
CONTIKI_TARGET_DIRS += . $(BOARD)
-PLATFORM_ROOT_DIR = $(CONTIKI)/platform/$(TARGET)
+PLATFORM_ROOT_DIR = $(CONTIKI)/drivers/platform/$(TARGET)
### Include the board dir if one exists
-include $(PLATFORM_ROOT_DIR)/$(BOARD)/Makefile.$(BOARD)
@@ -47,11 +47,11 @@ ifndef SMALL
endif
### Define the CPU directory
-CONTIKI_CPU=$(CONTIKI)/cpu/cc2538
+CONTIKI_CPU=$(CONTIKI)/drivers/cpu/cc2538
include $(CONTIKI_CPU)/Makefile.cc2538
MODULES += core/net core/net/mac core/net/ip \
- dev/cc1200
+ drivers/dev/cc1200
ifeq ($(WITH_IP64),1)
MODULES += core/net/ip64
diff --git a/platform/zoul/README.md b/drivers/platform/zoul/README.md
similarity index 100%
rename from platform/zoul/README.md
rename to drivers/platform/zoul/README.md
diff --git a/platform/zoul/contiki-conf.h b/drivers/platform/zoul/contiki-conf.h
similarity index 100%
rename from platform/zoul/contiki-conf.h
rename to drivers/platform/zoul/contiki-conf.h
diff --git a/platform/zoul/contiki-main.c b/drivers/platform/zoul/contiki-main.c
similarity index 100%
rename from platform/zoul/contiki-main.c
rename to drivers/platform/zoul/contiki-main.c
diff --git a/platform/zoul/dev/ac-dimmer.c b/drivers/platform/zoul/dev/ac-dimmer.c
similarity index 100%
rename from platform/zoul/dev/ac-dimmer.c
rename to drivers/platform/zoul/dev/ac-dimmer.c
diff --git a/platform/zoul/dev/ac-dimmer.h b/drivers/platform/zoul/dev/ac-dimmer.h
similarity index 100%
rename from platform/zoul/dev/ac-dimmer.h
rename to drivers/platform/zoul/dev/ac-dimmer.h
diff --git a/platform/zoul/dev/adc-sensors.c b/drivers/platform/zoul/dev/adc-sensors.c
similarity index 100%
rename from platform/zoul/dev/adc-sensors.c
rename to drivers/platform/zoul/dev/adc-sensors.c
diff --git a/platform/zoul/dev/adc-sensors.h b/drivers/platform/zoul/dev/adc-sensors.h
similarity index 100%
rename from platform/zoul/dev/adc-sensors.h
rename to drivers/platform/zoul/dev/adc-sensors.h
diff --git a/platform/zoul/dev/adc-zoul.c b/drivers/platform/zoul/dev/adc-zoul.c
similarity index 100%
rename from platform/zoul/dev/adc-zoul.c
rename to drivers/platform/zoul/dev/adc-zoul.c
diff --git a/platform/zoul/dev/adc-zoul.h b/drivers/platform/zoul/dev/adc-zoul.h
similarity index 100%
rename from platform/zoul/dev/adc-zoul.h
rename to drivers/platform/zoul/dev/adc-zoul.h
diff --git a/platform/zoul/dev/antenna-sw.c b/drivers/platform/zoul/dev/antenna-sw.c
similarity index 100%
rename from platform/zoul/dev/antenna-sw.c
rename to drivers/platform/zoul/dev/antenna-sw.c
diff --git a/platform/zoul/dev/antenna-sw.h b/drivers/platform/zoul/dev/antenna-sw.h
similarity index 100%
rename from platform/zoul/dev/antenna-sw.h
rename to drivers/platform/zoul/dev/antenna-sw.h
diff --git a/platform/zoul/dev/bme280-arch.c b/drivers/platform/zoul/dev/bme280-arch.c
similarity index 100%
rename from platform/zoul/dev/bme280-arch.c
rename to drivers/platform/zoul/dev/bme280-arch.c
diff --git a/platform/zoul/dev/bmpx8x.c b/drivers/platform/zoul/dev/bmpx8x.c
similarity index 100%
rename from platform/zoul/dev/bmpx8x.c
rename to drivers/platform/zoul/dev/bmpx8x.c
diff --git a/platform/zoul/dev/bmpx8x.h b/drivers/platform/zoul/dev/bmpx8x.h
similarity index 100%
rename from platform/zoul/dev/bmpx8x.h
rename to drivers/platform/zoul/dev/bmpx8x.h
diff --git a/platform/zoul/dev/button-sensor.c b/drivers/platform/zoul/dev/button-sensor.c
similarity index 100%
rename from platform/zoul/dev/button-sensor.c
rename to drivers/platform/zoul/dev/button-sensor.c
diff --git a/platform/zoul/dev/button-sensor.h b/drivers/platform/zoul/dev/button-sensor.h
similarity index 100%
rename from platform/zoul/dev/button-sensor.h
rename to drivers/platform/zoul/dev/button-sensor.h
diff --git a/platform/zoul/dev/cc1200-zoul-arch.c b/drivers/platform/zoul/dev/cc1200-zoul-arch.c
similarity index 100%
rename from platform/zoul/dev/cc1200-zoul-arch.c
rename to drivers/platform/zoul/dev/cc1200-zoul-arch.c
diff --git a/platform/zoul/dev/dht22.c b/drivers/platform/zoul/dev/dht22.c
similarity index 100%
rename from platform/zoul/dev/dht22.c
rename to drivers/platform/zoul/dev/dht22.c
diff --git a/platform/zoul/dev/dht22.h b/drivers/platform/zoul/dev/dht22.h
similarity index 100%
rename from platform/zoul/dev/dht22.h
rename to drivers/platform/zoul/dev/dht22.h
diff --git a/platform/zoul/dev/grove-gyro.c b/drivers/platform/zoul/dev/grove-gyro.c
similarity index 100%
rename from platform/zoul/dev/grove-gyro.c
rename to drivers/platform/zoul/dev/grove-gyro.c
diff --git a/platform/zoul/dev/grove-gyro.h b/drivers/platform/zoul/dev/grove-gyro.h
similarity index 100%
rename from platform/zoul/dev/grove-gyro.h
rename to drivers/platform/zoul/dev/grove-gyro.h
diff --git a/platform/zoul/dev/iaq.c b/drivers/platform/zoul/dev/iaq.c
similarity index 100%
rename from platform/zoul/dev/iaq.c
rename to drivers/platform/zoul/dev/iaq.c
diff --git a/platform/zoul/dev/iaq.h b/drivers/platform/zoul/dev/iaq.h
similarity index 100%
rename from platform/zoul/dev/iaq.h
rename to drivers/platform/zoul/dev/iaq.h
diff --git a/platform/zoul/dev/led-strip.c b/drivers/platform/zoul/dev/led-strip.c
similarity index 100%
rename from platform/zoul/dev/led-strip.c
rename to drivers/platform/zoul/dev/led-strip.c
diff --git a/platform/zoul/dev/led-strip.h b/drivers/platform/zoul/dev/led-strip.h
similarity index 100%
rename from platform/zoul/dev/led-strip.h
rename to drivers/platform/zoul/dev/led-strip.h
diff --git a/platform/zoul/dev/leds-arch.c b/drivers/platform/zoul/dev/leds-arch.c
similarity index 100%
rename from platform/zoul/dev/leds-arch.c
rename to drivers/platform/zoul/dev/leds-arch.c
diff --git a/platform/zoul/dev/mmc-arch.c b/drivers/platform/zoul/dev/mmc-arch.c
similarity index 100%
rename from platform/zoul/dev/mmc-arch.c
rename to drivers/platform/zoul/dev/mmc-arch.c
diff --git a/platform/zoul/dev/motion-sensor.c b/drivers/platform/zoul/dev/motion-sensor.c
similarity index 100%
rename from platform/zoul/dev/motion-sensor.c
rename to drivers/platform/zoul/dev/motion-sensor.c
diff --git a/platform/zoul/dev/motion-sensor.h b/drivers/platform/zoul/dev/motion-sensor.h
similarity index 100%
rename from platform/zoul/dev/motion-sensor.h
rename to drivers/platform/zoul/dev/motion-sensor.h
diff --git a/platform/zoul/dev/mp3-wtv020sd.c b/drivers/platform/zoul/dev/mp3-wtv020sd.c
similarity index 100%
rename from platform/zoul/dev/mp3-wtv020sd.c
rename to drivers/platform/zoul/dev/mp3-wtv020sd.c
diff --git a/platform/zoul/dev/mp3-wtv020sd.h b/drivers/platform/zoul/dev/mp3-wtv020sd.h
similarity index 100%
rename from platform/zoul/dev/mp3-wtv020sd.h
rename to drivers/platform/zoul/dev/mp3-wtv020sd.h
diff --git a/platform/zoul/dev/pm10-sensor.c b/drivers/platform/zoul/dev/pm10-sensor.c
similarity index 100%
rename from platform/zoul/dev/pm10-sensor.c
rename to drivers/platform/zoul/dev/pm10-sensor.c
diff --git a/platform/zoul/dev/pm10-sensor.h b/drivers/platform/zoul/dev/pm10-sensor.h
similarity index 100%
rename from platform/zoul/dev/pm10-sensor.h
rename to drivers/platform/zoul/dev/pm10-sensor.h
diff --git a/platform/zoul/dev/relay.c b/drivers/platform/zoul/dev/relay.c
similarity index 100%
rename from platform/zoul/dev/relay.c
rename to drivers/platform/zoul/dev/relay.c
diff --git a/platform/zoul/dev/relay.h b/drivers/platform/zoul/dev/relay.h
similarity index 100%
rename from platform/zoul/dev/relay.h
rename to drivers/platform/zoul/dev/relay.h
diff --git a/platform/zoul/dev/rgb-bl-lcd.c b/drivers/platform/zoul/dev/rgb-bl-lcd.c
similarity index 100%
rename from platform/zoul/dev/rgb-bl-lcd.c
rename to drivers/platform/zoul/dev/rgb-bl-lcd.c
diff --git a/platform/zoul/dev/rgb-bl-lcd.h b/drivers/platform/zoul/dev/rgb-bl-lcd.h
similarity index 100%
rename from platform/zoul/dev/rgb-bl-lcd.h
rename to drivers/platform/zoul/dev/rgb-bl-lcd.h
diff --git a/platform/zoul/dev/rtcc-config.h b/drivers/platform/zoul/dev/rtcc-config.h
similarity index 100%
rename from platform/zoul/dev/rtcc-config.h
rename to drivers/platform/zoul/dev/rtcc-config.h
diff --git a/platform/zoul/dev/rtcc.c b/drivers/platform/zoul/dev/rtcc.c
similarity index 100%
rename from platform/zoul/dev/rtcc.c
rename to drivers/platform/zoul/dev/rtcc.c
diff --git a/platform/zoul/dev/rtcc.h b/drivers/platform/zoul/dev/rtcc.h
similarity index 100%
rename from platform/zoul/dev/rtcc.h
rename to drivers/platform/zoul/dev/rtcc.h
diff --git a/platform/zoul/dev/servo.c b/drivers/platform/zoul/dev/servo.c
similarity index 100%
rename from platform/zoul/dev/servo.c
rename to drivers/platform/zoul/dev/servo.c
diff --git a/platform/zoul/dev/servo.h b/drivers/platform/zoul/dev/servo.h
similarity index 100%
rename from platform/zoul/dev/servo.h
rename to drivers/platform/zoul/dev/servo.h
diff --git a/platform/zoul/dev/sht25.c b/drivers/platform/zoul/dev/sht25.c
similarity index 100%
rename from platform/zoul/dev/sht25.c
rename to drivers/platform/zoul/dev/sht25.c
diff --git a/platform/zoul/dev/sht25.h b/drivers/platform/zoul/dev/sht25.h
similarity index 100%
rename from platform/zoul/dev/sht25.h
rename to drivers/platform/zoul/dev/sht25.h
diff --git a/platform/zoul/dev/tmp102.c b/drivers/platform/zoul/dev/tmp102.c
similarity index 100%
rename from platform/zoul/dev/tmp102.c
rename to drivers/platform/zoul/dev/tmp102.c
diff --git a/platform/zoul/dev/tmp102.h b/drivers/platform/zoul/dev/tmp102.h
similarity index 100%
rename from platform/zoul/dev/tmp102.h
rename to drivers/platform/zoul/dev/tmp102.h
diff --git a/platform/zoul/dev/tsl256x.c b/drivers/platform/zoul/dev/tsl256x.c
similarity index 100%
rename from platform/zoul/dev/tsl256x.c
rename to drivers/platform/zoul/dev/tsl256x.c
diff --git a/platform/zoul/dev/tsl256x.h b/drivers/platform/zoul/dev/tsl256x.h
similarity index 100%
rename from platform/zoul/dev/tsl256x.h
rename to drivers/platform/zoul/dev/tsl256x.h
diff --git a/platform/zoul/dev/weather-meter.c b/drivers/platform/zoul/dev/weather-meter.c
similarity index 100%
rename from platform/zoul/dev/weather-meter.c
rename to drivers/platform/zoul/dev/weather-meter.c
diff --git a/platform/zoul/dev/weather-meter.h b/drivers/platform/zoul/dev/weather-meter.h
similarity index 100%
rename from platform/zoul/dev/weather-meter.h
rename to drivers/platform/zoul/dev/weather-meter.h
diff --git a/platform/zoul/dev/zonik.c b/drivers/platform/zoul/dev/zonik.c
similarity index 100%
rename from platform/zoul/dev/zonik.c
rename to drivers/platform/zoul/dev/zonik.c
diff --git a/platform/zoul/dev/zonik.h b/drivers/platform/zoul/dev/zonik.h
similarity index 100%
rename from platform/zoul/dev/zonik.h
rename to drivers/platform/zoul/dev/zonik.h
diff --git a/platform/zoul/dev/zoul-sensors.c b/drivers/platform/zoul/dev/zoul-sensors.c
similarity index 100%
rename from platform/zoul/dev/zoul-sensors.c
rename to drivers/platform/zoul/dev/zoul-sensors.c
diff --git a/platform/zoul/dev/zoul-sensors.h b/drivers/platform/zoul/dev/zoul-sensors.h
similarity index 100%
rename from platform/zoul/dev/zoul-sensors.h
rename to drivers/platform/zoul/dev/zoul-sensors.h
diff --git a/platform/zoul/firefly-reva/Makefile.firefly-reva b/drivers/platform/zoul/firefly-reva/Makefile.firefly-reva
similarity index 100%
rename from platform/zoul/firefly-reva/Makefile.firefly-reva
rename to drivers/platform/zoul/firefly-reva/Makefile.firefly-reva
diff --git a/platform/zoul/firefly-reva/README.md b/drivers/platform/zoul/firefly-reva/README.md
similarity index 100%
rename from platform/zoul/firefly-reva/README.md
rename to drivers/platform/zoul/firefly-reva/README.md
diff --git a/platform/zoul/firefly-reva/board.c b/drivers/platform/zoul/firefly-reva/board.c
similarity index 100%
rename from platform/zoul/firefly-reva/board.c
rename to drivers/platform/zoul/firefly-reva/board.c
diff --git a/platform/zoul/firefly-reva/board.h b/drivers/platform/zoul/firefly-reva/board.h
similarity index 100%
rename from platform/zoul/firefly-reva/board.h
rename to drivers/platform/zoul/firefly-reva/board.h
diff --git a/platform/zoul/firefly/Makefile.firefly b/drivers/platform/zoul/firefly/Makefile.firefly
similarity index 100%
rename from platform/zoul/firefly/Makefile.firefly
rename to drivers/platform/zoul/firefly/Makefile.firefly
diff --git a/platform/zoul/firefly/README.md b/drivers/platform/zoul/firefly/README.md
similarity index 100%
rename from platform/zoul/firefly/README.md
rename to drivers/platform/zoul/firefly/README.md
diff --git a/platform/zoul/firefly/board.c b/drivers/platform/zoul/firefly/board.c
similarity index 100%
rename from platform/zoul/firefly/board.c
rename to drivers/platform/zoul/firefly/board.c
diff --git a/platform/zoul/firefly/board.h b/drivers/platform/zoul/firefly/board.h
similarity index 100%
rename from platform/zoul/firefly/board.h
rename to drivers/platform/zoul/firefly/board.h
diff --git a/platform/zoul/fs/fat/diskio.c b/drivers/platform/zoul/fs/fat/diskio.c
similarity index 100%
rename from platform/zoul/fs/fat/diskio.c
rename to drivers/platform/zoul/fs/fat/diskio.c
diff --git a/platform/zoul/fs/fat/ffconf.h b/drivers/platform/zoul/fs/fat/ffconf.h
similarity index 100%
rename from platform/zoul/fs/fat/ffconf.h
rename to drivers/platform/zoul/fs/fat/ffconf.h
diff --git a/platform/zoul/images/firefly-reva.jpg b/drivers/platform/zoul/images/firefly-reva.jpg
old mode 100755
new mode 100644
similarity index 100%
rename from platform/zoul/images/firefly-reva.jpg
rename to drivers/platform/zoul/images/firefly-reva.jpg
diff --git a/platform/zoul/orion/Makefile.orion b/drivers/platform/zoul/orion/Makefile.orion
similarity index 86%
rename from platform/zoul/orion/Makefile.orion
rename to drivers/platform/zoul/orion/Makefile.orion
index 684ce6d0f..ef1b74c3e 100644
--- a/platform/zoul/orion/Makefile.orion
+++ b/drivers/platform/zoul/orion/Makefile.orion
@@ -1,5 +1,5 @@
MOTELIST_ZOLERTIA = orion
-MODULES += dev/enc28j60
+MODULES += drivers/dev/enc28j60
CC2538_ENC28J60_ARCH ?= gpio
WITH_IP64 ?= 1
CFLAGS += -DUIP_FALLBACK_INTERFACE=ip64_uip_fallback_interface
diff --git a/platform/zoul/orion/README.md b/drivers/platform/zoul/orion/README.md
similarity index 100%
rename from platform/zoul/orion/README.md
rename to drivers/platform/zoul/orion/README.md
diff --git a/platform/zoul/orion/board.c b/drivers/platform/zoul/orion/board.c
similarity index 100%
rename from platform/zoul/orion/board.c
rename to drivers/platform/zoul/orion/board.c
diff --git a/platform/zoul/orion/board.h b/drivers/platform/zoul/orion/board.h
similarity index 100%
rename from platform/zoul/orion/board.h
rename to drivers/platform/zoul/orion/board.h
diff --git a/platform/zoul/orion/enc28j60-arch-gpio.c b/drivers/platform/zoul/orion/enc28j60-arch-gpio.c
similarity index 100%
rename from platform/zoul/orion/enc28j60-arch-gpio.c
rename to drivers/platform/zoul/orion/enc28j60-arch-gpio.c
diff --git a/platform/zoul/orion/enc28j60-arch-spi.c b/drivers/platform/zoul/orion/enc28j60-arch-spi.c
similarity index 100%
rename from platform/zoul/orion/enc28j60-arch-spi.c
rename to drivers/platform/zoul/orion/enc28j60-arch-spi.c
diff --git a/platform/zoul/orion/ip64-conf.h b/drivers/platform/zoul/orion/ip64-conf.h
similarity index 100%
rename from platform/zoul/orion/ip64-conf.h
rename to drivers/platform/zoul/orion/ip64-conf.h
diff --git a/platform/zoul/remote-reva/Makefile.remote-reva b/drivers/platform/zoul/remote-reva/Makefile.remote-reva
similarity index 55%
rename from platform/zoul/remote-reva/Makefile.remote-reva
rename to drivers/platform/zoul/remote-reva/Makefile.remote-reva
index 893b2a6fe..ac1c3a47b 100644
--- a/platform/zoul/remote-reva/Makefile.remote-reva
+++ b/drivers/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 += lib/fs/fat lib/fs/fat/option platform/zoul/fs/fat dev/disk/mmc
+MODULES += lib/fs/fat lib/fs/fat/option drivers/platform/zoul/fs/fat drivers/dev/disk/mmc
diff --git a/platform/zoul/remote-reva/README.md b/drivers/platform/zoul/remote-reva/README.md
similarity index 100%
rename from platform/zoul/remote-reva/README.md
rename to drivers/platform/zoul/remote-reva/README.md
diff --git a/platform/zoul/remote-reva/board.c b/drivers/platform/zoul/remote-reva/board.c
similarity index 100%
rename from platform/zoul/remote-reva/board.c
rename to drivers/platform/zoul/remote-reva/board.c
diff --git a/platform/zoul/remote-reva/board.h b/drivers/platform/zoul/remote-reva/board.h
similarity index 100%
rename from platform/zoul/remote-reva/board.h
rename to drivers/platform/zoul/remote-reva/board.h
diff --git a/platform/zoul/remote-reva/power-mgmt.c b/drivers/platform/zoul/remote-reva/power-mgmt.c
similarity index 100%
rename from platform/zoul/remote-reva/power-mgmt.c
rename to drivers/platform/zoul/remote-reva/power-mgmt.c
diff --git a/platform/zoul/remote-reva/power-mgmt.h b/drivers/platform/zoul/remote-reva/power-mgmt.h
similarity index 100%
rename from platform/zoul/remote-reva/power-mgmt.h
rename to drivers/platform/zoul/remote-reva/power-mgmt.h
diff --git a/platform/zoul/remote-revb/Makefile.remote-revb b/drivers/platform/zoul/remote-revb/Makefile.remote-revb
similarity index 56%
rename from platform/zoul/remote-revb/Makefile.remote-revb
rename to drivers/platform/zoul/remote-revb/Makefile.remote-revb
index 1c5e05d18..d6f597932 100644
--- a/platform/zoul/remote-revb/Makefile.remote-revb
+++ b/drivers/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 += lib/fs/fat lib/fs/fat/option platform/zoul/fs/fat dev/disk/mmc
+MODULES += lib/fs/fat lib/fs/fat/option drivers/platform/zoul/fs/fat drivers/dev/disk/mmc
diff --git a/platform/zoul/remote-revb/README.md b/drivers/platform/zoul/remote-revb/README.md
similarity index 100%
rename from platform/zoul/remote-revb/README.md
rename to drivers/platform/zoul/remote-revb/README.md
diff --git a/platform/zoul/remote-revb/board.c b/drivers/platform/zoul/remote-revb/board.c
similarity index 100%
rename from platform/zoul/remote-revb/board.c
rename to drivers/platform/zoul/remote-revb/board.c
diff --git a/platform/zoul/remote-revb/board.h b/drivers/platform/zoul/remote-revb/board.h
similarity index 100%
rename from platform/zoul/remote-revb/board.h
rename to drivers/platform/zoul/remote-revb/board.h
diff --git a/platform/zoul/remote-revb/leds-res-arch.c b/drivers/platform/zoul/remote-revb/leds-res-arch.c
similarity index 100%
rename from platform/zoul/remote-revb/leds-res-arch.c
rename to drivers/platform/zoul/remote-revb/leds-res-arch.c
diff --git a/platform/zoul/remote-revb/power-mgmt.c b/drivers/platform/zoul/remote-revb/power-mgmt.c
similarity index 100%
rename from platform/zoul/remote-revb/power-mgmt.c
rename to drivers/platform/zoul/remote-revb/power-mgmt.c
diff --git a/platform/zoul/remote-revb/power-mgmt.h b/drivers/platform/zoul/remote-revb/power-mgmt.h
similarity index 100%
rename from platform/zoul/remote-revb/power-mgmt.h
rename to drivers/platform/zoul/remote-revb/power-mgmt.h
diff --git a/platform/zoul/zolertia-zoul-cdc-acm.inf b/drivers/platform/zoul/zolertia-zoul-cdc-acm.inf
old mode 100755
new mode 100644
similarity index 100%
rename from platform/zoul/zolertia-zoul-cdc-acm.inf
rename to drivers/platform/zoul/zolertia-zoul-cdc-acm.inf
diff --git a/examples/ipv6/rpl-border-router/Makefile b/examples/ipv6/rpl-border-router/Makefile
index d325918ec..da203d464 100644
--- a/examples/ipv6/rpl-border-router/Makefile
+++ b/examples/ipv6/rpl-border-router/Makefile
@@ -12,9 +12,9 @@ PROJECT_SOURCEFILES += slip-bridge.c
#Simple built-in webserver is the default.
#Override with make WITH_WEBSERVER=0 for no webserver.
#WITH_WEBSERVER=webserver-name will use /apps/webserver-name if it can be
-#found in the /apps, /platform/$(TARGET)/apps/, or current directory (in that order).
+#found in the /apps, /drivers//platform/$(TARGET)/apps/, or current directory (in that order).
# WITH_WEBSERVER=webserver for /apps/webserver
-# WITH_WEBSERVER=raven-webserver for /platform/avr-raven/apps/raven-webserver/
+# WITH_WEBSERVER=raven-webserver for /drivers/platform/avr-raven/apps/raven-webserver/
#make clean before changing webservers!
#Note /apps/webserver contains a 2500 byte style sheet which is a severe test
diff --git a/examples/zolertia/z1/Makefile b/examples/zolertia/z1/Makefile
index d0ba2abc8..70a107e75 100644
--- a/examples/zolertia/z1/Makefile
+++ b/examples/zolertia/z1/Makefile
@@ -11,7 +11,7 @@ CONTIKI_PROJECT += test-battery test-relay-phidget test-tlc59116 test-sht25
CONTIKI_SOURCEFILES += reed-sensor.c sht25.c tlc59116.c light-ziglet.c \
relay-phidget.c
-MODULES += dev/sht11
+MODULES += drivers/dev/sht11
ifeq ($(ZOLERTIA_Z1SP),1)
CONTIKI_PROJECT += test-potent
diff --git a/examples/zolertia/zoul/Makefile b/examples/zolertia/zoul/Makefile
index 33b223d1e..f871d647f 100644
--- a/examples/zolertia/zoul/Makefile
+++ b/examples/zolertia/zoul/Makefile
@@ -13,7 +13,7 @@ CONTIKI_TARGET_SOURCEFILES += adc-sensors.c weather-meter.c grove-gyro.c
CONTIKI_TARGET_SOURCEFILES += rgb-bl-lcd.c pm10-sensor.c iaq.c zonik.c relay.c
CONTIKI_TARGET_SOURCEFILES += dht22.c servo.c ac-dimmer.c bme280-arch.c
-MODULES += /dev/bme280
+MODULES += drivers//dev/bme280
all: $(CONTIKI_PROJECT)
diff --git a/platform/zoul/images/firefly-reva-pinout-front.png b/platform/zoul/images/firefly-reva-pinout-front.png
deleted file mode 100644
index 7e70c1f94..000000000
Binary files a/platform/zoul/images/firefly-reva-pinout-front.png and /dev/null differ
diff --git a/platform/zoul/images/firefly.png b/platform/zoul/images/firefly.png
deleted file mode 100755
index 362047c64..000000000
Binary files a/platform/zoul/images/firefly.png and /dev/null differ
diff --git a/platform/zoul/images/orion-pinout.png b/platform/zoul/images/orion-pinout.png
deleted file mode 100755
index bb11265b7..000000000
Binary files a/platform/zoul/images/orion-pinout.png and /dev/null differ
diff --git a/platform/zoul/images/orion-router-front.png b/platform/zoul/images/orion-router-front.png
deleted file mode 100755
index 1cb0c2b9b..000000000
Binary files a/platform/zoul/images/orion-router-front.png and /dev/null differ
diff --git a/platform/zoul/images/remote-reva-back.png b/platform/zoul/images/remote-reva-back.png
deleted file mode 100755
index d94e9edac..000000000
Binary files a/platform/zoul/images/remote-reva-back.png and /dev/null differ
diff --git a/platform/zoul/images/remote-reva-front.png b/platform/zoul/images/remote-reva-front.png
deleted file mode 100755
index 390e16719..000000000
Binary files a/platform/zoul/images/remote-reva-front.png and /dev/null differ
diff --git a/platform/zoul/images/remote-reva-pinout-back.png b/platform/zoul/images/remote-reva-pinout-back.png
deleted file mode 100755
index 15ced83a0..000000000
Binary files a/platform/zoul/images/remote-reva-pinout-back.png and /dev/null differ
diff --git a/platform/zoul/images/remote-reva-pinout-front.png b/platform/zoul/images/remote-reva-pinout-front.png
deleted file mode 100755
index 18a9bf40c..000000000
Binary files a/platform/zoul/images/remote-reva-pinout-front.png and /dev/null differ
diff --git a/platform/zoul/images/zoul-front.png b/platform/zoul/images/zoul-front.png
deleted file mode 100755
index 1a5130515..000000000
Binary files a/platform/zoul/images/zoul-front.png and /dev/null differ
diff --git a/platform/zoul/images/zoul-pinout-back.png b/platform/zoul/images/zoul-pinout-back.png
deleted file mode 100755
index 215075222..000000000
Binary files a/platform/zoul/images/zoul-pinout-back.png and /dev/null differ
diff --git a/platform/zoul/images/zoul-pinout-front.png b/platform/zoul/images/zoul-pinout-front.png
deleted file mode 100755
index c18bee7b3..000000000
Binary files a/platform/zoul/images/zoul-pinout-front.png and /dev/null differ
diff --git a/regression-tests/05-compile-tools/Makefile b/regression-tests/05-compile-tools/Makefile
index fd7ee67f9..7d571f772 100644
--- a/regression-tests/05-compile-tools/Makefile
+++ b/regression-tests/05-compile-tools/Makefile
@@ -25,7 +25,7 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
-TOOLS=sky tools z80=hex2bin
+TOOLS=sky tools
FAILTOOLS=sky=uip6-bridge
diff --git a/tools/6502/Makefile b/tools/6502/Makefile
deleted file mode 100644
index 8f845bf12..000000000
--- a/tools/6502/Makefile
+++ /dev/null
@@ -1,511 +0,0 @@
-#
-# Copyright (c) 2010, Adam Dunkels.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in the
-# documentation and/or other materials provided with the distribution.
-# 3. The name of the author may not be used to endorse or promote
-# products derived from this software without specific prior
-# written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
-# OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
-# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
-# GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-# This file is part of the Contiki operating system.
-#
-# Author: Oliver Schmidt
-#
-
-ifndef AC
- ${error AC not defined! You must specify where the AppleCommander jar resides}
-endif
-
-ifndef C1541
- ${error C1541 not defined! You must specify where VICE c1541 resides}
-endif
-
-ifndef DIR2ATR
- ${error DIR2ATR not defined! You must specify where dir2atr resides}
-endif
-
-all: apple2 atari c64 c128
-clean: apple2-clean atari-clean c64-clean c128-clean
-
-ifeq ($(shell echo),)
- NULLDEV = /dev/null
-else
- NULLDEV = nul:
-endif
-
-ZIPCOMMENT := $(shell git rev-parse --short HEAD 2>$(NULLDEV))
-ifeq ($(words $(ZIPCOMMENT)),1)
- ZIPCOMMENT := https://github.com/contiki-os/contiki/commits/$(ZIPCOMMENT)
-else
- ZIPCOMMENT := N/A
-endif
-
-CC65 := $(shell cl65 --print-target-path)
-
-ifdef SLIP
-DEV = ser
-else
-DEV = eth
-endif
-
-define makes
-.PHONY: $1-$2makes
-$1-$2makes:
- $(MAKE) -C ../../cpu/6502/$(DEV)config TARGET=$1 $2
- $(MAKE) -C ../../cpu/6502/ipconfig TARGET=$1 $2
- $(MAKE) -C ../../examples/webbrowser TARGET=$1 $2
- $(MAKE) -C ../../examples/webbrowser-80col TARGET=$1 $2
- $(MAKE) -C ../../examples/wget TARGET=$1 $2
- $(MAKE) -C ../../examples/irc TARGET=$1 $2
- $(MAKE) -C ../../examples/irc-80col TARGET=$1 $2
- $(MAKE) -C ../../examples/webserver TARGET=$1 HTTPD-CFS=1 $2
- $(MAKE) -C ../../examples/telnet-server TARGET=$1 $2
-endef
-
-$(eval $(call makes,apple2enh))
-$(eval $(call makes,apple2enh,clean))
-
-%.zip:
- zip $@ $^
- echo $(ZIPCOMMENT) | zip -z $@
-
-.PHONY: apple2 apple2-clean atari atari-clean c64 c64-clean c128 c128-clean
-
-apple2: contiki-apple2.zip
-
-apple2-clean: apple2enh-cleanmakes
- rm -f contiki-apple2.zip contiki-apple2-1.dsk contiki-apple2-2.dsk contiki-apple2-3.dsk contiki-apple2.po
-
-contiki-apple2.zip: contiki-apple2-1.dsk contiki-apple2-2.dsk contiki-apple2-3.dsk contiki-apple2.po
-
-contiki-apple2-1.dsk: apple2enh-makes
- cp ../apple2enh/prodos.dsk $@
- java -jar $(AC) -p $@ menu.system sys < ../apple2enh/menu.system
- java -jar $(AC) -p $@ $(DEV)confi.system sys < $(CC65)/apple2enh/util/loader.system
- java -jar $(AC) -cc65 $@ $(DEV)confi bin < ../../cpu/6502/$(DEV)config/$(DEV)config.apple2enh
- java -jar $(AC) -p $@ ipconfig.system sys < $(CC65)/apple2enh/util/loader.system
- java -jar $(AC) -cc65 $@ ipconfig bin < ../../cpu/6502/ipconfig/ipconfig.apple2enh
- java -jar $(AC) -p $@ webbrows.system sys < $(CC65)/apple2enh/util/loader.system
- java -jar $(AC) -cc65 $@ webbrows bin < ../../examples/webbrowser-80col/webbrowser.apple2enh
- java -jar $(AC) -p $@ wget.system sys < $(CC65)/apple2enh/util/loader.system
- java -jar $(AC) -cc65 $@ wget bin < ../../examples/wget/wget.apple2enh
-ifdef SLIP
- java -jar $(AC) -p $@ contiki.cfg bin 0 < default.cfg
-else
- java -jar $(AC) -p $@ contiki.cfg bin 0 < ../apple2enh/default.cfg
- java -jar $(AC) -p $@ cs8900a.eth rel 0 < ../../cpu/6502/ethconfig/cs8900a.eth
- java -jar $(AC) -p $@ lan91c96.eth rel 0 < ../../cpu/6502/ethconfig/lan91c96.eth
- java -jar $(AC) -p $@ w5100.eth rel 0 < ../../cpu/6502/ethconfig/w5100.eth
-endif
-
-contiki-apple2-2.dsk: apple2enh-makes
- cp ../apple2enh/prodos.dsk $@
- java -jar $(AC) -p $@ menu.system sys < ../apple2enh/menu.system
- java -jar $(AC) -p $@ $(DEV)confi.system sys < $(CC65)/apple2enh/util/loader.system
- java -jar $(AC) -cc65 $@ $(DEV)confi bin < ../../cpu/6502/$(DEV)config/$(DEV)config.apple2enh
- java -jar $(AC) -p $@ ipconfig.system sys < $(CC65)/apple2enh/util/loader.system
- java -jar $(AC) -cc65 $@ ipconfig bin < ../../cpu/6502/ipconfig/ipconfig.apple2enh
- java -jar $(AC) -p $@ irc.system sys < $(CC65)/apple2enh/util/loader.system
- java -jar $(AC) -cc65 $@ irc bin < ../../examples/irc-80col/irc-client.apple2enh
-ifdef SLIP
- java -jar $(AC) -p $@ contiki.cfg bin 0 < default.cfg
-else
- java -jar $(AC) -p $@ contiki.cfg bin 0 < ../apple2enh/default.cfg
- java -jar $(AC) -p $@ cs8900a.eth rel 0 < ../../cpu/6502/ethconfig/cs8900a.eth
- java -jar $(AC) -p $@ lan91c96.eth rel 0 < ../../cpu/6502/ethconfig/lan91c96.eth
- java -jar $(AC) -p $@ w5100.eth rel 0 < ../../cpu/6502/ethconfig/w5100.eth
-endif
-
-contiki-apple2-3.dsk: apple2enh-makes
- cp ../apple2enh/prodos.dsk $@
- java -jar $(AC) -p $@ menu.system sys < ../apple2enh/menu.system
- java -jar $(AC) -p $@ $(DEV)confi.system sys < $(CC65)/apple2enh/util/loader.system
- java -jar $(AC) -cc65 $@ $(DEV)confi bin < ../../cpu/6502/$(DEV)config/$(DEV)config.apple2enh
- java -jar $(AC) -p $@ ipconfig.system sys < $(CC65)/apple2enh/util/loader.system
- java -jar $(AC) -cc65 $@ ipconfig bin < ../../cpu/6502/ipconfig/ipconfig.apple2enh
- java -jar $(AC) -p $@ webserv.system sys < $(CC65)/apple2enh/util/loader.system
- java -jar $(AC) -cc65 $@ webserv bin < ../../examples/webserver/webserver-example.apple2enh
- java -jar $(AC) -p $@ telnetd.system sys < $(CC65)/apple2enh/util/loader.system
- java -jar $(AC) -cc65 $@ telnetd bin < ../../examples/telnet-server/telnet-server.apple2enh
-ifdef SLIP
- java -jar $(AC) -p $@ contiki.cfg bin 0 < default.cfg
-else
- java -jar $(AC) -p $@ contiki.cfg bin 0 < ../apple2enh/default.cfg
- java -jar $(AC) -p $@ cs8900a.eth rel 0 < ../../cpu/6502/ethconfig/cs8900a.eth
- java -jar $(AC) -p $@ lan91c96.eth rel 0 < ../../cpu/6502/ethconfig/lan91c96.eth
- java -jar $(AC) -p $@ w5100.eth rel 0 < ../../cpu/6502/ethconfig/w5100.eth
-endif
- java -jar $(AC) -p $@ index.htm bin 0 < ../../examples/webserver/httpd-cfs/index.htm
- java -jar $(AC) -p $@ backgrnd.gif bin 0 < ../../examples/webserver/httpd-cfs/backgrnd.gif
- java -jar $(AC) -p $@ contiki.gif bin 0 < ../../examples/webserver/httpd-cfs/contiki.gif
- java -jar $(AC) -p $@ notfound.htm bin 0 < ../../examples/webserver/httpd-cfs/notfound.htm
-
-contiki-apple2.po: apple2enh-makes
- cp ../apple2enh/prodos.po $@
- java -jar $(AC) -p $@ menu.system sys < ../apple2enh/menu.system
- java -jar $(AC) -p $@ $(DEV)confi.system sys < $(CC65)/apple2enh/util/loader.system
- java -jar $(AC) -cc65 $@ $(DEV)confi bin < ../../cpu/6502/$(DEV)config/$(DEV)config.apple2enh
- java -jar $(AC) -p $@ ipconfig.system sys < $(CC65)/apple2enh/util/loader.system
- java -jar $(AC) -cc65 $@ ipconfig bin < ../../cpu/6502/ipconfig/ipconfig.apple2enh
- java -jar $(AC) -p $@ webbrows.system sys < $(CC65)/apple2enh/util/loader.system
- java -jar $(AC) -cc65 $@ webbrows bin < ../../examples/webbrowser-80col/webbrowser.apple2enh
- java -jar $(AC) -p $@ wget.system sys < $(CC65)/apple2enh/util/loader.system
- java -jar $(AC) -cc65 $@ wget bin < ../../examples/wget/wget.apple2enh
- java -jar $(AC) -p $@ irc.system sys < $(CC65)/apple2enh/util/loader.system
- java -jar $(AC) -cc65 $@ irc bin < ../../examples/irc-80col/irc-client.apple2enh
- java -jar $(AC) -p $@ webserv.system sys < $(CC65)/apple2enh/util/loader.system
- java -jar $(AC) -cc65 $@ webserv bin < ../../examples/webserver/webserver-example.apple2enh
- java -jar $(AC) -p $@ telnetd.system sys < $(CC65)/apple2enh/util/loader.system
- java -jar $(AC) -cc65 $@ telnetd bin < ../../examples/telnet-server/telnet-server.apple2enh
-ifdef SLIP
- java -jar $(AC) -p $@ contiki.cfg bin 0 < default.cfg
-else
- java -jar $(AC) -p $@ contiki.cfg bin 0 < ../apple2enh/default.cfg
- java -jar $(AC) -p $@ cs8900a.eth rel 0 < ../../cpu/6502/ethconfig/cs8900a.eth
- java -jar $(AC) -p $@ lan91c96.eth rel 0 < ../../cpu/6502/ethconfig/lan91c96.eth
- java -jar $(AC) -p $@ w5100.eth rel 0 < ../../cpu/6502/ethconfig/w5100.eth
-endif
- java -jar $(AC) -p $@ contiki.mou rel 0 < $(CC65)/apple2enh/drv/mou/a2e.stdmou.mou
- java -jar $(AC) -p $@ index.htm bin 0 < ../../examples/webserver/httpd-cfs/index.htm
- java -jar $(AC) -p $@ backgrnd.gif bin 0 < ../../examples/webserver/httpd-cfs/backgrnd.gif
- java -jar $(AC) -p $@ contiki.gif bin 0 < ../../examples/webserver/httpd-cfs/contiki.gif
- java -jar $(AC) -p $@ notfound.htm bin 0 < ../../examples/webserver/httpd-cfs/notfound.htm
-
-$(eval $(call makes,atarixl))
-$(eval $(call makes,atarixl,clean))
-
-atari: contiki-atari.zip
-
-atari-clean: atarixl-cleanmakes
- rm -f contiki-atari.zip contiki-atari-1.atr contiki-atari-2.atr contiki-atari-3.atr contiki-atari.atr
-
-contiki-atari.zip: contiki-atari-1.atr contiki-atari-2.atr contiki-atari-3.atr contiki-atari.atr
-
-contiki-atari-1.atr: atarixl-makes
- mkdir atr
- cp ../atarixl/dos25/dos.sys atr/dos.sys
- cp ../atarixl/dos25/dup.sys atr/dup.sys
-ifdef SLIP
- cp ../../cpu/6502/serconfig/serconfig.atarixl atr/serconfi.com
-endif
- cp ../../cpu/6502/ipconfig/ipconfig.atarixl atr/ipconfig.com
- cp ../../examples/webbrowser/webbrowser.atarixl atr/webbrows.com
- cp ../../examples/wget/wget.atarixl atr/wget.com
-ifdef SLIP
- cp default.cfg atr/contiki.cfg
-else
- cp ../atarixl/default.cfg atr/contiki.cfg
-endif
- cp $(CC65)/atarixl/drv/mou/atrxst.mou atr/contiki.mou
- cp $(CC65)/atarixl/drv/mou/atrxami.mou atr/ami.mou
- cp $(CC65)/atarixl/drv/mou/atrxjoy.mou atr/joy.mou
- cp $(CC65)/atarixl/drv/mou/atrxtrk.mou atr/trk.mou
- cp $(CC65)/atarixl/drv/mou/atrxtt.mou atr/tt.mou
- $(DIR2ATR) -b Dos25 1040 $@ atr
- rm -r atr
-
-contiki-atari-2.atr: atarixl-makes
- mkdir atr
- cp ../atarixl/dos25/dos.sys atr/dos.sys
- cp ../atarixl/dos25/dup.sys atr/dup.sys
-ifdef SLIP
- cp ../../cpu/6502/serconfig/serconfig.atarixl atr/serconfi.com
-endif
- cp ../../cpu/6502/ipconfig/ipconfig.atarixl atr/ipconfig.com
- cp ../../examples/irc/irc-client.atarixl atr/irc.com
-ifdef SLIP
- cp default.cfg atr/contiki.cfg
-else
- cp ../atarixl/default.cfg atr/contiki.cfg
-endif
- cp $(CC65)/atarixl/drv/mou/atrxst.mou atr/contiki.mou
- cp $(CC65)/atarixl/drv/mou/atrxami.mou atr/ami.mou
- cp $(CC65)/atarixl/drv/mou/atrxjoy.mou atr/joy.mou
- cp $(CC65)/atarixl/drv/mou/atrxtrk.mou atr/trk.mou
- cp $(CC65)/atarixl/drv/mou/atrxtt.mou atr/tt.mou
- $(DIR2ATR) -b Dos25 1040 $@ atr
- rm -r atr
-
-contiki-atari-3.atr: atarixl-makes
- mkdir atr
- cp ../atarixl/dos25/dos.sys atr/dos.sys
- cp ../atarixl/dos25/dup.sys atr/dup.sys
-ifdef SLIP
- cp ../../cpu/6502/serconfig/serconfig.atarixl atr/serconfi.com
-endif
- cp ../../cpu/6502/ipconfig/ipconfig.atarixl atr/ipconfig.com
- cp ../../examples/webserver/webserver-example.atarixl atr/webserv.com
- cp ../../examples/telnet-server/telnet-server.atarixl atr/telnetd.com
-ifdef SLIP
- cp default.cfg atr/contiki.cfg
-else
- cp ../atarixl/default.cfg atr/contiki.cfg
-endif
- cp $(CC65)/atarixl/drv/mou/atrxst.mou atr/contiki.mou
- cp $(CC65)/atarixl/drv/mou/atrxami.mou atr/ami.mou
- cp $(CC65)/atarixl/drv/mou/atrxjoy.mou atr/joy.mou
- cp $(CC65)/atarixl/drv/mou/atrxtrk.mou atr/trk.mou
- cp $(CC65)/atarixl/drv/mou/atrxtt.mou atr/tt.mou
- cp ../../examples/webserver/httpd-cfs/index.htm atr/index.htm
- cp ../../examples/webserver/httpd-cfs/backgrnd.gif atr/backgrnd.gif
- cp ../../examples/webserver/httpd-cfs/contiki.gif atr/contiki.gif
- cp ../../examples/webserver/httpd-cfs/notfound.htm atr/notfound.htm
- $(DIR2ATR) -b Dos25 1040 $@ atr
- rm -r atr
-
-contiki-atari.atr: atarixl-makes
- mkdir atr
- cp ../atarixl/mydos4534/dos.sys atr/dos.sys
- cp ../atarixl/mydos4534/dup.sys atr/dup.sys
-ifdef SLIP
- cp ../../cpu/6502/serconfig/serconfig.atarixl atr/serconfi.com
-endif
- cp ../../cpu/6502/ipconfig/ipconfig.atarixl atr/ipconfig.com
- cp ../../examples/webbrowser/webbrowser.atarixl atr/webbrows.com
- cp ../../examples/wget/wget.atarixl atr/wget.com
- cp ../../examples/irc/irc-client.atarixl atr/irc.com
- cp ../../examples/webserver/webserver-example.atarixl atr/webserv.com
- cp ../../examples/telnet-server/telnet-server.atarixl atr/telnetd.com
-ifdef SLIP
- cp default.cfg atr/contiki.cfg
-else
- cp ../atarixl/default.cfg atr/contiki.cfg
-endif
- cp $(CC65)/atarixl/drv/mou/atrxst.mou atr/contiki.mou
- cp $(CC65)/atarixl/drv/mou/atrxami.mou atr/ami.mou
- cp $(CC65)/atarixl/drv/mou/atrxjoy.mou atr/joy.mou
- cp $(CC65)/atarixl/drv/mou/atrxtrk.mou atr/trk.mou
- cp $(CC65)/atarixl/drv/mou/atrxtt.mou atr/tt.mou
- cp ../../examples/webserver/httpd-cfs/index.htm atr/index.htm
- cp ../../examples/webserver/httpd-cfs/backgrnd.gif atr/backgrnd.gif
- cp ../../examples/webserver/httpd-cfs/contiki.gif atr/contiki.gif
- cp ../../examples/webserver/httpd-cfs/notfound.htm atr/notfound.htm
- $(DIR2ATR) -d -b MyDos4534 3200 $@ atr
- rm -r atr
-
-$(eval $(call makes,c64))
-$(eval $(call makes,c64,clean))
-
-c64: contiki-c64.zip
-
-c64-clean: c64-cleanmakes
- rm -f contiki-c64.zip contiki-c64-1.d64 contiki-c64-2.d64 contiki-c64-3.d64 contiki-c64.d71 contiki-c64.d81
-
-contiki-c64.zip: contiki-c64-1.d64 contiki-c64-2.d64 contiki-c64-3.d64 contiki-c64.d71 contiki-c64.d81
-
-contiki-c64-1.d64: c64-makes
- $(C1541) -format contiki-1,00 d64 $@
- $(C1541) -attach $@ -write ../../cpu/6502/$(DEV)config/$(DEV)config.c64 $(DEV)config,p >$(NULLDEV)
- $(C1541) -attach $@ -write ../../cpu/6502/ipconfig/ipconfig.c64 ipconfig,p >$(NULLDEV)
- $(C1541) -attach $@ -write ../../examples/webbrowser/webbrowser.c64 webbrowser,p >$(NULLDEV)
- $(C1541) -attach $@ -write ../../examples/webbrowser-80col/webbrowser.c64 webbrowser80,p >$(NULLDEV)
- $(C1541) -attach $@ -write ../../examples/wget/wget.c64 wget,p >$(NULLDEV)
-ifdef SLIP
- $(C1541) -attach $@ -write default.cfg contiki.cfg,s >$(NULLDEV)
-else
- $(C1541) -attach $@ -write ../c64/default.cfg contiki.cfg,s >$(NULLDEV)
- $(C1541) -attach $@ -write ../../cpu/6502/ethconfig/cs8900a.eth cs8900a.eth,s >$(NULLDEV)
- $(C1541) -attach $@ -write ../../cpu/6502/ethconfig/lan91c96.eth lan91c96.eth,s >$(NULLDEV)
-endif
- $(C1541) -attach $@ -write $(CC65)/c64/drv/mou/c64-1351.mou contiki.mou,s >$(NULLDEV)
- $(C1541) -attach $@ -write $(CC65)/c64/drv/mou/c64-inkwell.mou inkwell.mou,s >$(NULLDEV)
- $(C1541) -attach $@ -write $(CC65)/c64/drv/mou/c64-joy.mou joy.mou,s >$(NULLDEV)
- $(C1541) -attach $@ -write $(CC65)/c64/drv/mou/c64-pot.mou pot.mou,s >$(NULLDEV)
-
-contiki-c64-2.d64: c64-makes
- $(C1541) -format contiki-2,00 d64 $@
- $(C1541) -attach $@ -write ../../cpu/6502/$(DEV)config/$(DEV)config.c64 $(DEV)config,p >$(NULLDEV)
- $(C1541) -attach $@ -write ../../cpu/6502/ipconfig/ipconfig.c64 ipconfig,p >$(NULLDEV)
- $(C1541) -attach $@ -write ../../examples/irc/irc-client.c64 irc,p >$(NULLDEV)
- $(C1541) -attach $@ -write ../../examples/irc-80col/irc-client.c64 irc80,p >$(NULLDEV)
-ifdef SLIP
- $(C1541) -attach $@ -write default.cfg contiki.cfg,s >$(NULLDEV)
-else
- $(C1541) -attach $@ -write ../c64/default.cfg contiki.cfg,s >$(NULLDEV)
- $(C1541) -attach $@ -write ../../cpu/6502/ethconfig/cs8900a.eth cs8900a.eth,s >$(NULLDEV)
- $(C1541) -attach $@ -write ../../cpu/6502/ethconfig/lan91c96.eth lan91c96.eth,s >$(NULLDEV)
-endif
- $(C1541) -attach $@ -write $(CC65)/c64/drv/mou/c64-1351.mou contiki.mou,s >$(NULLDEV)
- $(C1541) -attach $@ -write $(CC65)/c64/drv/mou/c64-inkwell.mou inkwell.mou,s >$(NULLDEV)
- $(C1541) -attach $@ -write $(CC65)/c64/drv/mou/c64-joy.mou joy.mou,s >$(NULLDEV)
- $(C1541) -attach $@ -write $(CC65)/c64/drv/mou/c64-pot.mou pot.mou,s >$(NULLDEV)
-
-contiki-c64-3.d64: c64-makes
- $(C1541) -format contiki-3,00 d64 $@
- $(C1541) -attach $@ -write ../../cpu/6502/$(DEV)config/$(DEV)config.c64 $(DEV)config,p >$(NULLDEV)
- $(C1541) -attach $@ -write ../../cpu/6502/ipconfig/ipconfig.c64 ipconfig,p >$(NULLDEV)
- $(C1541) -attach $@ -write ../../examples/webserver/webserver-example.c64 webserver,p >$(NULLDEV)
- $(C1541) -attach $@ -write ../../examples/telnet-server/telnet-server.c64 telnetd,p >$(NULLDEV)
-ifdef SLIP
- $(C1541) -attach $@ -write default.cfg contiki.cfg,s >$(NULLDEV)
-else
- $(C1541) -attach $@ -write ../c64/default.cfg contiki.cfg,s >$(NULLDEV)
- $(C1541) -attach $@ -write ../../cpu/6502/ethconfig/cs8900a.eth cs8900a.eth,s >$(NULLDEV)
- $(C1541) -attach $@ -write ../../cpu/6502/ethconfig/lan91c96.eth lan91c96.eth,s >$(NULLDEV)
-endif
- $(C1541) -attach $@ -write $(CC65)/c64/drv/mou/c64-1351.mou contiki.mou,s >$(NULLDEV)
- $(C1541) -attach $@ -write $(CC65)/c64/drv/mou/c64-inkwell.mou inkwell.mou,s >$(NULLDEV)
- $(C1541) -attach $@ -write $(CC65)/c64/drv/mou/c64-joy.mou joy.mou,s >$(NULLDEV)
- $(C1541) -attach $@ -write $(CC65)/c64/drv/mou/c64-pot.mou pot.mou,s >$(NULLDEV)
- $(C1541) -attach $@ -write ../../examples/webserver/httpd-cfs/index.htm index.htm,s >$(NULLDEV)
- $(C1541) -attach $@ -write ../../examples/webserver/httpd-cfs/backgrnd.gif backgrnd.gif,s >$(NULLDEV)
- $(C1541) -attach $@ -write ../../examples/webserver/httpd-cfs/contiki.gif contiki.gif,s >$(NULLDEV)
- $(C1541) -attach $@ -write ../../examples/webserver/httpd-cfs/notfound.htm notfound.htm,s >$(NULLDEV)
-
-contiki-c64.d71: c64-makes
- $(C1541) -format contiki,00 d71 $@
- $(C1541) -attach $@ -write ../../cpu/6502/$(DEV)config/$(DEV)config.c64 $(DEV)config,p >$(NULLDEV)
- $(C1541) -attach $@ -write ../../cpu/6502/ipconfig/ipconfig.c64 ipconfig,p >$(NULLDEV)
- $(C1541) -attach $@ -write ../../examples/webbrowser/webbrowser.c64 webbrowser,p >$(NULLDEV)
- $(C1541) -attach $@ -write ../../examples/webbrowser-80col/webbrowser.c64 webbrowser80,p >$(NULLDEV)
- $(C1541) -attach $@ -write ../../examples/wget/wget.c64 wget,p >$(NULLDEV)
- $(C1541) -attach $@ -write ../../examples/irc/irc-client.c64 irc,p >$(NULLDEV)
- $(C1541) -attach $@ -write ../../examples/irc-80col/irc-client.c64 irc80,p >$(NULLDEV)
- $(C1541) -attach $@ -write ../../examples/webserver/webserver-example.c64 webserver,p >$(NULLDEV)
- $(C1541) -attach $@ -write ../../examples/telnet-server/telnet-server.c64 telnetd,p >$(NULLDEV)
-ifdef SLIP
- $(C1541) -attach $@ -write default.cfg contiki.cfg,s >$(NULLDEV)
-else
- $(C1541) -attach $@ -write ../c64/default.cfg contiki.cfg,s >$(NULLDEV)
- $(C1541) -attach $@ -write ../../cpu/6502/ethconfig/cs8900a.eth cs8900a.eth,s >$(NULLDEV)
- $(C1541) -attach $@ -write ../../cpu/6502/ethconfig/lan91c96.eth lan91c96.eth,s >$(NULLDEV)
-endif
- $(C1541) -attach $@ -write $(CC65)/c64/drv/mou/c64-1351.mou contiki.mou,s >$(NULLDEV)
- $(C1541) -attach $@ -write $(CC65)/c64/drv/mou/c64-inkwell.mou inkwell.mou,s >$(NULLDEV)
- $(C1541) -attach $@ -write $(CC65)/c64/drv/mou/c64-joy.mou joy.mou,s >$(NULLDEV)
- $(C1541) -attach $@ -write $(CC65)/c64/drv/mou/c64-pot.mou pot.mou,s >$(NULLDEV)
- $(C1541) -attach $@ -write ../../examples/webserver/httpd-cfs/index.htm index.htm,s >$(NULLDEV)
- $(C1541) -attach $@ -write ../../examples/webserver/httpd-cfs/backgrnd.gif backgrnd.gif,s >$(NULLDEV)
- $(C1541) -attach $@ -write ../../examples/webserver/httpd-cfs/contiki.gif contiki.gif,s >$(NULLDEV)
- $(C1541) -attach $@ -write ../../examples/webserver/httpd-cfs/notfound.htm notfound.htm,s >$(NULLDEV)
-
-contiki-c64.d81: c64-makes
- $(C1541) -format contiki,00 d81 $@
- $(C1541) -attach $@ -write ../../cpu/6502/$(DEV)config/$(DEV)config.c64 $(DEV)config,p >$(NULLDEV)
- $(C1541) -attach $@ -write ../../cpu/6502/ipconfig/ipconfig.c64 ipconfig,p >$(NULLDEV)
- $(C1541) -attach $@ -write ../../examples/webbrowser/webbrowser.c64 webbrowser,p >$(NULLDEV)
- $(C1541) -attach $@ -write ../../examples/webbrowser-80col/webbrowser.c64 webbrowser80,p >$(NULLDEV)
- $(C1541) -attach $@ -write ../../examples/wget/wget.c64 wget,p >$(NULLDEV)
- $(C1541) -attach $@ -write ../../examples/irc/irc-client.c64 irc,p >$(NULLDEV)
- $(C1541) -attach $@ -write ../../examples/irc-80col/irc-client.c64 irc80,p >$(NULLDEV)
- $(C1541) -attach $@ -write ../../examples/webserver/webserver-example.c64 webserver,p >$(NULLDEV)
- $(C1541) -attach $@ -write ../../examples/telnet-server/telnet-server.c64 telnetd,p >$(NULLDEV)
-ifdef SLIP
- $(C1541) -attach $@ -write default.cfg contiki.cfg,s >$(NULLDEV)
-else
- $(C1541) -attach $@ -write ../c64/default.cfg contiki.cfg,s >$(NULLDEV)
- $(C1541) -attach $@ -write ../../cpu/6502/ethconfig/cs8900a.eth cs8900a.eth,s >$(NULLDEV)
- $(C1541) -attach $@ -write ../../cpu/6502/ethconfig/lan91c96.eth lan91c96.eth,s >$(NULLDEV)
-endif
- $(C1541) -attach $@ -write $(CC65)/c64/drv/mou/c64-1351.mou contiki.mou,s >$(NULLDEV)
- $(C1541) -attach $@ -write $(CC65)/c64/drv/mou/c64-inkwell.mou inkwell.mou,s >$(NULLDEV)
- $(C1541) -attach $@ -write $(CC65)/c64/drv/mou/c64-joy.mou joy.mou,s >$(NULLDEV)
- $(C1541) -attach $@ -write $(CC65)/c64/drv/mou/c64-pot.mou pot.mou,s >$(NULLDEV)
- $(C1541) -attach $@ -write ../../examples/webserver/httpd-cfs/index.htm index.htm,s >$(NULLDEV)
- $(C1541) -attach $@ -write ../../examples/webserver/httpd-cfs/backgrnd.gif backgrnd.gif,s >$(NULLDEV)
- $(C1541) -attach $@ -write ../../examples/webserver/httpd-cfs/contiki.gif contiki.gif,s >$(NULLDEV)
- $(C1541) -attach $@ -write ../../examples/webserver/httpd-cfs/notfound.htm notfound.htm,s >$(NULLDEV)
-
-$(eval $(call makes,c128))
-$(eval $(call makes,c128,clean))
-
-c128: contiki-c128.zip
-
-c128-clean: c128-cleanmakes
- rm -f contiki-c128.zip contiki-c128-1.d64 contiki-c128-2.d64 contiki-c128.d71 contiki-c128.d81
-
-contiki-c128.zip: contiki-c128-1.d64 contiki-c128-2.d64 contiki-c128.d71 contiki-c128.d81
-
-contiki-c128-1.d64: c128-makes
- $(C1541) -format contiki-1,00 d64 $@
- $(C1541) -attach $@ -write ../../cpu/6502/$(DEV)config/$(DEV)config.c128 $(DEV)config,p >$(NULLDEV)
- $(C1541) -attach $@ -write ../../cpu/6502/ipconfig/ipconfig.c128 ipconfig,p >$(NULLDEV)
- $(C1541) -attach $@ -write ../../examples/webbrowser-80col/webbrowser.c128 webbrowser,p >$(NULLDEV)
- $(C1541) -attach $@ -write ../../examples/wget/wget.c128 wget,p >$(NULLDEV)
- $(C1541) -attach $@ -write ../../examples/irc-80col/irc-client.c128 irc,p >$(NULLDEV)
-ifdef SLIP
- $(C1541) -attach $@ -write default.cfg contiki.cfg,s >$(NULLDEV)
-else
- $(C1541) -attach $@ -write ../c128/default.cfg contiki.cfg,s >$(NULLDEV)
- $(C1541) -attach $@ -write ../../cpu/6502/ethconfig/cs8900a.eth cs8900a.eth,s >$(NULLDEV)
- $(C1541) -attach $@ -write ../../cpu/6502/ethconfig/lan91c96.eth lan91c96.eth,s >$(NULLDEV)
-endif
-
-contiki-c128-2.d64: c128-makes
- $(C1541) -format contiki-3,00 d64 $@
- $(C1541) -attach $@ -write ../../cpu/6502/$(DEV)config/$(DEV)config.c128 $(DEV)config,p >$(NULLDEV)
- $(C1541) -attach $@ -write ../../cpu/6502/ipconfig/ipconfig.c128 ipconfig,p >$(NULLDEV)
- $(C1541) -attach $@ -write ../../examples/webserver/webserver-example.c128 webserver,p >$(NULLDEV)
- $(C1541) -attach $@ -write ../../examples/telnet-server/telnet-server.c128 telnetd,p >$(NULLDEV)
-ifdef SLIP
- $(C1541) -attach $@ -write default.cfg contiki.cfg,s >$(NULLDEV)
-else
- $(C1541) -attach $@ -write ../c128/default.cfg contiki.cfg,s >$(NULLDEV)
- $(C1541) -attach $@ -write ../../cpu/6502/ethconfig/cs8900a.eth cs8900a.eth,s >$(NULLDEV)
- $(C1541) -attach $@ -write ../../cpu/6502/ethconfig/lan91c96.eth lan91c96.eth,s >$(NULLDEV)
-endif
- $(C1541) -attach $@ -write ../../examples/webserver/httpd-cfs/index.htm index.htm,s >$(NULLDEV)
- $(C1541) -attach $@ -write ../../examples/webserver/httpd-cfs/backgrnd.gif backgrnd.gif,s >$(NULLDEV)
- $(C1541) -attach $@ -write ../../examples/webserver/httpd-cfs/contiki.gif contiki.gif,s >$(NULLDEV)
- $(C1541) -attach $@ -write ../../examples/webserver/httpd-cfs/notfound.htm notfound.htm,s >$(NULLDEV)
-
-contiki-c128.d71: c128-makes
- $(C1541) -format contiki,00 d71 $@
- $(C1541) -attach $@ -write ../../cpu/6502/$(DEV)config/$(DEV)config.c128 $(DEV)config,p >$(NULLDEV)
- $(C1541) -attach $@ -write ../../cpu/6502/ipconfig/ipconfig.c128 ipconfig,p >$(NULLDEV)
- $(C1541) -attach $@ -write ../../examples/webbrowser-80col/webbrowser.c128 webbrowser,p >$(NULLDEV)
- $(C1541) -attach $@ -write ../../examples/wget/wget.c128 wget,p >$(NULLDEV)
- $(C1541) -attach $@ -write ../../examples/irc-80col/irc-client.c128 irc,p >$(NULLDEV)
- $(C1541) -attach $@ -write ../../examples/webserver/webserver-example.c128 webserver,p >$(NULLDEV)
- $(C1541) -attach $@ -write ../../examples/telnet-server/telnet-server.c128 telnetd,p >$(NULLDEV)
-ifdef SLIP
- $(C1541) -attach $@ -write default.cfg contiki.cfg,s >$(NULLDEV)
-else
- $(C1541) -attach $@ -write ../c128/default.cfg contiki.cfg,s >$(NULLDEV)
- $(C1541) -attach $@ -write ../../cpu/6502/ethconfig/cs8900a.eth cs8900a.eth,s >$(NULLDEV)
- $(C1541) -attach $@ -write ../../cpu/6502/ethconfig/lan91c96.eth lan91c96.eth,s >$(NULLDEV)
-endif
- $(C1541) -attach $@ -write ../../examples/webserver/httpd-cfs/index.htm index.htm,s >$(NULLDEV)
- $(C1541) -attach $@ -write ../../examples/webserver/httpd-cfs/backgrnd.gif backgrnd.gif,s >$(NULLDEV)
- $(C1541) -attach $@ -write ../../examples/webserver/httpd-cfs/contiki.gif contiki.gif,s >$(NULLDEV)
- $(C1541) -attach $@ -write ../../examples/webserver/httpd-cfs/notfound.htm notfound.htm,s >$(NULLDEV)
-
-contiki-c128.d81: c128-makes
- $(C1541) -format contiki,00 d81 $@
- $(C1541) -attach $@ -write ../../cpu/6502/$(DEV)config/$(DEV)config.c128 $(DEV)config,p >$(NULLDEV)
- $(C1541) -attach $@ -write ../../cpu/6502/ipconfig/ipconfig.c128 ipconfig,p >$(NULLDEV)
- $(C1541) -attach $@ -write ../../examples/webbrowser-80col/webbrowser.c128 webbrowser,p >$(NULLDEV)
- $(C1541) -attach $@ -write ../../examples/wget/wget.c128 wget,p >$(NULLDEV)
- $(C1541) -attach $@ -write ../../examples/irc-80col/irc-client.c128 irc,p >$(NULLDEV)
- $(C1541) -attach $@ -write ../../examples/webserver/webserver-example.c128 webserver,p >$(NULLDEV)
- $(C1541) -attach $@ -write ../../examples/telnet-server/telnet-server.c128 telnetd,p >$(NULLDEV)
-ifdef SLIP
- $(C1541) -attach $@ -write default.cfg contiki.cfg,s >$(NULLDEV)
-else
- $(C1541) -attach $@ -write ../c128/default.cfg contiki.cfg,s >$(NULLDEV)
- $(C1541) -attach $@ -write ../../cpu/6502/ethconfig/cs8900a.eth cs8900a.eth,s >$(NULLDEV)
- $(C1541) -attach $@ -write ../../cpu/6502/ethconfig/lan91c96.eth lan91c96.eth,s >$(NULLDEV)
-endif
- $(C1541) -attach $@ -write ../../examples/webserver/httpd-cfs/index.htm index.htm,s >$(NULLDEV)
- $(C1541) -attach $@ -write ../../examples/webserver/httpd-cfs/backgrnd.gif backgrnd.gif,s >$(NULLDEV)
- $(C1541) -attach $@ -write ../../examples/webserver/httpd-cfs/contiki.gif contiki.gif,s >$(NULLDEV)
- $(C1541) -attach $@ -write ../../examples/webserver/httpd-cfs/notfound.htm notfound.htm,s >$(NULLDEV)
diff --git a/tools/6502/default.cfg b/tools/6502/default.cfg
deleted file mode 100644
index f6c0401fc..000000000
Binary files a/tools/6502/default.cfg and /dev/null differ
diff --git a/tools/6502/sample.cfg b/tools/6502/sample.cfg
deleted file mode 100644
index 1a40699e4..000000000
Binary files a/tools/6502/sample.cfg and /dev/null differ
diff --git a/tools/Makefile b/tools/Makefile
index 3dab44216..a4d3022ef 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -19,7 +19,7 @@ cleanfiles:
@find ../examples -name "contiki-*.a" -delete
cleantargets:
${info Removing .TARGET builds...}
- @rm -f -v ${addprefix ../examples/*/*., ${shell ls ../platform/}}
- @rm -f -v ${addprefix ../examples/*/*/*., ${shell ls ../platform/}}
+ @rm -f -v ${addprefix ../examples/*/*., ${shell ls ../drivers/platform/}}
+ @rm -f -v ${addprefix ../examples/*/*/*., ${shell ls ../drivers/platform/}}
cleandone:
@echo ${info All done!}
diff --git a/tools/apple2enh/default.cfg b/tools/apple2enh/default.cfg
deleted file mode 100644
index e9bc3f02a..000000000
Binary files a/tools/apple2enh/default.cfg and /dev/null differ
diff --git a/tools/apple2enh/menu.system b/tools/apple2enh/menu.system
deleted file mode 100644
index a194bcba4..000000000
Binary files a/tools/apple2enh/menu.system and /dev/null differ
diff --git a/tools/apple2enh/prodos.dsk b/tools/apple2enh/prodos.dsk
deleted file mode 100644
index 68eec755f..000000000
Binary files a/tools/apple2enh/prodos.dsk and /dev/null differ
diff --git a/tools/apple2enh/prodos.po b/tools/apple2enh/prodos.po
deleted file mode 100644
index af35b8c45..000000000
Binary files a/tools/apple2enh/prodos.po and /dev/null differ
diff --git a/tools/apple2enh/sample.cfg b/tools/apple2enh/sample.cfg
deleted file mode 100644
index 43ca5486f..000000000
Binary files a/tools/apple2enh/sample.cfg and /dev/null differ
diff --git a/tools/atarixl/default.cfg b/tools/atarixl/default.cfg
deleted file mode 100644
index f2cf1eb31..000000000
Binary files a/tools/atarixl/default.cfg and /dev/null differ
diff --git a/tools/atarixl/dos25/dos.sys b/tools/atarixl/dos25/dos.sys
deleted file mode 100644
index 12c3eaa56..000000000
Binary files a/tools/atarixl/dos25/dos.sys and /dev/null differ
diff --git a/tools/atarixl/dos25/dup.sys b/tools/atarixl/dos25/dup.sys
deleted file mode 100644
index 2aa1ba4fa..000000000
Binary files a/tools/atarixl/dos25/dup.sys and /dev/null differ
diff --git a/tools/atarixl/mydos4534/dos.sys b/tools/atarixl/mydos4534/dos.sys
deleted file mode 100644
index 3171b55c4..000000000
Binary files a/tools/atarixl/mydos4534/dos.sys and /dev/null differ
diff --git a/tools/atarixl/mydos4534/dup.sys b/tools/atarixl/mydos4534/dup.sys
deleted file mode 100644
index f3acea1c5..000000000
Binary files a/tools/atarixl/mydos4534/dup.sys and /dev/null differ
diff --git a/tools/atarixl/sample.cfg b/tools/atarixl/sample.cfg
deleted file mode 100644
index f6e72b1c6..000000000
Binary files a/tools/atarixl/sample.cfg and /dev/null differ
diff --git a/tools/avr-make-symbols b/tools/avr-make-symbols
deleted file mode 100755
index 83c6e591b..000000000
--- a/tools/avr-make-symbols
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/sh
-
-NM=avr-nm
-
-SYMBOLS=`$NM $* | perl -ne 'print ".global $2\n$2 = 0x$1\n" if(/([0-9a-f]+) [ABDRST] (.+)$/);' | grep -v ^_ | grep -v _reset_vector | grep = | perl -ne 'print "{\"$1\", (char *)$2},\n" if(/(\w+) = (\w+)/)' | wc -l`
-SYMBOLS=`expr $SYMBOLS + 1`
-
-echo \#ifndef __SYMBOLS_H__ > symbols.h
-echo \#define __SYMBOLS_H__ >> symbols.h
-echo \#include '"loader/symbols-def.h"' >> symbols.h
-echo "extern const struct symbols symbols[$SYMBOLS];" >> symbols.h
-echo \#endif >> symbols.h
-
-echo \#include '"symbols.h"' > symbols.c
-echo \#include '' >> symbols.c
-$NM $* | perl -ne 'print ".global $2\n$2 = 0x$1\n" if(/([0-9a-f]+) [ABDRST] (.+)$/);' | grep -v ^_ | grep -v _reset_vector | grep = | perl -ne 'print "static const unsigned char s_$1 [] PROGMEM = \"$1\";\n" if(/(\w+) = (\w+)/)' | sort >> symbols.c
-
-echo "PROGMEM const struct symbols symbols[] = {" >> symbols.c
-avr-nm $* | perl -ne 'print ".global $2\n$2 = 0x$1\n" if(/([0-9a-f]+) [ABDRST] (.+)$/);' | grep -v ^_ | grep -v _reset_vector | grep = | perl -ne 'print "{(const char*)s_$1, (void*)$2},\n" if(/(\w+) = (\w+)/)' | sort >> symbols.c
-echo "{(const char *)0, (void*)0} };" >> symbols.c
diff --git a/tools/avr-makecoffeedata b/tools/avr-makecoffeedata
deleted file mode 100644
index 38697eaef..000000000
--- a/tools/avr-makecoffeedata
+++ /dev/null
@@ -1,278 +0,0 @@
-#!/usr/bin/perl
-#Generate a .c source that preinitializes a coffee file system
-#David Kopf July 2009
-#For coffee file_header structure of
-#struct file_header {
-# coffee_page_t log_page;
-# uint16_t log_records;
-# uint16_t log_record_size;
-# coffee_page_t max_pages;
-# uint8_t deprecated_eof_hint;
-# uint8_t flags;
-# char name[COFFEE_NAME_LENGTH];
-# } __attribute__((packed));
-
-goto DEFAULTS;
-START:$version="1.0 dak";
-
-#Process options
-for($n=0;$n<=$#ARGV;$n++) {
- $arg=$ARGV[$n];
- if ($arg eq "-p") {
- $n++;$coffee_page_length=$ARGV[$n];
- } elsif ($arg eq "-s") {
- $n++;$coffee_sector_size=$ARGV[$n];
- } elsif ($arg eq "-t") {
- $n++;$coffee_page_t =$ARGV[$n];
- } elsif ($arg eq "-f") {
- $n++;$coffee_name_length=$ARGV[$n];
- } elsif ($arg eq "-S") {
- $n++;$sectionname=$ARGV[$n];
- } elsif ($arg eq "-c") {
- $complement=1;
- } elsif ($arg eq "-l") {
- $linkedlist=1;
- } elsif ($arg eq "-v") {
- print "avr-makecoffeedata Version $version\n";
- } elsif ($arg eq "-d") {
- $n++;$directory=$ARGV[$n];
- } elsif ($arg eq "-o") {
- $n++;$outputfile=$ARGV[$n];
- } else {
-DEFAULTS:
-#Set up defaults
-$coffee_page_length=256;
-$coffee_sector_size=256;
-$coffee_page_t=1;
-$coffee_name_length=16;
-$complement=0;
-$directory="";
-$outputfile="httpd-fsdata.c";
-$linkedlist=0;
-$sectionname=".coffeefiles";
-if (!$version) {goto START;}
- print "\n";
- print "Usage: avr-makecoffeedata <-d input_directory> <-o output_file>\n";
- print " Generates c source file to make a pre-initialized coffee file system\n";
- print " The default output file is $outputfile\n";
- print " The input directory structure is copied. If input_directory is specified\n";
- print " it becomes the root \"/\". If no input_directory is specified the first\n";
- print " subdirectory found in the current directory is used as the root.\n";
- print " WARNING : If the output file exists it will be overwritten without confirmation\n\n";
- print " Options are:\n";
- print " -p pagesize Page size in bytes (default $coffee_page_length)\n";
- print " -s sectorsize Sector size in bytes (default $coffee_sector_size)\n";
- print " -t page_t Number of bytes in coffee_page_t (1,2,or 4, default $coffee_page_t)\n";
- print " -f namesize File name field size in bytes (default $coffee_name_length)\n";
- print " -S section Section name (default $sectionname)\n";
- print " -c Complement the data, useful when flash is all 1s after erase\n";
- print " -l Append a linked list of the file starting addresses\n";
- print " -v Display the version number\n";
- exit;
- }
-}
-
-#printf "coffee_page_length=$coffee_page_length\n";
-#printf "coffee_page_t=$coffee_page_t\n";
-#printf "coffee_name_length=$coffee_name_length\n";
-#printf "complement=$complement\n";
-#printf "directory=$directory\n";
-#printf "outputfile=$outputfile\n";
-#printf "sectionname=$sectionname;
-
-if ($coffee_page_t==1) {
- $coffeemax=0xff;
-} elsif ($coffee_page_t==2) {
- $coffeemax=0xffff;
-} elsif ($coffee_page_t==4) {
- $coffeemax=0xffffffff;
-} else {
- die "Unsupported coffee_page_t $coffee_page_t\n";
-}
-$coffee_header_length=2*$coffee_page_t+$coffee_name_length+6;
-$null="0x00";if ($complement) {$null="0xff";}
-#$tab="/t"; #optional tab string
-$tab=" "; #optional tabs or spaces at beginning of line, e.g. "\t\t"
-
-if (!open(OUTPUT, "> $outputfile")) {die "Aborted: Could not create output file $outputfile";}
-#awkward but could not figure out how to compare paths later unless the file exists -- dak
-print(OUTPUT "\n");
-close($outputfile);
-use Cwd qw(abs_path);
-if (!open(OUTPUT, "> $outputfile")) {die "Aborted: Could not create output file $outputfile";}
-$outputfile=abs_path($outputfile);
-
-if ($directory eq "") {
- opendir(DIR, ".");
- @files = grep { !/^\./ && !/(CVS|~)/ } readdir(DIR);
- closedir(DIR);
- foreach $file (@files) {
- if(-d $file && $file !~ /^\./) {
- $directory=$file;
- break;
- }
- }
-}
-if ($directory eq "") {die "Aborted: No subdirectory in current directory";}
-if (!chdir("$directory")) {die "Aborted: Directory \"$directory\" does not exist!";}
-
-print "Processing directory $directory as root of coffee file system\n";
-opendir(DIR, ".");
-@files = grep { !/^\./ && !/(CVS|~)/ } readdir(DIR);
-closedir(DIR);
-
-foreach $file (@files) {
- if(-d $file && $file !~ /^\./) {
- print "Adding subdirectory $file\n";
- opendir(DIR, $file);
- @newfiles = grep { !/^\./ && !/(CVS|~)/ } readdir(DIR);
- closedir(DIR);
-# printf "Adding files @newfiles\n";
- @files = (@files, map { $_ = "$file/$_" } @newfiles);
- next;
- }
-}
-
-print "Writing to $outputfile\n";
-print(OUTPUT "/**************Generated by /tools/avr-makecoffeedata*****************/\n");
-print(OUTPUT "/*For coffee filesystem of sector size $coffee_sector_size and header length $coffee_header_length bytes*/\n");
-
-$n=0;$coffeesize=0;$coffeesectors=0;
-foreach $file (@files) {if(-f $file) {
- if (length($file)>($coffee_name_length-1)) {die "Aborted: File name $file is too long";}
-
- if (abs_path("$file") eq abs_path("$outputfile")) {
- print "Skipping $outputfile for recursive input\n";
- next;
- }
- print "Adding $file\n";
-
- open(FILE, $file) || die "Aborted: Could not open file $file\n";
- if (grep /.png/,$file) {binmode FILE;}
- if (grep /.jpg/,$file) {binmode FILE;}
- if (grep /.gif/,$file) {binmode FILE;}
-
- $file =~ s-^-/-;
- $fvar = $file;
- $fvar =~ s-/-_-g;
- $fvar =~ s-\.-_-g;
- $file_length= -s FILE;
- $coffee_sectors=int(($coffee_header_length+$file_length+$coffee_sector_size-1)/$coffee_sector_size);
-# $coffee_sectors=sprintf("%.0f",($coffee_header_length+$file_length+$coffee_sector_size-1)/$coffee_sector_size)-1;
- $coffee_length=$coffee_sectors*$coffee_sector_size;
- $flen[$n]=$file_length;
- $clen[$n]=$coffee_length;
- $n++;$coffeesectors+=$coffee_sectors;$coffeesize+=$coffee_length;
- if ($coffeesectors>$coffeemax) {
- print "Warning: sector number $coffeesectors overflows allocated sector size in coffee header\n";
- }
- print(OUTPUT "\n__attribute__ ((section (\"$sectionname\")))\n");
- print(OUTPUT "volatile const char data".$fvar."[$coffee_length] = {\n");
- print(OUTPUT "$tab/* $file */\n$tab ");
-#--------------------Header-----------------------------
-#log_page
- for($j=0;$j<$coffee_page_t;$j++) {print (OUTPUT "$null, ");}
-#log_records, log_record_size
- for($j=0;$j<4;$j++) {print (OUTPUT "$null, ");}
-#max_pages
- if ($complement) {$coffee_sectors=$coffee_sectors^0xffffffff;}
- if ($coffee_page_t==1) {
- printf(OUTPUT "0x%2.2x, ",($coffee_sectors )&0xff);
- } elsif ($coffee_page_t==2) {
- printf(OUTPUT "0x%2.2x, ",($coffee_sectors>> 8)&0xff);
- printf(OUTPUT "0x%2.2x, ",($coffee_sectors )&0xff);
- } elsif ($coffee_page_t==4) {
- printf(OUTPUT "0x%2.2x, ",($coffee_sectors>>24)&0xff);
- printf(OUTPUT "0x%2.2x, ",($coffee_sectors>>16)&0xff);
- printf(OUTPUT "0x%2.2x, ",($coffee_sectors>> 8)&0xff);
- printf(OUTPUT "0x%2.2x, ",($coffee_sectors )&0xff);
- }
- if ($complement) {$coffee_sectors=$coffee_sectors^0xffffffff;}
-#eof hint and flags
- if ($complement) {
- print(OUTPUT "0xff, 0xfc,\n$tab");
- } else {
- print(OUTPUT "0x00, 0x03,\n$tab");
- }
-
-#file name
- for($j = 0; $j < length($file); $j++) {
- $temp=unpack("C", substr($file, $j, 1));
- if ($complement) {$temp=$temp^0xff;}
- printf(OUTPUT " %#02.2x,", $temp);
- }
- for(; $j < $coffee_name_length; $j++) {printf(OUTPUT " $null,");}
- print(OUTPUT "\n$tab");
-#------------------File Data---------------------------
- $coffee_length-=$coffee_header_length;
- $i = 0;
- while(read(FILE, $data, 1)) {
- $temp=unpack("C", $data);
- if ($complement) {$temp=$temp^0xff;}
- printf(OUTPUT " 0x%2.2x,", $temp);
- $i++;$coffee_length--;
- if($i == 10) {
- print(OUTPUT "\n$tab");
- $i = 0;
- }
- }
- while (--$coffee_length>1) {
- print (OUTPUT " $null,");
- if($i++ == 9) {
- print(OUTPUT "\n$tab");
- $i = 0;
- }
- }
- print (OUTPUT " $null};\n");
- close(FILE);
- push(@fvars, $fvar);
- push(@pfiles, $file);
-}}
-
-if ($linkedlist) {
-#-------------------httpd_fsdata_file links-------------------
-#The non-coffee PROGMEM flash file system for the Raven webserver uses a linked flash list as follows:
-print(OUTPUT "\n\n/* Structure of linked list (all offsets relative to start of section):\n");
-print(OUTPUT "struct httpd_fsdata_file {\n");
-print(OUTPUT "$tab const struct httpd_fsdata_file *next; //actual flash address of next link\n");
-print(OUTPUT "$tab const char *name; //offset to coffee file name\n");
-print(OUTPUT "$tab const char *data; //offset to coffee file data\n");
-print(OUTPUT "$tab const int len; //length of file data\n");
-print(OUTPUT "#if HTTPD_FS_STATISTICS == 1 //not enabled since list is in PROGMEM\n");
-print(OUTPUT "$tab uint16_t count; //storage for file statistics\n");
-print(OUTPUT "#endif\n");
-print(OUTPUT "}\n*/\n");
-
-# Note flash addresses above 0xffff require 32 bit pointers using pgm_read_byte_far,
-# and the coffee file system is above that. So the addresses start from 0 which
-# allows a 64K file system. The flash starting address is added in the read routine.
-
-print(OUTPUT "\n#define HTTPD_FS_ROOT file$fvars[$i - 1]\n\n");
-
-for($i = 0; $i < @fvars; $i++) {
- $file = $pfiles[$i];
- $fvar = $fvars[$i];
- if($i == 0) {
- $prevfile = "NULL";
- $data_offset=0;
- } else {
- $data_offset=$data_offset+$clen[$i-1];
- $prevfile = "file" . $fvars[$i - 1];
- }
- $filename_offset=$data_offset+6+2*$coffee_page_t;
- $coffee_offset=$data_offset+$coffee_header_length;
- if ($coffee_offset>0xffff) {print "Warning : Linked list offset field overflow\n";}
-
- print(OUTPUT "const struct httpd_fsdata_file");
- for ($t=length($file);$t<16;$t++) {print(OUTPUT " ")};
- # for AVR, add PROGMEM here
- print(OUTPUT " file".$fvar."[] PROGMEM={{");
- for ($t=length($prevfile);$t<20;$t++) {print(OUTPUT " ")};
- print(OUTPUT "$prevfile, ");
- printf(OUTPUT "(const char *)0x%4.4x, ",$filename_offset);
- printf(OUTPUT "(const char *)0x%4.4x, ",$coffee_offset);
- printf(OUTPUT "%5u}};\n",$flen[$i]);
-}
-print(OUTPUT "\n#define HTTPD_FS_NUMFILES $i\n");
-}
-print "All done, preallocated coffee files occupy $coffeesize bytes\n";
diff --git a/tools/avr-makefsdata b/tools/avr-makefsdata
deleted file mode 100644
index 2aaca1878..000000000
--- a/tools/avr-makefsdata
+++ /dev/null
@@ -1,82 +0,0 @@
-#!/usr/bin/perl
-
-open(OUTPUT, "> httpd-fsdata.c");
-
-chdir("httpd-fs");
-
-opendir(DIR, ".");
-@files = grep { !/^\./ && !/(CVS|~)/ } readdir(DIR);
-closedir(DIR);
-
-foreach $file (@files) {
-
- if(-d $file && $file !~ /^\./) {
- print "Processing directory $file\n";
- opendir(DIR, $file);
- @newfiles = grep { !/^\./ && !/(CVS|~)/ } readdir(DIR);
- closedir(DIR);
- printf "Adding files @newfiles\n";
- @files = (@files, map { $_ = "$file/$_" } @newfiles);
- next;
- }
-}
-
-foreach $file (@files) {
- if(-f $file) {
-
- print "Adding file $file\n";
-
- open(FILE, $file) || die "Could not open file $file\n";
- if (grep /.png/,$file) {binmode FILE;}
- if (grep /.jpg/,$file) {binmode FILE;}
- if (grep /.gif/,$file) {binmode FILE;}
-
- $file =~ s-^-/-;
- $fvar = $file;
- $fvar =~ s-/-_-g;
- $fvar =~ s-\.-_-g;
- # for AVR, add PROGMEM here
- print(OUTPUT "static const char data".$fvar."[] PROGMEM = {\n");
- print(OUTPUT "\t/* $file */\n\t");
- for($j = 0; $j < length($file); $j++) {
- printf(OUTPUT "%#02x, ", unpack("C", substr($file, $j, 1)));
- }
- printf(OUTPUT "0,\n");
-
-
- $i = 0;
- while(read(FILE, $data, 1)) {
- if($i == 0) {
- print(OUTPUT "\t");
- }
- printf(OUTPUT "%#02x, ", unpack("C", $data));
- $i++;
- if($i == 10) {
- print(OUTPUT "\n");
- $i = 0;
- }
- }
- print(OUTPUT "0};\n\n");
- close(FILE);
- push(@fvars, $fvar);
- push(@pfiles, $file);
- }
-}
-
-for($i = 0; $i < @fvars; $i++) {
- $file = $pfiles[$i];
- $fvar = $fvars[$i];
-
- if($i == 0) {
- $prevfile = "NULL";
- } else {
- $prevfile = "file" . $fvars[$i - 1];
- }
-# for AVR, add PROGMEM here
- print(OUTPUT "const struct httpd_fsdata_file file".$fvar."[] PROGMEM = {{$prevfile, data$fvar, ");
- print(OUTPUT "data$fvar + ". (length($file) + 1) .", ");
- print(OUTPUT "sizeof(data$fvar) - ". (length($file) + 1) ."}};\n\n");
-}
-
-print(OUTPUT "#define HTTPD_FS_ROOT file$fvars[$i - 1]\n\n");
-print(OUTPUT "#define HTTPD_FS_NUMFILES $i\n");
diff --git a/tools/base64-encode b/tools/base64-encode
deleted file mode 100755
index 348f27864..000000000
--- a/tools/base64-encode
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-perl -MMIME::Base64 -e 'print encode_base64(join("", <>))'
diff --git a/tools/blaster/Makefile b/tools/blaster/Makefile
deleted file mode 100644
index ceafb5cca..000000000
--- a/tools/blaster/Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
-CC = gcc
-CFLAGS = -Wall -g
-HEADERS =
-
-all: blaster
-
-depend:
- sudo apt-get install libconfig8-dev uuid-dev libqrencode-dev
-
-%.o: %.c $(HEADERS)
- $(CC) -c $(CFLAGS) -o $@ $<
-
-blaster: blaster.o
- $(CC) $(CFLAGS) -o $@ $^ -lconfig -luuid -lqrencode
-
-clean:
- rm *.o blaster
-
-.PHONY: all depend clean
diff --git a/tools/blaster/README b/tools/blaster/README
deleted file mode 100644
index 7fd109460..000000000
--- a/tools/blaster/README
+++ /dev/null
@@ -1,10 +0,0 @@
-Blaster extends the compiled firmware with additional data for
-storing into flash memory. See examples/econotag-flash-test for
-usage. Its written for Econotag / MC1322X
-
-./blaster [ ...]
-To Generate a default configuration file, use blaster without parameter.
-
-Its important to use -l as a flash parameter.
-
-mc1322x-load -f flasher_econotag.bin -s firmware.bin -t /dev/ttyUSB1 -l
diff --git a/tools/blaster/blaster.c b/tools/blaster/blaster.c
deleted file mode 100644
index ff074c479..000000000
--- a/tools/blaster/blaster.c
+++ /dev/null
@@ -1,330 +0,0 @@
-/*
- * Copyright (c) 2014, Lars Schmertmann .
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * 3. Neither the name of the copyright holder nor the names of its
- * contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- * COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This file is part of the Contiki operating system.
- *
- */
-
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-
-#include
-#include
-#include
-#include
-
-#include "blaster.h"
-
-char *anschars = "abcdefghijklmnopqrstuvwxyz0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ_-";
-
-/* ---------------------------------------------------------------------------- */
-
-FILE *openFile(const char *name, const char *appendix, const char *mode);
-void writeStandardConfig();
-void writeImg(FILE *file, unsigned char *data, int width);
-
-/* ---------------------------------------------------------------------------- */
-
-int
-main(int nArgs, char **argv)
-{
- unsigned int c, i, config;
- unsigned int buf[64];
-
- if(nArgs < 2) {
- writeStandardConfig();
-
- fprintf(stderr, "Missing parameter: ./blaster [ ...]\n");
- fprintf(stderr, "Configuration template was created ib config.cfg.\n");
-
- exit(EXIT_FAILURE);
- }
-
- /* qrdata = "UUID:PSK\0" */
- char qrdata[54];
- qrdata[36] = ':';
- qrdata[53] = '\0';
-
- config_t cfg;
- for(config = 1; config < nArgs; config++) {
- config_init(&cfg);
- config_setting_t *setting;
- const char *str_val;
- if(access(argv[config], F_OK) == 0) {
- config_read_file(&cfg, argv[config]);
- } else {
- fprintf(stderr, "Unable to read config file.\n");
- exit(EXIT_FAILURE);
- }
- fprintf(stdout, "Working on %s ... ", argv[config]);
-
- config_lookup_string(&cfg, "input", &str_val);
- FILE *in_bin = openFile(str_val, ".bin", "r");
-
- config_lookup_string(&cfg, "output", &str_val);
- FILE *out_bin = openFile(str_val, ".bin", "w");
- FILE *out_txt = openFile(str_val, ".txt", "w");
- FILE *out_pbm = openFile(str_val, ".pbm", "w");
-
- char output[131072];
- for(i = 8; (c = fgetc(in_bin)) != EOF; i++) {
- output[i] = (unsigned char)c;
- }
- /* Set original length of firmware in little endian format ------------------- */
- unsigned int length = i - 8;
- memcpy(output + 4, (const void *)&length, 4);
- fprintf(out_txt, "Length: %u = 0x%08x\n", length, length);
-
- /* Fill additional flash with zeros for initialisation */
- for(; i < 0x1F000; i++) {
- output[i] = 0x00;
- }
-
- /* Example: Write an CoRE-Link-Answer for CoAP -------------------------------- */
- char *buffer = ";rt=\"dev.info\";if=\"core.rp\","
- ";rt=\"dev.info\";if=\"core.rp\","
- ";rt=\"dev.info\";if=\"core.rp\"";
- memcpy(output + RES_D_CORE, buffer, LEN_D_CORE);
-
- /* Contiki configuration ------------------------------------------------------ */
- output[RES_CONFIG + 0] = 0x22;
- output[RES_CONFIG + 1] = 0x13;
- output[RES_CONFIG + 2] = 1;
- output[RES_CONFIG + 3] = 0;
-
- setting = config_lookup(&cfg, "eui");
- for(i = 0; i < 8; i++) {
- output[RES_CONFIG + 8 + i] = config_setting_get_int_elem(setting, 7 - i);
- }
- fprintf(out_txt,
- "EUI: %02x-%02x-%02x-%02x-%02x-%02x-%02x-%02x\n",
- (uint8_t)output[RES_CONFIG + 15],
- (uint8_t)output[RES_CONFIG + 14],
- (uint8_t)output[RES_CONFIG + 13],
- (uint8_t)output[RES_CONFIG + 12],
- (uint8_t)output[RES_CONFIG + 11],
- (uint8_t)output[RES_CONFIG + 10],
- (uint8_t)output[RES_CONFIG + 9],
- (uint8_t)output[RES_CONFIG + 8]
- );
-
- output[RES_CONFIG + 16] = 15;
- output[RES_CONFIG + 17] = 17;
- output[RES_CONFIG + 18] = 0;
- output[RES_CONFIG + 19] = 0;
- output[RES_CONFIG + 20] = 5;
- output[RES_CONFIG + 21] = 0;
- output[RES_CONFIG + 22] = 0;
- output[RES_CONFIG + 23] = 0;
-
- /* Example: Set UUID ---------------------------------------------------------- */
- config_lookup_string(&cfg, "uuid", &str_val);
- memcpy(qrdata, str_val, 36);
- unsigned char uuid_bin[16];
- uuid_parse(str_val, uuid_bin);
- for(i = 0; i < 16; i++) {
- output[RES_UUID + i] = uuid_bin[i];
- }
- fprintf(out_txt, "UUID: %s\n", str_val);
-
- /* Example: Set PSK ----------------------------------------------------------- */
- config_lookup_string(&cfg, "psk", &str_val);
- memcpy(qrdata + 37, str_val, 16);
- for(i = 0; i < 16; i++) {
- output[RES_PSK + i] = str_val[i];
- }
- fprintf(out_txt, "PSK: %.*s\n", 16, str_val);
- memcpy(output + RES_ANSCHARS, anschars, LEN_ANSCHARS);
-
- /* Example: ECC base point and order for secp256r1 ---------------------------- */
- uint32_t *base_x = (uint32_t *)(output + RES_ECC_BASE_X);
- base_x[0] = 0xd898c296;
- base_x[1] = 0xf4a13945;
- base_x[2] = 0x2deb33a0;
- base_x[3] = 0x77037d81;
- base_x[4] = 0x63a440f2;
- base_x[5] = 0xf8bce6e5;
- base_x[6] = 0xe12c4247;
- base_x[7] = 0x6b17d1f2;
-
- uint32_t *base_y = (uint32_t *)(output + RES_ECC_BASE_Y);
- base_y[0] = 0x37bf51f5;
- base_y[1] = 0xcbb64068;
- base_y[2] = 0x6b315ece;
- base_y[3] = 0x2bce3357;
- base_y[4] = 0x7c0f9e16;
- base_y[5] = 0x8ee7eb4a;
- base_y[6] = 0xfe1a7f9b;
- base_y[7] = 0x4fe342e2;
-
- uint32_t *order = (uint32_t *)(output + RES_ECC_ORDER);
- order[0] = 0xFC632551;
- order[1] = 0xF3B9CAC2;
- order[2] = 0xA7179E84;
- order[3] = 0xBCE6FAAD;
- order[4] = 0xFFFFFFFF;
- order[5] = 0xFFFFFFFF;
- order[6] = 0x00000000;
- order[7] = 0xFFFFFFFF;
-
- /* Example: Set name ---------------------------------------------------------- */
- config_lookup_string(&cfg, "name", &str_val);
- snprintf(output + RES_NAME, LEN_NAME, "%s", str_val);
- fprintf(out_txt, "Name: %s\n", str_val);
-
- /* Example: Set model---------------------------------------------------------- */
- config_lookup_string(&cfg, "model", &str_val);
- snprintf(output + RES_MODEL, LEN_MODEL, "%s", str_val);
- fprintf(out_txt, "Model: %s\n", str_val);
-
- /* Example: Set time ---------------------------------------------------------- */
- time_t my_time = time(NULL);
- memcpy(output + RES_FLASHTIME, (void *)&my_time, LEN_FLASHTIME);
- struct tm *timeinfo = localtime(&my_time);
- fwrite(buf, 1, strftime((char *)buf, 64, "Created on %d.%m.%Y um %H:%M:%S", timeinfo), out_txt);
-
- /* Output result -------------------------------------------------------------- */
- for(i = 4; i < 0x1F000; i++) {
- fputc(output[i], out_bin);
- }
-
- /* Generate QR-Code ----------------------------------------------------------- */
- QRcode *code = QRcode_encodeString8bit(qrdata, 3, QR_ECLEVEL_L);
- writeImg(out_pbm, code->data, code->width);
-
- fclose(in_bin);
- fclose(out_bin);
- fclose(out_txt);
- fclose(out_pbm);
-
- fprintf(stdout, "DONE\n");
- }
-
- exit(EXIT_SUCCESS);
-}
-/* ---------------------------------------------------------------------------- */
-
-FILE *
-openFile(const char *name, const char *appendix, const char *mode)
-{
- char filename[64];
- sprintf(filename, "%s%s", name, appendix);
- FILE *file = fopen(filename, mode);
- if(file == NULL) {
- perror("Wasn't able to open file.");
- exit(EXIT_FAILURE);
- }
- return file;
-}
-void
-writeStandardConfig()
-{
- unsigned int i;
-
- config_t cfg;
- config_init(&cfg);
- config_setting_t *setting;
-
- config_setting_t *root = config_root_setting(&cfg);
-
- setting = config_setting_add(root, "input", CONFIG_TYPE_STRING);
- config_setting_set_string(setting, "dff_econotag");
-
- setting = config_setting_add(root, "output", CONFIG_TYPE_STRING);
- config_setting_set_string(setting, "dff_e_econotag");
-
- uint8_t eui[8] = { 0x02, 0x00, 0x00, 0x00, 0x12, 0x34, 0x56, 0x78 };
- config_setting_t *array = config_setting_add(root, "eui", CONFIG_TYPE_ARRAY);
- for(i = 0; i < 8; ++i) {
- setting = config_setting_add(array, NULL, CONFIG_TYPE_INT);
- config_setting_set_format(setting, CONFIG_FORMAT_HEX);
- config_setting_set_int(setting, eui[i]);
- }
-
- unsigned char uuid_bin[16];
- uuid_generate(uuid_bin);
- char uuid[37];
- uuid_unparse(uuid_bin, uuid);
- setting = config_setting_add(root, "uuid", CONFIG_TYPE_STRING);
- config_setting_set_string(setting, uuid);
-
- char psk[17];
- psk[16] = '\0';
- FILE *fd = fopen("/dev/urandom", "r");
- if(fd == NULL) {
- perror("Wasn't able to open /dev/urandom: ");
- return;
- }
- for(i = 0; i < 16; i++) {
- int c;
- while((c = fgetc(fd)) == EOF) ;
- psk[i] = anschars[c % 64];
- }
- if(fclose(fd) == -1) {
- perror("Wasn't able to close /dev/urandom: ");
- }
- setting = config_setting_add(root, "psk", CONFIG_TYPE_STRING);
- config_setting_set_string(setting, psk);
-
- setting = config_setting_add(root, "name", CONFIG_TYPE_STRING);
- config_setting_set_string(setting, "Blaster Standard Device");
-
- setting = config_setting_add(root, "model", CONFIG_TYPE_STRING);
- config_setting_set_string(setting, "Model 1234 for testing purposes only");
-
- config_write_file(&cfg, "config.cfg");
-}
-void
-writeImg(FILE *file, unsigned char *data, int width)
-{
- unsigned int buf[width];
-
- fprintf(file, "P4\n# %s\n%3u %3u\n", "QR-Code", width * 32, width * 32);
-
- int x, y;
- for(y = 0; y < width; y++) {
- for(x = 0; x < width; x++) {
- if(data[(y * width) + x] & 0x01) {
- buf[x] = 0xFFFFFFFF;
- } else {
- buf[x] = 0x00000000;
- }
- }
- for(x = 0; x < 32; x++) {
- fwrite(buf, 4, width, file);
- }
- }
-}
diff --git a/tools/blaster/blaster.h b/tools/blaster/blaster.h
deleted file mode 100644
index 085abf855..000000000
--- a/tools/blaster/blaster.h
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Copyright (c) 2014, Lars Schmertmann .
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * 3. Neither the name of the copyright holder nor the names of its
- * contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- * COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This file is part of the Contiki operating system.
- *
- */
-
-/* Purposes of the different flash blocks */
-/* 0x18000 - 0x18FFF : Random access block 1.1 */
-/* 0x19000 - 0x19FFF : Random access block 1.2 */
-/* 0x1A000 - 0x1AFFF : Random access block 2.1 */
-/* 0x1B000 - 0x1BFFF : Random access block 2.2 */
-/* 0x1C000 - 0x1CFFF : Stack without pop function */
-/* 0x1D000 - 0x1DFFF : Read only <- This is what blaster user */
-/* 0x1E000 - 0x1EFFF : Read only <- This is what blaster user */
-/* 0x1F000 - 0x1FFFF : System reserved */
-
-#ifndef BLASTER_H_
-#define BLASTER_H_
-
-#define RES_D_CORE 0x1D000
-#define LEN_D_CORE 0x6F
-
-#define RES_CONFIG 0x1E000
-#define LEN_CONFIG 0x12
-#define RES_UUID 0x1E020
-#define LEN_UUID 0x10
-#define RES_PSK 0x1E030
-#define LEN_PSK 0x10
-#define RES_ANSCHARS 0x1E040
-#define LEN_ANSCHARS 0x40
-#define RES_ECC_BASE_X 0x1E080
-#define LEN_ECC_BASE_X 0x20
-#define RES_ECC_BASE_Y 0x1E0A0
-#define LEN_ECC_BASE_Y 0x20
-#define RES_ECC_ORDER 0x1E0C0
-#define LEN_ECC_ORDER 0x20
-#define RES_NAME 0x1E0E0
-#define LEN_NAME 0x40
-#define RES_MODEL 0x1E120
-#define LEN_MODEL 0x40
-#define RES_FLASHTIME 0x1E160
-#define LEN_FLASHTIME 0x04
-
-#endif /* BLASTER_H_ */
diff --git a/tools/c128/default.cfg b/tools/c128/default.cfg
deleted file mode 100644
index 0958a903d..000000000
Binary files a/tools/c128/default.cfg and /dev/null differ
diff --git a/tools/c128/sample.cfg b/tools/c128/sample.cfg
deleted file mode 100644
index ebb58ba85..000000000
Binary files a/tools/c128/sample.cfg and /dev/null differ
diff --git a/tools/c64/default.cfg b/tools/c64/default.cfg
deleted file mode 100644
index 0958a903d..000000000
Binary files a/tools/c64/default.cfg and /dev/null differ
diff --git a/tools/c64/sample.cfg b/tools/c64/sample.cfg
deleted file mode 100644
index ebb58ba85..000000000
Binary files a/tools/c64/sample.cfg and /dev/null differ
diff --git a/tools/codeprop.c b/tools/codeprop.c
deleted file mode 100644
index 5d4df98b9..000000000
--- a/tools/codeprop.c
+++ /dev/null
@@ -1,134 +0,0 @@
-/*
- * Copyright (c) 2005, Swedish Institute of Computer Science
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the Institute nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * This file is part of the Contiki operating system.
- *
- */
-#include
-#include
-#include
-
-#include
-#include
-#include
-
-#include
-#include
-#include
-
-#include
-#include
-#include
-#include
-#include
-
-/* Should be included from codeprop.h, but the include paths in the makefiles
- isn't set up for that. */
-#define HDR_SIZE 4
-
-int
-main(int argc, char **argv) {
- struct sockaddr_in sa;
- int s, port, fd;
- char *ip_addr;
- int total = 0;
-
- if(argc != 3) {
- printf("usage: %s ipaddress filename\n", argv[0]);
- exit(1);
- }
- ip_addr = argv[1];
- port = 6510;
-
- /* Create socket. */
- if((s = socket(AF_INET,SOCK_STREAM,0)) < 0){
- perror("Can't create socket");
- exit(1);
- }
-
- /* Set the destination address of the socket. */
- bzero((char *) &sa, sizeof(sa));
- sa.sin_family = AF_INET;
- sa.sin_addr.s_addr = inet_addr(ip_addr);
- sa.sin_port = uip_htons(port);
-
- /* Connect the socket to the remote host. */
- if(connect(s, (struct sockaddr *)&sa, sizeof(sa)) < 0) {
- perror("connect failed");
- exit(1);
- }
- socklen_t slen = 576 - 40;
- if (setsockopt(s, SOL_SOCKET, SO_SNDBUF, &slen, sizeof(slen)) < 0) {
- perror("setsockopt failed");
- exit(1);
- }
-
- if((fd = open(argv[2], O_RDONLY)) < 0) {
- perror("Could not open file");
- exit(1);
- }
-
-
- while(1) {
- char buf[64000];
- int len;
-
- len = read(fd, &buf[HDR_SIZE], sizeof(buf) - HDR_SIZE);
- if(len == 0) {
- printf("File successfully sent (%d bytes)\n", total);
- len = read(s, buf, sizeof(buf));
- buf[len] = 0;
- printf("Reply: %s", buf);
- if(buf[0] != 'o' || buf[1] != 'k') {
- /* Cut and pasted from core/loader/elfloader.h */
- printf("OK 0\n"
- "BAD_HEADER 1\n"
- "NO_SYMTAB 2\n"
- "NO_STRTAB 3\n"
- "NO_TEXT 4\n"
- "UNDEFINED 5\n"
- "UNKNOWN_SEGMENT 6\n"
- "NO_STARTPOINT 7\n"
- "TEXT_TO_LARGE 8\n"
- "DATA_TO_LARGE 9\n"
- "UNKNOWN_RELOC 10\n"
- "MULTIPLY_DEFINED 11\n");
- }
- exit(0);
- }
- total += len;
- buf[0] = len >> 8;
- buf[1] = len & 0xff;
- if(write(s, buf, len + HDR_SIZE) == -1) {
- perror("network send failed");
- exit(1);
- }
- }
-
- return 0;
-}
diff --git a/tools/csc/csc-compute-neighbor-stats b/tools/csc/csc-compute-neighbor-stats
deleted file mode 100755
index a62990d92..000000000
--- a/tools/csc/csc-compute-neighbor-stats
+++ /dev/null
@@ -1,75 +0,0 @@
-#!/usr/bin/perl
-
-$num = 0;
-$override_range = $ARGV[0];
-
-# Go through the .csc file; find the transmission range and all the
-# nodes' x and y coordinates.
-while() {
- if(/\([\d.]+)\<\//) {
- $range = $1;
- }
- if(/\([\d.]+)\<\//) {
- $success_ratio_rx = $1;
- }
-
- if(/\([\d.]+)\([\d.]+)\ 1) {
- $reception_probability = 0;
- } else {
- $reception_probability = 1 - $ratio * (1 - $success_ratio_rx);
- }
- $reception_probability_sum += $reception_probability;
- }
- }
- }
- if($neighbors == 0) {
- $no_neighbors++;
- }
- if($neighbors == $num - 1) {
- $all_neighbors++;
- }
- $total_neighbors += $neighbors;
-}
-
-print "$num $range " . ($total_neighbors / $num) .
- " " . ($no_neighbors / $num) .
- " " . ($all_neighbors / $num) .
- " " . ($reception_probability_sum / $total_neighbors) .
- "\n";
-print "# Range $range number of nodes $num override range $override_range\n";
-print "# Num nodes $num, average neighbors " . ($total_neighbors / $num) .
- ", $no_neighbors nodes (" . (100 * $no_neighbors / $num) .
- "%) have no neighbors, $all_neighbors (" . (100 * $all_neighbors / $num) .
- "%) have all other nodes as neighbors\n";
-print "# Average reception probability " .
- ($reception_probability_sum / $total_neighbors) . "\n";
diff --git a/tools/csc/csc-create-range-success b/tools/csc/csc-create-range-success
deleted file mode 100755
index c58f90530..000000000
--- a/tools/csc/csc-create-range-success
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/usr/bin/perl
-
-
-$csc = $ARGV[0];
-$range = $ARGV[1];
-$success = $ARGV[2];
-
-if(!$success) {
- print "takes a .csc file as input, creates a .csc file with a given tx range and reliability\n";
- exit 0;
-}
-
-open(F, $csc);
-
-$csc =~ s/\.csc/-$range-$success.csc/g;
-
-open(O, "> $csc");
-
-while() {
- if(m-\[\d.]+\-) {
- print O "$range\n";
- } elsif(m-\[\d.]+\-) {
- print O "" . ($range * 2) . "\n";
- } elsif(m-\[\d.]+\-) {
- print O "$success\n";
- } else {
- print O;
- }
-}
diff --git a/tools/cygwin/cygwin1.dll b/tools/cygwin/cygwin1.dll
deleted file mode 100755
index 3db37e7ec..000000000
Binary files a/tools/cygwin/cygwin1.dll and /dev/null differ
diff --git a/tools/freebsd-6-setup-slip b/tools/freebsd-6-setup-slip
deleted file mode 100755
index 410137d82..000000000
--- a/tools/freebsd-6-setup-slip
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-# A small script for setting up SLIP under FreeBSD
-killall slattach
-#stty -f /dev/cuaa0 19200
-slattach -l -s 57600 /dev/cuad0
-sleep 1
-ifconfig sl0 172.16.0.1 172.16.0.2
-route delete 172.16.0.0/16
-route add -net 172.16.0.0/16 172.16.0.2
diff --git a/tools/make-symbols-nm b/tools/make-symbols-nm
deleted file mode 100755
index ca749277b..000000000
--- a/tools/make-symbols-nm
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/sh
-
-SYMBOLS=`nm -P $* | grep -v " . _ " | grep " [A-Z] " | cut -f 1 -d \ | grep -v symbols | wc -l`
-SYMBOLS=`expr $SYMBOLS + 1`
-
-echo \#ifndef __SYMBOLS_H__ > symbols.h
-echo \#define __SYMBOLS_H__ >> symbols.h
-echo \#include '"loader/symbols-def.h"' >> symbols.h
-echo "extern const struct symbols symbols[$SYMBOLS];" >> symbols.h
-echo \#endif >> symbols.h
-
-echo \#include '"symbols.h"' > symbols.c
-
-nm -P $* | grep -v " . _ " | grep " [A-Z] " | cut -f 1 -d \ | grep -v symbols | perl -ne 'print "extern int $1();\n" if(/(\w+)/)' | sort >> symbols.c
-
-echo "const struct symbols symbols[$SYMBOLS] = {" >> symbols.c
-
-if [ -f $* ] ; then
- nm -P $* | grep -v " . _ " | grep " [A-Z] " | cut -f 1 -d \ | grep -v symbols | perl -ne 'print "{\"$1\", (char *)$1},\n" if(/(\w+)/)' | sort >> symbols.c
-fi
-
-echo "{(void *)0, 0} };" >> symbols.c
diff --git a/tools/makestrings b/tools/makestrings
deleted file mode 100755
index a6c4a8843..000000000
--- a/tools/makestrings
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/usr/bin/perl
-
-
-sub stringify {
- my $name = shift(@_);
- open(OUTPUTC, "> $name.c");
- open(OUTPUTH, "> $name.h");
-
- open(FILE, "$name");
-
- while() {
- if(/(.+) "(.+)"/) {
- $var = $1;
- $data = $2;
-
- $datan = $data;
- $datan =~ s/\\r/\r/g;
- $datan =~ s/\\n/\n/g;
- $datan =~ s/\\01/\01/g;
- $datan =~ s/\\0/\0/g;
-
- printf(OUTPUTC "const char $var\[%d] = \n", length($datan) + 1);
- printf(OUTPUTC "/* \"$data\" */\n");
- printf(OUTPUTC "{");
- for($j = 0; $j < length($datan); $j++) {
- printf(OUTPUTC "%#02x, ", unpack("C", substr($datan, $j, 1)));
- }
- printf(OUTPUTC "};\n");
-
- printf(OUTPUTH "extern const char $var\[%d];\n", length($datan) + 1);
-
- }
- }
- close(OUTPUTC);
- close(OUTPUTH);
-}
-stringify($ARGV[0]);
-
-exit 0;
-
diff --git a/tools/mknmlist b/tools/mknmlist
deleted file mode 100644
index c47a83dc5..000000000
--- a/tools/mknmlist
+++ /dev/null
@@ -1,53 +0,0 @@
-function sort(V, N, tmp, i, j) {
- V[-1] = ""; # Used as a sentinel before V[0].
- for (i = 1; i < N; i++)
- for (j = i; V[j - 1] > V[j]; j--) {
- tmp = V[j];
- V[j] = V[j - 1];
- V[j - 1] = tmp;
- }
- return;
-}
-
-BEGIN {
- nname = 0;
- builtin["printf"] = "int printf(const char *, ...)";
- builtin["sprintf"] = "int sprintf(char *, const char *, ...)";
- builtin["malloc"] = "void *malloc()";
- builtin["calloc"] = "void *calloc()";
- builtin["memcpy"] = "void *memcpy()";
- builtin["memset"] = "void *memset()";
- builtin["memmove"] = "void *memmove()";
- builtin["strcpy"] = "char *strcpy()";
- builtin["strchr"] = "char *strchr()";
- builtin[""] = "";
-}
-
-/^[0123456789abcdef]+ [ABCDGRSTUVW] [^__]/ {
- if ($3 != "symbols" && $3 != "symbols_nelts") {
- name[nname] = $3;
- nname++;
- }
-}
-
-END {
- sort(name, nname);
-
- print "#include \"loader/symbols.h\"\n";
-
- # Must deal with compiler builtins etc.
- for (x = 0; x < nname; x++) {
- if (builtin[name[x]] != "")
- print builtin[name[x]] ";";
- else
- print "extern int " name[x]"();";
- }
- print "\n";
-
- # nname++: An { 0, 0 } entry is added at the end of the vector.
- print "const int symbols_nelts = " nname+1 ";";
- print "const struct symbols symbols[" nname+1 "] = {";
- for (x = 0; x < nname; x++)
- print "{ \"" name[x] "\", (void *)&"name[x]" },";
- print "{ (const char *)0, (void *)0} };";
-}
diff --git a/tools/mknmlist-ansi b/tools/mknmlist-ansi
deleted file mode 100644
index 7a8234686..000000000
--- a/tools/mknmlist-ansi
+++ /dev/null
@@ -1,113 +0,0 @@
-#
-#
-# Create tables so that we can lookup ANSI C objects and functions in
-# an object file (by reading nm output from stdin).
-#
-# This tool makes assumptions compatible with ANSI C. Unfortunately
-# this implies that we need to rely on ANSI C features.
-
-function sort(V, N, tmp, i, j) {
- V[-1] = ""; # Used as a sentinel before V[0].
- for (i = 1; i < N; i++)
- for (j = i; V[j - 1] > V[j]; j--) {
- tmp = V[j];
- V[j] = V[j - 1];
- V[j - 1] = tmp;
- }
- return;
-}
-
-BEGIN {
- ndata = ntext = 0;
- builtin["sym_function"] = "sym_func_t sym_function(const char *)";
- builtin["sym_object"] = "void *sym_object(const char *)";
-#
- builtin["printf"] = "int printf(const char *, ...)";
- builtin["sprintf"] = "int sprintf(char *, const char *, ...)";
- builtin["malloc"] = "void *malloc()";
- builtin["memcpy"] = "void *memcpy()";
- builtin["memset"] = "void *memset()";
- builtin["memmove"] = "void *memmove()";
- builtin["strcpy"] = "char *strcpy()";
-#
- builtin["sin"] = "double sin()";
- builtin["cos"] = "double cos()";
- builtin["sinf"] = "float sinf(float)";
- builtin["cosf"] = "float cosf(float)";
- builtin[""] = "";
-}
-
-# DATA or TEXT (ignored)
-/^[0123456789abcdef]+ [AVWw] / {
- print "/* " $1 " " $2 " " $3 " */";
-}
-
-# DATA
-/^[0123456789abcdef]+ [BCDGRS] / {
- if ($3 != "sym_obj" && $3 != "sym_obj_nelts" &&
- $3 != "sym_func" && $3 != "sym_func_nelts") {
- data[ndata++] = $3;
- }
-}
-
-# TEXT
-/^[0123456789abcdef]+ [T] / {
- if ($3 != "sym_obj" && $3 != "sym_obj_nelts" &&
- $3 != "sym_func" && $3 != "sym_func_nelts") {
- text[ntext++] = $3;
- }
-}
-
-END {
- sort(data, ndata);
- sort(text, ntext);
-
- print "#ifdef __AVR__"
- print "#define PROGMEM __attribute__((__progmem__))"
- print "#else"
- print "#define PROGMEM"
- print "#endif"
- print "#include \"loader/sym.h\"";
-
- print "";
- for (x = 0; x < ndata; x++) {
- print "static const PROGMEM char __D"x"[] = \""data[x]"\";";
- }
-
- # Extern decls. Must deal with compiler builtins etc.
- print "";
- for (x = 0; x < ndata; x++) {
- if (builtin[data[x]] != "")
- print builtin[data[x]] ";";
- else
- print "extern int " data[x]";";
- }
-
- print "";
- print "const int sym_obj_nelts = " ndata ";";
- print "PROGMEM const struct sym_bol sym_obj[" ndata "] = {";
- for (x = 0; x < ndata; x++)
- print " { (const char *)__D"x", { .obj = (void *)&" data[x] " } },";
- print "};";
-
- print "";
- for (x = 0; x < ntext; x++) {
- print "static const PROGMEM char __T"x"[] = \""text[x]"\";";
- }
-
- # Extern decls. Must deal with compiler builtins etc.
- print "";
- for (x = 0; x < ntext; x++) {
- if (builtin[text[x]] != "")
- print builtin[text[x]] ";";
- else
- print "extern int " text[x]"();";
- }
-
- print "";
- print "const int sym_func_nelts = " ntext ";";
- print "PROGMEM const struct sym_bol sym_func[" ntext "] = {";
- for (x = 0; x < ntext; x++)
- print " { (const char *)__T"x", { .func = (sym_func_t)&" text[x] " } },";
- print "};";
-}
diff --git a/tools/msp430-make-symbols b/tools/msp430-make-symbols
deleted file mode 100755
index e434d3bc0..000000000
--- a/tools/msp430-make-symbols
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/sh
-NM=msp430-nm
-
-SYMBOLS=`$NM $* | perl -ne 'print ".global $2\n$2 = 0x$1\n" if(/([0-9a-f]+) [ABDRST] (.+)$/);' | grep -v ^_ | grep -v _reset_vector | grep = | perl -ne 'print "{\"$1\", (char *)$2},\n" if(/(\w+) = (\w+)/)' | wc -l`
-SYMBOLS=`expr $SYMBOLS + 1`
-
-echo \#ifndef __SYMBOLS_H__ > symbols.h
-echo \#define __SYMBOLS_H__ >> symbols.h
-echo \#include '"loader/symbols-def.h"' >> symbols.h
-echo "extern const struct symbols symbols[$SYMBOLS];" >> symbols.h
-echo \#endif >> symbols.h
-
-echo \#include '"symbols.h"' > symbols.c
-echo "const struct symbols symbols[$SYMBOLS] = {" >> symbols.c
-
-if [ -f $* ] ; then
- $NM $* | perl -ne 'print ".global $2\n$2 = 0x$1\n" if(/([0-9a-f]+) [ABDRST] (.+)$/);' | grep -v ^_ | grep -v _reset_vector | grep = | perl -ne 'print "{\"$1\", (char *)$2},\n" if(/(\w+) = (\w+)/)' | sort >> symbols.c
-# msp430-nm $* | perl -ne 'print ".global $2\n$2 = 0x$1\n" if(/([0-9a-f]+) [ABDRST] (.+)$/);' | grep -v ^_ | grep -v _reset_vector | grep = | perl -ne 'print "{\"$1\", (char *)$2},\n" if(/(\w+) = (\w+)/)' | sort
- status=$?
-fi
-
-echo "{(void *)0, 0} };" >> symbols.c
-
-exit $status
diff --git a/tools/release-tools/Makefile b/tools/release-tools/Makefile
deleted file mode 100644
index f89f5e175..000000000
--- a/tools/release-tools/Makefile
+++ /dev/null
@@ -1,54 +0,0 @@
-ifndef TAG
- ifndef RELEASE
- ${error You must specify the RELEASE variable (e.g. make RELEASE=2.5)}
- endif
- RELEASETAG=$(subst .,-,$(RELEASE))
- TAG=contiki-$(RELEASETAG)
-else
- RELEASE=$(TAG)
-endif
-
-GITROOT=git://contiki.git.sourceforge.net/gitroot/contiki/contiki
-
-package: all
-
-test: export-package compile almost-clean
-
-export-package: clean checkout copy tgz zip
-
-almost-clean:
- rm -rf contiki contiki-$(RELEASE) contiki-collect-$(RELEASE)
-
-clean:
- rm -rf contiki contiki-$(RELEASE) contiki-collect-$(RELEASE) *.zip *.tar.gz
-
-copy:
- cp -r contiki contiki-$(RELEASE)
-
-doc:
- (cd contiki/doc; make dox pdf)
-
-copydoc:
- cp contiki/doc/latex/refman.pdf contiki-$(RELEASE)/doc/
- cp -r contiki/doc/html contiki-$(RELEASE)/doc/
-
-tgz:
- tar czf contiki-$(RELEASE).tar.gz contiki-$(RELEASE)
- chmod 644 contiki-$(RELEASE).tar.gz
-
-zip:
- zip -r contiki-$(RELEASE).zip contiki-$(RELEASE)
- chmod 644 contiki-$(RELEASE).zip
-
-compile:
- (cd contiki/examples/compile-platforms; make)
-
-checkout:
- git clone $(GITROOT)
- git checkout $(TAG)
- rm -rf contiki/.git
-
--include Makefile.sky
--include Makefile.raven
-
-all: export-package $(BINARIES) almost-clean
diff --git a/tools/release-tools/Makefile.raven b/tools/release-tools/Makefile.raven
deleted file mode 100644
index 6b438d859..000000000
--- a/tools/release-tools/Makefile.raven
+++ /dev/null
@@ -1,17 +0,0 @@
-contiki-raven:
- (cd contiki-2.x/examples/webserver-ipv6-raven; make)
- (cd contiki-2.x/platform/avr-ravenlcd; make)
- (cd contiki-2.x/examples/ravenusbstick; make)
- mkdir contiki-raven-$(RELEASE)
- cp contiki-2.x/examples/webserver-ipv6-raven/webserver6.elf contiki-raven-$(RELEASE)
- cp contiki-2.x/platform/avr-ravenlcd/ravenlcd_3290.elf contiki-raven-$(RELEASE)
- cp contiki-2.x/examples/ravenusbstick/ravenusbstick.elf contiki-raven-$(RELEASE)
- cp contiki-2.x/cpu/avr/dev/usb/INF/*.inf contiki-raven-$(RELEASE)
-
-contiki-raven-$(RELEASE).zip: contiki-raven
- tar czf contiki-raven-$(RELEASE).tar.gz contiki-raven-$(RELEASE)
- chmod 644 contiki-raven-$(RELEASE).tar.gz
- zip -r contiki-raven-$(RELEASE).zip contiki-raven-$(RELEASE)
- chmod 644 contiki-raven-$(RELEASE).zip
-
-BINARIES += contiki-raven-$(RELEASE).zip
diff --git a/tools/release-tools/Makefile.sky b/tools/release-tools/Makefile.sky
deleted file mode 100644
index d40ded17d..000000000
--- a/tools/release-tools/Makefile.sky
+++ /dev/null
@@ -1,9 +0,0 @@
-contiki-collect-sky:
- (cd contiki-2.x/tools/collect-view/; ant dist && chmod 755 dist/tools/*-linux)
- cp -r contiki-2.x/tools/collect-view/dist contiki-collect-sky-$(RELEASE)
-
-contiki-collect-sky-$(RELEASE).zip: contiki-collect-sky
- zip -r contiki-collect-sky-$(RELEASE).zip contiki-collect-sky-$(RELEASE)
- chmod 644 contiki-collect-sky-$(RELEASE).zip
-
-BINARIES += contiki-collect-sky-$(RELEASE).zip
diff --git a/tools/release-tools/README.md b/tools/release-tools/README.md
deleted file mode 100644
index 29d2fe519..000000000
--- a/tools/release-tools/README.md
+++ /dev/null
@@ -1,15 +0,0 @@
-Release tools
-=============
-
-The tools/release-tools directory contains files for building and testing
-Contiki releases. To compile a release of Contiki, run
-
- make RELEASE=2.6
-
-for Contiki 2.6. It is also possible to compile a release of a specific git tag
-or other non-numbered version, such as the current git HEAD, like this:
-
- make TAG=HEAD
-
-The compile-examples and compile-platform directories are used for running
-nightly builds of the git version of Contiki.
diff --git a/tools/release-tools/compile-examples/Makefile b/tools/release-tools/compile-examples/Makefile
deleted file mode 100644
index 4749fd7e2..000000000
--- a/tools/release-tools/compile-examples/Makefile
+++ /dev/null
@@ -1,36 +0,0 @@
-all:
- @rm -f *.output
- @echo Compiling on:
- @uname -a
- @$(MAKE) -s -k compile || cat *.output
-
-compile: rime-examples shell hello-world \
- ipso-ipv6-raven jcreate multi-threading sky sky-ip sky-shell \
- webserver-ipv6 webserver-ipv6-raven tools
-
-tools:
- @(cd ../../../tools ; $(MAKE))
- @(cd ../../../tools/sky/uip6-bridge ; $(MAKE))
-
-shell: example-example-shell.native
-hello-world: example-hello-world.sky example-hello-world.native \
- example-hello-world.micaz example-hello-world.z1
-rime-examples: example-rime.sky example-rime.z1
-ipso-ipv6-raven: example-ipso-ipv6-raven.avr-raven
-jcreate: example-jcreate.jcreate
-multi-threading: example-multi-threading.sky \
- example-multi-threading.native
- example-multi-threading.z1
-sky: example-sky.sky
-sky-ip: example-sky-ip.sky
-sky-shell: example-sky-shell.sky
-webserver-ipv6: example-webserver-ipv6.sky
-webserver-ipv6-raven: example-webserver-ipv6-raven.avr-raven
-
-example-%:
- @((echo; echo ------------------- $* -------------------; \
- cd ../../../examples/${basename $*} ; $(MAKE) TARGET=${subst .,,${suffix $*}} clean;\
- ($(MAKE) TARGET=${subst .,,${suffix $*}} > /dev/null 2>&1 ) ; \
- $(MAKE) TARGET=${subst .,,${suffix $*}}) > $*.output 2>&1 && echo "$* succeeded" && rm $*.output) || \
- (echo; echo "$* failed"; exit 1)
-# (cd ../../../examples/${basename $*}; make TARGET=${subst .,,${suffix $*}})
diff --git a/tools/release-tools/compile-platforms/Makefile b/tools/release-tools/compile-platforms/Makefile
deleted file mode 100644
index 06f8ca3f8..000000000
--- a/tools/release-tools/compile-platforms/Makefile
+++ /dev/null
@@ -1,25 +0,0 @@
-all:
- @rm -f *.output
- @echo Compiling on:
- @uname -a
- @$(MAKE) -s -k compile || cat *.output
-
-compile: 6502 msp430 native avr arm
-
-6502: c64.platform c128.platform apple2enh.platform atarixl.platform
-msp430: sky.platform esb.platform z1.platform
-native: native.platform
-avr: avr-raven.platform
-arm: redbee-econotag.platform redbee-dev.platform
-
-clean:
- @rm -rf [a-z]*
-
-%.platform:
- @mkdir -p $*
- @cp *.c $*
- @cp Makefile.platform $*/Makefile
- @((echo; echo ------------------- $* -------------------; \
- cd $* ; ($(MAKE) TARGET=$* > /dev/null 2>&1 ) ; \
- $(MAKE) TARGET=$*) > $*.output 2>&1 && echo "$* succeeded") || \
- (echo; echo "$* failed"; exit 1)
diff --git a/tools/release-tools/compile-platforms/Makefile.platform b/tools/release-tools/compile-platforms/Makefile.platform
deleted file mode 100644
index c76758b61..000000000
--- a/tools/release-tools/compile-platforms/Makefile.platform
+++ /dev/null
@@ -1,9 +0,0 @@
-all: print-version hello-world
-CONTIKI = ../../../..
-APPS=serial-shell webserver telnetd
-
-CONTIKI_WITH_IPV6 = 1
-
-include $(CONTIKI)/Makefile.include
-print-version:
- @$(CC) --version || echo
diff --git a/tools/release-tools/compile-platforms/hello-world.c b/tools/release-tools/compile-platforms/hello-world.c
deleted file mode 100644
index bc11ab91f..000000000
--- a/tools/release-tools/compile-platforms/hello-world.c
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright (c) 2006, Swedish Institute of Computer Science.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the Institute nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * This file is part of the Contiki operating system.
- *
- */
-
-/**
- * \file
- * A very simple Contiki application showing how Contiki programs look
- * \author
- * Adam Dunkels
- */
-
-#include "contiki.h"
-
-#include /* For printf() */
-/*---------------------------------------------------------------------------*/
-PROCESS(hello_world_process, "Hello world process");
-AUTOSTART_PROCESSES(&hello_world_process);
-/*---------------------------------------------------------------------------*/
-PROCESS_THREAD(hello_world_process, ev, data)
-{
- PROCESS_BEGIN();
-
- printf("Hello, world\n");
-
- PROCESS_END();
-}
-/*---------------------------------------------------------------------------*/
diff --git a/tools/scat.c b/tools/scat.c
deleted file mode 100644
index 9642acc27..000000000
--- a/tools/scat.c
+++ /dev/null
@@ -1,197 +0,0 @@
-/*
- * Copyright (c) 2006, Swedish Institute of Computer Science
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote
- * products derived from this software without specific prior
- * written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
- * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
- * GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- *
- */
-
-#include
-#include
-#include
-#include
-#include
-#include
-
-#include
-#include
-#include
-#include
-#include
-#include
-
-#include
-#include
-#include
-
-#include
-
-#define SLIP_END 0300
-#define SLIP_ESC 0333
-#define SLIP_ESC_END 0334
-#define SLIP_ESC_ESC 0335
-
-#ifndef BAUDRATE
-#define BAUDRATE B115200
-#endif
-speed_t b_rate = BAUDRATE;
-
-void
-stty_telos(int fd)
-{
- struct termios tty;
- int i;
-
- if(tcflush(fd, TCIOFLUSH) == -1) err(1, "tcflush");
-
- if(tcgetattr(fd, &tty) == -1) err(1, "tcgetattr");
-
- cfmakeraw(&tty);
-
- /* Blocking read. */
- tty.c_cc[VTIME] = 0;
- tty.c_cc[VMIN] = 1;
- tty.c_cflag &= ~CRTSCTS;
- tty.c_cflag &= ~HUPCL;
- tty.c_cflag &= ~CLOCAL;
-
- cfsetispeed(&tty, b_rate);
- cfsetospeed(&tty, b_rate);
-
- if(tcsetattr(fd, TCSAFLUSH, &tty) == -1) err(1, "tcsetattr");
-
- tty.c_cflag |= CLOCAL;
- if(tcsetattr(fd, TCSAFLUSH, &tty) == -1) err(1, "tcsetattr");
-
- i = TIOCM_DTR;
- if(ioctl(fd, TIOCMBIS, &i) == -1) err(1, "ioctl");
-
- usleep(10*1000); /* Wait for hardware 10ms. */
-
- /* Flush input and output buffers. */
- if(tcflush(fd, TCIOFLUSH) == -1) err(1, "tcflush");
-}
-
-int
-main(int argc, char **argv)
-{
- int c;
- int slipfd;
- FILE *inslip;
- const char *siodev;
- int baudrate = -2;
-
- while ((c = getopt(argc, argv, "B:")) != -1) {
- switch (c) {
- case 'B':
- baudrate = atoi(optarg);
- break;
-
- case '?':
- case 'h':
- default:
- err(1, "usage: scat [-B baudrate] device-file");
- break;
- }
- }
- argc -= (optind - 1);
- argv += (optind - 1);
-
- switch (baudrate) {
- case -2:
- break; /* Use default. */
- case 9600:
- b_rate = B9600;
- break;
- case 19200:
- b_rate = B19200;
- break;
- case 38400:
- b_rate = B38400;
- break;
- case 57600:
- b_rate = B57600;
- break;
- case 115200:
- b_rate = B115200;
- break;
- default:
- err(1, "unknown baudrate %d", baudrate);
- break;
- }
-
- if (argc != 2)
- err(1, "usage: scat device-file");
- siodev = argv[1];
-
- setvbuf(stdout, NULL, _IOLBF, 0); /* Line buffered output. */
-
- slipfd = open(siodev, O_RDWR);
- if (slipfd == -1) err(1, "can't open '%s'", siodev);
- stty_telos(slipfd);
- inslip = fdopen(slipfd, "r");
- if(inslip == NULL) err(1, "main: fdopen");
-
- while (1) {
- int c = getc(inslip);
- while (c == SLIP_END)
- c = getc(inslip);
- do {
- if (c == SLIP_ESC) {
- c = getc(inslip);
- if (c == SLIP_ESC_ESC)
- c = SLIP_ESC;
- else if (c == SLIP_ESC_END)
- c = SLIP_END;
- }
- switch (c) {
- case EOF:
- err(1, "getc(inslip)");
- break;
-
- case '\007':
- case '\b':
- case '\f':
- case '\n':
- case '\r':
- case '\t':
- case '\v':
- putchar(c);
- break;
-
- default:
- if (isprint(c))
- putchar(c);
- else
- printf("%02x ", c);
- break;
- }
- c = getc(inslip);
- } while (c != SLIP_END);
- }
-
- return 0;
-}
diff --git a/tools/serial-log.pl b/tools/serial-log.pl
deleted file mode 100644
index 81b49a515..000000000
--- a/tools/serial-log.pl
+++ /dev/null
@@ -1,124 +0,0 @@
-#!/usr/bin/perl -w
-#Log serial port to terminal and file with timestamps
-#D.Kopf 8/28/2001
-#
-
-use Device::SerialPort;
-use Term::ReadKey;
-use Getopt::Long;
-use Time::HiRes qw(usleep);
-
-use strict;
-
-my $term = '/dev/com1';
-my $baud = '57600';
-my $rts = 'none';
-my $logfile = 'none';
-my $ssss = '';
-
-GetOptions ('terminal=s' => \$term,
- 'baud=s' => \$baud,
- 'rts=s' => \$rts,
- 'seconds!' => \$ssss,
- 'logfile:s' =>\$logfile
-) or goto printhelp;
-goto bypass;
-printhelp:
- print "Example serial-log.pl -t /dev/ttyS0 -b 57600 -r none -l logfile\n";
- print " -t, --terminal\n";
- print " -b, --baud\n";
- print " -r,--rts [none|rts] flow control\n";
- print " -s,--seconds Display ssss instead of hh:mm:ss\n";
- print " -l,--logfile outputfile (.log will be added, -l defaults to serial.log)\n";
- print "\n";
- print "The default is equivalent to serial-log.pl -t /dev/com1 -b 57600 -r none\n";
- exit;
-bypass:
-
-my $ob = Device::SerialPort->new ($term) or die "Can't start $term\n";
- # next test will die at runtime unless $ob
-
-$ob->baudrate($baud);
-$ob->parity('none');
-$ob->databits(8);
-$ob->stopbits(1);
-if($rts eq 'rts') {
- $ob->handshake('rts');
-} else {
- $ob->handshake('none');
-}
-$ob->read_const_time(1000); # 1 second per unfulfilled "read" call
-$ob->rts_active(1);
-
-my $c; my $count;
-my ($hh,$mm,$ss,$mday,$mon,$year,$wday,$yday,$isdst,$theTime,$seconds,$startseconds);
-#use POSIX qw(strftime);
-
-($ss,$mm,$hh,$mday,$mon,$year,$wday,$yday,$isdst) = localtime;
-$theTime = sprintf "on %02d/%02d/%04d at %02d:%02d:%02d\n", $mon+1, $mday, $year+1900, $hh, $mm, $ss;
-if($logfile ne 'none') {
- if($logfile eq '') {$logfile = 'serial';}
- $logfile ="${logfile}.log";
- $c=1;
- open LOGFILE, "$logfile" or do {$c=0;};
- if ($c) {
- print "File $logfile exists. Restart, append, or quit (r,a,q) (q) ? ";
- #$| = 1; # force a flush after print
- $_ = ;chomp;
- if ($_ eq 'r') {
- open LOGFILE, ">$logfile" or die $!;
- print "Restarting $logfile $theTime\n";
- print LOGFILE "serial-log.pl logging to $logfile started $theTime\n";
- } else {
- if ($_ eq 'a') {
- open LOGFILE, ">>$logfile" or die $!;
- print "Appending to $logfile $theTime\n";
- print LOGFILE "serial-log.pl appending to $logfile $theTime\n";
- } else {
- print "Quitting, file unchanged.\n";
- exit;
- }
- }
- } else {
- open LOGFILE, ">$logfile" or die $!;
- print LOGFILE "serial-log.pl logging to $logfile started $theTime\n";
- print "Starting $logfile $theTime\n";
-
- }
- LOGFILE->autoflush(1);
-} else {
- $logfile='';
- print "Serial logging of $term started $theTime\n";
-}
-if($ssss ne '') {
- $startseconds=$hh*3600+$mm*60+$ss;
-}
-
-$theTime='';
-
-while(1) {
- ($count, $c) = $ob->read(1);
- if (defined($count) && ($count != 0)) {
- if ($theTime eq '') {
- ($ss,$mm,$hh) = localtime(time);
- if ($ssss ne '') {
- $seconds = $hh*3600+$mm*60+$ss-$startseconds;
- if ($seconds < 0) {$seconds+=24*60*60;}
- $theTime = sprintf("%04d ",$seconds);
- } else {
- $theTime = sprintf("%02d:%02s:%02d ", $hh,$mm,$ss);
- #$theTime = strftime "%H:%M:%S ", localtime;
- }
- print $theTime ;
- if ($logfile) {LOGFILE->autoflush(1);print LOGFILE $theTime;}
- }
- print $c ;
- if ($logfile) { print LOGFILE $c;}
- if ($c eq "\n") {$theTime=''};
- }
-}
-if ($logfile) {close LOGFILE or die $!}
-$ob -> close or die "Serial port close failed: $!\n";
-ReadMode 0;
-undef $ob; # closes port AND frees memory in perl
-exit;
diff --git a/tools/setup-nat-ubuntu b/tools/setup-nat-ubuntu
deleted file mode 100755
index addae148c..000000000
--- a/tools/setup-nat-ubuntu
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh
-
-# Run this script as root ("sudo ./setup-nat-ubuntu"). It has been tested on Ubunru 8.04.
-
-/sbin/iptables --table nat --append POSTROUTING --out-interface eth10 -j MASQUERADE
-/sbin/iptables --append FORWARD --in-interface tun0 -j ACCEPT
-/sbin/iptables --append FORWARD --in-interface tap0 -j ACCEPT
-
-/sbin/sysctl -w net.ipv4.conf.default.forwarding=1
-/sbin/sysctl -w net.ipv4.conf.all.forwarding=1
-
-/sbin/sysctl -w net.ipv4.ip_forward=1
-
-echo 1 > /proc/sys/net/ipv4/ip_forward
-
diff --git a/tools/z80/hex2bin/.cvsignore b/tools/z80/hex2bin/.cvsignore
deleted file mode 100644
index 15c9185a1..000000000
--- a/tools/z80/hex2bin/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-hexameter.exe
diff --git a/tools/z80/hex2bin/LICENSE.txt b/tools/z80/hex2bin/LICENSE.txt
deleted file mode 100644
index b54de728e..000000000
--- a/tools/z80/hex2bin/LICENSE.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-Copyright (c) 2008, Takahide Matsutsuka.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-1. Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
-2. Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in the
- documentation and/or other materials provided with the distribution.
-3. Neither the name of the author nor the names of its contributors
- may be used to endorse or promote products derived from this software
- without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGE.
diff --git a/tools/z80/hex2bin/Makefile b/tools/z80/hex2bin/Makefile
deleted file mode 100644
index 6a7b04921..000000000
--- a/tools/z80/hex2bin/Makefile
+++ /dev/null
@@ -1,30 +0,0 @@
-#
-# Makefile for hexameter
-# @author Takahide Matsutsuka
-#
-# $Id: Makefile,v 1.3 2009/12/15 07:13:14 matsutsuka Exp $
-#
-
-#CFLAGS = -std=c99 -g -mno-cygwin -Wall
-CFLAGS = -g -Wall
-SOURCEDIR = src
-SOURCES = hexameter.c ihx2bin.c
-OBJECTDIR = bin
-OBJECTS = ${addprefix $(OBJECTDIR)/,$(SOURCES:.c=.o)}
-
-vpath %.c $(SOURCEDIR)
-
-hexameter: $(OBJECTS)
- $(CC) $(CFLAGS) -o $@ $(OBJECTS)
-
-clean:
- rm -rf bin
- rm -f *~ *.stackdump
- rm -f *~ hexameter hexameter.exe
-
-$(OBJECTDIR):
- mkdir $@
-
-$(OBJECTDIR)/%.o: %.c | $(OBJECTDIR)
- $(CC) $(CFLAGS) -c $< -o $@
-
diff --git a/tools/z80/hex2bin/README.md b/tools/z80/hex2bin/README.md
deleted file mode 100644
index afa1cc6c5..000000000
--- a/tools/z80/hex2bin/README.md
+++ /dev/null
@@ -1,158 +0,0 @@
-hexameter : Convert Intel hex files to a binary file
-====================================================
-
-version 2.1.0 Copyright (c) 2003-2008, Takahide Matsutsuka.
-
-What is it?
------------
-
-It converts Intel hex files, which emitted by SDCC-Z80 compiler, to a binary
-file. You can attach additional prefix and/or suffix file to comply the file
-with arbitrary binary format. It provides a development environment of C
-language on PC-6001 and other old computers.
-
-Installation
-------------
-
-Installation can be done in the following steps.
-
-1. Download and install SDCC from [http://sdcc.sf.net](http://sdcc.sf.net)
- Version 2.8.0 has been tested. SDCC is a cross-compiler for Z80 and other
- 8bit CPUs. Extract an archive on your disk, say "c:/sdcc".
-
-2. Place hexameter.exe and prefix/suffix files to any path-available directory.
-
-Use
----
-
-1. Write your own C code.
-
-2. Compile your code using SDCC. While linking, you need to specify options
- for SDCC so that the code can be worked on your machine. See
- sample/Makefile for actual usage.
-
- sdcc -mz80 -c YOUR_CODE1.c
- sdcc -mz80 -c YOUR_CODE2.c
-
- This step creates a file YOUR_CODE1.o and YOUR_CODE2.o respectively, which
- run on Z80-based machine.
-
- for target in YOUR_CODE1.o YOUR_CODE2.o; do echo $@ >> YOUR_LIB.lib $@; done
-
- This step makes a library file.
-
- sdcc -mz80 --no-std-crt0 --code-loc 0x840f --data-loc 0 -o YOUR_APP.ihx crt0.o -lYOUR_LIB.lib
-
- - -mz80 specifies the Z80 mode.
- - --code-loc specifies the start address of your object code. Basically, it
- depends on the machine and RAM size. As for PC-6001, 0x840f for 32kB, or
- 0xc40f for 16kB. As for PC-6001mkII, it would be 0x800f. If you are not
- sure what you are about to do, just leave it as default 0x840f.
- - --data-loc 0 specifies the code is followed by data. You can specify an
- arbitrary address instead.
- - --no-std-crt0 indicates that you use your own crt0 instead of sdcc's
- default crt0 object. The customized crt0.o file is in lib directory of
- this release.
-
-3. Convert ihx file to cas file using hexameter
-
- hexameter [ihx_file|binary_file ...]
-
- The ihx files are just attached in the specified order.
-
- Here you can take some options:
- -o specify output file name
- -d = define ihx-specific value replacement
- -v verbose output
- -b size of the output file in hexadecimal bytes.
- only if the size of the output is less than the size
- specified, the trailing bytes will filled by zeroes.
- note that it doesn't mean the size of output is
- restricted by the given size.
- -h displays simple usage
-
- You can find various predefined library file in "lib" directory.
- Each of them may take its own optional value, which you can specify
- with -d option.
-
-4. Example
-
- The following is a typical example to convert from ihx files to
- PC-6001 loadable cassette format.
-
- hexameter -v TAPE=myfile mode2.ihx mycode2.ihx -o myapp.p6
-
- Note that TAPE value is defined in mode2.ihx, defines cassette file name.
-
-5. Load your cas file into your 6001 emulator.
-
- I've checked it working on the following emulators:
-
- [iP6Win](http://www.retropc.net/mm/pc6001)
-
-IHX extentions
---------------
-
-To support run-time user specified values in ihx files, Hexameter supports
-extended ihx files. Examples are located in ihx directory.
-
-For example, mode2.ihx has the following line.
-
- :06000a02TAPE
-
-As in normal ihx format, the first 9 characters conform to the following
-format:
-
- :AABBBBCC
- AA bytes encoded in this line
- BBBB start address of this line
- CC type of this line
-
-The normal ihx file, which sdcc emits, has the type 00 (data) and 01 (end of
-file). In addition to this, Hexameter supports the following types.
-
- 02 string
- 03 byte
- 04 word (encoded in little endian)
-
-The rest of line defines a name of the definition. In the example above, the
-name TAPE is assigned to this line. You can use latin alphabets, numbers, and
-underscore for the name. Letters are case-sensitive.
-
-When you run Hexameter, you can specify a value for this definition like:
-
- hexameter -d TAPE=xxxx
-
-Since this example defines 06 in the bytes field, TAPE can have up to six
-characters. This string will override the memory location 000a specified in
-the second field.
-
-For type 03 (byte) and 04 (word), bytes field has no effect.
-
-
-Note
-----
-
-- Cygwin dependency has been removed.
-- SDCC has many isuues regarding compilation. Don't blame me about them! :)
-
-History
--------
-
-03/29/2003 1.0.0 First version
-04/20/2003 1.0.1 Mode option has been added
-09/01/2007 1.1.0 ROM-mode has been added
-09/28/2007 1.2.0 Customized crt0 has been introduced to clear global data
-03/15/2008 1.3.0 VRAM options introduced
-04/28/2008 1.4.0 Header file option introduced
-
-05/17/2008 2.0.0 Migrated to hexameter, to support more flexible configurations
-07/16/2008 2.1.0 Support arguments in ihx file, remove prefix/suffix instead
-07/18/2008 2.1.1 Cygwin dependency has been removed
-10/02/2008 2.1.2 Template for sdos 1.1 has been added
-12/14/2009 2.1.3 A minor bug in Linux environment has been fixed
-
-Enjoy!
-
-[http://www.markn.org](http://www.markn.org)
-
diff --git a/tools/z80/hex2bin/ihx/mode1.ihx b/tools/z80/hex2bin/ihx/mode1.ihx
deleted file mode 100644
index b6661c82c..000000000
--- a/tools/z80/hex2bin/ihx/mode1.ihx
+++ /dev/null
@@ -1,3 +0,0 @@
-:10000000d3d3d3d3d3d3d3d3d3d3000000000000
-:0e0010000dc40a00a5264843343046000000
-:06000a02TAPE
diff --git a/tools/z80/hex2bin/ihx/mode2.ihx b/tools/z80/hex2bin/ihx/mode2.ihx
deleted file mode 100644
index bab52b2fe..000000000
--- a/tools/z80/hex2bin/ihx/mode2.ihx
+++ /dev/null
@@ -1,3 +0,0 @@
-:10000000d3d3d3d3d3d3d3d3d3d3000000000000
-:0e0010000d840a00a5264838343046000000
-:06000a02TAPE
diff --git a/tools/z80/hex2bin/ihx/mode5.ihx b/tools/z80/hex2bin/ihx/mode5.ihx
deleted file mode 100644
index 6d59c5e9a..000000000
--- a/tools/z80/hex2bin/ihx/mode5.ihx
+++ /dev/null
@@ -1,3 +0,0 @@
-:10000000d3d3d3d3d3d3d3d3d3d3000000000000
-:0e0010000d800a00a5264838303046000000
-:06000a02TAPE
diff --git a/tools/z80/hex2bin/ihx/mp6.ihx b/tools/z80/hex2bin/ihx/mp6.ihx
deleted file mode 100644
index 20f928271..000000000
--- a/tools/z80/hex2bin/ihx/mp6.ihx
+++ /dev/null
@@ -1,3 +0,0 @@
-:10000000544d6767676767676767000000000000
-:02000c04MP6LOAD
-:02000e04MP6EXEC
diff --git a/tools/z80/hex2bin/ihx/n88.ihx b/tools/z80/hex2bin/ihx/n88.ihx
deleted file mode 100644
index bf26a708a..000000000
--- a/tools/z80/hex2bin/ihx/n88.ihx
+++ /dev/null
@@ -1,18 +0,0 @@
-:10000000d3d3d3d3d3d3d3d3d3d3202020202020
-:100010000d000a009720e0f10c00010018001400
-:1000200041f1e028112900000020202020202020
-:1000300020202020202020202020202020202020
-:1000400020202020202020202020202020202020
-:1000500020202020202020202020202020202020
-:1000600020202020202020202020202020202020
-:1000700020202020202020202020202020202020
-:1000800020202020202020202020202020202020
-:1000900020202020202020202020202020202020
-:1000a00020202020202020202020202020202020
-:1000b00020202020202020202020202020202020
-:1000c00020202020202020202020202020202020
-:1000d00020202020202020202020202020202020
-:1000e00020202020202020202020202020202020
-:1000f00020202020202020202020202020202020
-:0f010000202020202020202020202020202020
-:06000a02TAPE
diff --git a/tools/z80/hex2bin/ihx/rom60.ihx b/tools/z80/hex2bin/ihx/rom60.ihx
deleted file mode 100644
index b09bc3ce4..000000000
--- a/tools/z80/hex2bin/ihx/rom60.ihx
+++ /dev/null
@@ -1,2 +0,0 @@
-:0400000041420440
-:02000204ROMEXEC
diff --git a/tools/z80/hex2bin/ihx/rom62.ihx b/tools/z80/hex2bin/ihx/rom62.ihx
deleted file mode 100644
index 85130d106..000000000
--- a/tools/z80/hex2bin/ihx/rom62.ihx
+++ /dev/null
@@ -1,2 +0,0 @@
-:0400000043440440
-:02000204ROMEXEC
diff --git a/tools/z80/hex2bin/ihx/suffix.ihx b/tools/z80/hex2bin/ihx/suffix.ihx
deleted file mode 100644
index e4bc38fb8..000000000
--- a/tools/z80/hex2bin/ihx/suffix.ihx
+++ /dev/null
@@ -1 +0,0 @@
-:0c000000000000000000000000000000
diff --git a/tools/z80/hex2bin/src/hexameter.c b/tools/z80/hex2bin/src/hexameter.c
deleted file mode 100644
index 295f4a2e1..000000000
--- a/tools/z80/hex2bin/src/hexameter.c
+++ /dev/null
@@ -1,345 +0,0 @@
-/*
- * Copyright (c) 2003-2009, Takahide Matsutsuka.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following
- * disclaimer in the documentation and/or other materials provided
- * with the distribution.
- * 3. The name of the author may not be used to endorse or promote
- * products derived from this software without specific prior
- * written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
- * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
- * GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- *
- */
-
-/*
- * A main file for hexameter.
- */
-
-#define MAX_PATH 1024
-
-#include
-#include
-#include
-#include
-#include
-
-#include "ihx2bin.h"
-
-#define MAXFILES 256
-
-typedef struct {
- char* output;
- char* dir;
- char *files[MAXFILES];
- unsigned int defsize;
- struct ConvertDefinition defs[DEF_MAX];
- unsigned char verbose;
- // number of the ihx files
- int length;
- // output file size
- int size;
- // output file wriiten size
- int written;
-} Configuration;
-
-static
-const char* IHXEXT = ".ihx";
-
-static
-const char *strcasestr(const char *haystack, const char *needle) {
- int haypos;
- int needlepos;
-
- haypos = 0;
- while (haystack[haypos]) {
- if (tolower (haystack[haypos]) == tolower(needle[0])) {
- needlepos = 1;
- while ( (needle[needlepos]) &&
- (tolower(haystack[haypos + needlepos])
- == tolower(needle[needlepos])) )
- ++needlepos;
- if (! needle[needlepos]) return (haystack + haypos);
- }
- ++haypos;
- }
- return NULL;
-}
-
-static
-char *changeExt(const char *path, const char* ext) {
- char *p;
- char *tail;
- char *changed;
- int len;
- int extlen = strlen(ext);
-
- for (tail = (char*) path; *tail != 0; tail++);
- for (p = tail; p > path; p--) {
- if (*p == '.') {
- len = p - path;
- changed = (char*) malloc(len + extlen + 2);
-
- strncpy(changed, path, len + 1);
- strcpy(changed + len + 1, ext);
- return changed;
- }
- }
-
- len = strlen(path);
- changed = (char*) malloc(len + extlen + 2);
- strncpy(changed, path, len);
- *(changed + len) = '.';
- strcpy(changed + len + 1, ext);
- return changed;
-}
-
-static
-unsigned char analyzeOption(int argc, char **argv, Configuration *config) {
- int c;
- char *defval;
-
- opterr = 0;
- while ((c = getopt(argc, argv, "hvo:d:b:")) != EOF) {
- switch (c) {
- case 'v':
- config->verbose = 1;
- break;
- case 'o':
- config->output = optarg;
- break;
- case 'b':
- sscanf(optarg, "%x", &config->size);
- break;
- case 'd':
- if (config->defsize >= DEF_MAX) {
- printf("excess number of definitions\n");
- return 1;
- }
- defval = strchr(optarg, '=');
- if (defval) {
- *defval = 0;
- config->defs[config->defsize].name = optarg;
- config->defs[config->defsize].value = defval + 1;
- config->defsize++;
- } else {
- printf("definition value required:%s\n", optarg);
- return 1;
- }
-
- break;
- case 'h':
- printf("Hexameter: Convert Intel HEX file (ihx) to binary file, ver. 2.1.3\n");
- printf("Copyright (c) 2003-2009 Takahide Matsutsuka \n");
- printf("Usage: hexameter [options] [...]\n");
- printf("Options:\n");
- printf(" -v verbose output\n");
- printf(" -o