summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/drivers/videopkr.cpp
diff options
context:
space:
mode:
author Ivan Vangelista <mesgnet@yahoo.it>2020-05-15 18:15:39 +0200
committer Ivan Vangelista <mesgnet@yahoo.it>2020-05-15 18:15:39 +0200
commit7fd817a1d637d1c7c40da14dade8f63460d1b3a4 (patch)
tree91569462245bc5610e430bab28b31421014b2c97 /src/mame/drivers/videopkr.cpp
parent761d726697721751ecbe1e972b7760dad5d11ff9 (diff)
various drivers: READ/WRITE macros removal (nw)
Diffstat (limited to 'src/mame/drivers/videopkr.cpp')
-rw-r--r--src/mame/drivers/videopkr.cpp40
1 files changed, 20 insertions, 20 deletions
diff --git a/src/mame/drivers/videopkr.cpp b/src/mame/drivers/videopkr.cpp
index ebc407d5905..50bf6d44fcc 100644
--- a/src/mame/drivers/videopkr.cpp
+++ b/src/mame/drivers/videopkr.cpp
@@ -326,20 +326,20 @@ public:
private:
DECLARE_READ8_MEMBER(videopkr_io_r);
DECLARE_WRITE8_MEMBER(videopkr_io_w);
- DECLARE_READ8_MEMBER(videopkr_p1_data_r);
- DECLARE_READ8_MEMBER(videopkr_p2_data_r);
- DECLARE_WRITE8_MEMBER(videopkr_p1_data_w);
- DECLARE_WRITE8_MEMBER(videopkr_p2_data_w);
+ uint8_t videopkr_p1_data_r();
+ uint8_t videopkr_p2_data_r();
+ void videopkr_p1_data_w(uint8_t data);
+ void videopkr_p2_data_w(uint8_t data);
DECLARE_READ_LINE_MEMBER(videopkr_t0_latch);
DECLARE_WRITE_LINE_MEMBER(prog_w);
DECLARE_READ8_MEMBER(sound_io_r);
DECLARE_WRITE8_MEMBER(sound_io_w);
- DECLARE_READ8_MEMBER(sound_p2_r);
- DECLARE_WRITE8_MEMBER(sound_p2_w);
- DECLARE_READ8_MEMBER(baby_sound_p0_r);
- DECLARE_WRITE8_MEMBER(baby_sound_p0_w);
- DECLARE_READ8_MEMBER(baby_sound_p1_r);
- DECLARE_WRITE8_MEMBER(baby_sound_p3_w);
+ uint8_t sound_p2_r();
+ void sound_p2_w(uint8_t data);
+ uint8_t baby_sound_p0_r();
+ void baby_sound_p0_w(uint8_t data);
+ uint8_t baby_sound_p1_r();
+ void baby_sound_p3_w(uint8_t data);
TILE_GET_INFO_MEMBER(get_bg_tile_info);
void videopkr_palette(palette_device &palette) const;
DECLARE_VIDEO_START(vidadcba);
@@ -698,17 +698,17 @@ WRITE8_MEMBER(videopkr_state::videopkr_io_w)
}
}
-READ8_MEMBER(videopkr_state::videopkr_p1_data_r)
+uint8_t videopkr_state::videopkr_p1_data_r()
{
return m_p1;
}
-READ8_MEMBER(videopkr_state::videopkr_p2_data_r)
+uint8_t videopkr_state::videopkr_p2_data_r()
{
return m_p2;
}
-WRITE8_MEMBER(videopkr_state::videopkr_p1_data_w)
+void videopkr_state::videopkr_p1_data_w(uint8_t data)
{
m_p1 = data;
@@ -750,7 +750,7 @@ WRITE8_MEMBER(videopkr_state::videopkr_p1_data_w)
m_ant_jckp = m_jckp;
}
-WRITE8_MEMBER(videopkr_state::videopkr_p2_data_w)
+void videopkr_state::videopkr_p2_data_w(uint8_t data)
{
m_p2 = data;
}
@@ -833,12 +833,12 @@ WRITE8_MEMBER(videopkr_state::sound_io_w)
}
}
-READ8_MEMBER(videopkr_state::sound_p2_r)
+uint8_t videopkr_state::sound_p2_r()
{
return m_vp_sound_p2;
}
-WRITE8_MEMBER(videopkr_state::sound_p2_w)
+void videopkr_state::sound_p2_w(uint8_t data)
{
m_vp_sound_p2 = data;
@@ -870,17 +870,17 @@ WRITE8_MEMBER(videopkr_state::sound_p2_w)
/* Baby Sound Handlers */
-READ8_MEMBER(videopkr_state::baby_sound_p0_r)
+uint8_t videopkr_state::baby_sound_p0_r()
{
return m_sbp0;
}
-WRITE8_MEMBER(videopkr_state::baby_sound_p0_w)
+void videopkr_state::baby_sound_p0_w(uint8_t data)
{
m_sbp0 = data;
}
-READ8_MEMBER(videopkr_state::baby_sound_p1_r)
+uint8_t videopkr_state::baby_sound_p1_r()
{
m_c_io = (m_p1 >> 5) & 1;
m_hp_1 = (~m_p24_data >> 6) & 1;
@@ -890,7 +890,7 @@ READ8_MEMBER(videopkr_state::baby_sound_p1_r)
return m_c_io | (m_hp_1 << 1) | (m_hp_2 << 2) | (m_bell << 3) | (m_aux3 << 4) | 0xe0;
}
-WRITE8_MEMBER(videopkr_state::baby_sound_p3_w)
+void videopkr_state::baby_sound_p3_w(uint8_t data)
{
uint8_t lmp_ports, ay_intf;
lmp_ports = data >> 1 & 0x07;