summaryrefslogtreecommitdiffstatshomepage
path: root/src/devices/bus/hp9845_io
diff options
context:
space:
mode:
Diffstat (limited to 'src/devices/bus/hp9845_io')
-rw-r--r--src/devices/bus/hp9845_io/98032.cpp4
-rw-r--r--src/devices/bus/hp9845_io/98032.h4
-rw-r--r--src/devices/bus/hp9845_io/98034.cpp22
-rw-r--r--src/devices/bus/hp9845_io/98034.h22
-rw-r--r--src/devices/bus/hp9845_io/98035.cpp32
-rw-r--r--src/devices/bus/hp9845_io/98035.h36
-rw-r--r--src/devices/bus/hp9845_io/98046.cpp10
-rw-r--r--src/devices/bus/hp9845_io/98046.h10
-rw-r--r--src/devices/bus/hp9845_io/hp9845_io.cpp6
-rw-r--r--src/devices/bus/hp9845_io/hp9845_io.h6
10 files changed, 76 insertions, 76 deletions
diff --git a/src/devices/bus/hp9845_io/98032.cpp b/src/devices/bus/hp9845_io/98032.cpp
index 558f6a60890..ecfc92ba706 100644
--- a/src/devices/bus/hp9845_io/98032.cpp
+++ b/src/devices/bus/hp9845_io/98032.cpp
@@ -102,7 +102,7 @@ void hp98032_io_card_device::device_reset()
m_gpio->preset_w(0);
}
-READ16_MEMBER(hp98032_io_card_device::reg_r)
+uint16_t hp98032_io_card_device::reg_r(address_space &space, offs_t offset)
{
uint16_t res = 0;
@@ -173,7 +173,7 @@ READ16_MEMBER(hp98032_io_card_device::reg_r)
return res;
}
-WRITE16_MEMBER(hp98032_io_card_device::reg_w)
+void hp98032_io_card_device::reg_w(address_space &space, offs_t offset, uint16_t data)
{
LOG("wr R%u=%04x\n" , offset + 4 , data);
diff --git a/src/devices/bus/hp9845_io/98032.h b/src/devices/bus/hp9845_io/98032.h
index 4eaa33ec786..059b0248ae9 100644
--- a/src/devices/bus/hp9845_io/98032.h
+++ b/src/devices/bus/hp9845_io/98032.h
@@ -32,8 +32,8 @@ protected:
virtual void device_start() override;
virtual void device_reset() override;
- virtual DECLARE_READ16_MEMBER(reg_r) override;
- virtual DECLARE_WRITE16_MEMBER(reg_w) override;
+ virtual uint16_t reg_r(address_space &space, offs_t offset) override;
+ virtual void reg_w(address_space &space, offs_t offset, uint16_t data) override;
private:
required_device<hp98032_gpio_slot_device> m_gpio;
diff --git a/src/devices/bus/hp9845_io/98034.cpp b/src/devices/bus/hp9845_io/98034.cpp
index 92e98efd38f..d76101f003c 100644
--- a/src/devices/bus/hp9845_io/98034.cpp
+++ b/src/devices/bus/hp9845_io/98034.cpp
@@ -114,7 +114,7 @@ void hp98034_io_card_device::device_reset()
update_dc();
}
-READ16_MEMBER(hp98034_io_card_device::reg_r)
+uint16_t hp98034_io_card_device::reg_r(address_space &space, offs_t offset)
{
uint16_t res = m_odr;
@@ -154,7 +154,7 @@ READ16_MEMBER(hp98034_io_card_device::reg_r)
return res;
}
-WRITE16_MEMBER(hp98034_io_card_device::reg_w)
+void hp98034_io_card_device::reg_w(address_space &space, offs_t offset, uint16_t data)
{
m_idr = (uint8_t)data;
@@ -199,19 +199,19 @@ uint8_t hp98034_io_card_device::dc_r()
return res;
}
-WRITE8_MEMBER(hp98034_io_card_device::hpib_data_w)
+void hp98034_io_card_device::hpib_data_w(uint8_t data)
{
m_data_out = data;
update_data_out();
}
-WRITE8_MEMBER(hp98034_io_card_device::hpib_ctrl_w)
+void hp98034_io_card_device::hpib_ctrl_w(uint8_t data)
{
m_ctrl_out = data;
update_ctrl_out();
}
-READ8_MEMBER(hp98034_io_card_device::hpib_ctrl_r)
+uint8_t hp98034_io_card_device::hpib_ctrl_r()
{
uint8_t res = 0;
@@ -243,28 +243,28 @@ READ8_MEMBER(hp98034_io_card_device::hpib_ctrl_r)
return res;
}
-READ8_MEMBER(hp98034_io_card_device::hpib_data_r)
+uint8_t hp98034_io_card_device::hpib_data_r()
{
return ~m_ieee488->dio_r();
}
-READ8_MEMBER(hp98034_io_card_device::idr_r)
+uint8_t hp98034_io_card_device::idr_r()
{
return m_idr;
}
-WRITE8_MEMBER(hp98034_io_card_device::odr_w)
+void hp98034_io_card_device::odr_w(uint8_t data)
{
m_odr = data;
}
-READ8_MEMBER(hp98034_io_card_device::mode_reg_r)
+uint8_t hp98034_io_card_device::mode_reg_r()
{
LOG("%.06f MR=%02x\n" , machine().time().as_double() , m_mode_reg);
return m_mode_reg;
}
-WRITE8_MEMBER(hp98034_io_card_device::mode_reg_clear_w)
+void hp98034_io_card_device::mode_reg_clear_w(uint8_t data)
{
LOG("%.06f clear_w\n" , machine().time().as_double());
m_mode_reg = 0xff;
@@ -276,7 +276,7 @@ WRITE8_MEMBER(hp98034_io_card_device::mode_reg_clear_w)
}
}
-READ8_MEMBER(hp98034_io_card_device::switch_r)
+uint8_t hp98034_io_card_device::switch_r()
{
return m_sw1->read() | 0xc0;
}
diff --git a/src/devices/bus/hp9845_io/98034.h b/src/devices/bus/hp9845_io/98034.h
index 885686caa53..c8cb5ff8765 100644
--- a/src/devices/bus/hp9845_io/98034.h
+++ b/src/devices/bus/hp9845_io/98034.h
@@ -33,23 +33,23 @@ protected:
virtual const tiny_rom_entry *device_rom_region() const override;
virtual void device_add_mconfig(machine_config &config) override;
- virtual DECLARE_READ16_MEMBER(reg_r) override;
- virtual DECLARE_WRITE16_MEMBER(reg_w) override;
+ virtual uint16_t reg_r(address_space &space, offs_t offset) override;
+ virtual void reg_w(address_space &space, offs_t offset, uint16_t data) override;
private:
void dc_w(uint8_t data);
uint8_t dc_r();
uint8_t int_ack_r();
- DECLARE_WRITE8_MEMBER(hpib_data_w);
- DECLARE_WRITE8_MEMBER(hpib_ctrl_w);
- DECLARE_READ8_MEMBER(hpib_ctrl_r);
- DECLARE_READ8_MEMBER(hpib_data_r);
- DECLARE_READ8_MEMBER(idr_r);
- DECLARE_WRITE8_MEMBER(odr_w);
- DECLARE_READ8_MEMBER(mode_reg_r);
- DECLARE_WRITE8_MEMBER(mode_reg_clear_w);
- DECLARE_READ8_MEMBER(switch_r);
+ void hpib_data_w(uint8_t data);
+ void hpib_ctrl_w(uint8_t data);
+ uint8_t hpib_ctrl_r();
+ uint8_t hpib_data_r();
+ uint8_t idr_r();
+ void odr_w(uint8_t data);
+ uint8_t mode_reg_r();
+ void mode_reg_clear_w(uint8_t data);
+ uint8_t switch_r();
void np_io_map(address_map &map);
void np_program_map(address_map &map);
diff --git a/src/devices/bus/hp9845_io/98035.cpp b/src/devices/bus/hp9845_io/98035.cpp
index 9194e200b19..c4516bdbc37 100644
--- a/src/devices/bus/hp9845_io/98035.cpp
+++ b/src/devices/bus/hp9845_io/98035.cpp
@@ -254,7 +254,7 @@ void hp98035_io_card_device::device_timer(emu_timer &timer, device_timer_id id,
}
}
-READ16_MEMBER(hp98035_io_card_device::reg_r)
+uint16_t hp98035_io_card_device::reg_r(address_space &space, offs_t offset)
{
uint16_t res;
@@ -287,7 +287,7 @@ READ16_MEMBER(hp98035_io_card_device::reg_r)
return res;
}
-WRITE16_MEMBER(hp98035_io_card_device::reg_w)
+void hp98035_io_card_device::reg_w(address_space &space, offs_t offset, uint16_t data)
{
bool new_inten;
@@ -317,33 +317,33 @@ WRITE16_MEMBER(hp98035_io_card_device::reg_w)
LOG(("write R%u=%04x\n" , offset + 4 , data));
}
-WRITE8_MEMBER(hp98035_io_card_device::ram_addr_w)
+void hp98035_io_card_device::ram_addr_w(uint8_t data)
{
m_ram_addr = data;
}
-READ8_MEMBER(hp98035_io_card_device::ram_data_r)
+uint8_t hp98035_io_card_device::ram_data_r()
{
return m_np_ram[ m_ram_addr ];
}
-WRITE8_MEMBER(hp98035_io_card_device::ram_addr_data_w)
+void hp98035_io_card_device::ram_addr_data_w(uint8_t data)
{
m_ram_addr = data;
m_np_ram[ m_ram_addr ] = m_ram_data_in;
}
-WRITE8_MEMBER(hp98035_io_card_device::ram_data_w)
+void hp98035_io_card_device::ram_data_w(uint8_t data)
{
m_ram_data_in = data;
}
-WRITE8_MEMBER(hp98035_io_card_device::clock_key_w)
+void hp98035_io_card_device::clock_key_w(uint8_t data)
{
m_clock_keys = data & 7;
}
-READ8_MEMBER(hp98035_io_card_device::clock_digit_r)
+uint8_t hp98035_io_card_device::clock_digit_r()
{
switch (m_clock_mux) {
case 1:
@@ -360,20 +360,20 @@ READ8_MEMBER(hp98035_io_card_device::clock_digit_r)
}
}
-WRITE8_MEMBER(hp98035_io_card_device::odr_w)
+void hp98035_io_card_device::odr_w(uint8_t data)
{
m_odr = data;
set_flg(true);
}
-READ8_MEMBER(hp98035_io_card_device::idr_r)
+uint8_t hp98035_io_card_device::idr_r()
{
set_flg(true);
m_idr_full = false;
return m_idr;
}
-READ8_MEMBER(hp98035_io_card_device::np_status_r)
+uint8_t hp98035_io_card_device::np_status_r()
{
// Bit 2 = 0: use US date format
uint8_t res = 0x03;
@@ -396,13 +396,13 @@ READ8_MEMBER(hp98035_io_card_device::np_status_r)
return res;
}
-WRITE8_MEMBER(hp98035_io_card_device::clear_np_irq_w)
+void hp98035_io_card_device::clear_np_irq_w(uint8_t data)
{
m_np_irq = false;
update_dc();
}
-READ8_MEMBER(hp98035_io_card_device::clock_mux_r)
+uint8_t hp98035_io_card_device::clock_mux_r()
{
// External input lines are always active (bits 7-4)
uint8_t res = 0xf0 | m_clock_mux;
@@ -413,13 +413,13 @@ READ8_MEMBER(hp98035_io_card_device::clock_mux_r)
return res;
}
-WRITE8_MEMBER(hp98035_io_card_device::set_irq_w)
+void hp98035_io_card_device::set_irq_w(uint8_t data)
{
m_irq = true;
update_irq();
}
-READ8_MEMBER(hp98035_io_card_device::clr_inten_r)
+uint8_t hp98035_io_card_device::clr_inten_r()
{
m_intflag = false;
m_inten = false;
@@ -428,7 +428,7 @@ READ8_MEMBER(hp98035_io_card_device::clr_inten_r)
return 0xff;
}
-WRITE8_MEMBER(hp98035_io_card_device::clr_inten_w)
+void hp98035_io_card_device::clr_inten_w(uint8_t data)
{
m_intflag = false;
m_inten = false;
diff --git a/src/devices/bus/hp9845_io/98035.h b/src/devices/bus/hp9845_io/98035.h
index 5051c9058aa..0d057f6ef53 100644
--- a/src/devices/bus/hp9845_io/98035.h
+++ b/src/devices/bus/hp9845_io/98035.h
@@ -34,28 +34,28 @@ protected:
virtual const tiny_rom_entry *device_rom_region() const override;
virtual void device_add_mconfig(machine_config &config) override;
- virtual DECLARE_READ16_MEMBER(reg_r) override;
- virtual DECLARE_WRITE16_MEMBER(reg_w) override;
+ virtual uint16_t reg_r(address_space &space, offs_t offset) override;
+ virtual void reg_w(address_space &space, offs_t offset, uint16_t data) override;
private:
void dc_w(uint8_t data);
- DECLARE_WRITE8_MEMBER(ram_addr_w);
- DECLARE_READ8_MEMBER(ram_data_r);
- DECLARE_WRITE8_MEMBER(ram_addr_data_w);
- DECLARE_WRITE8_MEMBER(ram_data_w);
-
- DECLARE_WRITE8_MEMBER(clock_key_w);
- DECLARE_READ8_MEMBER(clock_digit_r);
-
- DECLARE_WRITE8_MEMBER(odr_w);
- DECLARE_READ8_MEMBER(idr_r);
- DECLARE_READ8_MEMBER(np_status_r);
- DECLARE_WRITE8_MEMBER(clear_np_irq_w);
- DECLARE_READ8_MEMBER(clock_mux_r);
- DECLARE_WRITE8_MEMBER(set_irq_w);
- DECLARE_READ8_MEMBER(clr_inten_r);
- DECLARE_WRITE8_MEMBER(clr_inten_w);
+ void ram_addr_w(uint8_t data);
+ uint8_t ram_data_r();
+ void ram_addr_data_w(uint8_t data);
+ void ram_data_w(uint8_t data);
+
+ void clock_key_w(uint8_t data);
+ uint8_t clock_digit_r();
+
+ void odr_w(uint8_t data);
+ uint8_t idr_r();
+ uint8_t np_status_r();
+ void clear_np_irq_w(uint8_t data);
+ uint8_t clock_mux_r();
+ void set_irq_w(uint8_t data);
+ uint8_t clr_inten_r();
+ void clr_inten_w(uint8_t data);
void np_io_map(address_map &map);
void np_program_map(address_map &map);
diff --git a/src/devices/bus/hp9845_io/98046.cpp b/src/devices/bus/hp9845_io/98046.cpp
index 328bbd91e81..8e977129a76 100644
--- a/src/devices/bus/hp9845_io/98046.cpp
+++ b/src/devices/bus/hp9845_io/98046.cpp
@@ -78,7 +78,7 @@ hp98046_io_card_device::~hp98046_io_card_device()
{
}
-READ16_MEMBER(hp98046_io_card_device::reg_r)
+uint16_t hp98046_io_card_device::reg_r(address_space &space, offs_t offset)
{
uint16_t res = 0;
@@ -129,7 +129,7 @@ READ16_MEMBER(hp98046_io_card_device::reg_r)
return res;
}
-WRITE16_MEMBER(hp98046_io_card_device::reg_w)
+void hp98046_io_card_device::reg_w(address_space &space, offs_t offset, uint16_t data)
{
LOG_CPU("wr R%u=%04x\n" , offset + 4 , data);
@@ -291,12 +291,12 @@ void hp98046_io_card_device::cpu_io_map(address_map &map)
map(0 , 0xff).rw(FUNC(hp98046_io_card_device::cpu_r) , FUNC(hp98046_io_card_device::cpu_w));
}
-READ8_MEMBER(hp98046_io_card_device::ram_r)
+uint8_t hp98046_io_card_device::ram_r(offs_t offset)
{
return m_ram[ offset ];
}
-READ8_MEMBER(hp98046_io_card_device::cpu_r)
+uint8_t hp98046_io_card_device::cpu_r(offs_t offset)
{
if (BIT(m_port_2 , 2)) {
return m_ram[ (offset & 0xff) | (uint16_t(m_port_2 & 3) << 8) ];
@@ -342,7 +342,7 @@ READ8_MEMBER(hp98046_io_card_device::cpu_r)
}
}
-WRITE8_MEMBER(hp98046_io_card_device::cpu_w)
+void hp98046_io_card_device::cpu_w(offs_t offset, uint8_t data)
{
if (BIT(m_port_2 , 2)) {
m_ram[ (offset & 0xff) | (uint16_t(m_port_2 & 3) << 8) ] = data;
diff --git a/src/devices/bus/hp9845_io/98046.h b/src/devices/bus/hp9845_io/98046.h
index 1105865ea3b..fb8197de6fb 100644
--- a/src/devices/bus/hp9845_io/98046.h
+++ b/src/devices/bus/hp9845_io/98046.h
@@ -25,8 +25,8 @@ public:
hp98046_io_card_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual ~hp98046_io_card_device();
- virtual DECLARE_READ16_MEMBER(reg_r) override;
- virtual DECLARE_WRITE16_MEMBER(reg_w) override;
+ virtual uint16_t reg_r(address_space &space, offs_t offset) override;
+ virtual void reg_w(address_space &space, offs_t offset, uint16_t data) override;
virtual bool has_dual_sc() const override;
@@ -74,9 +74,9 @@ private:
void cpu_program_map(address_map &map);
void cpu_io_map(address_map &map);
- DECLARE_READ8_MEMBER(ram_r);
- DECLARE_READ8_MEMBER(cpu_r);
- DECLARE_WRITE8_MEMBER(cpu_w);
+ uint8_t ram_r(offs_t offset);
+ uint8_t cpu_r(offs_t offset);
+ void cpu_w(offs_t offset, uint8_t data);
uint8_t p1_r();
void p2_w(uint8_t data);
DECLARE_WRITE_LINE_MEMBER(sio_int_w);
diff --git a/src/devices/bus/hp9845_io/hp9845_io.cpp b/src/devices/bus/hp9845_io/hp9845_io.cpp
index efb9124c317..a6d09154671 100644
--- a/src/devices/bus/hp9845_io/hp9845_io.cpp
+++ b/src/devices/bus/hp9845_io/hp9845_io.cpp
@@ -97,13 +97,13 @@ WRITE_LINE_MEMBER(hp9845_io_slot_device::dmar_w)
m_dmar_cb_func(state);
}
-int hp9845_io_slot_device::get_rw_handlers(read16_delegate& rhandler , write16_delegate& whandler)
+int hp9845_io_slot_device::get_rw_handlers(read16m_delegate& rhandler , write16m_delegate& whandler)
{
device_hp9845_io_interface *card = get_card_device();
if (card) {
- rhandler = read16_delegate(*card, FUNC(device_hp9845_io_interface::reg_r));
- whandler = write16_delegate(*card, FUNC(device_hp9845_io_interface::reg_w));
+ rhandler = read16m_delegate(*card, FUNC(device_hp9845_io_interface::reg_r));
+ whandler = write16m_delegate(*card, FUNC(device_hp9845_io_interface::reg_w));
return card->get_sc();
} else {
return -1;
diff --git a/src/devices/bus/hp9845_io/hp9845_io.h b/src/devices/bus/hp9845_io/hp9845_io.h
index 75a786afde0..bebe12c3408 100644
--- a/src/devices/bus/hp9845_io/hp9845_io.h
+++ b/src/devices/bus/hp9845_io/hp9845_io.h
@@ -61,7 +61,7 @@ public:
// getter for r/w handlers
// return value is SC (negative if no card is attached to slot)
- int get_rw_handlers(read16_delegate& rhandler , write16_delegate& whandler);
+ int get_rw_handlers(read16m_delegate& rhandler , write16m_delegate& whandler);
bool has_dual_sc() const;
@@ -84,8 +84,8 @@ class device_hp9845_io_interface : public device_interface
public:
void set_slot_device(hp9845_io_slot_device &dev);
- virtual DECLARE_READ16_MEMBER(reg_r) = 0;
- virtual DECLARE_WRITE16_MEMBER(reg_w) = 0;
+ virtual uint16_t reg_r(address_space &space, offs_t offset) = 0;
+ virtual void reg_w(address_space &space, offs_t offset, uint16_t data) = 0;
// SC getter
uint8_t get_sc();