chore(epicardium): Move all core1 code into a separate subdir

epicardium/ble/epic_ble_api.c

@@ -3,6 +3,7 @@
 #include "epicardium.h"
 #include "os/core.h"
 #include "modules/modules.h"
+#include "user_core/interrupts.h"
 
 #include "wsf_buf.h"
 #include "app_api.h"

epicardium/drivers/bhi.c

@@ -16,6 +16,7 @@
 #include "modules/modules.h"
 #include "drivers/drivers.h"
 #include "modules/stream.h"
+#include "user_core/interrupts.h"
 
 /* BHI160 Firmware Blob.  Contents are defined in libcard10. */
 extern uint8_t bhy1_fw[];

epicardium/drivers/max30001.c

@@ -16,6 +16,7 @@
 #include "modules/modules.h"
 #include "modules/stream.h"
 #include "os/mutex.h"
+#include "user_core/interrupts.h"
 
 /* Interrupt Pin */
 static const gpio_cfg_t max30001_interrupt_pin = {

epicardium/drivers/max86150.c

@@ -7,6 +7,7 @@
 #include "modules/stream.h"
 #include "gpio.h"
 #include "pmic.h"
+#include "user_core/interrupts.h"
 
 #include "FreeRTOS.h"
 #include "task.h"

epicardium/drivers/pmic.c

@@ -3,6 +3,7 @@
 #include "drivers/drivers.h"
 #include "os/core.h"
 #include "os/config.h"
+#include "user_core/user_core.h"
 
 #include "card10.h"
 #include "pmic.h"

epicardium/drivers/rtc.c

 #include "epicardium.h"
 #include "os/core.h"
 #include "modules/modules.h"
+#include "user_core/interrupts.h"
 
 #include "FreeRTOS.h"
 #include "task.h"

epicardium/drivers/serial.c

@@ -2,6 +2,7 @@
 #include "os/core.h"
 #include "modules/modules.h"
 #include "drivers/drivers.h"
+#include "user_core/interrupts.h"
 
 #include "max32665.h"
 #include "usb/cdcacm.h"

epicardium/fs/filesystem_fat.c

@@ -20,6 +20,7 @@
 
 #include "fs/internal.h"
 #include "modules/filesystem.h"
+#include "user_core/user_core.h"
 #include "epicardium.h"
 #include "card10.h"
 #include "os/core.h"

epicardium/main.c

@@ -3,8 +3,10 @@
 #include "os/work_queue.h"
 #include "modules/filesystem.h"
 #include "drivers/drivers.h"
+#include "user_core/user_core.h"
 #include "os/config.h"
 #include "card10-version.h"
+#include "user_core/interrupts.h"
 
 #include "gfx.h"
 #include "display.h"

epicardium/meson.build

@@ -67,6 +67,7 @@ freertos = static_library(
 
 subdir('modules/')
 subdir('drivers/')
+subdir('user_core/')
 subdir('ble/')
 subdir('os/')
 
@@ -102,6 +103,7 @@ elf = executable(
   'fs/fs_util.c',
   module_sources,
   os_sources,
+  user_core_sources,
   driver_sources,
   l0der_sources,
   ble_sources,

epicardium/modules/hardware.c

@@ -7,6 +7,8 @@
 #include "modules/modules.h"
 #include "modules/stream.h"
 #include "drivers/drivers.h"
+#include "user_core/interrupts.h"
+#include "user_core/user_core.h"
 
 #include "card10.h"
 #include "display.h"

epicardium/modules/meson.build

 module_sources = files(
-  'dispatcher.c',
   'fileops.c',
   'hardware.c',
   'hw-lock.c',
-  'interrupts.c',
-  'lifecycle.c',
   'personal_state.c',
   'stream.c',
 )

epicardium/modules/modules.h

@@ -9,30 +9,11 @@
 #include <stdint.h>
 #include <stdbool.h>
 
-/* ---------- Dispatcher --------------------------------------------------- */
-void vApiDispatcher(void *pvParameters);
-void dispatcher_mutex_init(void);
-extern struct mutex api_mutex;
-extern TaskHandle_t dispatcher_task_id;
-
 /* ---------- Hardware Init & Reset ---------------------------------------- */
 int hardware_early_init(void);
 int hardware_init(void);
 int hardware_reset(void);
 
-/* ---------- Lifecycle ---------------------------------------------------- */
-void vLifecycleTask(void *pvParameters);
-void return_to_menu(void);
-
-/* ---------- Interrupts --------------------------------------------------- */
-void interrupt_init(void);
-void interrupt_trigger(api_int_id_t id);
-void interrupt_trigger_sync(api_int_id_t id);
-void interrupt_trigger_unsafe(api_int_id_t id) __attribute__((deprecated(
-	"interrupt_trigger_unsafe() is racy and only exists for legacy code."
-)));
-void vInterruptsTask(void *pvParameters);
-
 /* ---------- LED Animation / Personal States ------------------------------ */
 #define PERSONAL_STATE_LED 14
 void vLedTask(void *pvParameters);

epicardium/support.c

@@ -6,7 +6,7 @@
 #include "task.h"
 
 #include "api/dispatcher.h"
-#include "modules/modules.h"
+#include "user_core/user_core.h"
 #include "os/core.h"
 
 #include "card10.h"

epicardium/user_core/interrupts.h

+#pragma once
+
+#include "epicardium.h"
+
+/* ---------- Interrupts --------------------------------------------------- */
+void interrupt_init(void);
+void interrupt_trigger(api_int_id_t id);
+void interrupt_trigger_sync(api_int_id_t id);
+void interrupt_trigger_unsafe(api_int_id_t id) __attribute__((deprecated(
+	"interrupt_trigger_unsafe() is racy and only exists for legacy code."
+)));
+void vInterruptsTask(void *pvParameters);

epicardium/modules/lifecycle.c → epicardium/user_core/lifecycle.c

@@ -3,6 +3,7 @@
 #include "modules/modules.h"
 #include "os/config.h"
 #include "os/mutex.h"
+#include "user_core/user_core.h"
 #include "api/dispatcher.h"
 #include "l0der/l0der.h"
 

epicardium/user_core/meson.build

+user_core_sources = files(
+  'dispatcher.c',
+  'interrupts.c',
+  'lifecycle.c',
+)

epicardium/user_core/user_core.h

+#pragma once
+
+#include "FreeRTOS.h"
+#include "os/mutex.h"
+
+/* ---------- Dispatcher --------------------------------------------------- */
+void vApiDispatcher(void *pvParameters);
+void dispatcher_mutex_init(void);
+extern struct mutex api_mutex;
+extern TaskHandle_t dispatcher_task_id;
+
+/* ---------- Lifecycle ---------------------------------------------------- */
+void vLifecycleTask(void *pvParameters);
+void return_to_menu(void);