From 184477b448c2990296cf548d3e15b9d32e6d070d Mon Sep 17 00:00:00 2001
From: Christopher Roy Bratusek <nano@tuxfamily.org>
Date: Sat, 22 Dec 2012 10:03:57 +0100
Subject: [PATCH] installer: use -lruntimeiospatch (verbose)

---
 installer/Makefile                 |   2 +-
 installer/source/RuntimeIOSPatch.c |  69 -----------------------------
 installer/source/RuntimeIOSPatch.h |  14 ------
 installer/source/main.cpp          |   4 +-
 installer/wad/0001000154484246.tmd | Bin 592 -> 592 bytes
 5 files changed, 3 insertions(+), 86 deletions(-)
 delete mode 100644 installer/source/RuntimeIOSPatch.c
 delete mode 100644 installer/source/RuntimeIOSPatch.h

diff --git a/installer/Makefile b/installer/Makefile
index c69d306..fefaec6 100644
--- a/installer/Makefile
+++ b/installer/Makefile
@@ -34,7 +34,7 @@ LDFLAGS	=	-g $(MACHDEP) -Wl,-Map,$(notdir $@).map
 #---------------------------------------------------------------------------------
 # any extra libraries we wish to link with the project
 #---------------------------------------------------------------------------------
-LIBS	:=	-lwiiuse -lbte -logc -lm
+LIBS	:=	-lwiiuse -lbte -logc -lm -lruntimeiospatch
 
 #---------------------------------------------------------------------------------
 # list of directories containing libraries, this must be the top level containing
diff --git a/installer/source/RuntimeIOSPatch.c b/installer/source/RuntimeIOSPatch.c
deleted file mode 100644
index b977f9c..0000000
--- a/installer/source/RuntimeIOSPatch.c
+++ /dev/null
@@ -1,69 +0,0 @@
-#include <gccore.h>
-#include <ogc/machine/processor.h>
-#include <stdio.h>
-#include <string.h>
-#include <unistd.h>
-
-#include "RuntimeIOSPatch.h"
-
-#define MEM_PROT 0xD8B420A
-
-const u8 isfs_permissions_old[] = { 0x42, 0x8B, 0xD0, 0x01, 0x25, 0x66 };
-const u8 isfs_permissions_patch[] = { 0x42, 0x8B, 0xE0, 0x01, 0x25, 0x66 };
-const u8 setuid_old[] = { 0xD1, 0x2A, 0x1C, 0x39 };
-const u8 setuid_patch[] = { 0x46, 0xC0 };
-const u8 es_identify_old[] = { 0x28, 0x03, 0xD1, 0x23 };
-const u8 es_identify_patch[] = { 0x00, 0x00 };
-const u8 hash_old[] = { 0x20, 0x07, 0x4B, 0x0B };
-const u8 hash_patch[] = { 0x00 };
-const u8 addticket_vers_check[] = { 0xD2, 0x01, 0x4E, 0x56 };
-const u8 addticket_patch[] = { 0xE0 };
-
-u32 apply_patch(const char *name, const u8 *old, u32 old_size, const u8 *patch, u32 patch_size, u32 patch_offset)
-{
-//	printf("Applying patch %s.....", name);
-	u8 *ptr = (u8 *) 0x93400000;
-	u32 i, found = 0;
-	u8 *start;
-
-	while ((u32) ptr < (0x94000000 - old_size))
-	{
-		if(!memcmp(ptr, old, old_size))
-		{
-			found++;
-			start = ptr + patch_offset;
-			for (i = 0; i < patch_size; i++)
-				*(start + i) = patch[i];
-			ptr += patch_size;
-			DCFlushRange((u8 *) (((u32) start) >> 5 << 5), (patch_size >> 5 << 5) + 64);
-		}
-		ptr++;
-	}
-//	if(found)
-//		printf("Patched\n");
-//	else
-//		printf("\n");
-
-	return found;
-}
-
-u32 runtimePatchApply()
-{
-	u32 count = 0;
-	write16(MEM_PROT, 0);
-	count += apply_patch("Trucha", hash_old,
-		sizeof(hash_old), hash_patch, sizeof(hash_patch), 1);
-	count += apply_patch("ES_Identify", es_identify_old,
-		sizeof(es_identify_old), es_identify_patch, sizeof(es_identify_patch),
-		2);
-	count += apply_patch("NAND Permissions", isfs_permissions_old,
-		sizeof(isfs_permissions_old), isfs_permissions_patch,
-		sizeof(isfs_permissions_patch), 0);
-	count += apply_patch("add ticket patch", addticket_vers_check,
-		sizeof(addticket_vers_check), addticket_patch, sizeof(addticket_patch),
-		0);
-	count += apply_patch("ES_SetUID", setuid_old, sizeof(setuid_old),
-		setuid_patch, sizeof(setuid_patch), 0);
-	write16(MEM_PROT, 1);
-	return count;
-}
diff --git a/installer/source/RuntimeIOSPatch.h b/installer/source/RuntimeIOSPatch.h
deleted file mode 100644
index 9f1d149..0000000
--- a/installer/source/RuntimeIOSPatch.h
+++ /dev/null
@@ -1,14 +0,0 @@
-#ifndef _RUNTIMEIOSPATCH_H_
-#define _RUNTIMEIOSPATCH_H_
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-u32 runtimePatchApply();
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/installer/source/main.cpp b/installer/source/main.cpp
index 37c1316..3a70848 100644
--- a/installer/source/main.cpp
+++ b/installer/source/main.cpp
@@ -1,8 +1,8 @@
 
 #include <malloc.h>
 #include <wiiuse/wpad.h>
+#include <runtimeiospatch.h>
 
-#include "RuntimeIOSPatch.h"
 #include "menu.h"
 #include "video.h"
 #include "wad.h"
@@ -19,7 +19,7 @@ int main(int argc, char **argv) {
 	Video_SetMode();
 
 	if(HAVE_AHBPROT)
-		runtimePatchApply();
+		IosPatch_RUNTIME(true, false, false, true);
 
 	WPAD_Init();
 	PAD_Init();
diff --git a/installer/wad/0001000154484246.tmd b/installer/wad/0001000154484246.tmd
index 6667fcac18797c15b007bb8d742427b1021cb555..ebebaab9f86f461816eeb20ec1e28eb5502da6f7 100644
GIT binary patch
delta 34
qcmcb>a)D)o7?T)}!olxT#TPZ@$Qw)jQ%n_0>Q(daelb~xNd*AhiVSH0

delta 34
scmV+-0Nwx41kePq76KLqpcHy*Y1%>7sM{CwnOMZc)T^I*Jd-Q}B>&3~KL7v#