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

Wifi power saving, hopefully enough!

This commit is contained in:
RSDuck 2022-02-25 14:25:19 +01:00
parent 03b5c48088
commit 0a1fb5ae50
2 changed files with 182 additions and 107 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

100
src/Wifi.cpp
View File

@ -23,7 +23,8 @@
#include "Wifi.h"
#include "WifiAP.h"
#include "Platform.h"
#include "ARM.h"
#include "GPU.h"
namespace Wifi
{
@ -83,7 +84,8 @@ int MPNumReplies;
bool MPInited;
bool LANInited;
int USUntilPowerOn;
bool ForcePowerOn;
// multiplayer host TX sequence:
// 1. preamble
@ -964,6 +966,21 @@ void USTimer(u32 param)
{
WifiAP::USTimer();
bool switchOffPowerSaving = false;
if (USUntilPowerOn < 0)
{
USUntilPowerOn++;
switchOffPowerSaving = USUntilPowerOn == 0 && (IOPORT(W_PowerUnk) & 0x0001 || ForcePowerOn);
}
if (USUntilPowerOn == 0 && (IOPORT(W_PowerState) & 0x0002 || switchOffPowerSaving))
{
IOPORT(W_PowerState) = 0;
IOPORT(W_RFPins) = 1;
IOPORT(W_RFPins) = 0x0084;
SetIRQ(11);
}
if (IOPORT(W_USCountCnt))
{
USCounter++;
@ -989,6 +1006,8 @@ void USTimer(u32 param)
if (IOPORT(W_ContentFree) != 0)
IOPORT(W_ContentFree)--;
if (!(IOPORT(W_PowerState) & 0x300))
{
if (ComStatus == 0)
{
u16 txbusy = IOPORT(W_TXBusy);
@ -1096,6 +1115,7 @@ void USTimer(u32 param)
IOPORT(W_RXTXAddr) = addr >> 1;
}
}
}
// TODO: make it more accurate, eventually
// in the DS, the wifi system has its own 22MHz clock and doesn't use the system clock
@ -1252,15 +1272,27 @@ void Write(u32 addr, u16 val)
if (!(oldval & 0x0001) && (val & 0x0001))
{
if (!(USUntilPowerOn < 0 && ForcePowerOn))
{
printf("mode reset power on %08x\n", NDS::ARM7->R[15]);
IOPORT(0x034) = 0x0002;
IOPORT(W_RFPins) = 0x0046;
IOPORT(W_RFStatus) = 9;
IOPORT(0x27C) = 0x0005;
// TODO: 02A2??
if (IOPORT(W_PowerUnk) & 0x0002)
{
USUntilPowerOn = -2048;
IOPORT(W_PowerState) |= 0x100;
}
}
}
else if ((oldval & 0x0001) && !(val & 0x0001))
{
printf("mode reset shutdown %08x\n", NDS::ARM7->R[15]);
IOPORT(0x27C) = 0x000A;
IOPORT(W_RFPins) = 0x0004;
IOPORT(W_RFStatus) = 9;
IOPORT(W_PowerState) |= 0x200;
}
if (val & 0x2000)
@ -1306,6 +1338,11 @@ void Write(u32 addr, u16 val)
case W_ModeWEP:
val &= 0x007F;
printf("writing mode web %x\n", val);
if ((val & 0x7) == 1)
IOPORT(W_PowerUnk) |= 0x0002;
if ((val & 0x7) == 2)
IOPORT(W_PowerUnk) = 0x0003;
break;
case W_IF:
@ -1317,28 +1354,53 @@ void Write(u32 addr, u16 val)
return;
case W_PowerState:
if (val & 0x0002)
{
// TODO: delay for this
SetIRQ(11);
IOPORT(W_PowerState) = 0x0000;
printf("writing power state %x %08x\n", val, NDS::ARM7->R[15]);
IOPORT(W_PowerState) |= val & 0x0002;
// checkme
IOPORT(W_RFPins) = 0x00C6;
IOPORT(W_RFStatus) = 9;
if (IOPORT(W_ModeReset) & 0x0001 && IOPORT(W_PowerState) & 0x0002)
{
/*if (IOPORT(W_PowerState) & 0x100)
{
AlwaysPowerOn = true;
USUntilPowerOn = -1;
}
else */
if (IOPORT(W_PowerForce) == 1)
{
printf("power on\n");
IOPORT(W_PowerState) |= 0x100;
USUntilPowerOn = -2048;
ForcePowerOn = false;
}
}
return;
case W_PowerForce:
if ((val&0x8001)==0x8000) printf("WIFI: forcing power %04X\n", val);
//if ((val&0x8001)==0x8000) printf("WIFI: forcing power %04X\n", val);
val &= 0x8001;
printf("writing power force %x %08x\n", val, NDS::ARM7->R[15]);
if (val == 0x8001)
{
printf("force power off\n");
IOPORT(0x034) = 0x0002;
IOPORT(W_PowerState) = 0x0200;
IOPORT(W_TXReqRead) = 0;
IOPORT(W_RFPins) = 0x0046;
IOPORT(W_RFStatus) = 9;
}
if (val == 1 && IOPORT(W_PowerState) & 0x0002)
{
printf("power on\n");
IOPORT(W_PowerState) |= 0x100;
USUntilPowerOn = -2048;
ForcePowerOn = false;
}
if (val == 0x8000)
{
printf("force power on\n");
IOPORT(W_PowerState) |= 0x100;
USUntilPowerOn = -2048;
ForcePowerOn = true;
}
break;
case W_PowerUS:
// schedule timer event when the clock is enabled
@ -1364,6 +1426,14 @@ void Write(u32 addr, u16 val)
NDS::CancelEvent(NDS::Event_Wifi);
}
break;
case W_PowerUnk:
val &= 0x0003;
printf("writing power unk %x\n", val);
if ((IOPORT(W_ModeWEP) & 0x7) == 1)
val |= 2;
else if ((IOPORT(W_ModeWEP) & 0x7) == 2)
val = 3;
break;
case W_USCountCnt: val &= 0x0001; break;
case W_USCompareCnt:
@ -1527,6 +1597,10 @@ void Write(u32 addr, u16 val)
case 0x214:
case 0x268:
return;
default:
//printf("WIFI unk: write %08X %04X\n", addr, val);
break;
}
//printf("WIFI: write %08X %04X\n", addr, val);

1
src/Wifi.h
View File

@ -51,6 +51,7 @@ enum
W_PowerTX = 0x038,
W_PowerState = 0x03C,
W_PowerForce = 0x040,
W_PowerUnk = 0x48,
W_Random = 0x044,