Merge pull request #31 from stevenewald/file-refactor

Refactor file structure
stevenewald · Nov 15, 2024 · ff10f0b · ff10f0b
2 parents 88fb3b4 + b0fdd27
commit ff10f0b
Show file tree

Hide file tree

Showing 23 changed files with 28 additions and 20 deletions.
diff --git a/Makefile b/Makefile
@@ -17,9 +17,21 @@ ETL_INCLUDES += ./external/etl/include/etl/unordered_map.h
 
 # Source and header files
 APP_HEADER_PATHS += ./include
-APP_SOURCE_PATHS += ./src
-APP_SOURCE_PATHS += ./src/user
-APP_SOURCES = $(notdir $(wildcard src/*.cpp src/user/*.cpp))
+APP_SOURCE_PATHS = ./src
+APP_SOURCE_PATHS += ./src/user_programs
+APP_SOURCE_PATHS += ./src/drivers
+APP_SOURCE_PATHS += ./src/faults
+APP_SOURCE_PATHS += ./src/hal
+APP_SOURCE_PATHS += ./src/ipc
+APP_SOURCE_PATHS += ./src/scheduler
+APP_SOURCE_PATHS += ./src/userlib
+APP_SOURCE_PATHS += ./src/svc
+
+# I hate make
+rwildcard = $(foreach d,$(wildcard $1*), \
+                $(call rwildcard,$d/,$2)) $(wildcard $1$2)
+
+APP_SOURCES = $(foreach dir,$(APP_SOURCE_PATHS),$(call rwildcard,$(dir)/,*.cpp))
 
 # Path to base of nRF52x-base repo
 NRF_BASE_DIR = external/nrf52x-base/

diff --git a/include/fault_handler.hpp → include/faults/fault_handler.hpp b/include/fault_handler.hpp → include/faults/fault_handler.hpp
diff --git a/include/register_utils.hpp b/include/register_utils.hpp
diff --git a/include/pending_process_callbacks.hpp → ...e/scheduler/pending_process_callbacks.hpp b/include/pending_process_callbacks.hpp → ...e/scheduler/pending_process_callbacks.hpp
diff --git a/src/button_driver.cpp → src/drivers/button_driver.cpp b/src/button_driver.cpp → src/drivers/button_driver.cpp
@@ -1,7 +1,7 @@
 #include "drivers/button_driver.hpp"
 
 #include "drivers/driver_enums.hpp"
-#include "pending_process_callbacks.hpp"
+#include "scheduler/pending_process_callbacks.hpp"
 
 namespace edge::drivers {
 

diff --git a/src/driver_commands.cpp → src/drivers/driver_commands.cpp b/src/driver_commands.cpp → src/drivers/driver_commands.cpp
diff --git a/src/led_display.cpp → src/drivers/led_display.cpp b/src/led_display.cpp → src/drivers/led_display.cpp
diff --git a/src/timer.cpp → src/drivers/timer.cpp b/src/timer.cpp → src/drivers/timer.cpp
diff --git a/src/main.cpp → src/entrypoint.cpp b/src/main.cpp → src/entrypoint.cpp
@@ -1,5 +1,5 @@
 #include "drivers/driver_enums.hpp"
-#include "fault_handler.hpp"
+#include "faults/fault_handler.hpp"
 #include "scheduler/scheduler.hpp"
 #include "util.hpp"
 

diff --git a/src/fault_handler.cpp → src/faults/fault_handler.cpp b/src/fault_handler.cpp → src/faults/fault_handler.cpp
@@ -1,7 +1,7 @@
-#include "fault_handler.hpp"
+#include "faults/fault_handler.hpp"
 
 #include "nrf52.h"
-#include "pending_process_callbacks.hpp"
+#include "scheduler/pending_process_callbacks.hpp"
 #include "scheduler/scheduler.hpp"
 
 #include <stdio.h>

diff --git a/src/raw_fault_handling.cpp → src/faults/raw_fault_handling.cpp b/src/raw_fault_handling.cpp → src/faults/raw_fault_handling.cpp
@@ -1,4 +1,4 @@
-#include "fault_handler.hpp"
+#include "faults/fault_handler.hpp"
 #include "nrf52833.h"
 
 #include <stdio.h>

diff --git a/src/gpio_event_controller.cpp → src/hal/gpio_event_controller.cpp b/src/gpio_event_controller.cpp → src/hal/gpio_event_controller.cpp
diff --git a/src/gpio_wrapper.cpp → src/hal/gpio_wrapper.cpp b/src/gpio_wrapper.cpp → src/hal/gpio_wrapper.cpp
diff --git a/src/hal_enums.cpp → src/hal/hal_enums.cpp b/src/hal_enums.cpp → src/hal/hal_enums.cpp
diff --git a/src/ipc_manager.cpp → src/ipc/ipc_manager.cpp b/src/ipc_manager.cpp → src/ipc/ipc_manager.cpp
@@ -1,6 +1,6 @@
 #include "ipc/ipc_manager.hpp"
 
-#include "pending_process_callbacks.hpp"
+#include "scheduler/pending_process_callbacks.hpp"
 #include "util.hpp"
 
 #include <stdio.h>

diff --git a/src/mpu.cpp → src/scheduler/mpu.cpp b/src/mpu.cpp → src/scheduler/mpu.cpp
diff --git a/src/pending_process_callbacks.cpp → src/scheduler/pending_process_callbacks.cpp b/src/pending_process_callbacks.cpp → src/scheduler/pending_process_callbacks.cpp
@@ -1,4 +1,4 @@
-#include "pending_process_callbacks.hpp"
+#include "scheduler/pending_process_callbacks.hpp"
 
 #include <stdio.h>
 

diff --git a/src/scheduler.cpp → src/scheduler/scheduler.cpp b/src/scheduler.cpp → src/scheduler/scheduler.cpp
@@ -2,7 +2,7 @@
 
 #include "drivers/driver_commands.hpp"
 #include "nrf52833.h"
-#include "pending_process_callbacks.hpp"
+#include "scheduler/pending_process_callbacks.hpp"
 #include "scheduler/mpu.hpp"
 #include "util.hpp"
 

diff --git a/src/svc.cpp → src/svc/svc.cpp b/src/svc.cpp → src/svc/svc.cpp
@@ -1,6 +1,6 @@
 #include "drivers/driver_commands.hpp"
 #include "drivers/driver_enums.hpp"
-#include "fault_handler.hpp"
+#include "faults/fault_handler.hpp"
 #include "ipc/ipc_command_types.hpp"
 #include "ipc/ipc_manager.hpp"
 #include "scheduler/scheduler.hpp"

diff --git a/src/user/user_program_exception.cpp → src/user_programs/user_program_exception.cpp b/src/user/user_program_exception.cpp → src/user_programs/user_program_exception.cpp
diff --git a/src/user/user_program_ipc_part_1.cpp → ...user_programs/user_program_ipc_part_1.cpp b/src/user/user_program_ipc_part_1.cpp → ...user_programs/user_program_ipc_part_1.cpp
diff --git a/src/user/user_program_ipc_part_2.cpp → ...user_programs/user_program_ipc_part_2.cpp b/src/user/user_program_ipc_part_2.cpp → ...user_programs/user_program_ipc_part_2.cpp
diff --git a/src/syscalls.cpp → src/userlib/syscalls.cpp b/src/syscalls.cpp → src/userlib/syscalls.cpp
@@ -2,12 +2,15 @@
 
 #include "drivers/driver_enums.hpp"
 #include "ipc/ipc_command_types.hpp"
-#include "register_utils.hpp"
 #include "userlib/system_call_type.hpp"
 #include "util.hpp"
 
 #include <stdio.h>
 
+#define TRIGGER_SVC(call_type)   asm volatile("svc %0" ::"I"(call_type))
+#define SET_REGISTER(reg, value) asm volatile("mov " #reg ", %0" ::"r"(value) : #reg)
+#define READ_REGISTER(reg, var)  asm volatile("mov %0, " #reg : "=r"(var))
+
 #define RETURN_REGISTER(reg)                                                           \
     int ret;                                                                           \
     READ_REGISTER(reg, ret);                                                           \