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

DEV9: swap unlocks to avoid potential deadlock

This commit is contained in:
refractionpcsx2 2023-06-10 13:48:05 +01:00
parent 5a4e21287a
commit 21900555dc
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pcsx2/DEV9/smap.cpp
View File

@ -571,15 +571,12 @@ void smap_write8(u32 addr, u8 value)
//DevCon.WriteLn("DEV9: SMAP_R_RXFIFO_CTRL 8bit write %x", value); //DevCon.WriteLn("DEV9: SMAP_R_RXFIFO_CTRL 8bit write %x", value);
if (value & SMAP_RXFIFO_RESET) if (value & SMAP_RXFIFO_RESET)
{ {
reset_lock.lock(); //lock reset mutex 1st std::scoped_lock lock(reset_lock, counter_lock);
counter_lock.lock();
dev9.rxbdi = 0; dev9.rxbdi = 0;
dev9.rxfifo_wr_ptr = 0; dev9.rxfifo_wr_ptr = 0;
dev9Ru8(SMAP_R_RXFIFO_FRAME_CNT) = 0; dev9Ru8(SMAP_R_RXFIFO_FRAME_CNT) = 0;
dev9Ru32(SMAP_R_RXFIFO_RD_PTR) = 0; dev9Ru32(SMAP_R_RXFIFO_RD_PTR) = 0;
dev9Ru32(SMAP_R_RXFIFO_SIZE) = 16384; dev9Ru32(SMAP_R_RXFIFO_SIZE) = 16384;
reset_lock.unlock();
counter_lock.unlock();
} }
value &= ~SMAP_RXFIFO_RESET; value &= ~SMAP_RXFIFO_RESET;
dev9Ru8(addr) = value; dev9Ru8(addr) = value;