X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=libpcsxcore%2Fcdrom.h;h=2ec10545a7a9944f4a85d00193bb4421d4458356;hb=981752f84063a77f456e494dc298808ec14611a9;hp=543c619dbf0362ef8f722d9beca915c8f2014c04;hpb=55b8460a0e10da33133a98faeeb5b2375ef91dc0;p=pcsx_rearmed.git

diff --git a/libpcsxcore/cdrom.h b/libpcsxcore/cdrom.h
index 543c619d..2ec10545 100644
--- a/libpcsxcore/cdrom.h
+++ b/libpcsxcore/cdrom.h
@@ -34,6 +34,10 @@ extern "C" {
 #define btoi(b)     ((b) / 16 * 10 + (b) % 16) /* BCD to u_char */
 #define itob(i)     ((i) / 10 * 16 + (i) % 10) /* u_char to BCD */
 
+#define ABS_CD(x) ((x >= 0) ? x : -x)
+#define MIN_VALUE(a,b) ({ __typeof__ (a) _a = (a); __typeof__ (b) _b = (b); _a < _b ? _a : _b; })
+#define MAX_VALUE(a,b) ({ __typeof__ (a) _a = (a); __typeof__ (b) _b = (b); _a > _b ? _a : _b; })
+
 #define MSF2SECT(m, s, f)		(((m) * 60 + (s) - 2) * 75 + (f))
 
 #define CD_FRAMESIZE_RAW		2352
@@ -59,7 +63,8 @@ typedef struct {
 		unsigned char Absolute[3];
 	} subq;
 	unsigned char TrackChanged;
-	unsigned char pad1[3];
+	boolean m_locationChanged;
+	unsigned char pad1[2];
 	unsigned int  freeze_ver;
 
 	unsigned char Prev[4];
@@ -86,7 +91,7 @@ typedef struct {
 	int CurTrack;
 	int Mode, File, Channel;
 	int Reset;
-	int RErr;
+	int NoErr;
 	int FirstSector;
 
 	xa_decode_t Xa;