Merge pull request #1 from Reisyukaku/master
update

update
Merge pull request #2 from Reisyukaku/master
update
Reisyukaku
Unified Split

Showing with 315 additions and 304 deletions.

+4 −1 Makefile

+1 −1 NX_Sysmodules

+2 −0 README.md

+1 −0 src/error.c

+116 −23 src/firmware.c

+1 −1 src/hwinit/util.c

+16 −2 src/kippatches/fs.inc

+90 −27 src/package.c

+84 −249 src/package.h
diff --git a/Makefile b/Makefile
@@ -4,7 +4,7 @@ ifeq ($(strip $(DEVKITARM)),)
 $(error "Please set DEVKITARM in your environment. export DEVKITARM=<path to>devkitARM")
 endif

-CC = $(DEVKITARM)/bin/arm-none-eabi-gcc
+include $(DEVKITARM)/base_tools
 LD = $(DEVKITARM)/bin/arm-none-eabi-ld
 OBJCOPY = $(DEVKITARM)/bin/arm-none-eabi-objcopy

@@ -51,9 +51,12 @@ $(dir_out)/sysmodules: $(dir_sysmod)
 $(dir_out)/$(name).bin: $(dir_build)/$(name).elf
 	@mkdir -p "$(@D)"
 	@mkdir -p "$(dir_out)/ReiNX/sysmodules"
+	@mkdir -p "$(dir_out)/ReiNX/sysmodules.dis"
 	@mkdir -p "$(dir_out)/ReiNX/patches"
 	@cp $(dir_sysmod)/loader/loader.kip $(dir_out)/ReiNX/sysmodules/
 	@cp $(dir_sysmod)/sm/sm.kip $(dir_out)/ReiNX/sysmodules/
+	@cp $(dir_sysmod)/pm/pm.kip $(dir_out)/ReiNX/sysmodules.dis/
+	@cp $(dir_sysmod)/fs_mitm/fs_mitm.kip $(dir_out)/ReiNX/sysmodules.dis/
 	@cp -R $(dir_data)/*.bin $(dir_out)/ReiNX/
 	@cp -R $(dir_data)/*.rxp $(dir_out)/ReiNX/patches
 	$(OBJCOPY) -S -O binary $< $@
diff --git a/NX_Sysmodules b/NX_Sysmodules
diff --git a/README.md b/README.md
@@ -23,6 +23,8 @@ To compile with Docker, `chmod +x docker-build.sh` and run the shell script `./d

 * FS patches on the fly (NCA verify/cmac and optional nogc)

+* Kernel patches on the fly (optional debug mode)
+
 * Exclusive ReiNX sysmodules

 * ES patch in RXP patch format (used with custom loader.kip)
diff --git a/src/error.c b/src/error.c
@@ -30,6 +30,7 @@ void panic() {
 }

 void error(char *errStr) {
+    gfx_con.mute = 0;
    gfx_con_setcol(&gfx_con, RED, 0, 0);
    print("Error: %s", errStr);
    gfx_con_setcol(&gfx_con, DEFAULT_TEXT_COL, 0, 0);
diff --git a/src/firmware.c b/src/firmware.c
@@ -25,13 +25,14 @@

 static pk11_offs *pk11Offs = NULL;

-void drawSplash() {
+int drawSplash() {
    // Draw splashscreen to framebuffer.
    if(fopen("/ReiNX/splash.bin", "rb") != 0) {
        fread((void*)0xC0000000, fsize(), 1);
        fclose();
-        usleep(3000000);
+        return 1;
    }
+    return 0;
 }

 pk11_offs *pkg11_offsentify(u8 *pkg1) {
@@ -120,21 +121,108 @@ void patch(pk11_offs *pk11, pkg2_hdr_t *pkg2, link_t *kips) {
    //Patch Kernel
    if(!customKern) {
        u32 crc = crc32c(pkg2->data, pkg2->sec_size[PKG2_SEC_KERNEL]);
-		const pkg2_kernel_id_t * id = pkg2_identify(crc);
-		
-		kernel_patch_t * kpatch = id->kernel_patchset;
-		if(kpatch!=NULL) {
-			for(int i=0; kpatch[i].id!=-1; i++) {
-				if(kpatch[i].id != ATM_ARR_PATCH)
-					*(vu32 *)(pkg2->data + kpatch[i].off) = kpatch[i].val;
-				else {
-					u32 * temp = (u32 *)kpatch[i].ptr;
-					for(int j=0; j< kpatch[i].val; j++) {
-						*(vu32*)(pkg2->data + kpatch[i].off + j*4) = temp[j];
-					}
-				}
-			}
-		}
+        uPtr kern = (uPtr)&pkg2->data;
+        uPtr sendOff, recvOff, codeRcvOff, codeSndOff, svcVerifOff, svcDebugOff, ver;
+        switch(crc){
+            case 0x427f2647:{   //1.0.0
+                svcVerifOff = 0x3764C;
+                svcDebugOff = 0x44074;
+                sendOff = 0x23CC0;
+                recvOff = 0x219F0;
+                codeSndOff = 4;
+                codeRcvOff = 4;
+                ver = 0;
+                break;
+            }
+            case 0xae19cf1b:{   //2.0.0
+                svcVerifOff = 0x54834;
+                svcDebugOff = 0x6086C;
+                sendOff = 0x3F134;
+                recvOff = 0x3D1A8;
+                codeSndOff = 4;
+                codeRcvOff = 4;
+                ver = 1;
+                break;
+            }
+            case 0x73c9e274:{   //3.0.0
+                svcVerifOff = 0x3BD24;
+                svcDebugOff = 0x483FC;
+                sendOff = 0x26080;
+                recvOff = 0x240F0;
+                codeSndOff = 4;
+                codeRcvOff = 4;
+                ver = 2;
+                break;
+            }
+            case 0xe0e8cdc4:{   //3.0.2
+                svcVerifOff = 0x3BD24;
+                svcDebugOff = 0x48414;
+                sendOff = 0x26080;
+                recvOff = 0x240F0;
+                codeSndOff = 4;
+                codeRcvOff = 4;
+                ver = 3;
+                break;
+            }
+            case 0x485d0157:{   //4.0.0
+                svcVerifOff = 0x41EB4;
+                svcDebugOff = 0x4EBFC;
+                sendOff = 0x2AF64;
+                recvOff = 0x28F6C;
+                codeSndOff = 8;
+                codeRcvOff = 4;
+                ver = 4;
+                break;
+            }
+            case 0xf3c363f2:{   //5.0.0
+                svcVerifOff = 0x45E6C;
+                svcDebugOff = 0x5513C;
+                sendOff = 0x2AD34;
+                recvOff = 0x28DAC;
+                codeSndOff = 8;
+                codeRcvOff = 8;
+                ver = 5;
+                break;
+            }
+            case 0x64ce1a44:{   //6.0.0
+                svcVerifOff = 0x47EA0;
+                svcDebugOff = 0x57548;
+                sendOff = 0x2BB8C;
+                recvOff = 0x29B6C;
+                codeSndOff = 0x10;
+                codeRcvOff = 0x10;
+                ver = 6;
+                break;
+            }
+            default:
+                error("Kernel not supported");
+                goto end;
+        }
+        
+        //ID Send
+        uPtr freeSpace = getFreeSpace((void*)(kern+0x45000), 0x200, 0x20000) + 0x45000;      //Find area to write payload
+        print("Kernel Freespace: 0x%08X\n", freeSpace);
+        size_t payloadSize;
+        u32 *sndPayload = getSndPayload(ver, &payloadSize);
+        *(vu32*)(kern + sendOff) = _B(sendOff, freeSpace);                                             //write hook to payload
+        memcpy((void*)(kern + freeSpace), sndPayload, payloadSize);                             //Copy payload to free space
+        *(vu32*)(kern + freeSpace + payloadSize) = _B(freeSpace + payloadSize, sendOff + codeSndOff);  //Jump back skipping the hook
+        
+        //ID Receive
+        freeSpace += (payloadSize+4);
+        u32 *rcvPayload = getRcvPayload(ver, &payloadSize);
+        *(vu32*)(kern + recvOff) = _B(recvOff, freeSpace);
+        memcpy((void*)(kern + freeSpace), rcvPayload, payloadSize);
+        *(vu32*)(kern + freeSpace + payloadSize) = _B(freeSpace + payloadSize, recvOff + codeRcvOff);
+        
+        //SVC patches
+        *(vu32*)(kern + svcVerifOff) = NOP;
+        if (fopen("/ReiNX/debug", "rb")) {
+            fclose();
+            *(vu32*)(kern + svcDebugOff) = _MOVZX(8, 1, 0);
+        }
+        
+        end:;
    }

    u8 kipHash[0x20];
@@ -302,14 +390,14 @@ void firmware() {
    gfx_con_init(&gfx_con, &gfx_ctxt);
    gfx_con_setcol(&gfx_con, DEFAULT_TEXT_COL, 0, 0);

-    while (!sdMount()) {
+    if (!sdMount()) {
        error("Failed to init SD card!\n");
-        print("Press POWER to power off, any other key to retry\n");
+        print("Press POWER to power off, or any other key to continue without SD.\n");
        if (btn_wait() & BTN_POWER)
            i2c_send_byte(I2C_5, 0x3C, MAX77620_REG_ONOFFCNFG1, MAX77620_ONOFFCNFG1_PWR_OFF);
        btn_wait();
    }
-    
+
    if(PMC(APBDEV_PMC_SCRATCH49) != 69 && fopen("/ReiNX.bin", "rb")) {
        fread((void*)PAYLOAD_ADDR, fsize(), 1);
        fclose();
@@ -321,10 +409,15 @@ void firmware() {
        ((void (*)())PAYLOAD_ADDR)();
    }
    SYSREG(AHB_AHB_SPARE_REG) = (volatile vu32)0xFFFFFF9F;
-	PMC(APBDEV_PMC_SCRATCH49) = 0;
-    
+    PMC(APBDEV_PMC_SCRATCH49) = 0;
+
+    if (btn_read() & BTN_VOL_DOWN) {
+        print("Booting verbosely\n");
+    } else if (drawSplash()) {
+        gfx_con.mute = 1;
+    }
+
    print("Welcome to ReiNX %s!\n", VERSION);
    loadFirm();
-    drawSplash();
    launch();
 }
diff --git a/src/hwinit/util.c b/src/hwinit/util.c
@@ -70,7 +70,7 @@ uPtr getFreeSpace(void *start, size_t space, size_t searchSize) {
        if(*(u8*)(start+i) == 0) {
            for(int j=0;j<space;j++) {
                if(*(u8*)(start+i+j) != 0) break;
-                if(j==space-1) return (uPtr)(start+i);
+                if(j==space-1) return (uPtr)i;
            }
        }
    }
diff --git a/src/kippatches/fs.inc b/src/kippatches/fs.inc
@@ -252,14 +252,28 @@ static kippatch_t fs_kip_patches_510[] = {
  { NULL, NULL }
 };

-static kippatch_t fs_kip_patches_600[] = {
+static kippatch_t fs_kip_patches_600_40[] = {
  { "nosigchk", fs_diffs_600_nosigchk },
  { "nocmac", fs_diffs_600_nocmac },
  { "nogc", fs_diffs_600_nogc },
  { NULL, NULL }
 };

-static kippatch_t fs_kip_patches_600_exfat[] = {
+static kippatch_t fs_kip_patches_600_40_exfat[] = {
+  { "nosigchk", fs_diffs_600_exfat_nosigchk },
+  { "nocmac", fs_diffs_600_exfat_nocmac },
+  { "nogc", fs_diffs_600_exfat_nogc },
+  { NULL, NULL }
+};
+
+static kippatch_t fs_kip_patches_600_50[] = {
+  { "nosigchk", fs_diffs_600_nosigchk },
+  { "nocmac", fs_diffs_600_nocmac },
+  { "nogc", fs_diffs_600_nogc },
+  { NULL, NULL }
+};
+
+static kippatch_t fs_kip_patches_600_50_exfat[] = {
  { "nosigchk", fs_diffs_600_exfat_nosigchk },
  { "nocmac", fs_diffs_600_exfat_nocmac },
  { "nogc", fs_diffs_600_exfat_nogc },
+1 −1		Makefile
+2 −0		README.md
+36 −42		libstratosphere/include/stratosphere/hossynch.hpp
+6 −4		loader/source/ldr_nso.cpp
+1 −0		pm/pm.json
+1 −0		pm/source/pm_boot2.cpp
+1 −0		pm/source/pm_boot2.hpp
+10 −0		pm/source/pm_debug_monitor.cpp
+3 −0		pm/source/pm_debug_monitor.hpp
+8 −8		pm/source/pm_main.cpp
+10 −0		pm/source/pm_registration.cpp
+12 −11		pm/source/pm_registration.hpp
+87 −39		pm/source/pm_resource_limits.cpp