From f808bbc8e08389ccc67ef1f4d93db3de6304dce6 Mon Sep 17 00:00:00 2001 From: "crediar@rypp.net" Date: Fri, 9 Nov 2012 20:30:55 +0000 Subject: [PATCH] Again another donation another feature. Thanks for donating! -updated to version 2.5- *Fixed a bug in DM that could cause a fatal read error when using devices with under 8GB size *Added a PADHOOK pattern for Batman:Vengeance *Added a screenshot feature This feature can be enabled/disabled via the DM(L) config Press R+Z on the fourth controller to take a screenshot any time! Screenshots will be saved to device:/screenshots in the YPbPr format, you can use my tool to convert them. git-svn-id: svn://localhost/Users/andi/Downloads/code/trunk@33 be6c1b03-d731-4111-a574-e37d80d43941 --- Config.h | 1 + Patches.c | 158 +++++++++++++++++++++++++++++++++++++++++++++++++-- Patches.h | 11 ++++ asm/padipc.S | 7 +++ dip.c | 2 +- global.h | 2 +- main.c | 15 +++++ 7 files changed, 189 insertions(+), 7 deletions(-) diff --git a/Config.h b/Config.h index 01d9459..f01a740 100644 --- a/Config.h +++ b/Config.h @@ -65,6 +65,7 @@ enum dmlconfig DML_CFG_BOOT_DISC = (1<<10), DML_CFG_BOOT_DISC2 = (1<<11), DML_CFG_NODISC = (1<<12), + DML_CFG_SCREENSHOT = (1<<13), }; enum dmlvideomode diff --git a/Patches.c b/Patches.c index 0d3ab84..a307ef0 100644 --- a/Patches.c +++ b/Patches.c @@ -6,6 +6,18 @@ #include "CheatCode.c" extern u32 DOLSize; +u32 FrameBuffer = 0; +u32 FBOffset = 0; +u32 FBEnable = 0; +u32 FBSize = 0; + +unsigned char VISetFB[] = +{ + 0x38, 0x7F, 0x00, 0xF0, // mr %r3, %r7 + 0x38, 0x9F, 0x01, 0x24, + 0x38, 0xBF, 0x01, 0x28, + 0x38, 0xDF, 0x01, 0x3C, +}; unsigned char OSReportDM[] = { @@ -147,7 +159,7 @@ FuncPattern FPatterns[] = { 0x2FC, 73, 8, 23, 16, 15, (u8*)NULL, 0xdead000B, "PADRead B", 2, 0 }, { 0x3B0, 87, 13, 27, 17, 25, (u8*)NULL, 0xdead000B, "PADRead C", 2, 0 }, { 0x334, 78, 7, 20, 17, 19, (u8*)NULL, 0xdead000B, "PADRead D", 2, 0 }, - + { 0x2A8, 66, 4, 20, 17, 14, (u8*)NULL, 0xdead000B, "PADRead E", 2, 0 }, }; FuncPattern CPatterns[] = @@ -197,7 +209,97 @@ FuncPattern CPatterns[] = u32 CardLowestOff = 0; +u32 FB[MAX_FB]; +void SMenuAddFramebuffer( void ) +{ + u32 i,j,f; + + if( *(vu32*)FBEnable != 1 ) + return; + + FrameBuffer = (*(vu32*)FBOffset) & 0x7FFFFFFF; + + for( i=0; i < MAX_FB; i++) + { + if( FB[i] ) //add a new entry + continue; + + //check if we already know this address + f=0; + for( j=0; j> 16 == 0x3DA0 && r13 == 0 ) + { + r13 = ((*(u32*)(ptr+i)) & 0xFFFF) << 16; + r13|= (*(u32*)(ptr+i+4)) & 0xFFFF; + + dbgprintf("Patch:r13:%08X\n", r13 ); + } + + if( memcmp( ptr+i, VISetFB, sizeof(VISetFB) ) == 0 && FBEnable == 0 ) + { + dbgprintf("Patch:[VISetFB]%08X\n", (u32)ptr+i ); + + FBEnable = ( *(u32*)(ptr+i-4) ); + + if( FBEnable & 0x8000 ) + { + FBEnable = ((~FBEnable) & 0xFFFF) + 1; + FBEnable = (r13 - FBEnable) & 0x7FFFFFF; + } else { + FBEnable = FBEnable & 0xFFFF; + FBEnable = (r13 + FBEnable) & 0x7FFFFFF; + } + + FBOffset = FBEnable - 0x08; + // dbgprintf("FBOffset:%08X\n", FBOffset ); + // dbgprintf("FBEnable:%08X\n", FBEnable ); + + for( j=0; j < MAX_FB; ++j ) + FB[j] = 0; + + PatchCount |= 128; + } + } else { + PatchCount |= 128; + + } + } + if( ConfigGetConfig(DML_CFG_CHEATS) || ConfigGetConfig( DML_CFG_DEBUGGER ) ) { - if( PatchCount == 127 ) + if( PatchCount == 255 ) break; } else { - if( PatchCount == 111 ) + if( PatchCount == 239 ) break; } } @@ -881,8 +1029,8 @@ void DoPatches( char *ptr, u32 size, u32 SectionOffset ) dbgprintf("Patch:[PADRead hook] %08X\n", FOffset + j ); - memcpy( (void*)0x2EE0, padipc, sizeof(padipc) ); - PatchB( 0x2EE0, FOffset + j ); + memcpy( (void*)0x2ECC, padipc, sizeof(padipc) ); + PatchB( 0x2ECC, FOffset + j ); write32( 0x12FC, 0 ); } break; diff --git a/Patches.h b/Patches.h index 0795bac..172dc54 100644 --- a/Patches.h +++ b/Patches.h @@ -10,6 +10,7 @@ #include "dol.h" #include "Config.h" +#define MAX_FB 3 typedef struct PatchInfo { @@ -60,12 +61,22 @@ typedef struct _gx_rmodeobj { u8 vfilter[7]; } GXRModeObj; + +#define VI_NTSC 0 +#define VI_PAL 1 +#define VI_MPAL 2 +#define VI_DEBUG 3 +#define VI_DEBUG_PAL 4 +#define VI_EUR60 5 + #define GXPal528IntDf 0 #define GXEurgb60Hz480IntDf 1 #define GXMpal480IntDf 2 #define GXNtsc480IntDf 3 #define GXNtsc480Int 4 +void SMenuAddFramebuffer( void ); +void ScreenShot( void ); void DoPatches( char *ptr, u32 size, u32 SectionOffset ); void DoCardPatches( char *ptr, u32 size, u32 SectionOffset ); void DoPatchesLoader( char *ptr, u32 size ); diff --git a/asm/padipc.S b/asm/padipc.S index e5544a0..03c4a76 100644 --- a/asm/padipc.S +++ b/asm/padipc.S @@ -4,8 +4,15 @@ PADRead: lis %r4, 0xCC00 + + lwz %r5, 0x6428(%r4) + lwz %r0, 0x642C(%r4) + lwz %r0, 0x6404(%r4) lwz %r4, 0x6408(%r4) + lis %r4, 0xC000 stw %r0, 0x12FC(%r4) + stw %r5, 0x12F8(%r4) + blr diff --git a/dip.c b/dip.c index 252e2dc..498195b 100644 --- a/dip.c +++ b/dip.c @@ -335,7 +335,7 @@ u32 DIUpdateRegisters( void ) if( (u64)read32(HW_TIMER) >= 2 * 60 * 243000000LL / 128 ) { - USBStorage_Read_Sectors( (read32(HW_TIMER) << 3) & 0x00FFFFFF, 1, (void*)0x1000 ); + USBStorage_Read_Sectors( (read32(HW_TIMER) << 3) & 0x000FFFFF, 1, (void*)0x1000 ); write32( HW_TIMER, 0 ); } diff --git a/global.h b/global.h index 0ffaf6c..c12f941 100644 --- a/global.h +++ b/global.h @@ -15,7 +15,7 @@ #define PADHOOK 1 #define CONFIG_VERSION 0x00000002 -#define DM_VERSION 0x00020004 +#define DM_VERSION 0x00020005 #define DI_SUCCESS 1 #define DI_ERROR 2 diff --git a/main.c b/main.c index b472dd1..503266f 100644 --- a/main.c +++ b/main.c @@ -19,6 +19,7 @@ Copyright (C) 2010-2012 crediar #include "DVD.h" #include "Drive.h" #include "dip.h" +#include "Patches.h" char __aeabi_unwind_cpp_pr0[0]; @@ -248,10 +249,23 @@ int main( int argc, char *argv[] ) write32( 0x30F8, 0 ); // Tell PPC side to start ahb_flush_to( AHB_PPC ); + + u32 PADLock = 0; while (1) { ahb_flush_from( AHB_STARLET ); //flush to arm + + if( (((read32(0x12F8) >> 16) & 0x30) == 0x30 ) ) + { + if( !PADLock ) + { + ScreenShot(); + PADLock = 1; + } + } else { + PADLock = 0; + } if( (((read32(0x12FC) >> 16) & 0x1030) == 0x1030 ) ) { @@ -286,6 +300,7 @@ int main( int argc, char *argv[] ) // write32(0x1860, 0xdeadbeef); //} + SMenuAddFramebuffer(); DIUpdateRegisters();