summaryrefslogtreecommitdiffstats
path: root/src/mame/drivers/micral.cpp
diff options
context:
space:
mode:
author Ivan Vangelista <mesgnet@yahoo.it>2020-05-28 18:10:20 +0200
committer Ivan Vangelista <mesgnet@yahoo.it>2020-05-28 18:10:20 +0200
commitd4c772bcc7263dd2697a7977d196a96ad2d067a3 (patch)
tree3fa4d24ee8250f44ec9f7a0cc9df94bf8bd3c5cb /src/mame/drivers/micral.cpp
parentc7d667d41adaa9627a3350e7f984fe7fc431f081 (diff)
drivers starting with i, j, k, l and m: more macro removal (nw)
Diffstat (limited to 'src/mame/drivers/micral.cpp')
-rw-r--r--src/mame/drivers/micral.cpp20
1 files changed, 10 insertions, 10 deletions
diff --git a/src/mame/drivers/micral.cpp b/src/mame/drivers/micral.cpp
index 5154a1609d5..ae3f8a90748 100644
--- a/src/mame/drivers/micral.cpp
+++ b/src/mame/drivers/micral.cpp
@@ -86,11 +86,11 @@ public:
private:
DECLARE_MACHINE_RESET(micral);
- DECLARE_READ8_MEMBER(keyin_r);
- DECLARE_READ8_MEMBER(status_r);
- DECLARE_READ8_MEMBER(unk_r);
- DECLARE_READ8_MEMBER(video_r);
- DECLARE_WRITE8_MEMBER(video_w);
+ u8 keyin_r();
+ u8 status_r();
+ u8 unk_r();
+ u8 video_r(offs_t offset);
+ void video_w(offs_t offset, u8 data);
u32 screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
void io_kbd(address_map &map);
@@ -108,17 +108,17 @@ private:
required_device<crt5037_device> m_crtc;
};
-READ8_MEMBER( micral_state::status_r )
+u8 micral_state::status_r()
{
return m_uart->dav_r() | 4;
}
-READ8_MEMBER( micral_state::unk_r )
+u8 micral_state::unk_r()
{
return 0x96;
}
-READ8_MEMBER( micral_state::keyin_r )
+u8 micral_state::keyin_r()
{
m_uart->write_rdav(0);
u8 result = m_uart->receive();
@@ -126,7 +126,7 @@ READ8_MEMBER( micral_state::keyin_r )
return result;
}
-READ8_MEMBER( micral_state::video_r )
+u8 micral_state::video_r(offs_t offset)
{
if (offset)
return 0x07;
@@ -134,7 +134,7 @@ READ8_MEMBER( micral_state::video_r )
return m_p_videoram[s_curpos];
}
-WRITE8_MEMBER( micral_state::video_w )
+void micral_state::video_w(offs_t offset, u8 data)
{
if (offset)
{