diff options
| author | notaz | 2010-12-25 21:41:04 +0200 |
|---|---|---|
| committer | notaz | 2010-12-25 21:41:04 +0200 |
| commit | df656ddecc69bddda9cf02285710127444e3d06d (patch) | |
| tree | 5ec7ed8f7f61142eca27c424f4f2950941177f45 | |
| parent | 4f3639fab62fa95f4bdc620b2e3500e717a0fcf3 (diff) | |
| download | pcsx_rearmed-df656ddecc69bddda9cf02285710127444e3d06d.tar.gz pcsx_rearmed-df656ddecc69bddda9cf02285710127444e3d06d.tar.bz2 pcsx_rearmed-df656ddecc69bddda9cf02285710127444e3d06d.zip | |
sync cdrom.h with pcsxr-svn
this may help to avoid savestate format change in the future.
| -rw-r--r-- | libpcsxcore/cdrom.h | 15 | ||||
| -rw-r--r-- | libpcsxcore/misc.c | 2 |
2 files changed, 15 insertions, 2 deletions
diff --git a/libpcsxcore/cdrom.h b/libpcsxcore/cdrom.h index c5d448c..abadc4d 100644 --- a/libpcsxcore/cdrom.h +++ b/libpcsxcore/cdrom.h @@ -56,7 +56,7 @@ typedef struct { unsigned char Prev[4]; unsigned char Param[8]; - unsigned char Result[8]; + unsigned char Result[16]; unsigned char ParamC; unsigned char ParamP; @@ -71,6 +71,7 @@ typedef struct { unsigned char ResultTD[4]; unsigned char SetSector[4]; unsigned char SetSectorSeek[4]; + unsigned char SetSectorPlay[4]; unsigned char Track; boolean Play, Muted; int CurTrack; @@ -87,13 +88,25 @@ typedef struct { u32 eCycle; boolean Seeked; + + u8 LidCheck; + u8 FastForward; + u8 FastBackward; + u8 pad; + + u32 LeftVol, RightVol; } cdrStruct; extern cdrStruct cdr; +void cdrDecodedBufferInterrupt(); + void cdrReset(); void cdrInterrupt(); void cdrReadInterrupt(); +void cdrRepplayInterrupt(); +void cdrLidSeekInterrupt(); +void cdrPlayInterrupt(); unsigned char cdrRead0(void); unsigned char cdrRead1(void); unsigned char cdrRead2(void); diff --git a/libpcsxcore/misc.c b/libpcsxcore/misc.c index d743b34..4a70b2f 100644 --- a/libpcsxcore/misc.c +++ b/libpcsxcore/misc.c @@ -458,7 +458,7 @@ static const char PcsxHeader[32] = "STv4 PCSX v" PACKAGE_VERSION; // Savestate Versioning! // If you make changes to the savestate version, please increment the value below. -static const u32 SaveVersion = 0x8b410005; +static const u32 SaveVersion = 0x8b410006; int SaveState(const char *file) { gzFile f; |