linked in NX_Sysmodules; minor refactor

Reisyukaku · Aug 3, 2018 · bbff1c414d83e480036b6b36de5b7624045e065f · bbff1c4
1 parent 10c9361
commit bbff1c414d83e480036b6b36de5b7624045e065f
Unified Split

Showing with 21 additions and 4 deletions.

+3 −0 .gitmodules

+15 −2 Makefile

+1 −0 NX_Sysmodules

BIN data/loader.kip

BIN data/sm.kip

+2 −2 src/firmware.c
diff --git a/.gitmodules b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "NX_Sysmodules"]
+	path = NX_Sysmodules
+	url = https://github.com/Reisyukaku/NX_Sysmodules.git
diff --git a/Makefile b/Makefile
@@ -14,6 +14,7 @@ dir_source := src
 dir_data := data
 dir_build := build
 dir_out := out
+dir_sysmod := NX_Sysmodules

 ARCH := -march=armv4t -mtune=arm7tdmi -mthumb -mthumb-interwork
 CFLAGS = $(ARCH) -Os -nostdlib -ffunction-sections -fdata-sections -fomit-frame-pointer -fno-inline -fno-builtin -std=gnu11# -Wall
@@ -28,18 +29,30 @@ define bin2o
 endef

 .PHONY: all
-all: $(dir_out)/$(name).bin
+all: sysmod reinx
+
+.PHONY: sysmod
+sysmod: $(dir_out)/sysmodules
+
+.PHONY: reinx
+reinx: $(dir_out)/$(name).bin

 .PHONY: clean
 clean:
 	@echo "clean ..."
 	@rm -rf $(dir_build)
 	@rm -rf $(dir_out)
+	@$(MAKE) -C $(dir_sysmod) clean
+
+$(dir_out)/sysmodules: $(dir_sysmod)
+	@$(MAKE) -C $(dir_sysmod)

 $(dir_out)/$(name).bin: $(dir_build)/$(name).elf
 	@mkdir -p "$(@D)"
 	@mkdir -p "$(dir_out)/ReiNX/sysmodules"
-	@cp -R $(dir_data)/*.kip $(dir_out)/ReiNX/sysmodules/
+	@cp $(dir_sysmod)/loader/loader.kip $(dir_out)/ReiNX/sysmodules/
+	@cp $(dir_sysmod)/sm/sm.kip $(dir_out)/ReiNX/sysmodules/
+	@cp $(dir_sysmod)/fs_mitm/fs_mitm.kip $(dir_out)/ReiNX/sysmodules/
 	@cp -R $(dir_data)/*.bin $(dir_out)/ReiNX/
 	$(OBJCOPY) -S -O binary $< $@

diff --git a/NX_Sysmodules b/NX_Sysmodules
diff --git a/data/loader.kip b/data/loader.kip
diff --git a/data/sm.kip b/data/sm.kip
diff --git a/src/firmware.c b/src/firmware.c
@@ -59,8 +59,8 @@ void drawSplash() {
    if(fopen("/ReiNX/splash.bin", "rb") != 0) {
        fread((void*)0xC0000000, fsize(), 1);
        fclose();
+        usleep(3000000);
    }
-    usleep(3000000);
 }

 pk11_offs *pkg11_offsentify(u8 *pkg1) {
@@ -197,7 +197,7 @@ void patch(pk11_offs *pk11, pkg2_hdr_t *pkg2, link_t *kips) {
                      }
                    }

-                    moddedKip->flags = 0x3E;
+                    moddedKip->flags &= ~1;
                    memcpy((void*)moddedKip->data, kipDecompText, moddedKip->sections[i].size_decomp);
                    free(kipDecompText);
                    pos += moddedKip->sections[i].size_comp;