summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/drivers/majorpkr.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/majorpkr.cpp
parentc7d667d41adaa9627a3350e7f984fe7fc431f081 (diff)
drivers starting with i, j, k, l and m: more macro removal (nw)
Diffstat (limited to 'src/mame/drivers/majorpkr.cpp')
-rw-r--r--src/mame/drivers/majorpkr.cpp48
1 files changed, 24 insertions, 24 deletions
diff --git a/src/mame/drivers/majorpkr.cpp b/src/mame/drivers/majorpkr.cpp
index 02cc039e3ef..ebdab3e6aba 100644
--- a/src/mame/drivers/majorpkr.cpp
+++ b/src/mame/drivers/majorpkr.cpp
@@ -494,18 +494,18 @@ protected:
virtual void video_start() override;
private:
- DECLARE_WRITE8_MEMBER(rom_bank_w);
- DECLARE_WRITE8_MEMBER(palette_bank_w);
- DECLARE_WRITE8_MEMBER(vram_bank_w);
- DECLARE_WRITE8_MEMBER(fg_vram_w);
- DECLARE_WRITE8_MEMBER(bg_vram_w);
- DECLARE_WRITE8_MEMBER(vidreg_w);
- DECLARE_READ8_MEMBER(mux_port_r);
- DECLARE_READ8_MEMBER(mux_port2_r);
- DECLARE_WRITE8_MEMBER(mux_sel_w);
- DECLARE_WRITE8_MEMBER(lamps_a_w);
- DECLARE_WRITE8_MEMBER(lamps_b_w);
- DECLARE_WRITE8_MEMBER(pulses_w);
+ void rom_bank_w(uint8_t data);
+ void palette_bank_w(uint8_t data);
+ void vram_bank_w(uint8_t data);
+ void fg_vram_w(offs_t offset, uint8_t data);
+ void bg_vram_w(offs_t offset, uint8_t data);
+ void vidreg_w(uint8_t data);
+ uint8_t mux_port_r();
+ uint8_t mux_port2_r();
+ void mux_sel_w(uint8_t data);
+ void lamps_a_w(uint8_t data);
+ void lamps_b_w(uint8_t data);
+ void pulses_w(uint8_t data);
TILE_GET_INFO_MEMBER(bg_get_tile_info);
TILE_GET_INFO_MEMBER(fg_get_tile_info);
uint32_t screen_update_majorpkr(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
@@ -576,40 +576,40 @@ uint32_t majorpkr_state::screen_update_majorpkr(screen_device &screen, bitmap_rg
* R/W Handlers *
******************************/
-WRITE8_MEMBER(majorpkr_state::rom_bank_w)
+void majorpkr_state::rom_bank_w(uint8_t data)
{
m_rom_bank->set_entry(data & 0x3);
if (data & (0x3 ^ 0xff))
logerror("%s: accessing rom bank %02X\n", machine().describe_context(), data);
}
-WRITE8_MEMBER(majorpkr_state::palette_bank_w)
+void majorpkr_state::palette_bank_w(uint8_t data)
{
m_palette_bank->set_bank(data & 0x3);
if (data & (0x3 ^ 0xff))
logerror("%s: accessing palette bank %02X\n", machine().describe_context(), data);
}
-WRITE8_MEMBER(majorpkr_state::vram_bank_w)
+void majorpkr_state::vram_bank_w(uint8_t data)
{
m_vram_bank->set_bank(data & 0x3);
if (data & (0x3 ^ 0xff))
logerror("%s: accessing vram bank %02X\n", machine().describe_context(), data);
}
-WRITE8_MEMBER(majorpkr_state::fg_vram_w)
+void majorpkr_state::fg_vram_w(offs_t offset, uint8_t data)
{
m_fg_vram[offset] = data;
m_fg_tilemap->mark_tile_dirty(offset >> 1);
}
-WRITE8_MEMBER(majorpkr_state::bg_vram_w)
+void majorpkr_state::bg_vram_w(offs_t offset, uint8_t data)
{
m_bg_vram[offset] = data;
m_bg_tilemap->mark_tile_dirty(offset >> 1);
}
-WRITE8_MEMBER(majorpkr_state::vidreg_w)
+void majorpkr_state::vidreg_w(uint8_t data)
{
/* If bit6 is active, the screen is drawn upside down.
(also 0xfc and 0x11 are written to the CRTC registers 0x0c and 0x0d)
@@ -639,7 +639,7 @@ WRITE8_MEMBER(majorpkr_state::vidreg_w)
/***** Multiplexed Ports *****/
-READ8_MEMBER(majorpkr_state::mux_port_r)
+uint8_t majorpkr_state::mux_port_r()
{
switch( (m_mux_data & 0xf0) ) // 00-10-20-30-0F-1F-2F-3F.
{
@@ -652,7 +652,7 @@ READ8_MEMBER(majorpkr_state::mux_port_r)
return 0xff;
}
-READ8_MEMBER(majorpkr_state::mux_port2_r)
+uint8_t majorpkr_state::mux_port2_r()
{
if ((m_mux_data & 0x0f) == 4)
{
@@ -664,7 +664,7 @@ READ8_MEMBER(majorpkr_state::mux_port2_r)
}
}
-WRITE8_MEMBER(majorpkr_state::mux_sel_w)
+void majorpkr_state::mux_sel_w(uint8_t data)
{
m_mux_data = data; // 00-10-20-30-0F-1F-2F-3F.
}
@@ -674,7 +674,7 @@ WRITE8_MEMBER(majorpkr_state::mux_sel_w)
* Lamps and Pulses *
*************************/
-WRITE8_MEMBER(majorpkr_state::lamps_a_w)
+void majorpkr_state::lamps_a_w(uint8_t data)
{
/* Lamps - Array A.
@@ -701,7 +701,7 @@ WRITE8_MEMBER(majorpkr_state::lamps_a_w)
logerror("Lamps A: Write to 13h: %02x\n", data);
}
-WRITE8_MEMBER(majorpkr_state::lamps_b_w)
+void majorpkr_state::lamps_b_w(uint8_t data)
{
/* Lamps - Array B.
@@ -726,7 +726,7 @@ WRITE8_MEMBER(majorpkr_state::lamps_b_w)
logerror("Lamps B: Write to 14h: %02x\n", data);
}
-WRITE8_MEMBER(majorpkr_state::pulses_w)
+void majorpkr_state::pulses_w(uint8_t data)
{
/* Pulses...