summaryrefslogtreecommitdiffstatshomepage
path: root/src/devices/bus/hp_dio/hp98643.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/devices/bus/hp_dio/hp98643.cpp')
-rw-r--r--src/devices/bus/hp_dio/hp98643.cpp32
1 files changed, 16 insertions, 16 deletions
diff --git a/src/devices/bus/hp_dio/hp98643.cpp b/src/devices/bus/hp_dio/hp98643.cpp
index ae468d3d490..1d8934f739a 100644
--- a/src/devices/bus/hp_dio/hp98643.cpp
+++ b/src/devices/bus/hp_dio/hp98643.cpp
@@ -13,9 +13,9 @@
//#define VERBOSE 1
#include "logmacro.h"
-DEFINE_DEVICE_TYPE_NS(HPDIO_98643, bus::hp_dio, dio16_98643_device, "dio98643", "HP98643A LANIC Ethernet card")
+DEFINE_DEVICE_TYPE(HPDIO_98643, bus::hp_dio::dio16_98643_device, "dio98643", "HP98643A LANIC Ethernet card")
-namespace bus { namespace hp_dio {
+namespace bus::hp_dio {
void dio16_98643_device::device_add_mconfig(machine_config &config)
{
@@ -95,6 +95,7 @@ void dio16_98643_device::device_start()
save_item(NAME(m_sc));
save_item(NAME(m_installed_io));
save_item(NAME(m_ram));
+ m_installed_io = false;
}
void dio16_98643_device::device_reset()
@@ -113,7 +114,7 @@ void dio16_98643_device::device_reset()
m_sc |= get_irq_line() << 4;
}
-WRITE_LINE_MEMBER(dio16_98643_device::lance_int_w)
+void dio16_98643_device::lance_int_w(int state)
{
if (state)
m_sc &= ~REG_SC_IP;
@@ -122,7 +123,7 @@ WRITE_LINE_MEMBER(dio16_98643_device::lance_int_w)
update_int();
}
-WRITE16_MEMBER(dio16_98643_device::sc_w)
+void dio16_98643_device::sc_w(uint16_t data)
{
LOG("%s: %02x\n", __func__, data);
data &= (REG_SC_LOCK|REG_SC_IE);
@@ -135,38 +136,38 @@ WRITE16_MEMBER(dio16_98643_device::sc_w)
update_int();
}
-READ16_MEMBER(dio16_98643_device::sc_r)
+uint16_t dio16_98643_device::sc_r()
{
LOG("%s: %02x\n", __func__, m_sc);
return m_sc;
}
-READ16_MEMBER(dio16_98643_device::id_r)
+uint16_t dio16_98643_device::id_r()
{
return (REG_ID | (m_switches->read() & REG_SWITCHES_REMOTE));
}
-WRITE16_MEMBER(dio16_98643_device::id_w)
+void dio16_98643_device::id_w(uint16_t data)
{
reset();
}
-READ16_MEMBER(dio16_98643_device::novram_r)
+uint16_t dio16_98643_device::novram_r(offs_t offset)
{
return m_novram[offset];
}
-WRITE16_MEMBER(dio16_98643_device::novram_w)
+void dio16_98643_device::novram_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
COMBINE_DATA(&m_novram[offset & 0x3f]);
}
-WRITE16_MEMBER(dio16_98643_device::lance_dma_out)
+void dio16_98643_device::lance_dma_out(offs_t offset, uint16_t data, uint16_t mem_mask)
{
LOG("%s: offset=%04x, data=%d\n", __func__, offset, data);
COMBINE_DATA(&m_ram[(offset >> 1) & 0x1fff]);
}
-READ16_MEMBER(dio16_98643_device::lance_dma_in)
+uint16_t dio16_98643_device::lance_dma_in(offs_t offset)
{
uint16_t ret = m_ram[(offset >> 1) & 0x1fff];
@@ -195,13 +196,13 @@ void dio16_98643_device::addrmap(address_map &map)
map(0x0000, 0x0001).rw(FUNC(dio16_98643_device::id_r), FUNC(dio16_98643_device::id_w));
map(0x0002, 0x0003).rw(FUNC(dio16_98643_device::sc_r), FUNC(dio16_98643_device::sc_w));
map(0x4000, 0x4003).lrw16(
- [this] (address_space &space, offs_t offset, u16 mem_mask) -> u16 {
+ [this] (address_space &space, offs_t offset) -> u16 {
m_sc |= REG_STATUS_ACK;
- return m_lance->regs_r(space, offset, mem_mask);
+ return m_lance->regs_r(space, offset);
}, "lance_r",
- [this] (address_space &space, offs_t offset, u16 data, u16 mem_mask) {
+ [this] (offs_t offset, u16 data) {
m_sc |= REG_STATUS_ACK;
- return m_lance->regs_w(space, offset, data, mem_mask);
+ return m_lance->regs_w(offset, data);
}, "lance_w");
map(0x8000, 0xbfff).lrw16(
@@ -212,4 +213,3 @@ void dio16_98643_device::addrmap(address_map &map)
}
} // namespace bus::hp_dio
-} // namespace bus