summaryrefslogtreecommitdiffstatshomepage
path: root/src/devices/machine/z8038.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/devices/machine/z8038.cpp')
-rw-r--r--src/devices/machine/z8038.cpp21
1 files changed, 6 insertions, 15 deletions
diff --git a/src/devices/machine/z8038.cpp b/src/devices/machine/z8038.cpp
index 7cd55fb6d45..05e3997187f 100644
--- a/src/devices/machine/z8038.cpp
+++ b/src/devices/machine/z8038.cpp
@@ -21,7 +21,6 @@
#include "emu.h"
#include "z8038.h"
-#define LOG_GENERAL (1U << 0)
#define LOG_REG (1U << 1)
#define LOG_FIFO (1U << 2)
#define LOG_INT (1U << 3)
@@ -34,7 +33,7 @@ DEFINE_DEVICE_TYPE(Z8038, z8038_device, "z8038", "FIFO Input/Output Interface Un
z8038_device::z8038_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, Z8038, tag, owner, clock)
- , m_out_int_cb{ *this, *this }
+ , m_out_int_cb(*this)
, m_out_E_cb(*this)
, m_out_F_cb(*this)
, m_out_H_cb(*this)
@@ -60,14 +59,6 @@ template void z8038_device::zbus_map<2>(address_map &map);
void z8038_device::device_start()
{
- m_out_int_cb[0].resolve_safe();
- m_out_int_cb[1].resolve_safe();
-
- m_out_E_cb.resolve_safe();
- m_out_F_cb.resolve_safe();
- m_out_H_cb.resolve_safe();
- m_out_J_cb.resolve_safe();
-
save_item(NAME(m_control_2));
save_item(NAME(m_control_3));
@@ -92,7 +83,7 @@ void z8038_device::device_start()
//save_item(NAME(m_fifo));
- m_int_check = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(z8038_device::int_check), this));
+ m_int_check = timer_alloc(FUNC(z8038_device::int_check), this);
// suppress startup interrupt line changes
m_port[0].int_asserted = false;
@@ -306,7 +297,7 @@ u8 z8038_device::byte_count_r(u8 const port)
{
/*
* Bit 6 is reset upon completion of the CPU read of the Byte Count
- * register. The ongoing count appears in t he Byte Count register after
+ * register. The ongoing count appears in the Byte Count register after
* the read.
*/
if (m_port[port].control_1 & CR1_FBCR)
@@ -484,7 +475,7 @@ void z8038_device::message_out_w(u8 const port, u8 data)
m_port[!port].interrupt_status[0] |= ISR0_MIP;
}
-WRITE_LINE_MEMBER(z8038_device::in_E)
+void z8038_device::in_E(int state)
{
// check port 2 in i/o mode and pin 35 configured as input
if ((m_port[0].control_0 & CR0_P2M_IO) && (m_control_3 & CR3_P2CLR))
@@ -500,7 +491,7 @@ WRITE_LINE_MEMBER(z8038_device::in_E)
}
}
-WRITE_LINE_MEMBER(z8038_device::in_F)
+void z8038_device::in_F(int state)
{
// check port 2 in i/o mode and pin 34 configured as input
if ((m_port[0].control_0 & CR0_P2M_IO) && (m_control_3 & CR3_P2DIR))
@@ -522,7 +513,7 @@ WRITE_LINE_MEMBER(z8038_device::in_F)
}
}
-WRITE_LINE_MEMBER(z8038_device::in_G)
+void z8038_device::in_G(int state)
{
// check port 2 in i/o mode
if (m_port[0].control_0 & CR0_P2M_IO)