From 96d2907666a221bf4ac07f44c6ac8ae84e2a07b6 Mon Sep 17 00:00:00 2001 From: Ludwig Ortmann Date: Sat, 18 Oct 2014 10:47:26 +0200 Subject: [PATCH 1/4] native: add periph substructure --- cpu/native/Makefile | 1 + cpu/native/Makefile.include | 1 + cpu/native/periph/Makefile | 1 + 3 files changed, 3 insertions(+) create mode 100644 cpu/native/periph/Makefile diff --git a/cpu/native/Makefile b/cpu/native/Makefile index 9a82a5150..7b8920349 100644 --- a/cpu/native/Makefile +++ b/cpu/native/Makefile @@ -1,5 +1,6 @@ MODULE = cpu +DIRS += periph ifneq (,$(filter rtc,$(USEMODULE))) DIRS += rtc endif diff --git a/cpu/native/Makefile.include b/cpu/native/Makefile.include index bc0429d20..b77487230 100644 --- a/cpu/native/Makefile.include +++ b/cpu/native/Makefile.include @@ -1 +1,2 @@ export NATIVEINCLUDES += -I$(RIOTCPU)/native/include -I$(RIOTBASE)/sys/include +export USEMODULE += periph diff --git a/cpu/native/periph/Makefile b/cpu/native/periph/Makefile new file mode 100644 index 000000000..48422e909 --- /dev/null +++ b/cpu/native/periph/Makefile @@ -0,0 +1 @@ +include $(RIOTBASE)/Makefile.base From 833c36f09d010393d21ca111e67037bd36a67c66 Mon Sep 17 00:00:00 2001 From: Ludwig Ortmann Date: Sat, 18 Oct 2014 10:48:03 +0200 Subject: [PATCH 2/4] native: relocate periph/cpuid implementation --- cpu/native/{periph_cpuid.c => periph/cpuid.c} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename cpu/native/{periph_cpuid.c => periph/cpuid.c} (100%) diff --git a/cpu/native/periph_cpuid.c b/cpu/native/periph/cpuid.c similarity index 100% rename from cpu/native/periph_cpuid.c rename to cpu/native/periph/cpuid.c From 0136f208c63df8cd9504c35e306a07b0d70dfad8 Mon Sep 17 00:00:00 2001 From: Ludwig Ortmann Date: Sat, 18 Oct 2014 10:58:51 +0200 Subject: [PATCH 3/4] native: add drivers substructure --- cpu/native/Makefile | 1 + cpu/native/Makefile.include | 2 +- cpu/native/drivers/Makefile | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) create mode 100644 cpu/native/drivers/Makefile diff --git a/cpu/native/Makefile b/cpu/native/Makefile index 7b8920349..51adb1efb 100644 --- a/cpu/native/Makefile +++ b/cpu/native/Makefile @@ -1,6 +1,7 @@ MODULE = cpu DIRS += periph +DIRS += drivers ifneq (,$(filter rtc,$(USEMODULE))) DIRS += rtc endif diff --git a/cpu/native/Makefile.include b/cpu/native/Makefile.include index b77487230..ab8277f48 100644 --- a/cpu/native/Makefile.include +++ b/cpu/native/Makefile.include @@ -1,2 +1,2 @@ export NATIVEINCLUDES += -I$(RIOTCPU)/native/include -I$(RIOTBASE)/sys/include -export USEMODULE += periph +export USEMODULE += periph drivers diff --git a/cpu/native/drivers/Makefile b/cpu/native/drivers/Makefile new file mode 100644 index 000000000..48422e909 --- /dev/null +++ b/cpu/native/drivers/Makefile @@ -0,0 +1 @@ +include $(RIOTBASE)/Makefile.base From 45cf2e49676362e3d91c4e6c6952c1c04ba50839 Mon Sep 17 00:00:00 2001 From: Ludwig Ortmann Date: Sat, 18 Oct 2014 11:00:09 +0200 Subject: [PATCH 4/4] native: relocate drivers/rtc implementation --- cpu/native/Makefile | 3 --- cpu/native/drivers/Makefile | 4 ++++ cpu/native/{ => drivers}/rtc/Makefile | 0 cpu/native/{ => drivers}/rtc/posix-rtc.c | 0 4 files changed, 4 insertions(+), 3 deletions(-) rename cpu/native/{ => drivers}/rtc/Makefile (100%) rename cpu/native/{ => drivers}/rtc/posix-rtc.c (100%) diff --git a/cpu/native/Makefile b/cpu/native/Makefile index 51adb1efb..628d7eb5a 100644 --- a/cpu/native/Makefile +++ b/cpu/native/Makefile @@ -2,9 +2,6 @@ MODULE = cpu DIRS += periph DIRS += drivers -ifneq (,$(filter rtc,$(USEMODULE))) - DIRS += rtc -endif ifneq (,$(filter nativenet,$(USEMODULE))) DIRS += net endif diff --git a/cpu/native/drivers/Makefile b/cpu/native/drivers/Makefile index 48422e909..439af37cd 100644 --- a/cpu/native/drivers/Makefile +++ b/cpu/native/drivers/Makefile @@ -1 +1,5 @@ +ifneq (,$(filter rtc,$(USEMODULE))) + DIRS += rtc +endif + include $(RIOTBASE)/Makefile.base diff --git a/cpu/native/rtc/Makefile b/cpu/native/drivers/rtc/Makefile similarity index 100% rename from cpu/native/rtc/Makefile rename to cpu/native/drivers/rtc/Makefile diff --git a/cpu/native/rtc/posix-rtc.c b/cpu/native/drivers/rtc/posix-rtc.c similarity index 100% rename from cpu/native/rtc/posix-rtc.c rename to cpu/native/drivers/rtc/posix-rtc.c