diff options
Diffstat (limited to 'src/devices/machine/aic6250.cpp')
-rw-r--r-- | src/devices/machine/aic6250.cpp | 21 |
1 files changed, 6 insertions, 15 deletions
diff --git a/src/devices/machine/aic6250.cpp b/src/devices/machine/aic6250.cpp index 9c149f51627..6f08895ac44 100644 --- a/src/devices/machine/aic6250.cpp +++ b/src/devices/machine/aic6250.cpp @@ -29,7 +29,6 @@ #include "emu.h" #include "aic6250.h" -#define LOG_GENERAL (1U << 0) #define LOG_REG (1U << 1) #define LOG_STATE (1U << 2) #define LOG_CONFIG (1U << 3) @@ -52,9 +51,9 @@ aic6250_device::aic6250_device(const machine_config &mconfig, device_type type, , nscsi_slot_card_interface(mconfig, *this, DEVICE_SELF) , m_int_cb(*this) , m_breq_cb(*this) - , m_port_a_r_cb(*this) + , m_port_a_r_cb(*this, 0xff) , m_port_a_w_cb(*this) - , m_port_b_r_cb(*this) + , m_port_b_r_cb(*this, 0xff) , m_port_b_w_cb(*this) { } @@ -89,7 +88,7 @@ void aic6250_device::map(address_map &map) map(0xf, 0xf).rw(FUNC(aic6250_device::scsi_latch_data_r), FUNC(aic6250_device::scsi_bsy_rst_w)); } -READ8_MEMBER(aic6250_device::read) +u8 aic6250_device::read(address_space &space, offs_t offset) { u8 data = space.unmap(); @@ -123,7 +122,7 @@ READ8_MEMBER(aic6250_device::read) return data; } -WRITE8_MEMBER(aic6250_device::write) +void aic6250_device::write(offs_t offset, u8 data) { if (offset) { @@ -154,14 +153,6 @@ WRITE8_MEMBER(aic6250_device::write) void aic6250_device::device_start() { - m_int_cb.resolve_safe(); - m_breq_cb.resolve_safe(); - - m_port_a_r_cb.resolve_safe(0xff); - m_port_a_w_cb.resolve_safe(); - m_port_b_r_cb.resolve_safe(0xff); - m_port_b_w_cb.resolve_safe(); - save_item(NAME(m_dma_count)); save_item(NAME(m_int_msk_reg_0)); save_item(NAME(m_offset_cntrl)); @@ -182,7 +173,7 @@ void aic6250_device::device_start() m_rev_cntrl = 0x02; - m_state_timer = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(aic6250_device::state_loop), this)); + m_state_timer = timer_alloc(FUNC(aic6250_device::state_loop), this); m_state = IDLE; m_int_asserted = false; @@ -1015,7 +1006,7 @@ void aic6250_device::set_int_state(bool asserted) * the DMA transfer count falls below 8, data is transferred via individual * cycles on demand rather than prefetched. */ -WRITE_LINE_MEMBER(aic6250_device::back_w) +void aic6250_device::back_w(int state) { LOGMASKED(LOG_DMA, "back_w %d\n", state); |