revert

PSP-Archive · Jul 24, 2023 · 114454a · 114454a
1 parent d3b9e3c
commit 114454a
Show file tree

Hide file tree

Showing 18 changed files with 2,380 additions and 3,409 deletions.
diff --git a/core/compat/vita/popspatch.c b/core/compat/vita/popspatch.c
@@ -126,7 +126,7 @@ static int myKernelLoadModule(char * fname, int flag, void * opt)
 void patchPspPopsman(SceModule2* mod){
     u32 text_addr = mod->text_addr;
     u32 top_addr = text_addr + mod->text_size;
-
+    /*
     for (u32 addr=text_addr; addr<top_addr; addr+=4){
         u32 data = _lw(addr);
         if (data == 0x7C1D2804){
@@ -164,9 +164,9 @@ void patchPspPopsman(SceModule2* mod){
             _sw(JAL(myKernelLoadModule), addr + 4);
         }
     }
+    */
 
     // TN hacks
-    /*
     _sw(JR_RA, text_addr + 0x2F88);
     _sw(LI_V0(0), text_addr + 0x2F88 + 4);
 
@@ -191,10 +191,9 @@ void patchPspPopsman(SceModule2* mod){
 
     _sw(JR_RA, text_addr + 0x00003490);
     _sw(LI_V0(0), text_addr + 0x00003490 + 4);
-    */
 
     // patch loadmodule to load our own pops.prx
-    //_sw(JAL(myKernelLoadModule), text_addr + 0x00001EE0);
+    _sw(JAL(myKernelLoadModule), text_addr + 0x00001EE0);
 }
 
 void patchPspPopsSpu(SceModule2 * mod)

diff --git a/extras/modules/peops/Makefile b/extras/modules/peops/Makefile
@@ -1,6 +1,6 @@
 TARGET = peops
 OBJS = main.o psp.o audio.o $(SPU_OBJS) exports.o
-SPU_OBJS = spu/decode_xa.o spu/spu.o spu/registers.o spu/externals.o
+SPU_OBJS = spu/decode_xa.o spu/spu.o spu/registers.o
 
 INCDIR = $(ARKROOT)/common/include
 CFLAGS = -O2 -Os -G0 -Wall -fshort-wchar -fno-pic -mno-check-zero-division

diff --git a/extras/modules/peops/main.c b/extras/modules/peops/main.c
@@ -139,6 +139,18 @@ void PatchPops(SceModule2* mod)
 
 	u32 text_addr = mod->text_addr;
 
+	/*
+	for (u32 addr=text_addr; addr<text_addr+mod->text_size; addr+=4){
+		u32 data = _lw(addr);
+		// Replace Media Engine SPU Background Thread Starter
+        if (data == 0x24050260){
+            u32 a = addr;
+            do { a+=4; } while (_lw(a) != 0x8FBF0004); // find end of function
+            MAKE_CALL(a-8, sceMeAudioInitPatched);
+        }
+	}
+	*/
+
 	MAKE_CALL(text_addr + 0x1A038, sceMeAudioInitPatched);
 
 	REDIRECT_FUNCTION(text_addr + 0x3D264, sceMeAudioNotifyPatched);