diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2021-05-11 12:06:00 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2021-05-11 12:06:00 -0400 |
| commit | b1603bba92dac95fd1621978f21ee9bf107f7b6a (patch) | |
| tree | 9d86f2a2aed82e2dcbefebe7c5dbdecf3aed607e /src/librfu_intr.c | |
| parent | 44dc1a473c8a4ff1c73b776889f2002136c7787d (diff) | |
| parent | 4767019e4f541a19577a9bfd09851a94b2e3c745 (diff) | |
Merge remote-tracking branch 'origin/master' into modern_ld
Diffstat (limited to 'src/librfu_intr.c')
| -rw-r--r-- | src/librfu_intr.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/librfu_intr.c b/src/librfu_intr.c index 41085182a..4c2f2573a 100644 --- a/src/librfu_intr.c +++ b/src/librfu_intr.c @@ -147,11 +147,7 @@ static void sio32intr_clock_slave(void) { u32 regSIODATA32; u32 r0; - #ifndef NONMATCHING - register u32 reqLen asm("r2"); - #else - u32 reqLen; - #endif + u32 reqLen; gSTWIStatus->timerActive = 0; STWI_set_timer_in_RAM(100); @@ -164,10 +160,14 @@ static void sio32intr_clock_slave(void) ((u32*)gSTWIStatus->rxPacket)[0] = regSIODATA32; gSTWIStatus->reqNext = 1; r0 = 0x99660000; - if ((regSIODATA32 >> 16) == (r0 >> 16)) + // variable reuse required + reqLen = (regSIODATA32 >> 16); + if (reqLen == (r0 >> 16)) { + // only reqLen = regSIODATA32 >> 8 is required to match, but it looks a bit + // more consistent when both lines update the variables. Might have been a macro? gSTWIStatus->reqLength = reqLen = regSIODATA32 >> 8; - gSTWIStatus->reqActiveCommand = regSIODATA32; + gSTWIStatus->reqActiveCommand = reqLen = (regSIODATA32 >> 0); if (gSTWIStatus->reqLength == 0) { if ( |