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

EXI: Fix crash when loading save states with BBA activated

This commit is contained in:
Stenzek 2016-01-31 23:00:40 +10:00
parent ccc70a98f3
commit e75d37ec36
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Source/Core/Core/HW/EXI_DeviceEthernet.cpp
View File

@ -20,7 +20,7 @@
CEXIETHERNET::CEXIETHERNET() CEXIETHERNET::CEXIETHERNET()
{ {
tx_fifo = new u8[1518]; tx_fifo = new u8[BBA_TXFIFO_SIZE];
mBbaMem = new u8[BBA_MEM_SIZE]; mBbaMem = new u8[BBA_MEM_SIZE];
mRecvBuffer = new u8[BBA_RECV_SIZE]; mRecvBuffer = new u8[BBA_RECV_SIZE];
@ -206,9 +206,8 @@ void CEXIETHERNET::DMARead(u32 addr, u32 size)
void CEXIETHERNET::DoState(PointerWrap &p) void CEXIETHERNET::DoState(PointerWrap &p)
{ {
p.Do(mBbaMem); p.DoArray(tx_fifo, BBA_TXFIFO_SIZE);
// TODO ... the rest... p.DoArray(mBbaMem, BBA_MEM_SIZE);
ERROR_LOG(SP1, "CEXIETHERNET::DoState not implemented!");
} }
bool CEXIETHERNET::IsMXCommand(u32 const data) bool CEXIETHERNET::IsMXCommand(u32 const data)

3
Source/Core/Core/HW/EXI_DeviceEthernet.h
View File

@ -159,7 +159,8 @@ enum
{ {
BBA_NUM_PAGES = 0x10, BBA_NUM_PAGES = 0x10,
BBA_PAGE_SIZE = 0x100, BBA_PAGE_SIZE = 0x100,
BBA_MEM_SIZE = BBA_NUM_PAGES * BBA_PAGE_SIZE BBA_MEM_SIZE = BBA_NUM_PAGES * BBA_PAGE_SIZE,
BBA_TXFIFO_SIZE = 1518
}; };
enum enum