piwalker/melonDS
1
0
Fork 0
mirror of https://github.com/melonDS-emu/melonDS.git synced 2024-11-14 13:27:41 -07:00
Code Issues Actions Packages Projects Releases Wiki Activity

wifi: implement RAM access via the fancypants registers. allows Pictochat to proceed, but noone will reply to you.

Browse Source
This commit is contained in:
StapleButter 2017-05-01 19:29:25 +02:00
parent ee8d621880
commit d4270b0976
2 changed files with 50 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/NDS.cpp
View File

@ -1192,6 +1192,9 @@ u32 ARM7Read32(u32 addr)
case 0x04000000: case 0x04000000:
return ARM7IORead32(addr); return ARM7IORead32(addr);
case 0x04800000:
return Wifi::Read(addr) | (Wifi::Read(addr+2) << 16);
case 0x06000000: case 0x06000000:
case 0x06800000: case 0x06800000:
return GPU::ReadVRAM_ARM7<u32>(addr); return GPU::ReadVRAM_ARM7<u32>(addr);
@ -1289,6 +1292,11 @@ void ARM7Write32(u32 addr, u32 val)
ARM7IOWrite32(addr, val); ARM7IOWrite32(addr, val);
return; return;
case 0x04800000:
Wifi::Write(addr, val & 0xFFFF);
Wifi::Write(addr+2, val >> 16);
return;
case 0x06000000: case 0x06000000:
case 0x06800000: case 0x06800000:
GPU::WriteVRAM_ARM7<u32>(addr, val); GPU::WriteVRAM_ARM7<u32>(addr, val);

42
src/Wifi.cpp
View File

@ -129,12 +129,19 @@ void RFTransfer_Type3()
u16 Read(u32 addr) u16 Read(u32 addr)
{ {
if (addr >= 0x04810000)
return 0;
addr &= 0x7FFE; addr &= 0x7FFE;
//printf("WIFI: read %08X\n", addr); //printf("WIFI: read %08X\n", addr);
if (addr >= 0x4000 && addr < 0x6000) if (addr >= 0x4000 && addr < 0x6000)
{ {
return *(u16*)&RAM[addr & 0x1FFE]; return *(u16*)&RAM[addr & 0x1FFE];
} }
if (addr >= 0x2000 && addr < 0x4000)
return 0xFFFF; // checkme
bool activeread = (addr < 0x1000);
switch (addr) switch (addr)
{ {
@ -157,6 +164,22 @@ u16 Read(u32 addr)
return 0; // TODO eventually (BB busy flag) return 0; // TODO eventually (BB busy flag)
case W_RFBusy: case W_RFBusy:
return 0; // TODO eventually (RF busy flag) return 0; // TODO eventually (RF busy flag)
case W_RXBufDataRead:
if (activeread)
{
u32 rdaddr = IOPORT(W_RXBufReadAddr) & 0x1FFE;
u16 ret = *(u16*)&RAM[rdaddr];
rdaddr += 2;
if (rdaddr == (IOPORT(W_RXBufEnd) & 0x1FFE))
rdaddr = (IOPORT(W_RXBufBegin) & 0x1FFE);
IOPORT(W_RXBufReadAddr) = rdaddr & 0x1FFE;
IOPORT(W_RXBufDataRead) = ret;
}
break;
} }
//printf("WIFI: read %08X\n", addr); //printf("WIFI: read %08X\n", addr);
@ -165,6 +188,9 @@ u16 Read(u32 addr)
void Write(u32 addr, u16 val) void Write(u32 addr, u16 val)
{ {
if (addr >= 0x04810000)
return;
addr &= 0x7FFE; addr &= 0x7FFE;
//printf("WIFI: write %08X %04X\n", addr, val); //printf("WIFI: write %08X %04X\n", addr, val);
if (addr >= 0x4000 && addr < 0x6000) if (addr >= 0x4000 && addr < 0x6000)
@ -172,6 +198,8 @@ void Write(u32 addr, u16 val)
*(u16*)&RAM[addr & 0x1FFE] = val; *(u16*)&RAM[addr & 0x1FFE] = val;
return; return;
} }
if (addr >= 0x2000 && addr < 0x4000)
return;
switch (addr) switch (addr)
{ {
@ -284,6 +312,20 @@ void Write(u32 addr, u16 val)
val &= 0x413F; val &= 0x413F;
break; break;
case W_TXBufDataWrite:
{
u32 wraddr = IOPORT(W_TXBufWriteAddr) & 0x1FFE;
*(u16*)&RAM[wraddr] = val;
wraddr += 2;
if (wraddr == (IOPORT(W_TXBufGapAddr) & 0x1FFE))
wraddr += (IOPORT(W_TXBufGapSize) << 1);
IOPORT(W_TXBufWriteAddr) = wraddr & 0x1FFE;
}
return;
// read-only ports // read-only ports
case 0x000: case 0x000:
case 0x044: case 0x044: