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

dev9ghzdrk: Fix a few warnings. 

Mostly unsigned mismatches.
This commit is contained in:
Lioncash 2014-07-14 23:39:07 -04:00
parent 9a950cdca6
commit b5f805fc6c
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/dev9ghzdrk/Win32/Win32.cpp
View File

@ -60,7 +60,7 @@ void OnInitDialog(HWND hW) {
} }
} }
vector<tap_adapter> * al=GetTapAdapters(); vector<tap_adapter> * al=GetTapAdapters();
for (int i=0; i<al->size(); i++) { for (size_t i=0; i<al->size(); i++) {
int itm=ComboBox_AddString(GetDlgItem(hW, IDC_ETHDEV), al[0][i].name.c_str()); int itm=ComboBox_AddString(GetDlgItem(hW, IDC_ETHDEV), al[0][i].name.c_str());
ComboBox_SetItemData(GetDlgItem(hW, IDC_ETHDEV),itm,strdup( al[0][i].guid.c_str())); ComboBox_SetItemData(GetDlgItem(hW, IDC_ETHDEV),itm,strdup( al[0][i].guid.c_str()));

14
plugins/dev9ghzdrk/Win32/smap.cpp
View File

@ -131,10 +131,10 @@ void tx_process()
{ {
//we loop based on count ? or just *use* it ? //we loop based on count ? or just *use* it ?
u32 cnt=dev9Ru8(SMAP_R_TXFIFO_FRAME_CNT); u32 cnt=dev9Ru8(SMAP_R_TXFIFO_FRAME_CNT);
//spams// printf("tx_process : %d cnt frames !\n",cnt); //spams// printf("tx_process : %u cnt frames !\n",cnt);
NetPacket pk; NetPacket pk;
int fc=0; u32 fc=0;
for (fc=0;fc<cnt;fc++) for (fc=0;fc<cnt;fc++)
{ {
smap_bd_t *pbd= ((smap_bd_t *)&dev9.dev9R[SMAP_BD_TX_BASE & 0xffff])+dev9.txbdi; smap_bd_t *pbd= ((smap_bd_t *)&dev9.dev9R[SMAP_BD_TX_BASE & 0xffff])+dev9.txbdi;
@ -146,7 +146,7 @@ void tx_process()
} }
if (pbd->length&3) if (pbd->length&3)
{ {
//spams// emu_printf("WARN : pbd->length not alligned %d\n",pbd->length); //spams// emu_printf("WARN : pbd->length not aligned %u\n",pbd->length);
} }
if(pbd->length>1514) if(pbd->length>1514)
@ -157,13 +157,13 @@ void tx_process()
{ {
u32 base=(pbd->pointer-0x1000)&16383; u32 base=(pbd->pointer-0x1000)&16383;
DEV9_LOG("Sending Packet from base %x, size %d\n", base, pbd->length); DEV9_LOG("Sending Packet from base %x, size %d\n", base, pbd->length);
//spams// emu_printf("Sending Packet from base %x, size %d\n", base, pbd->length); //spams// emu_printf("Sending Packet from base %x, size %u\n", base, pbd->length);
pk.size=pbd->length; pk.size=pbd->length;
if (!(pbd->pointer>=0x1000)) if (!(pbd->pointer>=0x1000))
{ {
emu_printf("ERROR: odd , !pbd->pointer>0x1000 | 0x%X %d\n", pbd->pointer, pbd->length); emu_printf("ERROR: odd , !pbd->pointer>0x1000 | 0x%X %u\n", pbd->pointer, pbd->length);
} }
//increase fifo pointer(s) //increase fifo pointer(s)
//uh does that even exist on real h/w ? //uh does that even exist on real h/w ?
@ -205,7 +205,7 @@ void tx_process()
u32 was=16384-base; u32 was=16384-base;
memcpy(pk.buffer,dev9.txfifo+base,was); memcpy(pk.buffer,dev9.txfifo+base,was);
memcpy(pk.buffer,dev9.txfifo,pbd->length-was); memcpy(pk.buffer,dev9.txfifo,pbd->length-was);
printf("Warped read, was=%d, sz=%d, sz-was=%d\n",was,pbd->length,pbd->length-was); printf("Warped read, was=%u, sz=%u, sz-was=%u\n", was, pbd->length, pbd->length-was);
} }
else else
{ {
@ -225,7 +225,7 @@ void tx_process()
dev9Ru8(SMAP_R_TXFIFO_FRAME_CNT)--; dev9Ru8(SMAP_R_TXFIFO_FRAME_CNT)--;
} }
//spams// emu_printf("processed %d frames, %d count, cnt = %d\n",fc,dev9Ru8(SMAP_R_TXFIFO_FRAME_CNT),cnt); //spams// emu_printf("processed %u frames, %u count, cnt = %u\n",fc,dev9Ru8(SMAP_R_TXFIFO_FRAME_CNT),cnt);
//if some error/early exit signal TXDNV //if some error/early exit signal TXDNV
if (fc!=cnt || cnt==0) if (fc!=cnt || cnt==0)
{ {