'fix' 6.0; update sysmods; refactor

Reisyukaku · Sep 3, 2018 · 14101dca2784cb85c8b88808a3366c0e863e3e23 · 14101dc
1 parent 45d3dc8
commit 14101dca2784cb85c8b88808a3366c0e863e3e23
Unified Split

Showing with 8 additions and 8 deletions.

+1 −1 NX_Sysmodules

+3 −3 src/hwinit/util.c

+4 −4 src/package.h
diff --git a/NX_Sysmodules b/NX_Sysmodules
diff --git a/src/hwinit/util.c b/src/hwinit/util.c
@@ -56,9 +56,9 @@ void exec_cfg(u32 *base, const cfg_op_t *ops, u32 num_ops)
 		base[ops[i].off] = ops[i].val;
 }

-uPtr memsearch(const u8 *startPos, u32 searchSize, const void *pattern, u32 patternSize) {
+uPtr memsearch(void *startPos, size_t searchSize, void *pattern, size_t patternSize) {
    if(!searchSize) return 0;
-    for (u8 *pos = (u8 *)startPos; pos <= startPos + searchSize - patternSize; pos++) {
+    for (u8 *pos = (u8*)startPos; pos <= (u8*)startPos + searchSize - patternSize; pos++) {
        if (memcmp(pos, pattern, patternSize) == 0) return (uPtr)pos;
    }
    return 0;
@@ -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 (uintptr_t)(start+i);
+                if(j==space-1) return (uPtr)(start+i);
            }
        }
    }
diff --git a/src/package.h b/src/package.h
@@ -331,17 +331,17 @@ static kernel_patch_t kern5[] = {
 };

 static kernel_patch_t kern6[] = {
-	{ SVC_VERIFY_DS, 0x47E98, _NOP(), NULL },          // Disable SVC verifications
-	{ DEBUG_MODE_EN, 0x52D40, _MOVZX(8, 1, 0), NULL }, // Enable Debug Patch
+	{ SVC_VERIFY_DS, 0x47EA0, _NOP(), NULL },          // Disable SVC verifications
+	{ DEBUG_MODE_EN, 0x57548, _MOVZX(8, 1, 0), NULL }, // Enable Debug Patch
 	// Atmosphère kernel patches.
-	{ ATM_GEN_PATCH, ID_SND_OFF_600, _B(ID_SND_OFF_600, FREE_CODE_OFF_1ST_600), NULL},    // Send process id branch.
+	/*{ ATM_GEN_PATCH, ID_SND_OFF_600, _B(ID_SND_OFF_600, FREE_CODE_OFF_1ST_600), NULL},    // Send process id branch.
 	{ ATM_ARR_PATCH, FREE_CODE_OFF_1ST_600, sizeof(PRC_ID_SND_600) >> 2, PRC_ID_SND_600}, // Send process id code.
 	{ ATM_GEN_PATCH, FREE_CODE_OFF_1ST_600 + sizeof(PRC_ID_SND_600),                      // Branch back and skip 2 instructions.
 		_B(FREE_CODE_OFF_1ST_600 + sizeof(PRC_ID_SND_600), ID_SND_OFF_600 + 8), NULL},
 	{ ATM_GEN_PATCH, ID_RCV_OFF_600, _B(ID_RCV_OFF_600, FREE_CODE_OFF_2ND_600), NULL},    // Receive process id branch.
 	{ ATM_ARR_PATCH, FREE_CODE_OFF_2ND_600, sizeof(PRC_ID_RCV_600) >> 2, PRC_ID_RCV_600}, // Receive process id code.
 	{ ATM_GEN_PATCH, FREE_CODE_OFF_2ND_600 + sizeof(PRC_ID_RCV_600),                      // Branch back and skip 2 instructions.
-		_B(FREE_CODE_OFF_2ND_600 + sizeof(PRC_ID_RCV_600), ID_RCV_OFF_600 + 8), NULL},
+		_B(FREE_CODE_OFF_2ND_600 + sizeof(PRC_ID_RCV_600), ID_RCV_OFF_600 + 8), NULL},*/
 	{0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, (u32*)0xFFFFFFFF}
 };