* You should have received a copy of the GNU General Public License *
* along with this program; if not, write to the *
* Free Software Foundation, Inc., *
- * 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA. *
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. *
***************************************************************************/
-/*
+/*
* Handles all CD-ROM registers and functions.
*/
#define CdlID 26
#define CdlReadS 27
#define CdlReset 28
+#define CdlGetQ 29
#define CdlReadToc 30
char *CmdName[0x100]= {
#define STATUS_ROTATING (1<<1) // 0x02
#define STATUS_ERROR (1<<0) // 0x01
+/* Errors */
+#define ERROR_NOT_READY (1<<7) // 0x80
+#define ERROR_INVALIDCMD (1<<6) // 0x40
+#define ERROR_INVALIDARG (1<<5) // 0x20
// 1x = 75 sectors per second
// PSXCLK = 1 sec in the ps
DRIVESTATE_LID_OPEN,
DRIVESTATE_RESCAN_CD,
DRIVESTATE_PREPARE_CD,
+ DRIVESTATE_STOPPED,
};
// for cdr.Seeked
cdr.Reading = 0; \
psxRegs.interrupt &= ~(1 << PSXINT_CDREAD); \
} \
- cdr.StatP &= ~STATUS_READ;\
+ cdr.StatP &= ~(STATUS_READ|STATUS_SEEK);\
}
#define StopCdda() { \
cdr.subq.Absolute[0], cdr.subq.Absolute[1], cdr.subq.Absolute[2]);
}
-static void AddIrqQueue(unsigned char irq, unsigned long ecycle) {
- if (cdr.Irq != 0)
+static void AddIrqQueue(unsigned short irq, unsigned long ecycle) {
+ if (cdr.Irq != 0) {
+ if (irq == cdr.Irq || irq + 0x100 == cdr.Irq) {
+ cdr.IrqRepeated = 1;
+ CDR_INT(ecycle);
+ return;
+ }
+
CDR_LOG_I("cdr: override cmd %02x -> %02x\n", cdr.Irq, irq);
+ }
cdr.Irq = irq;
cdr.eCycle = ecycle;
setIrq();
}
- memcpy(cdr.SetSectorPlay, cdr.SetSector, 4);
+ if (cdr.SetlocPending) {
+ memcpy(cdr.SetSectorPlay, cdr.SetSector, 4);
+ cdr.SetlocPending = 0;
+ }
Find_CurTrack(cdr.SetSectorPlay);
ReadTrack(cdr.SetSectorPlay);
cdr.TrackChanged = FALSE;
}
void cdrInterrupt() {
- int i;
- unsigned char Irq = cdr.Irq;
+ u16 Irq = cdr.Irq;
+ int no_busy_error = 0;
+ int start_rotating = 0;
+ int error = 0;
+ int delay;
// Reschedule IRQ
if (cdr.Stat) {
return;
}
- cdr.Irq = 0;
cdr.Ctrl &= ~0x80;
+ // default response
+ SetResultSize(1);
+ cdr.Result[0] = cdr.StatP;
+ cdr.Stat = Acknowledge;
+
+ if (cdr.IrqRepeated) {
+ cdr.IrqRepeated = 0;
+ if (cdr.eCycle > psxRegs.cycle) {
+ CDR_INT(cdr.eCycle);
+ goto finish;
+ }
+ }
+
+ cdr.Irq = 0;
+
switch (Irq) {
case CdlSync:
- SetResultSize(1);
- cdr.StatP |= STATUS_ROTATING;
- cdr.Result[0] = cdr.StatP;
- cdr.Stat = Acknowledge;
+ // TOOD: sometimes/always return error?
break;
case CdlNop:
- SetResultSize(1);
- cdr.Result[0] = cdr.StatP;
- cdr.Stat = Acknowledge;
-
if (cdr.DriveState != DRIVESTATE_LID_OPEN)
cdr.StatP &= ~STATUS_SHELLOPEN;
+ no_busy_error = 1;
break;
case CdlSetloc:
- cdr.CmdProcess = 0;
- SetResultSize(1);
- cdr.StatP |= STATUS_ROTATING;
- cdr.Result[0] = cdr.StatP;
- cdr.Stat = Acknowledge;
break;
+ do_CdlPlay:
case CdlPlay:
+ StopCdda();
if (cdr.Seeked == SEEK_PENDING) {
// XXX: wrong, should seek instead..
- memcpy( cdr.SetSectorPlay, cdr.SetSector, 4 );
cdr.Seeked = SEEK_DONE;
}
+ if (cdr.SetlocPending) {
+ memcpy(cdr.SetSectorPlay, cdr.SetSector, 4);
+ cdr.SetlocPending = 0;
+ }
// BIOS CD Player
// - Pause player, hit Track 01/02/../xx (Setloc issued!!)
// Vib Ribbon: gameplay checks flag
cdr.StatP &= ~STATUS_SEEK;
-
- cdr.CmdProcess = 0;
- SetResultSize(1);
- cdr.StatP |= STATUS_ROTATING;
cdr.Result[0] = cdr.StatP;
- cdr.Stat = Acknowledge;
cdr.StatP |= STATUS_PLAY;
-
// BIOS player - set flag again
cdr.Play = TRUE;
CDRMISC_INT( cdReadTime );
+ start_rotating = 1;
break;
case CdlForward:
- cdr.CmdProcess = 0;
- SetResultSize(1);
- cdr.StatP |= STATUS_ROTATING;
- cdr.Result[0] = cdr.StatP;
+ // TODO: error 80 if stopped
cdr.Stat = Complete;
-
// GameShark CD Player: Calls 2x + Play 2x
if( cdr.FastForward == 0 ) cdr.FastForward = 2;
else cdr.FastForward++;
break;
case CdlBackward:
- cdr.CmdProcess = 0;
- SetResultSize(1);
- cdr.StatP |= STATUS_ROTATING;
- cdr.Result[0] = cdr.StatP;
cdr.Stat = Complete;
-
// GameShark CD Player: Calls 2x + Play 2x
if( cdr.FastBackward == 0 ) cdr.FastBackward = 2;
else cdr.FastBackward++;
break;
case CdlStandby:
- cdr.CmdProcess = 0;
- SetResultSize(1);
- cdr.StatP |= STATUS_ROTATING;
- cdr.Result[0] = cdr.StatP;
+ if (cdr.DriveState != DRIVESTATE_STOPPED) {
+ error = ERROR_INVALIDARG;
+ goto set_error;
+ }
+ AddIrqQueue(CdlStandby + 0x100, cdReadTime * 125 / 2);
+ start_rotating = 1;
+ break;
+
+ case CdlStandby + 0x100:
cdr.Stat = Complete;
break;
case CdlStop:
- cdr.CmdProcess = 0;
- SetResultSize(1);
+ if (cdr.Play) {
+ // grab time for current track
+ CDR_getTD((u8)(cdr.CurTrack), cdr.ResultTD);
+
+ cdr.SetSectorPlay[0] = cdr.ResultTD[2];
+ cdr.SetSectorPlay[1] = cdr.ResultTD[1];
+ cdr.SetSectorPlay[2] = cdr.ResultTD[0];
+ }
+
+ StopCdda();
+ StopReading();
+
+ delay = 0x800;
+ if (cdr.DriveState == DRIVESTATE_STANDBY)
+ delay = cdReadTime * 30 / 2;
+
+ cdr.DriveState = DRIVESTATE_STOPPED;
+ AddIrqQueue(CdlStop + 0x100, delay);
+ break;
+
+ case CdlStop + 0x100:
cdr.StatP &= ~STATUS_ROTATING;
cdr.Result[0] = cdr.StatP;
cdr.Stat = Complete;
-// cdr.Stat = Acknowledge;
break;
case CdlPause:
- SetResultSize(1);
- cdr.Result[0] = cdr.StatP;
- cdr.Stat = Acknowledge;
-
/*
Gundam Battle Assault 2: much slower (*)
- Fixes boot, gameplay
InuYasha - Feudal Fairy Tale: slower
- Fixes battles
*/
- AddIrqQueue(CdlPause + 0x20, cdReadTime * 3);
+ AddIrqQueue(CdlPause + 0x100, cdReadTime * 3);
cdr.Ctrl |= 0x80;
break;
- case CdlPause + 0x20:
- SetResultSize(1);
+ case CdlPause + 0x100:
cdr.StatP &= ~STATUS_READ;
- cdr.StatP |= STATUS_ROTATING;
cdr.Result[0] = cdr.StatP;
cdr.Stat = Complete;
break;
case CdlInit:
- SetResultSize(1);
- cdr.StatP = STATUS_ROTATING;
- cdr.Result[0] = cdr.StatP;
- cdr.Stat = Acknowledge;
-// if (!cdr.Init) {
- AddIrqQueue(CdlInit + 0x20, 0x800);
-// }
- break;
+ AddIrqQueue(CdlInit + 0x100, cdReadTime * 6);
+ no_busy_error = 1;
+ start_rotating = 1;
+ break;
- case CdlInit + 0x20:
- SetResultSize(1);
- cdr.Result[0] = cdr.StatP;
+ case CdlInit + 0x100:
cdr.Stat = Complete;
- cdr.Init = 1;
break;
case CdlMute:
- SetResultSize(1);
- cdr.StatP |= STATUS_ROTATING;
- cdr.Result[0] = cdr.StatP;
- cdr.Stat = Acknowledge;
+ cdr.Muted = TRUE;
break;
case CdlDemute:
- SetResultSize(1);
- cdr.StatP |= STATUS_ROTATING;
- cdr.Result[0] = cdr.StatP;
- cdr.Stat = Acknowledge;
+ cdr.Muted = FALSE;
break;
case CdlSetfilter:
- SetResultSize(1);
- cdr.StatP |= STATUS_ROTATING;
- cdr.Result[0] = cdr.StatP;
- cdr.Stat = Acknowledge;
+ cdr.File = cdr.Param[0];
+ cdr.Channel = cdr.Param[1];
break;
case CdlSetmode:
- SetResultSize(1);
- cdr.StatP |= STATUS_ROTATING;
- cdr.Result[0] = cdr.StatP;
- cdr.Stat = Acknowledge;
+ no_busy_error = 1;
break;
case CdlGetmode:
SetResultSize(6);
- cdr.StatP |= STATUS_ROTATING;
- cdr.Result[0] = cdr.StatP;
cdr.Result[1] = cdr.Mode;
cdr.Result[2] = cdr.File;
cdr.Result[3] = cdr.Channel;
cdr.Result[4] = 0;
cdr.Result[5] = 0;
- cdr.Stat = Acknowledge;
+ no_busy_error = 1;
break;
case CdlGetlocL:
SetResultSize(8);
- for (i = 0; i < 8; i++)
- cdr.Result[i] = cdr.Transfer[i];
- cdr.Stat = Acknowledge;
+ memcpy(cdr.Result, cdr.Transfer, 8);
break;
case CdlGetlocP:
if (!cdr.Play && !cdr.Reading)
cdr.Result[1] = 0; // HACK?
+ break;
+
+ case CdlReadT: // SetSession?
+ // really long
+ AddIrqQueue(CdlReadT + 0x100, cdReadTime * 290 / 4);
+ start_rotating = 1;
+ break;
- cdr.Stat = Acknowledge;
+ case CdlReadT + 0x100:
+ cdr.Stat = Complete;
break;
case CdlGetTN:
- cdr.CmdProcess = 0;
SetResultSize(3);
- cdr.StatP |= STATUS_ROTATING;
- cdr.Result[0] = cdr.StatP;
if (CDR_getTN(cdr.ResultTN) == -1) {
cdr.Stat = DiskError;
cdr.Result[0] |= STATUS_ERROR;
break;
case CdlGetTD:
- cdr.CmdProcess = 0;
cdr.Track = btoi(cdr.Param[0]);
SetResultSize(4);
- cdr.StatP |= STATUS_ROTATING;
if (CDR_getTD(cdr.Track, cdr.ResultTD) == -1) {
cdr.Stat = DiskError;
cdr.Result[0] |= STATUS_ERROR;
case CdlSeekL:
case CdlSeekP:
- SetResultSize(1);
- cdr.StatP |= STATUS_ROTATING;
- cdr.Result[0] = cdr.StatP;
+ StopCdda();
+ StopReading();
cdr.StatP |= STATUS_SEEK;
- cdr.Stat = Acknowledge;
/*
Crusaders of Might and Magic = 0.5x-4x
*/
CDRMISC_INT(cdr.Seeked == SEEK_DONE ? 0x800 : cdReadTime * 4);
cdr.Seeked = SEEK_PENDING;
+ start_rotating = 1;
break;
case CdlTest:
- cdr.Stat = Acknowledge;
switch (cdr.Param[0]) {
case 0x20: // System Controller ROM Version
SetResultSize(4);
memcpy(cdr.Result, Test23, 4);
break;
}
+ no_busy_error = 1;
break;
case CdlID:
- SetResultSize(1);
- cdr.StatP |= STATUS_ROTATING;
- cdr.Result[0] = cdr.StatP;
- cdr.Stat = Acknowledge;
- AddIrqQueue(CdlID + 0x20, 0x800);
+ AddIrqQueue(CdlID + 0x100, 20480);
break;
- case CdlID + 0x20:
+ case CdlID + 0x100:
SetResultSize(8);
cdr.Result[0] = cdr.StatP;
cdr.Result[1] = 0;
break;
case CdlReset:
- SetResultSize(1);
- cdr.StatP = STATUS_ROTATING;
- cdr.Result[0] = cdr.StatP;
- cdr.Stat = Acknowledge;
- break;
-
- case CdlReadT:
- SetResultSize(1);
- cdr.StatP |= STATUS_ROTATING;
- cdr.Result[0] = cdr.StatP;
- cdr.Stat = Acknowledge;
- AddIrqQueue(CdlReadT + 0x20, 0x800);
+ // yes, it really sets STATUS_SHELLOPEN
+ cdr.StatP |= STATUS_SHELLOPEN;
+ cdr.DriveState = DRIVESTATE_RESCAN_CD;
+ CDRLID_INT(20480);
+ no_busy_error = 1;
+ start_rotating = 1;
break;
- case CdlReadT + 0x20:
- SetResultSize(1);
- cdr.StatP |= STATUS_ROTATING;
- cdr.Result[0] = cdr.StatP;
- cdr.Stat = Complete;
+ case CdlGetQ:
+ // TODO?
+ CDR_LOG_I("got CdlGetQ\n");
break;
case CdlReadToc:
- SetResultSize(1);
- cdr.StatP |= STATUS_ROTATING;
- cdr.Result[0] = cdr.StatP;
- cdr.Stat = Acknowledge;
- AddIrqQueue(CdlReadToc + 0x20, cdReadTime * 16);
+ AddIrqQueue(CdlReadToc + 0x100, cdReadTime * 180 / 4);
+ no_busy_error = 1;
+ start_rotating = 1;
break;
- case CdlReadToc + 0x20:
- SetResultSize(1);
- cdr.StatP |= STATUS_ROTATING;
- cdr.Result[0] = cdr.StatP;
+ case CdlReadToc + 0x100:
cdr.Stat = Complete;
+ no_busy_error = 1;
break;
case CdlReadN:
case CdlReadS:
- if (!cdr.Reading) return;
+ if (cdr.SetlocPending) {
+ memcpy(cdr.SetSectorPlay, cdr.SetSector, 4);
+ cdr.SetlocPending = 0;
+ }
+ Find_CurTrack(cdr.SetSectorPlay);
+
+ if ((cdr.Mode & MODE_CDDA) && cdr.CurTrack > 1)
+ // Read* acts as play for cdda tracks in cdda mode
+ goto do_CdlPlay;
+
+ cdr.Reading = 1;
+ cdr.FirstSector = 1;
// Fighting Force 2 - update subq time immediately
// - fixes new game
- Find_CurTrack(cdr.SetSector);
- ReadTrack(cdr.SetSector);
+ ReadTrack(cdr.SetSectorPlay);
// Crusaders of Might and Magic - update getlocl now
CDREAD_INT((cdr.Mode & 0x80) ? (cdReadTime / 2) : cdReadTime * 1);
}
- SetResultSize(1);
- cdr.StatP |= STATUS_ROTATING;
cdr.Result[0] = cdr.StatP;
- cdr.Stat = Acknowledge;
+ start_rotating = 1;
break;
default:
- cdr.Stat = Complete;
+ CDR_LOG_I("Invalid command: %02x\n", Irq);
+ error = ERROR_INVALIDCMD;
+ // FALLTHROUGH
+
+ set_error:
+ SetResultSize(2);
+ cdr.Result[0] = cdr.StatP | STATUS_ERROR;
+ cdr.Result[1] = error;
+ cdr.Stat = DiskError;
break;
}
- if (Irq != CdlNop) {
+ if (cdr.DriveState == DRIVESTATE_STOPPED && start_rotating) {
+ cdr.DriveState = DRIVESTATE_STANDBY;
+ cdr.StatP |= STATUS_ROTATING;
+ }
+
+ if (!no_busy_error) {
switch (cdr.DriveState) {
case DRIVESTATE_LID_OPEN:
case DRIVESTATE_RESCAN_CD:
case DRIVESTATE_PREPARE_CD:
SetResultSize(2);
cdr.Result[0] = cdr.StatP | STATUS_ERROR;
- cdr.Result[1] = 0x80;
+ cdr.Result[1] = ERROR_NOT_READY;
cdr.Stat = DiskError;
break;
}
}
- cdr.ParamC = 0;
-
+finish:
setIrq();
+ cdr.ParamC = 0;
#ifdef CDR_LOG_CMD_IRQ
- SysPrintf("IRQ %d cmd %02x stat %02x: ",
- !!(cdr.Stat & cdr.Reg2), Irq, cdr.Stat);
- for (i = 0; i < cdr.ResultC; i++)
- SysPrintf("%02x ", cdr.Result[i]);
- SysPrintf("\n");
+ {
+ int i;
+ SysPrintf("CDR IRQ %d cmd %02x stat %02x: ",
+ !!(cdr.Stat & cdr.Reg2), Irq, cdr.Stat);
+ for (i = 0; i < cdr.ResultC; i++)
+ SysPrintf("%02x ", cdr.Result[i]);
+ SysPrintf("\n");
+ }
#endif
}
cdr.Result[0] = cdr.StatP;
cdr.Seeked = SEEK_DONE;
- ReadTrack(cdr.SetSector);
+ ReadTrack(cdr.SetSectorPlay);
buf = CDR_getBuffer();
if (buf == NULL)
}
}
- cdr.SetSector[2]++;
- if (cdr.SetSector[2] == 75) {
- cdr.SetSector[2] = 0;
- cdr.SetSector[1]++;
- if (cdr.SetSector[1] == 60) {
- cdr.SetSector[1] = 0;
- cdr.SetSector[0]++;
+ cdr.SetSectorPlay[2]++;
+ if (cdr.SetSectorPlay[2] == 75) {
+ cdr.SetSectorPlay[2] = 0;
+ cdr.SetSectorPlay[1]++;
+ if (cdr.SetSectorPlay[1] == 60) {
+ cdr.SetSectorPlay[1] = 0;
+ cdr.SetSectorPlay[0]++;
}
}
}
// update for CdlGetlocP
- ReadTrack(cdr.SetSector);
+ ReadTrack(cdr.SetSectorPlay);
}
/*
AddIrqQueue(cdr.Cmd, 0x800);
switch (cdr.Cmd) {
- case CdlSync:
- case CdlNop:
- case CdlForward:
- case CdlBackward:
- case CdlReadT:
- case CdlTest:
- case CdlID:
- case CdlReadToc:
- case CdlGetmode:
- case CdlGetlocL:
- case CdlGetlocP:
- case CdlGetTD:
- break;
-
case CdlSetloc:
- StopReading();
for (i = 0; i < 3; i++)
set_loc[i] = btoi(cdr.Param[i]);
- // FIXME: clean up this SetSector/SetSectorPlay mess,
- // there should be single var tracking current sector pos
- if (cdr.Play)
- i = msf2sec(cdr.SetSectorPlay);
- else
- i = msf2sec(cdr.SetSector);
+ i = msf2sec(cdr.SetSectorPlay);
i = abs(i - msf2sec(set_loc));
if (i > 16)
cdr.Seeked = SEEK_PENDING;
memcpy(cdr.SetSector, set_loc, 3);
cdr.SetSector[3] = 0;
- break;
-
- case CdlPlay:
- // Vib Ribbon: try same track again
- StopCdda();
-
- // Vib Ribbon - decoded buffer IRQ for CDDA reading
- // - fixes ribbon timing + music CD mode
- //CDRDBUF_INT( PSXCLK / 44100 * 0x100 );
-
- cdr.Play = TRUE;
-
- cdr.StatP |= STATUS_SEEK;
- cdr.StatP &= ~STATUS_ROTATING;
+ cdr.SetlocPending = 1;
break;
case CdlReadN:
- StopReading();
- cdr.Reading = 1;
- cdr.FirstSector = 1;
- cdr.Readed = 0xff;
- break;
-
- case CdlStandby:
- StopCdda();
- StopReading();
- break;
-
- case CdlStop:
- // GameShark CD Player: Reset CDDA to track start
- if (cdr.Play) {
- // grab time for current track
- CDR_getTD((u8)(cdr.CurTrack), cdr.ResultTD);
-
- cdr.SetSectorPlay[0] = cdr.ResultTD[2];
- cdr.SetSectorPlay[1] = cdr.ResultTD[1];
- cdr.SetSectorPlay[2] = cdr.ResultTD[0];
- }
-
- StopCdda();
- StopReading();
- break;
-
+ case CdlReadS:
case CdlPause:
- /*
- GameShark CD Player: save time for resume
-
- Twisted Metal - World Tour: don't mix Setloc / CdlPlay cursors
- */
-
StopCdda();
StopReading();
break;
StopReading();
break;
- case CdlMute:
- cdr.Muted = TRUE;
- // Duke Nukem - Time to Kill
- // - do not directly set cd-xa volume
- //SPU_writeRegister( H_CDLeft, 0x0000 );
- //SPU_writeRegister( H_CDRight, 0x0000 );
- break;
-
- case CdlDemute:
- cdr.Muted = FALSE;
-
- // Duke Nukem - Time to Kill
- // - do not directly set cd-xa volume
- //SPU_writeRegister( H_CDLeft, 0x7f00 );
- //SPU_writeRegister( H_CDRight, 0x7f00 );
- break;
-
- case CdlSetfilter:
- cdr.File = cdr.Param[0];
- cdr.Channel = cdr.Param[1];
- break;
-
case CdlSetmode:
CDR_LOG("cdrWrite1() Log: Setmode %x\n", cdr.Param[0]);
if( cdr.Play && (cdr.Mode & MODE_CDDA) == 0 )
StopCdda();
break;
-
- case CdlGetTN:
- //AddIrqQueue(cdr.Cmd, 0x800);
-
- // GameShark CDX CD Player: very long time
- AddIrqQueue(cdr.Cmd, 0x100000);
- break;
-
- case CdlSeekL:
- case CdlSeekP:
- // Tomb Raider 2 - reset cdda
- StopCdda();
- StopReading();
- break;
-
- case CdlReadS:
- StopReading();
- cdr.Reading = 2;
- cdr.FirstSector = 1;
- cdr.Readed = 0xff;
- break;
-
- default:
- cdr.ParamC = 0;
- CDR_LOG_I("cdrWrite1() Log: Unknown command: %x\n", cdr.Cmd);
- return;
}
}
cdr.Reg2 = 0x1f;
cdr.Stat = NoIntr;
cdr.DriveState = DRIVESTATE_STANDBY;
+ cdr.StatP = STATUS_ROTATING;
pTransfer = cdr.Transfer;
// BIOS player - default values
if (Mode == 0 && !Config.Cdda)
CDR_stop();
- cdr.freeze_ver = 0x63647201;
+ cdr.freeze_ver = 0x63647202;
gzfreeze(&cdr, sizeof(cdr));
if (Mode == 1) {
ReadTrack(tmpp);
if (cdr.Play) {
+ if (cdr.freeze_ver < 0x63647202)
+ memcpy(cdr.SetSectorPlay, cdr.SetSector, 3);
+
Find_CurTrack(cdr.SetSectorPlay);
if (!Config.Cdda)
CDR_play(cdr.SetSectorPlay);
SysPrintf("cdrom: fixing up old savestate\n");
cdr.Reg2 = 7;
}
+ // also did not save Attenuator..
+ if ((cdr.AttenuatorLeftToLeft | cdr.AttenuatorLeftToRight
+ | cdr.AttenuatorRightToLeft | cdr.AttenuatorRightToRight) == 0)
+ {
+ cdr.AttenuatorLeftToLeft = cdr.AttenuatorRightToRight = 0x80;
+ }
}
}
notaz.gp2x.de / pcsx_rearmed.git / blobdiff