summaryrefslogtreecommitdiffstatshomepage
path: root/src/devices/cpu/sh
diff options
context:
space:
mode:
author Ivan Vangelista <mesgnet@yahoo.it>2020-03-31 18:58:53 +0200
committer Ivan Vangelista <mesgnet@yahoo.it>2020-03-31 18:58:53 +0200
commitae008b65e0966dbd76efba8ea912c26f3003be27 (patch)
tree0d646367ec73fb0f1eed8109609fd8dc1a6915ef /src/devices/cpu/sh
parent68b4451635cd0afb045c5c2f77bc4962c109b4d5 (diff)
devices/cpu: simplified some handlers (nw)
Diffstat (limited to 'src/devices/cpu/sh')
-rw-r--r--src/devices/cpu/sh/sh7604_sci.cpp26
-rw-r--r--src/devices/cpu/sh/sh7604_sci.h30
2 files changed, 28 insertions, 28 deletions
diff --git a/src/devices/cpu/sh/sh7604_sci.cpp b/src/devices/cpu/sh/sh7604_sci.cpp
index 47b60dd8161..5d49eab5c31 100644
--- a/src/devices/cpu/sh/sh7604_sci.cpp
+++ b/src/devices/cpu/sh/sh7604_sci.cpp
@@ -29,12 +29,12 @@ DEFINE_DEVICE_TYPE(SH7604_SCI, sh7604_sci_device, "sh7604sci", "SH7604 SCI Contr
// LIVE DEVICE
//**************************************************************************
-READ8_MEMBER(sh7604_sci_device::serial_mode_r)
+uint8_t sh7604_sci_device::serial_mode_r()
{
return m_smr;
}
-WRITE8_MEMBER(sh7604_sci_device::serial_mode_w)
+void sh7604_sci_device::serial_mode_w(uint8_t data)
{
m_smr = data;
@@ -48,12 +48,12 @@ WRITE8_MEMBER(sh7604_sci_device::serial_mode_w)
logerror("\tClock select: clock/%d\n",4 << ((data & 0x03)*2));
}
-READ8_MEMBER(sh7604_sci_device::serial_control_r)
+uint8_t sh7604_sci_device::serial_control_r()
{
return m_scr;
}
-WRITE8_MEMBER(sh7604_sci_device::serial_control_w)
+void sh7604_sci_device::serial_control_w(uint8_t data)
{
m_scr = data;
@@ -61,39 +61,39 @@ WRITE8_MEMBER(sh7604_sci_device::serial_control_w)
throw emu_fatalerror("%s: enabled serial control %02x\n", tag(),data);
}
-READ8_MEMBER(sh7604_sci_device::serial_status_r)
+uint8_t sh7604_sci_device::serial_status_r()
{
return m_ssr;
}
-WRITE8_MEMBER(sh7604_sci_device::serial_ack_w)
+void sh7604_sci_device::serial_ack_w(uint8_t data)
{
// TODO: verify this
m_ssr = (m_ssr & 0x06) | (m_ssr & data & 0xf9);
}
-READ8_MEMBER(sh7604_sci_device::bitrate_r )
+uint8_t sh7604_sci_device::bitrate_r()
{
return m_brr;
}
-WRITE8_MEMBER(sh7604_sci_device::bitrate_w )
+void sh7604_sci_device::bitrate_w(uint8_t data)
{
m_brr = data;
}
-READ8_MEMBER(sh7604_sci_device::transmit_data_r)
+uint8_t sh7604_sci_device::transmit_data_r()
{
// ...
return 0;
}
-WRITE8_MEMBER(sh7604_sci_device::transmit_data_w)
+void sh7604_sci_device::transmit_data_w(uint8_t data)
{
// ...
}
-READ8_MEMBER(sh7604_sci_device::receive_data_r)
+uint8_t sh7604_sci_device::receive_data_r()
{
// ...
return 0;
@@ -146,12 +146,12 @@ void sh7604_sci_device::device_reset()
// READ/WRITE HANDLERS
//**************************************************************************
-READ8_MEMBER( sh7604_sci_device::read )
+uint8_t sh7604_sci_device::read(address_space &space, offs_t offset)
{
return space.read_byte(offset);
}
-WRITE8_MEMBER( sh7604_sci_device::write )
+void sh7604_sci_device::write(address_space &space, offs_t offset, uint8_t data)
{
space.write_byte(offset,data);
}
diff --git a/src/devices/cpu/sh/sh7604_sci.h b/src/devices/cpu/sh/sh7604_sci.h
index a4f12da1275..b77630db074 100644
--- a/src/devices/cpu/sh/sh7604_sci.h
+++ b/src/devices/cpu/sh/sh7604_sci.h
@@ -28,21 +28,21 @@ public:
// I/O operations
void sci_regs(address_map &map);
- DECLARE_WRITE8_MEMBER( write );
- DECLARE_READ8_MEMBER( read );
-
- DECLARE_READ8_MEMBER( serial_mode_r );
- DECLARE_WRITE8_MEMBER( serial_mode_w );
- DECLARE_READ8_MEMBER( bitrate_r );
- DECLARE_WRITE8_MEMBER( bitrate_w );
- DECLARE_READ8_MEMBER( serial_control_r );
- DECLARE_WRITE8_MEMBER( serial_control_w );
-
- DECLARE_READ8_MEMBER( transmit_data_r );
- DECLARE_WRITE8_MEMBER( transmit_data_w );
- DECLARE_READ8_MEMBER( serial_status_r );
- DECLARE_WRITE8_MEMBER( serial_ack_w );
- DECLARE_READ8_MEMBER( receive_data_r );
+ void write(address_space &space, offs_t offset, uint8_t data);
+ uint8_t read(address_space &space, offs_t offset);
+
+ uint8_t serial_mode_r();
+ void serial_mode_w(uint8_t data);
+ uint8_t bitrate_r();
+ void bitrate_w(uint8_t data);
+ uint8_t serial_control_r();
+ void serial_control_w(uint8_t data);
+
+ uint8_t transmit_data_r();
+ void transmit_data_w(uint8_t data);
+ uint8_t serial_status_r();
+ void serial_ack_w(uint8_t data);
+ uint8_t receive_data_r();
protected:
enum {