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 several fixes from PCSX Redux and adjust delay for SetLocPending. (#221)
[pcsx_rearmed.git]
/
libpcsxcore
/
cdrom.h
diff --git
a/libpcsxcore/cdrom.h
b/libpcsxcore/cdrom.h
index
fc1df46
..
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
@@
-59,7
+63,8
@@
typedef struct {
unsigned char Absolute[3];
} subq;
unsigned char TrackChanged;
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];
unsigned int freeze_ver;
unsigned char Prev[4];
@@
-73,31
+78,33
@@
typedef struct {
unsigned char ResultReady;
unsigned char Cmd;
unsigned char Readed;
unsigned char ResultReady;
unsigned char Cmd;
unsigned char Readed;
+ unsigned char SetlocPending;
u32 Reading;
unsigned char ResultTN[6];
unsigned char ResultTD[4];
u32 Reading;
unsigned char ResultTN[6];
unsigned char ResultTD[4];
- unsigned char SetSector[4];
- unsigned char SetSectorEnd[4];
unsigned char SetSectorPlay[4];
unsigned char SetSectorPlay[4];
+ unsigned char SetSectorEnd[4];
+ unsigned char SetSector[4];
unsigned char Track;
boolean Play, Muted;
int CurTrack;
int Mode, File, Channel;
int Reset;
unsigned char Track;
boolean Play, Muted;
int CurTrack;
int Mode, File, Channel;
int Reset;
- int
R
Err;
+ int
No
Err;
int FirstSector;
xa_decode_t Xa;
int Init;
int FirstSector;
xa_decode_t Xa;
int Init;
- unsigned char Irq;
+ u16 Irq;
+ u8 IrqRepeated;
u32 eCycle;
u8 Seeked;
u32 eCycle;
u8 Seeked;
- u8
LidCheck
;
+ u8
DriveState
;
u8 FastForward;
u8 FastBackward;
u8 pad;
u8 FastForward;
u8 FastBackward;
u8 pad;