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
CdlSync should be NULL and return an error. (#199)
[pcsx_rearmed.git]
/
libpcsxcore
/
cdrom.c
diff --git
a/libpcsxcore/cdrom.c
b/libpcsxcore/cdrom.c
index
a725efa
..
1e8f950
100644
(file)
--- a/
libpcsxcore/cdrom.c
+++ b/
libpcsxcore/cdrom.c
@@
-48,7
+48,7
@@
cdrStruct cdr;
static unsigned char *pTransfer;
/* CD-ROM magic numbers */
static unsigned char *pTransfer;
/* CD-ROM magic numbers */
-#define CdlSync 0
+#define CdlSync 0
/* nocash documentation : "Uh, actually, returns error code 40h = Invalid Command...?" */
#define CdlNop 1
#define CdlSetloc 2
#define CdlPlay 3
#define CdlNop 1
#define CdlSetloc 2
#define CdlPlay 3
@@
-496,6
+496,7
@@
void cdrPlayInterrupt()
if (cdr.SetlocPending) {
memcpy(cdr.SetSectorPlay, cdr.SetSector, 4);
cdr.SetlocPending = 0;
if (cdr.SetlocPending) {
memcpy(cdr.SetSectorPlay, cdr.SetSector, 4);
cdr.SetlocPending = 0;
+ cdr.m_locationChanged = TRUE;
}
Find_CurTrack(cdr.SetSectorPlay);
ReadTrack(cdr.SetSectorPlay);
}
Find_CurTrack(cdr.SetSectorPlay);
ReadTrack(cdr.SetSectorPlay);
@@
-527,7
+528,15
@@
void cdrPlayInterrupt()
}
}
}
}
- CDRMISC_INT(cdReadTime);
+ if (cdr.m_locationChanged)
+ {
+ CDRMISC_INT(cdReadTime * 30);
+ cdr.m_locationChanged = FALSE;
+ }
+ else
+ {
+ CDRMISC_INT(cdReadTime);
+ }
// update for CdlGetlocP/autopause
generate_subq(cdr.SetSectorPlay);
// update for CdlGetlocP/autopause
generate_subq(cdr.SetSectorPlay);
@@
-566,10
+575,6
@@
void cdrInterrupt() {
cdr.Irq = 0;
switch (Irq) {
cdr.Irq = 0;
switch (Irq) {
- case CdlSync:
- // TOOD: sometimes/always return error?
- break;
-
case CdlNop:
if (cdr.DriveState != DRIVESTATE_LID_OPEN)
cdr.StatP &= ~STATUS_SHELLOPEN;
case CdlNop:
if (cdr.DriveState != DRIVESTATE_LID_OPEN)
cdr.StatP &= ~STATUS_SHELLOPEN;
@@
-589,6
+594,7
@@
void cdrInterrupt() {
if (cdr.SetlocPending) {
memcpy(cdr.SetSectorPlay, cdr.SetSector, 4);
cdr.SetlocPending = 0;
if (cdr.SetlocPending) {
memcpy(cdr.SetSectorPlay, cdr.SetSector, 4);
cdr.SetlocPending = 0;
+ cdr.m_locationChanged = TRUE;
}
// BIOS CD Player
}
// BIOS CD Player
@@
-914,6
+920,7
@@
void cdrInterrupt() {
if(seekTime > 1000000) seekTime = 1000000;
memcpy(cdr.SetSectorPlay, cdr.SetSector, 4);
cdr.SetlocPending = 0;
if(seekTime > 1000000) seekTime = 1000000;
memcpy(cdr.SetSectorPlay, cdr.SetSector, 4);
cdr.SetlocPending = 0;
+ cdr.m_locationChanged = TRUE;
}
Find_CurTrack(cdr.SetSectorPlay);
}
Find_CurTrack(cdr.SetSectorPlay);
@@
-962,7
+969,7
@@
void cdrInterrupt() {
cdr.Result[0] = cdr.StatP;
start_rotating = 1;
break;
cdr.Result[0] = cdr.StatP;
start_rotating = 1;
break;
-
+ case CdlSync:
default:
CDR_LOG_I("Invalid command: %02x\n", Irq);
error = ERROR_INVALIDCMD;
default:
CDR_LOG_I("Invalid command: %02x\n", Irq);
error = ERROR_INVALIDCMD;
@@
-1105,9
+1112,14
@@
void cdrReadInterrupt() {
cdr.Channel = cdr.Transfer[4 + 1];
}
cdr.Channel = cdr.Transfer[4 + 1];
}
+ /* Gameblabla
+ * Skips playing on channel 255.
+ * Fixes missing audio in Blue's Clues : Blue's Big Musical. (Should also fix Taxi 2)
+ * TODO : Check if this is the proper behaviour.
+ * */
if((cdr.Transfer[4 + 2] & 0x4) &&
(cdr.Transfer[4 + 1] == cdr.Channel) &&
if((cdr.Transfer[4 + 2] & 0x4) &&
(cdr.Transfer[4 + 1] == cdr.Channel) &&
- (cdr.Transfer[4 + 0] == cdr.File)) {
+ (cdr.Transfer[4 + 0] == cdr.File)
&& cdr.Channel != 255
) {
int ret = xa_decode_sector(&cdr.Xa, cdr.Transfer+4, cdr.FirstSector);
if (!ret) {
cdrAttenuate(cdr.Xa.pcm, cdr.Xa.nsamples, cdr.Xa.stereo);
int ret = xa_decode_sector(&cdr.Xa, cdr.Transfer+4, cdr.FirstSector);
if (!ret) {
cdrAttenuate(cdr.Xa.pcm, cdr.Xa.nsamples, cdr.Xa.stereo);
@@
-1130,7
+1142,13
@@
void cdrReadInterrupt() {
cdr.Readed = 0;
cdr.Readed = 0;
- CDREAD_INT((cdr.Mode & MODE_SPEED) ? (cdReadTime / 2) : cdReadTime);
+ uint32_t delay = (cdr.Mode & MODE_SPEED) ? (cdReadTime / 2) : cdReadTime;
+ if (cdr.m_locationChanged) {
+ CDREAD_INT(delay * 30);
+ cdr.m_locationChanged = FALSE;
+ } else {
+ CDREAD_INT(delay);
+ }
/*
Croc 2: $40 - only FORM1 (*)
/*
Croc 2: $40 - only FORM1 (*)
@@
-1468,6
+1486,8
@@
void cdrReset() {
cdr.DriveState = DRIVESTATE_STANDBY;
cdr.StatP = STATUS_ROTATING;
pTransfer = cdr.Transfer;
cdr.DriveState = DRIVESTATE_STANDBY;
cdr.StatP = STATUS_ROTATING;
pTransfer = cdr.Transfer;
+ cdr.SetlocPending = 0;
+ cdr.m_locationChanged = FALSE;
// BIOS player - default values
cdr.AttenuatorLeftToLeft = 0x80;
// BIOS player - default values
cdr.AttenuatorLeftToLeft = 0x80;