summaryrefslogtreecommitdiffstatshomepage
path: root/src/devices/bus
diff options
context:
space:
mode:
author Ivan Vangelista <mesgnet@yahoo.it>2020-05-13 18:25:16 +0200
committer Ivan Vangelista <mesgnet@yahoo.it>2020-05-13 18:25:16 +0200
commit56cf02734b424649b0e40770a502d2e2a6bb1a56 (patch)
tree6f9116351989dc9c1fd42355e9b62cefd23fe7c6 /src/devices/bus
parent04c5294ca0f2d3f3ba1e88405a793f9357f5ae01 (diff)
simplified some handlers (nw)
Diffstat (limited to 'src/devices/bus')
-rw-r--r--src/devices/bus/hp80_io/82937.cpp4
-rw-r--r--src/devices/bus/hp9845_io/98034.cpp4
-rw-r--r--src/devices/bus/hp_dio/human_interface.cpp2
-rw-r--r--src/devices/bus/ieee488/c2031.cpp2
-rw-r--r--src/devices/bus/ieee488/c2040.cpp2
-rw-r--r--src/devices/bus/ieee488/c8050.cpp2
-rw-r--r--src/devices/bus/ieee488/c8280.cpp2
-rw-r--r--src/devices/bus/ieee488/d9060.cpp2
-rw-r--r--src/devices/bus/ieee488/grid2102.cpp4
-rw-r--r--src/devices/bus/ieee488/hardbox.cpp2
-rw-r--r--src/devices/bus/ieee488/hp9122c.cpp2
-rw-r--r--src/devices/bus/ieee488/hp9895.cpp2
-rw-r--r--src/devices/bus/ieee488/ieee488.h6
-rw-r--r--src/devices/bus/ieee488/remote488.cpp2
-rw-r--r--src/devices/bus/ieee488/softbox.cpp2
15 files changed, 19 insertions, 21 deletions
diff --git a/src/devices/bus/hp80_io/82937.cpp b/src/devices/bus/hp80_io/82937.cpp
index c9a699cf539..dbd5eaecf58 100644
--- a/src/devices/bus/hp80_io/82937.cpp
+++ b/src/devices/bus/hp80_io/82937.cpp
@@ -158,7 +158,7 @@ READ8_MEMBER(hp82937_io_card_device::dio_r)
if (m_dio_out) {
return 0xff;
} else {
- return m_ieee488->read_dio();
+ return m_ieee488->dio_r();
}
}
@@ -252,7 +252,7 @@ void hp82937_io_card_device::device_reset()
void hp82937_io_card_device::update_data_out()
{
- m_ieee488->write_dio(m_dio_out ? m_cpu->p2_r() : 0xff);
+ m_ieee488->host_dio_w(m_dio_out ? m_cpu->p2_r() : 0xff);
}
void hp82937_io_card_device::update_signals()
diff --git a/src/devices/bus/hp9845_io/98034.cpp b/src/devices/bus/hp9845_io/98034.cpp
index bec3e84d3c0..92e98efd38f 100644
--- a/src/devices/bus/hp9845_io/98034.cpp
+++ b/src/devices/bus/hp9845_io/98034.cpp
@@ -245,7 +245,7 @@ READ8_MEMBER(hp98034_io_card_device::hpib_ctrl_r)
READ8_MEMBER(hp98034_io_card_device::hpib_data_r)
{
- return ~m_ieee488->read_dio();
+ return ~m_ieee488->dio_r();
}
READ8_MEMBER(hp98034_io_card_device::idr_r)
@@ -331,7 +331,7 @@ void hp98034_io_card_device::update_data_out()
if (m_clr_hpib) {
m_data_out = 0;
}
- m_ieee488->write_dio(~m_data_out);
+ m_ieee488->host_dio_w(~m_data_out);
}
void hp98034_io_card_device::update_ctrl_out()
diff --git a/src/devices/bus/hp_dio/human_interface.cpp b/src/devices/bus/hp_dio/human_interface.cpp
index 0eddcde7f48..10ecb19e549 100644
--- a/src/devices/bus/hp_dio/human_interface.cpp
+++ b/src/devices/bus/hp_dio/human_interface.cpp
@@ -217,7 +217,7 @@ WRITE8_MEMBER(human_interface_device::gpib_w)
if (m_ppoll_sc & PPOLL_IE) {
LOG("%s: start parallel poll\n", __func__);
- ieee488_dio_w(space, 0, m_ieee488->dio_r(space, 0));
+ ieee488_dio_w(space, 0, m_ieee488->dio_r());
}
break;
case 4:
diff --git a/src/devices/bus/ieee488/c2031.cpp b/src/devices/bus/ieee488/c2031.cpp
index 20abb161352..98c8c237af8 100644
--- a/src/devices/bus/ieee488/c2031.cpp
+++ b/src/devices/bus/ieee488/c2031.cpp
@@ -94,7 +94,7 @@ READ8_MEMBER( c2031_device::via0_pa_r )
*/
- return m_bus->read_dio();
+ return m_bus->dio_r();
}
WRITE8_MEMBER( c2031_device::via0_pa_w )
diff --git a/src/devices/bus/ieee488/c2040.cpp b/src/devices/bus/ieee488/c2040.cpp
index 53a2f9f95e8..3684664325b 100644
--- a/src/devices/bus/ieee488/c2040.cpp
+++ b/src/devices/bus/ieee488/c2040.cpp
@@ -222,7 +222,7 @@ READ8_MEMBER( c2040_device::dio_r )
*/
- return m_bus->read_dio();
+ return m_bus->dio_r();
}
WRITE8_MEMBER( c2040_device::dio_w )
diff --git a/src/devices/bus/ieee488/c8050.cpp b/src/devices/bus/ieee488/c8050.cpp
index 9594b26cf7e..81f64c271f0 100644
--- a/src/devices/bus/ieee488/c8050.cpp
+++ b/src/devices/bus/ieee488/c8050.cpp
@@ -274,7 +274,7 @@ READ8_MEMBER( c8050_device::dio_r )
*/
- return m_bus->read_dio();
+ return m_bus->dio_r();
}
WRITE8_MEMBER( c8050_device::dio_w )
diff --git a/src/devices/bus/ieee488/c8280.cpp b/src/devices/bus/ieee488/c8280.cpp
index 63b5cbe2506..75e0d054874 100644
--- a/src/devices/bus/ieee488/c8280.cpp
+++ b/src/devices/bus/ieee488/c8280.cpp
@@ -127,7 +127,7 @@ READ8_MEMBER( c8280_device::dio_r )
*/
- return m_bus->read_dio();
+ return m_bus->dio_r();
}
WRITE8_MEMBER( c8280_device::dio_w )
diff --git a/src/devices/bus/ieee488/d9060.cpp b/src/devices/bus/ieee488/d9060.cpp
index 58a34acae64..9bf524d9f64 100644
--- a/src/devices/bus/ieee488/d9060.cpp
+++ b/src/devices/bus/ieee488/d9060.cpp
@@ -153,7 +153,7 @@ READ8_MEMBER( d9060_device_base::dio_r )
*/
- return m_bus->read_dio();
+ return m_bus->dio_r();
}
diff --git a/src/devices/bus/ieee488/grid2102.cpp b/src/devices/bus/ieee488/grid2102.cpp
index a903ef1dc3e..d15e5a4bcdb 100644
--- a/src/devices/bus/ieee488/grid2102.cpp
+++ b/src/devices/bus/ieee488/grid2102.cpp
@@ -160,7 +160,7 @@ void grid210x_device::ieee488_dav(int state) {
// read data and wait for transfer end
int atn = m_bus->atn_r() ^ 1;
m_bus->nrfd_w(this, 0);
- uint8_t data = m_bus->read_dio() ^ 0xFF;
+ uint8_t data = m_bus->dio_r() ^ 0xFF;
int eoi = m_bus->eoi_r() ^ 1;
LOG_BYTES("grid210x_device byte recv %02x atn %d eoi %d\n", data, atn, eoi);
m_last_recv_byte = data;
@@ -235,7 +235,7 @@ void grid210x_device::ieee488_dav(int state) {
void grid210x_device::ieee488_nrfd(int state) {
if (state == 1 && m_gpib_loop_state == GRID210X_GPIB_STATE_SEND_DATA_START) {
// set dio and assert dav
- m_bus->write_dio(m_byte_to_send ^ 0xFF);
+ m_bus->host_dio_w(m_byte_to_send ^ 0xFF);
m_bus->eoi_w(this, m_send_eoi ^ 1);
m_bus->dav_w(this, 0);
m_bus->ndac_w(this, 1);
diff --git a/src/devices/bus/ieee488/hardbox.cpp b/src/devices/bus/ieee488/hardbox.cpp
index be648c1fa50..ed140734e13 100644
--- a/src/devices/bus/ieee488/hardbox.cpp
+++ b/src/devices/bus/ieee488/hardbox.cpp
@@ -131,7 +131,7 @@ void hardbox_device::hardbox_io(address_map &map)
READ8_MEMBER( hardbox_device::ppi0_pa_r )
{
- return m_bus->read_dio() ^ 0xff;
+ return m_bus->dio_r() ^ 0xff;
}
WRITE8_MEMBER( hardbox_device::ppi0_pb_w )
diff --git a/src/devices/bus/ieee488/hp9122c.cpp b/src/devices/bus/ieee488/hp9122c.cpp
index 9217d9eda76..bef1fdd8ecb 100644
--- a/src/devices/bus/ieee488/hp9122c.cpp
+++ b/src/devices/bus/ieee488/hp9122c.cpp
@@ -257,7 +257,7 @@ void hp9122c_device::update_intsel()
READ8_MEMBER(hp9122c_device::i8291a_dio_r)
{
- return m_bus->read_dio();
+ return m_bus->dio_r();
}
WRITE8_MEMBER(hp9122c_device::i8291a_dio_w)
diff --git a/src/devices/bus/ieee488/hp9895.cpp b/src/devices/bus/ieee488/hp9895.cpp
index 89f64b75884..a1546668d3f 100644
--- a/src/devices/bus/ieee488/hp9895.cpp
+++ b/src/devices/bus/ieee488/hp9895.cpp
@@ -473,7 +473,7 @@ WRITE_LINE_MEMBER(hp9895_device::phi_ren_w)
READ8_MEMBER(hp9895_device::phi_dio_r)
{
- return m_bus->read_dio();
+ return m_bus->dio_r();
}
WRITE8_MEMBER(hp9895_device::phi_dio_w)
diff --git a/src/devices/bus/ieee488/ieee488.h b/src/devices/bus/ieee488/ieee488.h
index 67c5ca6be07..5a83d0fe927 100644
--- a/src/devices/bus/ieee488/ieee488.h
+++ b/src/devices/bus/ieee488/ieee488.h
@@ -61,8 +61,7 @@ public:
void add_device(ieee488_slot_device *slot, device_t *target);
// reads for both host and peripherals
- uint8_t read_dio() { return get_data(); }
- DECLARE_READ8_MEMBER( dio_r ) { return get_data(); }
+ uint8_t dio_r() { return get_data(); }
DECLARE_READ_LINE_MEMBER( eoi_r ) { return get_signal(EOI); }
DECLARE_READ_LINE_MEMBER( dav_r ) { return get_signal(DAV); }
DECLARE_READ_LINE_MEMBER( nrfd_r ) { return get_signal(NRFD); }
@@ -73,8 +72,7 @@ public:
DECLARE_READ_LINE_MEMBER( ren_r ) { return get_signal(REN); }
// writes for host (driver_device)
- void write_dio(uint8_t data) { set_data(this, data); }
- DECLARE_WRITE8_MEMBER( host_dio_w ) { set_data(this, data); }
+ void host_dio_w(uint8_t data) { set_data(this, data); }
DECLARE_WRITE_LINE_MEMBER( host_eoi_w ) { set_signal(this, EOI, state); }
DECLARE_WRITE_LINE_MEMBER( host_dav_w ) { set_signal(this, DAV, state); }
DECLARE_WRITE_LINE_MEMBER( host_nrfd_w ) { set_signal(this, NRFD, state); }
diff --git a/src/devices/bus/ieee488/remote488.cpp b/src/devices/bus/ieee488/remote488.cpp
index b5eb0041632..233b5e9b758 100644
--- a/src/devices/bus/ieee488/remote488.cpp
+++ b/src/devices/bus/ieee488/remote488.cpp
@@ -707,7 +707,7 @@ void remote488_device::update_ah_fsm()
if (m_bus->dav_r()) {
m_ah_state = REM_AH_ACRS;
} else if (!m_waiting_cp) {
- uint8_t dio = ~m_bus->read_dio();
+ uint8_t dio = ~m_bus->dio_r();
if (!m_bus->eoi_r()) {
send_update(MSG_END_BYTE , dio);
diff --git a/src/devices/bus/ieee488/softbox.cpp b/src/devices/bus/ieee488/softbox.cpp
index 8076a0d5432..ac2630c39cc 100644
--- a/src/devices/bus/ieee488/softbox.cpp
+++ b/src/devices/bus/ieee488/softbox.cpp
@@ -100,7 +100,7 @@ void softbox_device::softbox_io(address_map &map)
READ8_MEMBER( softbox_device::ppi0_pa_r )
{
- return m_bus->read_dio() ^ 0xff;
+ return m_bus->dio_r() ^ 0xff;
}
WRITE8_MEMBER( softbox_device::ppi0_pb_w )