summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/machine/cdicdic.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/machine/cdicdic.cpp')
-rw-r--r--src/mame/machine/cdicdic.cpp27
1 files changed, 16 insertions, 11 deletions
diff --git a/src/mame/machine/cdicdic.cpp b/src/mame/machine/cdicdic.cpp
index 98717ee7c29..fe5f1aad345 100644
--- a/src/mame/machine/cdicdic.cpp
+++ b/src/mame/machine/cdicdic.cpp
@@ -565,7 +565,7 @@ void cdicdic_device::sample_trigger()
// Set the CDIC interrupt line
verboselog(*this, 0, "%s", "Setting CDIC interrupt line for soundmap decode\n" );
- m_int_callback(ASSERT_LINE);
+ m_intreq_callback(ASSERT_LINE);
}
else
{
@@ -717,7 +717,7 @@ void cdicdic_device::process_delayed_command()
//printf( "Setting CDIC interrupt line\n" );
verboselog(*this, 0, "%s", "Setting CDIC interrupt line for audio sector\n" );
- m_int_callback(ASSERT_LINE);
+ m_intreq_callback(ASSERT_LINE);
}
else if((buffer[CDIC_SECTOR_SUBMODE2] & (CDIC_SUBMODE_DATA | CDIC_SUBMODE_AUDIO | CDIC_SUBMODE_VIDEO)) == 0x00)
{
@@ -735,7 +735,7 @@ void cdicdic_device::process_delayed_command()
{
//printf( "Setting CDIC interrupt line\n" );
verboselog(*this, 0, "%s", "Setting CDIC interrupt line for message sector\n" );
- m_int_callback(ASSERT_LINE);
+ m_intreq_callback(ASSERT_LINE);
}
else
{
@@ -754,7 +754,7 @@ void cdicdic_device::process_delayed_command()
//printf( "Setting CDIC interrupt line\n" );
verboselog(*this, 0, "%s", "Setting CDIC interrupt line for data sector\n" );
- m_int_callback(ASSERT_LINE);
+ m_intreq_callback(ASSERT_LINE);
}
if((buffer[CDIC_SECTOR_SUBMODE2] & CDIC_SUBMODE_EOF) == 0 && m_command != 0x23)
@@ -848,7 +848,7 @@ void cdicdic_device::process_delayed_command()
}
verboselog(*this, 0, "%s", "Setting CDIC interrupt line for CDDA sector\n" );
- m_int_callback(ASSERT_LINE);
+ m_intreq_callback(ASSERT_LINE);
break;
}
case 0x2c: // Seek
@@ -898,7 +898,7 @@ void cdicdic_device::process_delayed_command()
m_time = next_msf << 8;
verboselog(*this, 0, "%s", "Setting CDIC interrupt line for Seek sector\n" );
- m_int_callback(ASSERT_LINE);
+ m_intreq_callback(ASSERT_LINE);
break;
}
}
@@ -944,7 +944,7 @@ READ16_MEMBER( cdicdic_device::regs_r )
m_audio_buffer &= 0x7fff;
if(!((m_audio_buffer | m_x_buffer) & 0x8000))
{
- m_int_callback(CLEAR_LINE);
+ m_intreq_callback(CLEAR_LINE);
verboselog(*this, 0, "%s", "Clearing CDIC interrupt line\n" );
////printf("Clearing CDIC interrupt line\n" );
}
@@ -958,7 +958,7 @@ READ16_MEMBER( cdicdic_device::regs_r )
m_x_buffer &= 0x7fff;
if(!((m_audio_buffer | m_x_buffer) & 0x8000))
{
- m_int_callback(CLEAR_LINE);
+ m_intreq_callback(CLEAR_LINE);
verboselog(*this, 0, "%s", "Clearing CDIC interrupt line\n" );
////printf("Clearing CDIC interrupt line\n" );
}
@@ -1157,7 +1157,7 @@ WRITE16_MEMBER( cdicdic_device::regs_w )
cdicdic_device::cdicdic_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, CDI_CDIC, tag, owner, clock)
- , m_int_callback(*this)
+ , m_intreq_callback(*this)
, m_memory_space(*this, ":maincpu", AS_PROGRAM)
, m_dmadac(*this, ":dac%u", 1U)
, m_scc(*this, ":maincpu")
@@ -1174,7 +1174,7 @@ cdicdic_device::cdicdic_device(const machine_config &mconfig, const char *tag, d
void cdicdic_device::device_resolve_objects()
{
- m_int_callback.resolve_safe();
+ m_intreq_callback.resolve_safe();
}
//-------------------------------------------------
@@ -1244,7 +1244,7 @@ void cdicdic_device::device_reset()
m_cdda->set_cdrom(m_cd);
}
- m_int_callback(CLEAR_LINE);
+ m_intreq_callback(CLEAR_LINE);
}
WRITE16_MEMBER( cdicdic_device::ram_w )
@@ -1256,3 +1256,8 @@ READ16_MEMBER( cdicdic_device::ram_r )
{
return m_ram[offset];
}
+
+uint8_t cdicdic_device::intack_r()
+{
+ return 0x80;
+}