X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=libpcsxcore%2Fcdrom.h;h=543c619dbf0362ef8f722d9beca915c8f2014c04;hp=fde7f2195da72f45effa29c7eff40e16f74c077f;hb=ba10822d813767632c528102055e3eeb54730b2c;hpb=8e1040b6a82ee1802fda83d4de84290a02656cc0

diff --git a/libpcsxcore/cdrom.h b/libpcsxcore/cdrom.h
index fde7f219..543c619d 100644
--- a/libpcsxcore/cdrom.h
+++ b/libpcsxcore/cdrom.h
@@ -51,8 +51,16 @@ typedef struct {
 
 	unsigned char StatP;
 
-	unsigned char Transfer[CD_FRAMESIZE_RAW];
-	unsigned int  pad1;
+	unsigned char Transfer[DATA_SIZE];
+	struct {
+		unsigned char Track;
+		unsigned char Index;
+		unsigned char Relative[3];
+		unsigned char Absolute[3];
+	} subq;
+	unsigned char TrackChanged;
+	unsigned char pad1[3];
+	unsigned int  freeze_ver;
 
 	unsigned char Prev[4];
 	unsigned char Param[8];
@@ -65,13 +73,14 @@ typedef struct {
 	unsigned char ResultReady;
 	unsigned char Cmd;
 	unsigned char Readed;
+	unsigned char SetlocPending;
 	u32 Reading;
 
 	unsigned char ResultTN[6];
 	unsigned char ResultTD[4];
-	unsigned char SetSector[4];
-	unsigned char SetSectorSeek[4];
 	unsigned char SetSectorPlay[4];
+	unsigned char SetSectorEnd[4];
+	unsigned char SetSector[4];
 	unsigned char Track;
 	boolean Play, Muted;
 	int CurTrack;
@@ -84,25 +93,28 @@ typedef struct {
 
 	int Init;
 
-	unsigned char Irq;
+	u16 Irq;
+	u8 IrqRepeated;
 	u32 eCycle;
 
-	boolean Seeked;
+	u8 Seeked;
 
-	u8 LidCheck;
+	u8 DriveState;
 	u8 FastForward;
 	u8 FastBackward;
 	u8 pad;
 
-	u8 AttenuatorLeft[2], AttenuatorRight[2];
-	u32 pad2;
+	u8 AttenuatorLeftToLeft, AttenuatorLeftToRight;
+	u8 AttenuatorRightToRight, AttenuatorRightToLeft;
+	u8 AttenuatorLeftToLeftT, AttenuatorLeftToRightT;
+	u8 AttenuatorRightToRightT, AttenuatorRightToLeftT;
 } cdrStruct;
 
 extern cdrStruct cdr;
 
-void cdrDecodedBufferInterrupt();
-
 void cdrReset();
+void cdrAttenuate(s16 *buf, int samples, int stereo);
+
 void cdrInterrupt();
 void cdrReadInterrupt();
 void cdrRepplayInterrupt();
@@ -118,7 +130,7 @@ void cdrWrite0(unsigned char rt);
 void cdrWrite1(unsigned char rt);
 void cdrWrite2(unsigned char rt);
 void cdrWrite3(unsigned char rt);
-int cdrFreeze(gzFile f, int Mode);
+int cdrFreeze(void *f, int Mode);
 
 #ifdef __cplusplus
 }