ShuriZma
/
melonDS
mirror of https://github.com/melonDS-emu/melonDS.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

wifi: fix TX start logic (it is possible to write TXREQ then TXLOC)

This commit is contained in:
StapleButter 2017-06-05 01:58:14 +02:00
parent fb1eb43fb4
commit 9e36cba941
2 changed files with 30 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/NDS.cpp
View File

@ -228,6 +228,9 @@ void SetupDirectBoot()
PowerControl9 = 0x820F; PowerControl9 = 0x820F;
GPU::DisplaySwap(PowerControl9); GPU::DisplaySwap(PowerControl9);
// checkme
RCnt = 0x8000;
SPU::SetBias(0x200); SPU::SetBias(0x200);
ARM7BIOSProt = 0x1204; ARM7BIOSProt = 0x1204;

38
src/Wifi.cpp
View File

@ -288,39 +288,38 @@ void StartTX_Beacon()
IOPORT(W_TXBusy) |= 0x0010; IOPORT(W_TXBusy) |= 0x0010;
} }
// TODO eventually: there is a small delay to firing TX
void FireTX() void FireTX()
{ {
u16 txbusy = IOPORT(W_TXBusy); u16 txbusy = IOPORT(W_TXBusy);
printf("attempting to fire TX: %04X %04X\n", txbusy, IOPORT(W_TXSlotLoc2));
u16 txreq = IOPORT(W_TXReqRead);
if ((txreq & 0x0001) && (IOPORT(W_TXSlotLoc1) & 0x8000)) txbusy |= 0x0001;
if ((txreq & 0x0002) && (IOPORT(W_TXSlotCmd) & 0x8000)) txbusy |= 0x0002;
if ((txreq & 0x0004) && (IOPORT(W_TXSlotLoc2) & 0x8000)) txbusy |= 0x0004;
if ((txreq & 0x0008) && (IOPORT(W_TXSlotLoc3) & 0x8000)) txbusy |= 0x0008;
IOPORT(W_TXBusy) = txbusy;
if (txbusy & 0x0008) if (txbusy & 0x0008)
{
if (IOPORT(W_TXSlotLoc3) & 0x8000)
{ {
StartTX_LocN(3, 2); StartTX_LocN(3, 2);
return; return;
} }
}
if (txbusy & 0x0004) if (txbusy & 0x0004)
{
if (IOPORT(W_TXSlotLoc2) & 0x8000)
{ {
StartTX_LocN(2, 1); StartTX_LocN(2, 1);
return; return;
} }
}
// TODO: CMD
if (txbusy & 0x0001) if (txbusy & 0x0001)
{
if (IOPORT(W_TXSlotLoc1) & 0x8000)
{ {
StartTX_LocN(0, 0); StartTX_LocN(0, 0);
return; return;
} }
}
IOPORT(W_TXBusy) = 0;
} }
void ProcessTX(TXSlot* slot, int num) void ProcessTX(TXSlot* slot, int num)
@ -887,7 +886,6 @@ void Write(u32 addr, u16 val)
return; return;
case W_TXReqSet: case W_TXReqSet:
IOPORT(W_TXReqRead) |= val; IOPORT(W_TXReqRead) |= val;
IOPORT(W_TXBusy) |= (val & 0x000F);
FireTX(); FireTX();
// CHECKME!!!!!!!!!!! // CHECKME!!!!!!!!!!!
return; return;
@ -936,10 +934,16 @@ void Write(u32 addr, u16 val)
val &= 0x0FFF; val &= 0x0FFF;
break; break;
case 0x090: case W_TXSlotCmd:
case 0x0A0: case W_TXSlotLoc1:
case 0x0A4: case W_TXSlotLoc2:
case 0x0A8: case W_TXSlotLoc3:
// checkme: is it possible to cancel a queued transfer that hasn't started yet
// by clearing bit15 here?
IOPORT(addr&0xFFF) = val;
FireTX();
return;
case 0x094: case 0x094:
printf("wifi: trying to send packet. %08X=%04X. TXREQ=%04X\n", addr, val, IOPORT(W_TXReqRead)); printf("wifi: trying to send packet. %08X=%04X. TXREQ=%04X\n", addr, val, IOPORT(W_TXReqRead));
break; break;