cdrom: clean up subq handling

[pcsx_rearmed.git] / libpcsxcore / cdrom.h

diff --git a/libpcsxcore/cdrom.h b/libpcsxcore/cdrom.h
index 5dbf471..7bca811 100644 (file)
--- 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  pad3;
 
        unsigned char Prev[4];
        unsigned char Param[8];
@@ -70,7 +78,7 @@ typedef struct {
        unsigned char ResultTN[6];
        unsigned char ResultTD[4];
        unsigned char SetSector[4];
-       unsigned char SetSectorSeek[4];
+       unsigned char SetSectorEnd[4];
        unsigned char SetSectorPlay[4];
        unsigned char Track;
        boolean Play, Muted;
@@ -100,8 +108,6 @@ typedef struct {
 
 extern cdrStruct cdr;
 
-void cdrDecodedBufferInterrupt();
-
 void cdrReset();
 void cdrInterrupt();
 void cdrReadInterrupt();