sync cdrom.h with pcsxr-svn

this may help to avoid savestate format change in the future.

diff --git a/libpcsxcore/cdrom.h b/libpcsxcore/cdrom.h
index c5d448c..abadc4d 100644 (file)
--- a/libpcsxcore/cdrom.h
+++ b/libpcsxcore/cdrom.h
@@ -56,7 +56,7 @@ typedef struct {
 
        unsigned char Prev[4];
        unsigned char Param[8];
 
        unsigned char Prev[4];
        unsigned char Param[8];

-       unsigned char Result[8];
+       unsigned char Result[16];

 
        unsigned char ParamC;
        unsigned char ParamP;
 
        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 ResultTD[4];
        unsigned char SetSector[4];
        unsigned char SetSectorSeek[4];

+       unsigned char SetSectorPlay[4];

        unsigned char Track;
        boolean Play, Muted;
        int CurTrack;
        unsigned char Track;
        boolean Play, Muted;
        int CurTrack;


@@ -87,13 +88,25 @@ typedef struct {
        u32 eCycle;
 
        boolean Seeked;
        u32 eCycle;
 
        boolean Seeked;

+
+       u8 LidCheck;
+       u8 FastForward;
+       u8 FastBackward;
+       u8 pad;
+
+       u32 LeftVol, RightVol;

 } cdrStruct;
 
 extern cdrStruct cdr;
 
 } cdrStruct;
 
 extern cdrStruct cdr;
 

+void cdrDecodedBufferInterrupt();
+

 void cdrReset();
 void cdrInterrupt();
 void cdrReadInterrupt();
 void cdrReset();
 void cdrInterrupt();
 void cdrReadInterrupt();

+void cdrRepplayInterrupt();
+void cdrLidSeekInterrupt();
+void cdrPlayInterrupt();

 unsigned char cdrRead0(void);
 unsigned char cdrRead1(void);
 unsigned char cdrRead2(void);
 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 (file)
--- 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.
 
 // 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;
 
 int SaveState(const char *file) {
        gzFile f;