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

mc.cpp: Silence a whole bunch of compiler warnings and improve code consistency.

This commit is contained in:
rogerman 2021-09-06 14:28:11 -07:00
parent 620d3b3a26
commit 207e93b8ae
3 changed files with 270 additions and 267 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
desmume/src/MMU.cpp
View File

@ -2366,12 +2366,14 @@ void DmaController::doCopy()
void triggerDma(EDMAMode mode) void triggerDma(EDMAMode mode)
{ {
MACRODO2(0, { MACRODO4(0, {
const int i=X; const int j=X;
MACRODO4(0, { MMU_new.dma[0][j].tryTrigger(mode);
const int j=X; });
MMU_new.dma[i][j].tryTrigger(mode);
}); MACRODO4(0, {
const int j=X;
MMU_new.dma[1][j].tryTrigger(mode);
}); });
} }

496
desmume/src/mc.cpp
View File

File diff suppressed because it is too large Load Diff

27
desmume/src/mc.h
View File

@ -112,7 +112,7 @@ public:
bool load_state(EMUFILE &is); bool load_state(EMUFILE &is);
//commands from mmu //commands from mmu
void reset_command() { reset_command_state = true; }; void reset_command() { this->_reset_command_state = true; };
u8 data_command(u8, u8); u8 data_command(u8, u8);
//this info was saved before the last reset (used for savestate compatibility) //this info was saved before the last reset (used for savestate compatibility)
@ -163,26 +163,27 @@ public:
u8 uninitializedValue; u8 uninitializedValue;
private: private:
EMUFILE *fpMC; EMUFILE *_fpMC;
std::string _fileName; std::string _fileName;
u32 fsize; u32 _fsize;
BackupDeviceFileInfo _info; BackupDeviceFileInfo _info;
int readFooter(); int readFooter();
bool write(u8 val); bool write(u8 val);
u8 read(); u8 read();
bool saveBuffer(u8 *data, u32 size, bool _rewind, bool _truncate = false); bool saveBuffer(u8 *data, u32 size, bool willRewind, bool willTruncate = false);
bool write_enable; bool _write_enable;
bool reset_command_state; bool _reset_command_state;
u32 com; //persistent command actually handled u32 _com; //persistent command actually handled
u32 addr_size, addr_counter; u32 _addr_size;
u32 addr; u32 _addr_counter;
u8 write_protect; u32 _addr;
u8 _write_protect;
std::vector<u8> data_autodetect; std::vector<u8> _data_autodetect;
enum STATE { enum STATE {
DETECTING = 0, RUNNING = 1 DETECTING = 0, RUNNING = 1
} state; } _state;
enum MOTION_INIT_STATE enum MOTION_INIT_STATE
{ {
@ -195,7 +196,7 @@ private:
MOTION_FLAG_ENABLED=1, MOTION_FLAG_ENABLED=1,
MOTION_FLAG_SENSORMODE=2 MOTION_FLAG_SENSORMODE=2
}; };
u8 motionInitState, motionFlag; u8 _motionInitState, _motionFlag;
void checkReset(); void checkReset();
void detect(); void detect();