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

Update code for RXHWWriteCursor -> RXWriteCursor rename.

This commit is contained in:
riccardom 2010-04-20 17:00:16 +00:00
parent fb0db7b5ac
commit 5f98f3906e
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
desmume/src/wifi.cpp
View File

@ -749,22 +749,22 @@ static void WIFI_RXPutWord(u16 val)
/* abort when RX data queuing is not enabled */ /* abort when RX data queuing is not enabled */
if (!(wifiMac.RXCnt & 0x8000)) return; if (!(wifiMac.RXCnt & 0x8000)) return;
/* abort when ringbuffer is full */ /* abort when ringbuffer is full */
//if (wifiMac.RXReadCursor == wifiMac.RXHWWriteCursor) return; //if (wifiMac.RXReadCursor == wifiMac.RXWriteCursor) return;
/*if(wifiMac.RXHWWriteCursor >= wifiMac.RXReadCursor) /*if(wifiMac.RXWriteCursor >= wifiMac.RXReadCursor)
{ {
printf("WIFI: write cursor (%04X) above READCSR (%04X). Cannot write received packet.\n", printf("WIFI: write cursor (%04X) above READCSR (%04X). Cannot write received packet.\n",
wifiMac.RXHWWriteCursor, wifiMac.RXReadCursor); wifiMac.RXWriteCursor, wifiMac.RXReadCursor);
return; return;
}*/ }*/
/* write the data to cursor position */ /* write the data to cursor position */
wifiMac.RAM[wifiMac.RXWriteCursor & 0xFFF] = val; wifiMac.RAM[wifiMac.RXWriteCursor & 0xFFF] = val;
// printf("wifi: written word %04X to circbuf addr %04X\n", val, (wifiMac.RXHWWriteCursor << 1)); // printf("wifi: written word %04X to circbuf addr %04X\n", val, (wifiMac.RXWriteCursor << 1));
/* move cursor by one */ /* move cursor by one */
//printf("written one word to %04X (start %04X, end %04X), ", wifiMac.RXHWWriteCursor, wifiMac.RXRangeBegin, wifiMac.RXRangeEnd); //printf("written one word to %04X (start %04X, end %04X), ", wifiMac.RXWriteCursor, wifiMac.RXRangeBegin, wifiMac.RXRangeEnd);
wifiMac.RXWriteCursor++; wifiMac.RXWriteCursor++;
/* wrap around */ /* wrap around */
// wifiMac.RXHWWriteCursor %= (wifiMac.RXRangeEnd - wifiMac.RXRangeBegin) >> 1; // wifiMac.RXWriteCursor %= (wifiMac.RXRangeEnd - wifiMac.RXRangeBegin) >> 1;
// printf("new addr=%04X\n", wifiMac.RXHWWriteCursor); // printf("new addr=%04X\n", wifiMac.RXWriteCursor);
if(wifiMac.RXWriteCursor >= ((wifiMac.RXRangeEnd & 0x1FFE) >> 1)) if(wifiMac.RXWriteCursor >= ((wifiMac.RXRangeEnd & 0x1FFE) >> 1))
wifiMac.RXWriteCursor = ((wifiMac.RXRangeBegin & 0x1FFE) >> 1); wifiMac.RXWriteCursor = ((wifiMac.RXRangeBegin & 0x1FFE) >> 1);
} }
@ -1787,7 +1787,7 @@ void Adhoc_usTrigger()
(u8)fromAddr.sa_data[4], (u8)fromAddr.sa_data[5], (u8)fromAddr.sa_data[4], (u8)fromAddr.sa_data[5],
ntohs(*(u16*)&fromAddr.sa_data[0]));*/ ntohs(*(u16*)&fromAddr.sa_data[0]));*/
WIFI_LOG(2, "Ad-hoc: received a packet of %i bytes, frame control: %04X\n", packetLen, *(u16*)&ptr[0]); WIFI_LOG(2, "Ad-hoc: received a packet of %i bytes, frame control: %04X\n", packetLen, *(u16*)&ptr[0]);
//WIFI_LOG(2, "Storing packet at %08X.\n", 0x04804000 + (wifiMac.RXHWWriteCursor<<1)); //WIFI_LOG(2, "Storing packet at %08X.\n", 0x04804000 + (wifiMac.RXWriteCursor<<1));
//if (((*(u16*)&ptr[0]) != 0x0080) && ((*(u16*)&ptr[0]) != 0x0228)) //if (((*(u16*)&ptr[0]) != 0x0080) && ((*(u16*)&ptr[0]) != 0x0228))
// printf("received packet, framectl=%04X\n", (*(u16*)&ptr[0])); // printf("received packet, framectl=%04X\n", (*(u16*)&ptr[0]));