summaryrefslogtreecommitdiffstatshomepage
path: root/src/devices/bus/ecbbus
diff options
context:
space:
mode:
author AJR <ajrhacker@users.noreply.github.com>2020-05-21 22:38:18 -0400
committer AJR <ajrhacker@users.noreply.github.com>2020-05-21 22:38:18 -0400
commitf95267bf5e215e0f140407fecaf7c16c7da90f81 (patch)
tree4b2da8dca374c2e247ca84a841af34d09648fb65 /src/devices/bus/ecbbus
parent363485b628f370714ea065fcbd2484d7e0510c1e (diff)
Various buses and associated drivers: Simplify handler signatures (nw)
Diffstat (limited to 'src/devices/bus/ecbbus')
-rw-r--r--src/devices/bus/ecbbus/ecbbus.cpp8
-rw-r--r--src/devices/bus/ecbbus/ecbbus.h8
-rw-r--r--src/devices/bus/ecbbus/grip.cpp36
-rw-r--r--src/devices/bus/ecbbus/grip.h22
4 files changed, 39 insertions, 35 deletions
diff --git a/src/devices/bus/ecbbus/ecbbus.cpp b/src/devices/bus/ecbbus/ecbbus.cpp
index d222573cdf4..5eaeda9f284 100644
--- a/src/devices/bus/ecbbus/ecbbus.cpp
+++ b/src/devices/bus/ecbbus/ecbbus.cpp
@@ -116,7 +116,7 @@ void ecbbus_device::add_card(device_ecbbus_card_interface &card, int pos)
// mem_r -
//-------------------------------------------------
-READ8_MEMBER( ecbbus_device::mem_r )
+uint8_t ecbbus_device::mem_r(offs_t offset)
{
uint8_t data = 0;
@@ -136,7 +136,7 @@ READ8_MEMBER( ecbbus_device::mem_r )
// mem_w -
//-------------------------------------------------
-WRITE8_MEMBER( ecbbus_device::mem_w )
+void ecbbus_device::mem_w(offs_t offset, uint8_t data)
{
for (auto & elem : m_ecbbus_device)
{
@@ -152,7 +152,7 @@ WRITE8_MEMBER( ecbbus_device::mem_w )
// io_r -
//-------------------------------------------------
-READ8_MEMBER( ecbbus_device::io_r )
+uint8_t ecbbus_device::io_r(offs_t offset)
{
uint8_t data = 0;
@@ -172,7 +172,7 @@ READ8_MEMBER( ecbbus_device::io_r )
// io_w -
//-------------------------------------------------
-WRITE8_MEMBER( ecbbus_device::io_w )
+void ecbbus_device::io_w(offs_t offset, uint8_t data)
{
for (auto & elem : m_ecbbus_device)
{
diff --git a/src/devices/bus/ecbbus/ecbbus.h b/src/devices/bus/ecbbus/ecbbus.h
index 21ee9eb2bd3..bee5201a2fc 100644
--- a/src/devices/bus/ecbbus/ecbbus.h
+++ b/src/devices/bus/ecbbus/ecbbus.h
@@ -110,11 +110,11 @@ public:
void add_card(device_ecbbus_card_interface &card, int pos);
- DECLARE_READ8_MEMBER( mem_r );
- DECLARE_WRITE8_MEMBER( mem_w );
+ uint8_t mem_r(offs_t offset);
+ void mem_w(offs_t offset, uint8_t data);
- DECLARE_READ8_MEMBER( io_r );
- DECLARE_WRITE8_MEMBER( io_w );
+ uint8_t io_r(offs_t offset);
+ void io_w(offs_t offset, uint8_t data);
DECLARE_WRITE_LINE_MEMBER( irq_w ) { m_write_irq(state); }
DECLARE_WRITE_LINE_MEMBER( nmi_w ) { m_write_nmi(state); }
diff --git a/src/devices/bus/ecbbus/grip.cpp b/src/devices/bus/ecbbus/grip.cpp
index a51abad6c91..da925187f5e 100644
--- a/src/devices/bus/ecbbus/grip.cpp
+++ b/src/devices/bus/ecbbus/grip.cpp
@@ -634,7 +634,7 @@ void ecb_grip21_device::device_reset()
// vol0_w - volume 0
//-------------------------------------------------
-WRITE8_MEMBER( ecb_grip21_device::vol0_w )
+void ecb_grip21_device::vol0_w(uint8_t data)
{
m_vol0 = BIT(data, 7);
}
@@ -644,7 +644,7 @@ WRITE8_MEMBER( ecb_grip21_device::vol0_w )
// vol1_w - volume 1
//-------------------------------------------------
-WRITE8_MEMBER( ecb_grip21_device::vol1_w )
+void ecb_grip21_device::vol1_w(uint8_t data)
{
m_vol1 = BIT(data, 7);
}
@@ -654,7 +654,7 @@ WRITE8_MEMBER( ecb_grip21_device::vol1_w )
// flash_w -
//-------------------------------------------------
-WRITE8_MEMBER( ecb_grip21_device::flash_w )
+void ecb_grip21_device::flash_w(uint8_t data)
{
m_flash = BIT(data, 7);
}
@@ -664,7 +664,7 @@ WRITE8_MEMBER( ecb_grip21_device::flash_w )
// page_w - video page select
//-------------------------------------------------
-WRITE8_MEMBER( ecb_grip21_device::page_w )
+void ecb_grip21_device::page_w(uint8_t data)
{
m_page = BIT(data, 7);
@@ -681,7 +681,7 @@ WRITE_LINE_MEMBER(ecb_grip21_device::write_centronics_fault)
m_centronics_fault = state;
}
-READ8_MEMBER( ecb_grip21_device::stat_r )
+uint8_t ecb_grip21_device::stat_r()
{
/*
@@ -739,9 +739,10 @@ READ8_MEMBER( ecb_grip21_device::stat_r )
// lrs_r -
//-------------------------------------------------
-READ8_MEMBER( ecb_grip21_device::lrs_r )
+uint8_t ecb_grip21_device::lrs_r()
{
- m_lps = 0;
+ if (!machine().side_effects_disabled())
+ m_lps = 0;
return 0;
}
@@ -751,7 +752,7 @@ READ8_MEMBER( ecb_grip21_device::lrs_r )
// lrs_w -
//-------------------------------------------------
-WRITE8_MEMBER( ecb_grip21_device::lrs_w )
+void ecb_grip21_device::lrs_w(uint8_t data)
{
m_lps = 0;
}
@@ -761,10 +762,13 @@ WRITE8_MEMBER( ecb_grip21_device::lrs_w )
// cxstb_r - centronics strobe
//-------------------------------------------------
-READ8_MEMBER( ecb_grip21_device::cxstb_r )
+uint8_t ecb_grip21_device::cxstb_r()
{
- m_centronics->write_strobe(0);
- m_centronics->write_strobe(1);
+ if (!machine().side_effects_disabled())
+ {
+ m_centronics->write_strobe(0);
+ m_centronics->write_strobe(1);
+ }
return 0;
}
@@ -774,7 +778,7 @@ READ8_MEMBER( ecb_grip21_device::cxstb_r )
// cxstb_w - centronics strobe
//-------------------------------------------------
-WRITE8_MEMBER( ecb_grip21_device::cxstb_w )
+void ecb_grip21_device::cxstb_w(uint8_t data)
{
m_centronics->write_strobe(0);
m_centronics->write_strobe(1);
@@ -785,9 +789,9 @@ WRITE8_MEMBER( ecb_grip21_device::cxstb_w )
// eprom_w - EPROM bank select
//-------------------------------------------------
-WRITE8_MEMBER( grip5_state::eprom_w )
+void grip5_state::eprom_w(uint8_t data)
{
- membank("eprom")->set_entry(BIT(data, 0));
+ membank("eprom")->set_entry(BIT(data, 0));
}
@@ -795,9 +799,9 @@ WRITE8_MEMBER( grip5_state::eprom_w )
// dpage_w - display page select
//-------------------------------------------------
-WRITE8_MEMBER( grip5_state::dpage_w )
+void grip5_state::dpage_w(uint8_t data)
{
- m_dpage = BIT(data, 7);
+ m_dpage = BIT(data, 7);
}
*/
diff --git a/src/devices/bus/ecbbus/grip.h b/src/devices/bus/ecbbus/grip.h
index 9deaa5ddfbe..076a61880d9 100644
--- a/src/devices/bus/ecbbus/grip.h
+++ b/src/devices/bus/ecbbus/grip.h
@@ -103,23 +103,23 @@ private:
// timers
emu_timer *m_kb_timer;
- DECLARE_WRITE8_MEMBER( vol0_w );
- DECLARE_WRITE8_MEMBER( vol1_w );
- DECLARE_WRITE8_MEMBER( flash_w );
- DECLARE_WRITE8_MEMBER( page_w );
- DECLARE_READ8_MEMBER( stat_r );
- DECLARE_READ8_MEMBER( lrs_r );
- DECLARE_WRITE8_MEMBER( lrs_w );
- DECLARE_READ8_MEMBER( cxstb_r );
- DECLARE_WRITE8_MEMBER( cxstb_w );
+ void vol0_w(uint8_t data);
+ void vol1_w(uint8_t data);
+ void flash_w(uint8_t data);
+ void page_w(uint8_t data);
+ uint8_t stat_r();
+ uint8_t lrs_r();
+ void lrs_w(uint8_t data);
+ uint8_t cxstb_r();
+ void cxstb_w(uint8_t data);
void grip_io(address_map &map);
void grip_mem(address_map &map);
/*
required_device<hd6345_device> m_crtc;
- DECLARE_WRITE8_MEMBER( eprom_w );
- DECLARE_WRITE8_MEMBER( dpage_w );
+ void eprom_w(uint8_t data);
+ void dpage_w(uint8_t data);
// video state
int m_dpage; // displayed video page