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
drc: don't delay block restoration
[pcsx_rearmed.git]
/
libpcsxcore
/
cdrom.h
diff --git
a/libpcsxcore/cdrom.h
b/libpcsxcore/cdrom.h
index
a37f6ba
..
2ec1054
100644
(file)
--- 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 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
#define MSF2SECT(m, s, f) (((m) * 60 + (s) - 2) * 75 + (f))
#define CD_FRAMESIZE_RAW 2352
@@
-87,7
+91,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;