restructure

diff --git a/Makefile b/Makefile
index 3c19779dd381e2ce818e91b41b5942198987d304..24367adeca83cfda18ecf67c9be93d8381cac0c4 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -15,7 +15,7 @@
 #      preprocessor, 'cpp'.  The precise recipe is '$(CPP) $(CPPFLAGS)'.
 
 CPP := arm-none-eabi-cpp
-CPPFLAGS :=
+CPPFLAGS := -I sys/include
 
 AS := arm-none-eabi-as
 ASFLAGS :=
@@ -47,7 +47,7 @@ OCFLAGS := --output-target=binary
 
 #  ---------------------------------------------------------------------------  #
 
-objs := $(patsubst %.c, %.o, $(wildcard *.c))
+objs := $(patsubst %.c, %.o, $(wildcard sys/*/*.c))
 lds := kernel.ld
 LDFLAGS += -T $(lds)
 

diff --git a/exceptions.c b/sys/core/exceptions.c
similarity index 95%
rename from exceptions.c
rename to sys/core/exceptions.c
index b3afaaafe895b21f966cdbe5ae07cf58963b2242..77e67d7fd2748e5984ad90ca2a3aba6f46d9ce7d 100644 (file)
--- a/exceptions.c
+++ b/sys/core/exceptions.c
@@ -1,7 +1,7 @@
-#include "link.h"
-#include "led.h"
 #include "sysclk.h"
-#include "uart.h"
+#include <link.h>
+#include <led.h>
+#include <uart.h>
 
 /* Initialize just enough to be able to handle a fault.  */
 __attribute__ ((noinline, used)) static void

diff --git a/kentry.c b/sys/core/kentry.c
similarity index 95%
rename from kentry.c
rename to sys/core/kentry.c
index e9eab94499ba19eb28e5deda41f4826b78d1cf5d..7fcc4b8a1abb06ffc330ad7859a8eadf845ec73a 100644 (file)
--- a/kentry.c
+++ b/sys/core/kentry.c
@@ -1,5 +1,5 @@
-#include "uart.h"
-#include "led.h"
+#include <uart.h>
+#include <led.h>
 
 __attribute__ ((noreturn)) void kentry (void);
 

diff --git a/sysclk.c b/sys/core/sysclk.c
similarity index 97%
rename from sysclk.c
rename to sys/core/sysclk.c
index a106774ac2701bde180ebe032a6b677453770285..61f2c5a4febca0996b3e09d597479ed562a5c5c9 100644 (file)
--- a/sysclk.c
+++ b/sys/core/sysclk.c
@@ -1,5 +1,5 @@
 #include "sysclk.h"
-#include "stm32f411.h"
+#include <stm32f411.h>
 
 void
 sysclk_init (void)

diff --git a/sysclk.h b/sys/core/sysclk.h
similarity index 100%
rename from sysclk.h
rename to sys/core/sysclk.h

diff --git a/led.c b/sys/dev/led.c
similarity index 92%
rename from led.c
rename to sys/dev/led.c
index 662753542e3bb8c5473829bca9f5d45f7d0d337c..222bcb51a1810f3739584d0e67e31f8235e63ff5 100644 (file)
--- a/led.c
+++ b/sys/dev/led.c
@@ -1,5 +1,5 @@
-#include "led.h"
-#include "stm32f411.h"
+#include <led.h>
+#include <stm32f411.h>
 
 void
 led_init (void)

diff --git a/uart.c b/sys/dev/uart.c
similarity index 97%
rename from uart.c
rename to sys/dev/uart.c
index 71749798456f7ae69ffc706aa68da162b57be03b..de689748f584d552ac6e93753fe1193a0504a22d 100644 (file)
--- a/uart.c
+++ b/sys/dev/uart.c
@@ -1,5 +1,5 @@
-#include "uart.h"
-#include "stm32f411.h"
+#include <uart.h>
+#include <stm32f411.h>
 
 /* Wait for data to be transferred into the shift register.  */
 static void

diff --git a/led.h b/sys/include/led.h
similarity index 100%
rename from led.h
rename to sys/include/led.h

diff --git a/link.h b/sys/include/link.h
similarity index 100%
rename from link.h
rename to sys/include/link.h

diff --git a/stm32f411.h b/sys/include/stm32f411.h
similarity index 100%
rename from stm32f411.h
rename to sys/include/stm32f411.h

diff --git a/uart.h b/sys/include/uart.h
similarity index 100%
rename from uart.h
rename to sys/include/uart.h