notaz.gp2x.de
/
pcsx_rearmed.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #570 from Sanaki/drop_ps3
[pcsx_rearmed.git]
/
libpcsxcore
/
cdrom.h
diff --git
a/libpcsxcore/cdrom.h
b/libpcsxcore/cdrom.h
index
a37f6ba
..
216a213
100644
(file)
--- a/
libpcsxcore/cdrom.h
+++ b/
libpcsxcore/cdrom.h
@@
-41,6
+41,9
@@
extern "C" {
#define SUB_FRAMESIZE 96
#define SUB_FRAMESIZE 96
+#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; })
+
typedef struct {
unsigned char OCUP;
unsigned char Reg1Mode;
typedef struct {
unsigned char OCUP;
unsigned char Reg1Mode;
@@
-87,7
+90,7
@@
typedef struct {
int CurTrack;
int Mode, File, Channel;
int Reset;
int CurTrack;
int Mode, File, Channel;
int Reset;
- int
R
Err;
+ int
No
Err;
int FirstSector;
xa_decode_t Xa;
int FirstSector;
xa_decode_t Xa;