summaryrefslogtreecommitdiffstatshomepage
path: root/src/devices/bus/ata/atapicdr.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/devices/bus/ata/atapicdr.cpp')
-rw-r--r--src/devices/bus/ata/atapicdr.cpp120
1 files changed, 52 insertions, 68 deletions
diff --git a/src/devices/bus/ata/atapicdr.cpp b/src/devices/bus/ata/atapicdr.cpp
index 61a55bca4c2..ec6dbcd5e59 100644
--- a/src/devices/bus/ata/atapicdr.cpp
+++ b/src/devices/bus/ata/atapicdr.cpp
@@ -10,9 +10,7 @@
// device type definition
DEFINE_DEVICE_TYPE(ATAPI_CDROM, atapi_cdrom_device, "cdrom", "ATAPI CD-ROM")
-DEFINE_DEVICE_TYPE(ATAPI_FIXED_CDROM, atapi_fixed_cdrom_device, "cdrom_fixed", "ATAPI fixed CD-ROM")
DEFINE_DEVICE_TYPE(ATAPI_DVDROM, atapi_dvdrom_device, "dvdrom", "ATAPI CD/DVD-ROM")
-DEFINE_DEVICE_TYPE(ATAPI_FIXED_DVDROM, atapi_fixed_dvdrom_device, "dvdrom_fixed", "ATAPI fixed CD/DVD-ROM")
atapi_cdrom_device::atapi_cdrom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
atapi_cdrom_device(mconfig, ATAPI_CDROM, tag, owner, clock)
@@ -26,33 +24,18 @@ atapi_cdrom_device::atapi_cdrom_device(const machine_config &mconfig, device_typ
{
}
-atapi_fixed_cdrom_device::atapi_fixed_cdrom_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) :
- atapi_cdrom_device(mconfig, type, tag, owner, clock)
-{
-}
-
-atapi_fixed_cdrom_device::atapi_fixed_cdrom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
- atapi_fixed_cdrom_device(mconfig, ATAPI_FIXED_CDROM, tag, owner, clock)
-{
-}
-
atapi_dvdrom_device::atapi_dvdrom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
atapi_cdrom_device(mconfig, ATAPI_DVDROM, tag, owner, clock)
{
}
-atapi_fixed_dvdrom_device::atapi_fixed_dvdrom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
- atapi_cdrom_device(mconfig, ATAPI_FIXED_DVDROM, tag, owner, clock)
-{
-}
-
//-------------------------------------------------
// device_add_mconfig - add device configuration
//-------------------------------------------------
void atapi_cdrom_device::device_add_mconfig(machine_config &config)
{
- if(type() == ATAPI_DVDROM || type() == ATAPI_FIXED_DVDROM)
+ if(type() == ATAPI_DVDROM)
DVDROM(config, "image").set_interface("cdrom");
else if(type() == ATAPI_GDROM)
GDROM(config, "image").set_interface("cdrom");
@@ -68,37 +51,37 @@ void atapi_cdrom_device::device_start()
memset(m_identify_buffer, 0, sizeof(m_identify_buffer));
- m_identify_buffer[ 0 ] = 0x8500; // ATAPI device, cmd set 5 compliant, DRQ within 3 ms of PACKET command
-
- m_identify_buffer[ 23 ] = ('1' << 8) | '.';
- m_identify_buffer[ 24 ] = ('0' << 8) | ' ';
- m_identify_buffer[ 25 ] = (' ' << 8) | ' ';
- m_identify_buffer[ 26 ] = (' ' << 8) | ' ';
-
- m_identify_buffer[ 27 ] = ('M' << 8) | 'A';
- m_identify_buffer[ 28 ] = ('M' << 8) | 'E';
- m_identify_buffer[ 29 ] = (' ' << 8) | ' ';
- m_identify_buffer[ 30 ] = (' ' << 8) | ' ';
- m_identify_buffer[ 31 ] = ('V' << 8) | 'i';
- m_identify_buffer[ 32 ] = ('r' << 8) | 't';
- m_identify_buffer[ 33 ] = ('u' << 8) | 'a';
- m_identify_buffer[ 34 ] = ('l' << 8) | ' ';
- m_identify_buffer[ 35 ] = ('C' << 8) | 'D';
- m_identify_buffer[ 36 ] = ('R' << 8) | 'O';
- m_identify_buffer[ 37 ] = ('M' << 8) | ' ';
- m_identify_buffer[ 38 ] = (' ' << 8) | ' ';
- m_identify_buffer[ 39 ] = (' ' << 8) | ' ';
- m_identify_buffer[ 40 ] = (' ' << 8) | ' ';
- m_identify_buffer[ 41 ] = (' ' << 8) | ' ';
- m_identify_buffer[ 42 ] = (' ' << 8) | ' ';
- m_identify_buffer[ 43 ] = (' ' << 8) | ' ';
- m_identify_buffer[ 44 ] = (' ' << 8) | ' ';
- m_identify_buffer[ 45 ] = (' ' << 8) | ' ';
- m_identify_buffer[ 46 ] = (' ' << 8) | ' ';
-
- m_identify_buffer[ 49 ] = 0x0600; // Word 49=Capabilities, IORDY may be disabled (bit_10), LBA Supported mandatory (bit_9)
-
- m_identify_buffer[ 88 ] = m_ultra_dma_mode;
+ m_identify_buffer[0] = 0x8500; // ATAPI device, cmd set 5 compliant, DRQ within 3 ms of PACKET command
+
+ m_identify_buffer[23] = ('1' << 8) | '.';
+ m_identify_buffer[24] = ('0' << 8) | ' ';
+ m_identify_buffer[25] = (' ' << 8) | ' ';
+ m_identify_buffer[26] = (' ' << 8) | ' ';
+
+ m_identify_buffer[27] = ('M' << 8) | 'A';
+ m_identify_buffer[28] = ('M' << 8) | 'E';
+ m_identify_buffer[29] = (' ' << 8) | ' ';
+ m_identify_buffer[30] = (' ' << 8) | ' ';
+ m_identify_buffer[31] = ('V' << 8) | 'i';
+ m_identify_buffer[32] = ('r' << 8) | 't';
+ m_identify_buffer[33] = ('u' << 8) | 'a';
+ m_identify_buffer[34] = ('l' << 8) | ' ';
+ m_identify_buffer[35] = ('C' << 8) | 'D';
+ m_identify_buffer[36] = ('R' << 8) | 'O';
+ m_identify_buffer[37] = ('M' << 8) | ' ';
+ m_identify_buffer[38] = (' ' << 8) | ' ';
+ m_identify_buffer[39] = (' ' << 8) | ' ';
+ m_identify_buffer[40] = (' ' << 8) | ' ';
+ m_identify_buffer[41] = (' ' << 8) | ' ';
+ m_identify_buffer[42] = (' ' << 8) | ' ';
+ m_identify_buffer[43] = (' ' << 8) | ' ';
+ m_identify_buffer[44] = (' ' << 8) | ' ';
+ m_identify_buffer[45] = (' ' << 8) | ' ';
+ m_identify_buffer[46] = (' ' << 8) | ' ';
+
+ m_identify_buffer[49] = 0x0600; // Word 49=Capabilities, IORDY may be disabled (bit_10), LBA Supported mandatory (bit_9)
+
+ m_identify_buffer[88] = m_ultra_dma_mode;
atapi_hle_device::device_start();
}
@@ -115,13 +98,6 @@ void atapi_cdrom_device::device_reset()
m_sequence_counter = m_image->sequence_counter();
}
-void atapi_fixed_cdrom_device::device_reset()
-{
- atapi_hle_device::device_reset();
- m_media_change = false;
- m_sequence_counter = m_image->sequence_counter();
-}
-
void atapi_dvdrom_device::device_reset()
{
atapi_hle_device::device_reset();
@@ -129,13 +105,6 @@ void atapi_dvdrom_device::device_reset()
m_sequence_counter = m_image->sequence_counter();
}
-void atapi_fixed_dvdrom_device::device_reset()
-{
- atapi_hle_device::device_reset();
- m_media_change = false;
- m_sequence_counter = m_image->sequence_counter();
-}
-
void atapi_cdrom_device::process_buffer()
{
if( m_sequence_counter != m_image->sequence_counter() )
@@ -188,10 +157,15 @@ void atapi_cdrom_device::ExecCommand()
m_sense_asc = SCSI_SENSE_ASC_NOT_READY_TO_READY_TRANSITION;
m_status_code = SCSI_STATUS_CODE_CHECK_CONDITION;
m_transfer_length = 0;
+
+ if (command[0] == T10SPC_CMD_TEST_UNIT_READY || // amiga(idefix97)/firebeat/namcos12/sprinter
+ command[0] == T10SPC_CMD_MODE_SENSE_10) // stingnet
+ m_media_change = false;
return;
}
break;
case T10SPC_CMD_INQUIRY:
+ m_media_change = false; // mtouchxl(mitsumi)
break;
case T10SPC_CMD_REQUEST_SENSE:
m_media_change = false;
@@ -199,9 +173,19 @@ void atapi_cdrom_device::ExecCommand()
}
t10mmc::ExecCommand();
- // truckk requires seek complete flag to be set after calling the SEEK command
- // so set the seek complete status flag after a successful request to emulate
- // having asked the device itself to seek
- if (command[0] == T10SBC_CMD_SEEK_10 && m_status_code == SCSI_STATUS_CODE_GOOD)
- m_status |= IDE_STATUS_DSC;
+ if (m_status_code == SCSI_STATUS_CODE_GOOD)
+ {
+ switch (command[0])
+ {
+ // Set the DSC (Drive Seek Complete) bit on commands that involve a drive seek.
+ // truckk is known to rely on this flag being set after T10SBC_CMD_SEEK_10.
+ case T10SBC_CMD_SEEK_10:
+ case T10MMC_CMD_PLAY_AUDIO_10:
+ case T10MMC_CMD_PLAY_AUDIO_12:
+ case T10MMC_CMD_PLAY_AUDIO_MSF:
+ case T10MMC_CMD_PLAY_AUDIO_TRACK_INDEX:
+ m_status |= IDE_STATUS_DSC;
+ break;
+ }
+ }
}