From bf97907efce6c35e323d53bd1fbe199ac8c38e96 Mon Sep 17 00:00:00 2001 From: Seth Barberee Date: Fri, 19 Jun 2026 08:56:16 -0700 Subject: [PATCH] move nitro src files to correct directories --- common.mk | 4 +- lib/NitroSDK/src/{ => mi}/mi_init.c | 0 lib/NitroSDK/src/{ => mi}/mi_memory.c | 0 lib/NitroSDK/src/{ => mi}/mi_uncompress.c | 0 lib/NitroSDK/src/{ => mi}/mi_wram.c | 0 lib/NitroSDK/src/{ => os}/os_cache.c | 0 lib/NitroSDK/src/{ => os}/os_context.c | 0 lib/NitroSDK/src/{ => os}/os_entropy.c | 0 lib/NitroSDK/src/{ => os}/os_init.c | 0 lib/NitroSDK/src/{ => os}/os_message.c | 0 lib/NitroSDK/src/{ => os}/os_mutex.c | 0 lib/NitroSDK/src/{ => os}/os_ownerInfo.c | 0 lib/NitroSDK/src/{ => os}/os_printf_1.c | 0 .../src/{ => os}/os_protectionRegion.c | 0 lib/NitroSDK/src/{ => os}/os_protectionUnit.c | 0 lib/NitroSDK/src/{ => os}/os_system.c | 0 lib/NitroSDK/src/{ => os}/os_tcm.c | 0 lib/NitroSDK/src/{ => os}/os_terminate_proc.c | 0 lib/NitroSDK/src/{ => os}/os_timer.c | 0 lib/NitroSDK/src/{ => os}/os_vramExclusive.c | 0 lib/NitroSDK/src/{ => snd}/snd_main.c | 0 lib/NitroSDK/src/{ => snd}/snd_util.c | 0 main.lsf | 42 +++++++++---------- 23 files changed, 24 insertions(+), 22 deletions(-) rename lib/NitroSDK/src/{ => mi}/mi_init.c (100%) rename lib/NitroSDK/src/{ => mi}/mi_memory.c (100%) rename lib/NitroSDK/src/{ => mi}/mi_uncompress.c (100%) rename lib/NitroSDK/src/{ => mi}/mi_wram.c (100%) rename lib/NitroSDK/src/{ => os}/os_cache.c (100%) rename lib/NitroSDK/src/{ => os}/os_context.c (100%) rename lib/NitroSDK/src/{ => os}/os_entropy.c (100%) rename lib/NitroSDK/src/{ => os}/os_init.c (100%) rename lib/NitroSDK/src/{ => os}/os_message.c (100%) rename lib/NitroSDK/src/{ => os}/os_mutex.c (100%) rename lib/NitroSDK/src/{ => os}/os_ownerInfo.c (100%) rename lib/NitroSDK/src/{ => os}/os_printf_1.c (100%) rename lib/NitroSDK/src/{ => os}/os_protectionRegion.c (100%) rename lib/NitroSDK/src/{ => os}/os_protectionUnit.c (100%) rename lib/NitroSDK/src/{ => os}/os_system.c (100%) rename lib/NitroSDK/src/{ => os}/os_tcm.c (100%) rename lib/NitroSDK/src/{ => os}/os_terminate_proc.c (100%) rename lib/NitroSDK/src/{ => os}/os_timer.c (100%) rename lib/NitroSDK/src/{ => os}/os_vramExclusive.c (100%) rename lib/NitroSDK/src/{ => snd}/snd_main.c (100%) rename lib/NitroSDK/src/{ => snd}/snd_util.c (100%) diff --git a/common.mk b/common.mk index 497f3eef..7a31100b 100644 --- a/common.mk +++ b/common.mk @@ -77,10 +77,12 @@ PRECOMPILE_OBJ_DIR := $(dir $(PRECOMPILE_OBJ)) PRECOMPILE_DEPFILE := $(BUILD_DIR)/precompile/global.d # Directories +NITROSDK_SRC_SUBDIRS := os mi snd + LIB_SUBDIRS := DSE NitroSDK MSL_C SRC_SUBDIR := src ASM_SUBDIR := asm -LIB_SRC_SUBDIR := lib/src $(LIB_SUBDIRS:%=lib/%/src) +LIB_SRC_SUBDIR := lib/src $(LIB_SUBDIRS:%=lib/%/src) $(NITROSDK_SRC_SUBDIRS:%=lib/NitroSDK/src/%) LIB_ASM_SUBDIR := lib/asm $(LIB_SUBDIRS:%=lib/%/asm) ALL_SUBDIRS := $(SRC_SUBDIR) $(ASM_SUBDIR) $(LIB_SRC_SUBDIR) $(LIB_ASM_SUBDIR) diff --git a/lib/NitroSDK/src/mi_init.c b/lib/NitroSDK/src/mi/mi_init.c similarity index 100% rename from lib/NitroSDK/src/mi_init.c rename to lib/NitroSDK/src/mi/mi_init.c diff --git a/lib/NitroSDK/src/mi_memory.c b/lib/NitroSDK/src/mi/mi_memory.c similarity index 100% rename from lib/NitroSDK/src/mi_memory.c rename to lib/NitroSDK/src/mi/mi_memory.c diff --git a/lib/NitroSDK/src/mi_uncompress.c b/lib/NitroSDK/src/mi/mi_uncompress.c similarity index 100% rename from lib/NitroSDK/src/mi_uncompress.c rename to lib/NitroSDK/src/mi/mi_uncompress.c diff --git a/lib/NitroSDK/src/mi_wram.c b/lib/NitroSDK/src/mi/mi_wram.c similarity index 100% rename from lib/NitroSDK/src/mi_wram.c rename to lib/NitroSDK/src/mi/mi_wram.c diff --git a/lib/NitroSDK/src/os_cache.c b/lib/NitroSDK/src/os/os_cache.c similarity index 100% rename from lib/NitroSDK/src/os_cache.c rename to lib/NitroSDK/src/os/os_cache.c diff --git a/lib/NitroSDK/src/os_context.c b/lib/NitroSDK/src/os/os_context.c similarity index 100% rename from lib/NitroSDK/src/os_context.c rename to lib/NitroSDK/src/os/os_context.c diff --git a/lib/NitroSDK/src/os_entropy.c b/lib/NitroSDK/src/os/os_entropy.c similarity index 100% rename from lib/NitroSDK/src/os_entropy.c rename to lib/NitroSDK/src/os/os_entropy.c diff --git a/lib/NitroSDK/src/os_init.c b/lib/NitroSDK/src/os/os_init.c similarity index 100% rename from lib/NitroSDK/src/os_init.c rename to lib/NitroSDK/src/os/os_init.c diff --git a/lib/NitroSDK/src/os_message.c b/lib/NitroSDK/src/os/os_message.c similarity index 100% rename from lib/NitroSDK/src/os_message.c rename to lib/NitroSDK/src/os/os_message.c diff --git a/lib/NitroSDK/src/os_mutex.c b/lib/NitroSDK/src/os/os_mutex.c similarity index 100% rename from lib/NitroSDK/src/os_mutex.c rename to lib/NitroSDK/src/os/os_mutex.c diff --git a/lib/NitroSDK/src/os_ownerInfo.c b/lib/NitroSDK/src/os/os_ownerInfo.c similarity index 100% rename from lib/NitroSDK/src/os_ownerInfo.c rename to lib/NitroSDK/src/os/os_ownerInfo.c diff --git a/lib/NitroSDK/src/os_printf_1.c b/lib/NitroSDK/src/os/os_printf_1.c similarity index 100% rename from lib/NitroSDK/src/os_printf_1.c rename to lib/NitroSDK/src/os/os_printf_1.c diff --git a/lib/NitroSDK/src/os_protectionRegion.c b/lib/NitroSDK/src/os/os_protectionRegion.c similarity index 100% rename from lib/NitroSDK/src/os_protectionRegion.c rename to lib/NitroSDK/src/os/os_protectionRegion.c diff --git a/lib/NitroSDK/src/os_protectionUnit.c b/lib/NitroSDK/src/os/os_protectionUnit.c similarity index 100% rename from lib/NitroSDK/src/os_protectionUnit.c rename to lib/NitroSDK/src/os/os_protectionUnit.c diff --git a/lib/NitroSDK/src/os_system.c b/lib/NitroSDK/src/os/os_system.c similarity index 100% rename from lib/NitroSDK/src/os_system.c rename to lib/NitroSDK/src/os/os_system.c diff --git a/lib/NitroSDK/src/os_tcm.c b/lib/NitroSDK/src/os/os_tcm.c similarity index 100% rename from lib/NitroSDK/src/os_tcm.c rename to lib/NitroSDK/src/os/os_tcm.c diff --git a/lib/NitroSDK/src/os_terminate_proc.c b/lib/NitroSDK/src/os/os_terminate_proc.c similarity index 100% rename from lib/NitroSDK/src/os_terminate_proc.c rename to lib/NitroSDK/src/os/os_terminate_proc.c diff --git a/lib/NitroSDK/src/os_timer.c b/lib/NitroSDK/src/os/os_timer.c similarity index 100% rename from lib/NitroSDK/src/os_timer.c rename to lib/NitroSDK/src/os/os_timer.c diff --git a/lib/NitroSDK/src/os_vramExclusive.c b/lib/NitroSDK/src/os/os_vramExclusive.c similarity index 100% rename from lib/NitroSDK/src/os_vramExclusive.c rename to lib/NitroSDK/src/os/os_vramExclusive.c diff --git a/lib/NitroSDK/src/snd_main.c b/lib/NitroSDK/src/snd/snd_main.c similarity index 100% rename from lib/NitroSDK/src/snd_main.c rename to lib/NitroSDK/src/snd/snd_main.c diff --git a/lib/NitroSDK/src/snd_util.c b/lib/NitroSDK/src/snd/snd_util.c similarity index 100% rename from lib/NitroSDK/src/snd_util.c rename to lib/NitroSDK/src/snd/snd_util.c diff --git a/main.lsf b/main.lsf index 3ed2e402..6a21944b 100644 --- a/main.lsf +++ b/main.lsf @@ -241,41 +241,41 @@ Static main Object lib/NitroSDK/asm/os_interrupt.o Object lib/NitroSDK/asm/os_spinlock.o Object lib/NitroSDK/asm/os_thread.o - Object lib/NitroSDK/src/os_context.o + Object lib/NitroSDK/src/os/os_context.o Object lib/NitroSDK/asm/os_emulator.o - Object lib/NitroSDK/src/os_message.o - Object lib/NitroSDK/src/os_mutex.o - Object lib/NitroSDK/src/os_cache.o - Object lib/NitroSDK/src/os_init.o + Object lib/NitroSDK/src/os/os_message.o + Object lib/NitroSDK/src/os/os_mutex.o + Object lib/NitroSDK/src/os/os_cache.o + Object lib/NitroSDK/src/os/os_init.o Object lib/NitroSDK/asm/os_arena.o ### Object lib/NitroSDK/asm/os_alloc.o ### - Object lib/NitroSDK/src/os_tcm.o - Object lib/NitroSDK/src/os_protectionUnit.o - Object lib/NitroSDK/src/os_protectionRegion.o + Object lib/NitroSDK/src/os/os_tcm.o + Object lib/NitroSDK/src/os/os_protectionUnit.o + Object lib/NitroSDK/src/os/os_protectionRegion.o Object lib/NitroSDK/asm/os_exception.o - Object lib/NitroSDK/src/os_timer.o + Object lib/NitroSDK/src/os/os_timer.o Object lib/NitroSDK/asm/os_tick.o Object lib/NitroSDK/asm/os_alarm.o Object lib/NitroSDK/asm/os_valarm.o - Object lib/NitroSDK/src/os_system.o + Object lib/NitroSDK/src/os/os_system.o object lib/NitroSDK/asm/os_reset.o - object lib/NitroSDK/src/os_ownerinfo.o - Object lib/NitroSDK/src/os_vramExclusive.o - Object lib/NitroSDK/src/os_entropy.o - Object lib/NitroSDK/src/os_terminate_proc.o - Object lib/NitroSDK/src/mi_wram.o + object lib/NitroSDK/src/os/os_ownerinfo.o + Object lib/NitroSDK/src/os/os_vramExclusive.o + Object lib/NitroSDK/src/os/os_entropy.o + Object lib/NitroSDK/src/os/os_terminate_proc.o + Object lib/NitroSDK/src/mi/mi_wram.o Object lib/NitroSDK/asm/mi_dma.o - Object lib/NitroSDK/src/mi_memory.o + Object lib/NitroSDK/src/mi/mi_memory.o Object lib/NitroSDK/asm/mi_memory_1.o - Object lib/NitroSDK/src/mi_uncompress.o + Object lib/NitroSDK/src/mi/mi_uncompress.o Object lib/NitroSDK/asm/mi_dma_card.o - Object lib/NitroSDK/src/mi_init.o + Object lib/NitroSDK/src/mi/mi_init.o Object lib/NitroSDK/asm/snd_interface.o - Object lib/NitroSDK/src/snd_main.o + Object lib/NitroSDK/src/snd/snd_main.o Object lib/NitroSDK/asm/snd_command.o Object lib/NitroSDK/asm/snd_alarm.o Object lib/NitroSDK/asm/snd_work.o - Object lib/NitroSDK/src/snd_util.o + Object lib/NitroSDK/src/snd/snd_util.o Object lib/NitroSDK/asm/snd_bank.o Object lib/NitroSDK/src/pxi_init.o Object lib/NitroSDK/asm/pxi_fifo.o @@ -310,7 +310,7 @@ Static main Object lib/NitroSDK/asm/math_dgt.o Object lib/NitroSDK/asm/math_crc.o Object lib/NitroSDK/asm/std_string.o - Object lib/NitroSDK/src/os_printf_1.o + Object lib/NitroSDK/src/os/os_printf_1.o Object lib/NitroSDK/asm/os_printf.o Object lib/MSL_C/asm/msl.o Object lib/MSL_C/src/arith.o