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

C++ build fixes

This commit is contained in:
Jeffrey Pfau 2014-10-14 01:48:56 -07:00
parent 02ef49dea8
commit aaf9c42782
2 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/gba/gba-serialize.h
View File

@ -5,7 +5,7 @@
#include "gba.h" #include "gba.h"
const uint32_t GBA_SAVESTATE_MAGIC; extern const uint32_t GBA_SAVESTATE_MAGIC;
/* Savestate format: /* Savestate format:
* 0x00000 - 0x00003: Version Magic (0x01000000) * 0x00000 - 0x00003: Version Magic (0x01000000)

24
src/gba/gba.h
View File

@ -66,6 +66,18 @@ struct GBARotationSource;
struct Patch; struct Patch;
struct VFile; struct VFile;
struct GBATimer {
uint16_t reload;
uint16_t oldReload;
int32_t lastEvent;
int32_t nextEvent;
int32_t overflowInterval;
unsigned prescaleBits : 4;
unsigned countUp : 1;
unsigned doIrq : 1;
unsigned enable : 1;
};
struct GBA { struct GBA {
struct ARMComponent d; struct ARMComponent d;
@ -80,17 +92,7 @@ struct GBA {
struct ARMDebugger* debugger; struct ARMDebugger* debugger;
int timersEnabled; int timersEnabled;
struct GBATimer { struct GBATimer timers[4];
uint16_t reload;
uint16_t oldReload;
int32_t lastEvent;
int32_t nextEvent;
int32_t overflowInterval;
unsigned prescaleBits : 4;
unsigned countUp : 1;
unsigned doIrq : 1;
unsigned enable : 1;
} timers[4];
int springIRQ; int springIRQ;
uint32_t biosChecksum; uint32_t biosChecksum;