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

Wifi: fix a bug due to the new POWCNT1/2 implementation.

This commit is contained in:
luigi__ 2010-01-16 01:10:28 +00:00
parent 31c31675c5
commit b496da643d
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
desmume/src/wifi.cpp
View File

@ -1038,7 +1038,7 @@ static void WIFI_BeaconTXStart()
void WIFI_write16(u32 address, u16 val) void WIFI_write16(u32 address, u16 val)
{ {
BOOL action = FALSE ; BOOL action = FALSE ;
if (!(MMU_read32(ARMCPU_ARM7,REG_PWRCNT) & 0x0002)) return ; /* access to wifi hardware was disabled */ if (!nds.power2.wifi) return;
WIFI_LOG(5, "Write at address %08X, %04X\n", address, val); WIFI_LOG(5, "Write at address %08X, %04X\n", address, val);
//printf("WIFI: Write at address %08X, %04X, pc=%08X\n", address, val, NDS_ARM7.instruct_adr); //printf("WIFI: Write at address %08X, %04X, pc=%08X\n", address, val, NDS_ARM7.instruct_adr);
@ -1413,7 +1413,7 @@ u16 WIFI_read16(u32 address)
{ {
BOOL action = FALSE ; BOOL action = FALSE ;
u16 temp ; u16 temp ;
if (!(MMU_read32(ARMCPU_ARM7,REG_PWRCNT) & 0x0002)) return 0 ; /* access to wifi hardware was disabled */ if (!nds.power2.wifi) return 0;
//if (address != 0x0480819C) //if (address != 0x0480819C)
// printf("WIFI: Read at address %08X, pc=%08X, r1=%08X\n", address, NDS_ARM7.instruct_adr, NDS_ARM7.R[1]); // printf("WIFI: Read at address %08X, pc=%08X, r1=%08X\n", address, NDS_ARM7.instruct_adr, NDS_ARM7.R[1]);
@ -2178,7 +2178,7 @@ void SoftAP_usTrigger()
//if((wifiMac.SoftAP.usecCounter % (100 * 1024)) == 0) //if((wifiMac.SoftAP.usecCounter % (100 * 1024)) == 0)
if((wifiMac.SoftAP.usecCounter & 131071) == 0) if((wifiMac.SoftAP.usecCounter & 131071) == 0)
{ {
// printf("send beacon, store to %04X (readcsr=%04X), size=%x\n", //printf("send beacon, store to %04X (readcsr=%04X), size=%x\n",
// wifiMac.RXHWWriteCursor<<1, wifiMac.RXReadCursor<<1, sizeof(SoftAP_Beacon)+12); // wifiMac.RXHWWriteCursor<<1, wifiMac.RXReadCursor<<1, sizeof(SoftAP_Beacon)+12);
SoftAP_SendBeacon(); SoftAP_SendBeacon();
} }
@ -2229,6 +2229,7 @@ void SoftAP_usTrigger()
// EXTREMELY EXPERIMENTAL packet receiving code // EXTREMELY EXPERIMENTAL packet receiving code
// slow >.< // slow >.<
// should be in a separate thread, but let's make things work first
if (!(wifiMac.SoftAP.usecCounter & 1023)) if (!(wifiMac.SoftAP.usecCounter & 1023))
{ {
pcap_pkthdr hdr; pcap_pkthdr hdr;