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

Merge pull request #60 from MrColdbird/master 

Fixing DEV9 Adapter Detection
This commit is contained in:
ramapcsx2 2014-06-05 16:25:40 +02:00
parent c64d7483db 002dc80d48
commit ff837a767b
2 changed files with 6 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
plugins/dev9ghzdrk/DEV9.cpp
View File

@ -183,7 +183,6 @@ void CALLBACK DEV9shutdown() {
#endif
}
bool tx_p_first;
s32 CALLBACK DEV9open(void *pDsp)
{
DEV9_LOG("DEV9open\n");
@ -191,8 +190,6 @@ s32 CALLBACK DEV9open(void *pDsp)
DEV9_LOG("open r+: %s\n", config.Hdd);
config.HddSize = 8*1024;
tx_p_first=false; // reset stack init hack so it works on game reboots
iopPC = (u32*)pDsp;
#ifdef ENABLE_ATA
@ -627,4 +624,4 @@ int emu_printf(const char *fmt, ...)
va_end(vl);
fflush(stderr);
return ret;
}
}

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

@ -127,25 +127,12 @@ u32 wswap(u32 d)
return (d>>16)|(d<<16);
}
extern bool tx_p_first;
void tx_process()
{
//we loop based on count ? or just *use* it ?
u32 cnt=dev9Ru8(SMAP_R_TXFIFO_FRAME_CNT);
//spams// printf("tx_process : %d cnt frames !\n",cnt);
//Hack needed for GT4. Game fails to init the adapter otherwise (and notices about that via IOP kprintf on bootup).
//Reseting SMAP_R_TXFIFO_FRAME_CNT to 0 however breaks OPL. Thankfully not doing that fixes the problem while GT4 still works.
if (!tx_p_first)
{
//dev9Ru8(SMAP_R_TXFIFO_FRAME_CNT)=0;
tx_p_first=true;
//THIS IS A HACK.without that the stack wont init, i guess its missing e3/emac emulation ..
emu_printf("WARN : First packet interrupt hack ..\n");
_DEV9irq(SMAP_INTR_RXEND|SMAP_INTR_TXEND|SMAP_INTR_TXDNV,100);
return;
}
NetPacket pk;
int fc=0;
for (fc=0;fc<cnt;fc++)
@ -273,12 +260,14 @@ void emac3_write(u32 addr)
if (value)
emu_printf("SMAP_R_EMAC3_TxMODE0_L: extra bits set !\n");
break;
case SMAP_R_EMAC3_TxMODE1_L:
emu_printf("SMAP_R_EMAC3_TxMODE1_L 32bit write %x\n", value);
if (value == 0x380f0000)
{
emu_printf("Adapter Detection Hack - Resetting RX/TX\n");
_DEV9irq(SMAP_INTR_RXEND | SMAP_INTR_TXEND | SMAP_INTR_TXDNV, 5);
}
break;
case SMAP_R_EMAC3_STA_CTRL_L:
DEV9_LOG("SMAP: SMAP_R_EMAC3_STA_CTRL write %x\n", value);
{