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

DEV9: move DMA size correction into DEV9read/writeDMA8Mem 

ATA also needs the size correction, so do it in one place
This commit is contained in:
TheLastRar 2020-11-16 20:23:40 +00:00 committed by refractionpcsx2
parent 64bc5409d1
commit afc9412191
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pcsx2/DEV9/DEV9.cpp
View File

@ -774,6 +774,7 @@ void DEV9readDMA8Mem(u32* pMem, int size)
DEV9_LOG("*DEV9readDMA8Mem: size %x\n", size);
emu_printf("rDMA\n");
size >>= 1;
smap_readDMA8Mem(pMem, size);
#ifdef ENABLE_ATA
@ -788,6 +789,7 @@ void DEV9writeDMA8Mem(u32* pMem, int size)
DEV9_LOG("*DEV9writeDMA8Mem: size %x\n", size);
emu_printf("wDMA\n");
size >>= 1;
smap_writeDMA8Mem(pMem, size);
#ifdef ENABLE_ATA

6
pcsx2/DEV9/smap.cpp
View File

@ -416,7 +416,7 @@ smap_read16(u32 addr)
}
*/
}
#ifdef DEV9_LOG_ENABLE
#if (DEV9_LOG_LEVEL <= 1)
switch (addr)
{
case SMAP_R_TXFIFO_FRAME_CNT:
@ -829,7 +829,7 @@ smap_readDMA8Mem(u32* pMem, int size)
if (dev9Ru16(SMAP_R_RXFIFO_CTRL) & SMAP_RXFIFO_DMAEN)
{
dev9Ru32(SMAP_R_RXFIFO_RD_PTR) &= 16383;
size >>= 1;
DEV9_LOG(" * * SMAP DMA READ START: rd_ptr=%d, wr_ptr=%d\n", dev9Ru32(SMAP_R_RXFIFO_RD_PTR), dev9.rxfifo_wr_ptr);
while (size > 0)
{
@ -850,7 +850,7 @@ smap_writeDMA8Mem(u32* pMem, int size)
if (dev9Ru16(SMAP_R_TXFIFO_CTRL) & SMAP_TXFIFO_DMAEN)
{
dev9Ru32(SMAP_R_TXFIFO_WR_PTR) &= 16383;
size >>= 1;
DEV9_LOG(" * * SMAP DMA WRITE START: wr_ptr=%d, rd_ptr=%d\n", dev9Ru32(SMAP_R_TXFIFO_WR_PTR), dev9.txfifo_rd_ptr);
while (size > 0)
{