ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-11-16 19:47:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1412 from ProjectRevoTPP/Sio32IDIntr

Browse Source 
Eliminate the last fakematching (Sio32IDIntr). We are free of nonmatchings/fakematchings!
This commit is contained in:
GriffinR 2021-04-21 08:49:22 -04:00 committed by GitHub
commit e96e7ba2e8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/librfu_rfu.c
View File

@ -1758,9 +1758,6 @@ static void rfu_constructSendLLFrame(void)
{ {
u8 *maxSize = llf_p - offsetof(struct RfuFixed, LLFBuffer[1]); u8 *maxSize = llf_p - offsetof(struct RfuFixed, LLFBuffer[1]);
// Does the volatile qualifier make sense?
// It's the same as:
// asm("":::"memory");
pakcketSize = maxSize - *(u8 *volatile *)&gRfuFixed; pakcketSize = maxSize - *(u8 *volatile *)&gRfuFixed;
} }
} }

29
src/librfu_sio32id.c
View File

@ -123,34 +123,29 @@ static void Sio32IDIntr(void)
{ {
u32 regSIODATA32; u32 regSIODATA32;
u16 delay; u16 delay;
#ifndef NONMATCHING
register u32 rfuSIO32IdUnk0_times_16 asm("r1");
register u16 negRfuSIO32IdUnk6 asm("r0");
#else
u32 rfuSIO32IdUnk0_times_16; u32 rfuSIO32IdUnk0_times_16;
u16 negRfuSIO32IdUnk6;
#endif
regSIODATA32 = REG_SIODATA32; regSIODATA32 = REG_SIODATA32;
if (gRfuSIO32Id.MS_mode != AGB_CLK_MASTER) if (gRfuSIO32Id.MS_mode != AGB_CLK_MASTER)
REG_SIOCNT |= SIO_ENABLE; REG_SIOCNT |= SIO_ENABLE;
rfuSIO32IdUnk0_times_16 = 16 * gRfuSIO32Id.MS_mode; // to handle side effect of inline asm rfuSIO32IdUnk0_times_16 = (regSIODATA32 << (16 * gRfuSIO32Id.MS_mode)) >> 16;
rfuSIO32IdUnk0_times_16 = (regSIODATA32 << rfuSIO32IdUnk0_times_16) >> 16;
regSIODATA32 = (regSIODATA32 << 16 * (1 - gRfuSIO32Id.MS_mode)) >> 16; regSIODATA32 = (regSIODATA32 << 16 * (1 - gRfuSIO32Id.MS_mode)) >> 16;
if (gRfuSIO32Id.lastId == 0) if (gRfuSIO32Id.lastId == 0)
{ {
if (rfuSIO32IdUnk0_times_16 == gRfuSIO32Id.recv_id) u16 backup = rfuSIO32IdUnk0_times_16;
if (backup == gRfuSIO32Id.recv_id)
{ {
if (gRfuSIO32Id.count > 3) if (gRfuSIO32Id.count < 4)
{ {
backup = (u16)~gRfuSIO32Id.send_id;
if (gRfuSIO32Id.recv_id == backup)
{
if (regSIODATA32 == (u16)~gRfuSIO32Id.recv_id)
++gRfuSIO32Id.count;
}
}
else
gRfuSIO32Id.lastId = regSIODATA32; gRfuSIO32Id.lastId = regSIODATA32;
}
else if (rfuSIO32IdUnk0_times_16 == (u16)~gRfuSIO32Id.send_id)
{
negRfuSIO32IdUnk6 = ~gRfuSIO32Id.recv_id;
if (regSIODATA32 == negRfuSIO32IdUnk6)
++gRfuSIO32Id.count;
}
} }
else else
{ {