LowLevel/Luma3DS-3GX
Archived
1
0
Fork 0
Code Issues Pull Requests Releases 2 Wiki Activity

Refactor pattern for ir hook

Browse Source
This commit is contained in:
TuxSH 2017-06-09 04:11:23 +02:00 committed by Ezekiel Bethel
parent c0059c83ac
commit 53e2ef24f1
No known key found for this signature in database
GPG Key ID: 6915A190A8C54CCB
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sysmodules/rosalina/source/input_redirection.c
View File

@ -104,7 +104,7 @@ void inputRedirectionThreadMain(void)
break; break;
else if(n < 12) else if(n < 12)
continue; continue;
memcpy(hidDataPhys, buf, 12); memcpy(hidDataPhys, buf, 12);
if(n >= 20) if(n >= 20)
{ {
@ -117,7 +117,7 @@ void inputRedirectionThreadMain(void)
srvPublishToSubscriber(0x204, 0); srvPublishToSubscriber(0x204, 0);
else if((oldSpecialButtons & 1) && !(specialButtons & 1)) // HOME button released else if((oldSpecialButtons & 1) && !(specialButtons & 1)) // HOME button released
srvPublishToSubscriber(0x205, 0); srvPublishToSubscriber(0x205, 0);
if(!(oldSpecialButtons & 2) && (specialButtons & 2)) // POWER button pressed if(!(oldSpecialButtons & 2) && (specialButtons & 2)) // POWER button pressed
srvPublishToSubscriber(0x202, 0); srvPublishToSubscriber(0x202, 0);
@ -255,8 +255,6 @@ Result InputRedirection_DoOrUndoPatches(void)
static const u32 irOrigCppFlagCode[] = { static const u32 irOrigCppFlagCode[] = {
0xE3550000, // cmp r5, #0 0xE3550000, // cmp r5, #0
0xE3A0B080, // mov r11, #0x80 0xE3A0B080, // mov r11, #0x80
0xE28D0060, // add r0, sp, #0xb0+var_50
0x0A00002C // beq loc_105688
}; };
static u32 *irHookLoc, *irWaitSyncLoc, *irCppFlagLoc; static u32 *irHookLoc, *irWaitSyncLoc, *irCppFlagLoc;
@ -316,7 +314,7 @@ Result InputRedirection_DoOrUndoPatches(void)
*irWaitSyncLoc = 0xE3A00000; // mov r0, #0 *irWaitSyncLoc = 0xE3A00000; // mov r0, #0
// This NOPs out a flag check in ir:user's CPP emulation // This NOPs out a flag check in ir:user's CPP emulation
*(irCppFlagLoc+3) = 0xea00002c; *irCppFlagLoc = 0xE3150000; // tst r5, #0
} }
} }

4
sysmodules/rosalina/source/input_redirection_hooks.s
View File

@ -108,7 +108,7 @@ b skip_vars
i2c_readdeviceraw_addr: i2c_readdeviceraw_addr:
.word 0 .word 0
redirected_input_addr: redirected_input_addr:
.word 0 .word 0
skip_vars: skip_vars:
stmfd sp!, {r4-r5, lr} stmfd sp!, {r4-r5, lr}
@ -141,4 +141,4 @@ streq r0, [r4] @ store it instead of the value read from i2c
@ Return! @ Return!
mov r0, #0 @ For ir:user. mov r0, #0 @ For ir:user.
ldmfd sp!, {r4-r5, pc} ldmfd sp!, {r4-r5, pc}
.pool .pool