summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author Robbbert <Robbbert@users.noreply.github.com>2020-05-13 23:11:02 +1000
committer Robbbert <Robbbert@users.noreply.github.com>2020-05-13 23:11:02 +1000
commit0670f5d5002630d47840f854202f5847d9fcff16 (patch)
treea5701a11675cba39718cfffd39ecc9cbe755e047
parentee08de5a0303aff58b514bbd2d885be853794aa5 (diff)
(nw) super80: more cleaning
-rw-r--r--src/mame/drivers/super80.cpp34
-rw-r--r--src/mame/includes/super80.h16
-rw-r--r--src/mame/video/super80.cpp16
3 files changed, 31 insertions, 35 deletions
diff --git a/src/mame/drivers/super80.cpp b/src/mame/drivers/super80.cpp
index a2302dc96f5..fb5b369fdde 100644
--- a/src/mame/drivers/super80.cpp
+++ b/src/mame/drivers/super80.cpp
@@ -256,19 +256,15 @@ void super80v_state::super80v_map(address_map &map)
map(0x0800, 0xbfff).ram();
map(0xc000, 0xc7ff).lr8 (NAME([this](u16 offset) { if (!machine().side_effects_disabled()) m_boot_in_progress = false; return m_rom[offset]; }));
map(0xc800, 0xefff).lr8 (NAME([this](u16 offset) { return m_rom[offset+0x0800]; }));
- map(0xf000, 0xf7ff).lrw8(NAME([this](u16 offset) { return super80v_state::low_r(offset); }),
- NAME([this](u16 offset, u8 data) { super80v_state::low_w(offset, data); }));
- map(0xf800, 0xffff).lrw8(NAME([this](u16 offset) { return super80v_state::high_r(offset); }),
- NAME([this](u16 offset, u8 data) { super80v_state::high_w(offset, data); }));
+ map(0xf000, 0xf7ff).rw(FUNC(super80v_state::low_r), FUNC(super80v_state::low_w));
+ map(0xf800, 0xffff).rw(FUNC(super80v_state::high_r), FUNC(super80v_state::high_w));
}
void super80r_state::super80r_map(address_map &map)
{
super80v_map(map);
- map(0xf000, 0xf7ff).lrw8(NAME([this](u16 offset) { return super80r_state::low_r(offset); }),
- NAME([this](u16 offset, u8 data) { super80r_state::low_w(offset, data); }));
- map(0xf800, 0xffff).lrw8(NAME([this](u16 offset) { return super80r_state::high_r(offset); }),
- NAME([this](u16 offset, u8 data) { super80r_state::high_w(offset, data); }));
+ map(0xf000, 0xf7ff).rw(FUNC(super80r_state::low_r), FUNC(super80r_state::low_w));
+ map(0xf800, 0xffff).rw(FUNC(super80r_state::high_r), FUNC(super80r_state::high_w));
}
void super80_state::super80_io(address_map &map)
@@ -276,10 +272,10 @@ void super80_state::super80_io(address_map &map)
map.global_mask(0xff);
map.unmap_value_high();
map(0xdc, 0xdc).r("cent_status_in", FUNC(input_buffer_device::read));
- map(0xdc, 0xdc).lw8(NAME([this](u8 data) { super80_state::portdc_w(data); }));
- map(0xe0, 0xe0).mirror(0x14).lw8(NAME([this](u8 data) { super80_state::portf0_w(data); }));
- map(0xe1, 0xe1).mirror(0x14).lw8(NAME([this](u8 data) { super80_state::portf1_w(data); }));
- map(0xe2, 0xe2).mirror(0x14).lr8(NAME([this]() { return super80_state::portf2_r(); }));
+ map(0xdc, 0xdc).w(FUNC(super80_state::portdc_w));
+ map(0xe0, 0xe0).mirror(0x14).w(FUNC(super80_state::portf0_w));
+ map(0xe1, 0xe1).mirror(0x14).w(FUNC(super80_state::portf1_w));
+ map(0xe2, 0xe2).mirror(0x14).r(FUNC(super80_state::portf2_r));
map(0xf8, 0xfb).mirror(0x04).rw(m_pio, FUNC(z80pio_device::read_alt), FUNC(z80pio_device::write_alt));
}
@@ -288,10 +284,10 @@ void super80_state::super80e_io(address_map &map)
map.global_mask(0xff);
map.unmap_value_high();
map(0xbc, 0xbc).r("cent_status_in", FUNC(input_buffer_device::read));
- map(0xbc, 0xbc).lw8(NAME([this](u8 data) { super80_state::portdc_w(data); }));
- map(0xe0, 0xe0).mirror(0x14).lw8(NAME([this](u8 data) { super80_state::portf0_w(data); }));
- map(0xe1, 0xe1).mirror(0x14).lw8(NAME([this](u8 data) { super80_state::portf1_w(data); }));
- map(0xe2, 0xe2).mirror(0x14).lr8(NAME([this]() { return super80_state::portf2_r(); }));
+ map(0xbc, 0xbc).w(FUNC(super80_state::portdc_w));
+ map(0xe0, 0xe0).mirror(0x14).w(FUNC(super80_state::portf0_w));
+ map(0xe1, 0xe1).mirror(0x14).w(FUNC(super80_state::portf1_w));
+ map(0xe2, 0xe2).mirror(0x14).r(FUNC(super80_state::portf2_r));
map(0xf8, 0xfb).mirror(0x04).rw(m_pio, FUNC(z80pio_device::read_alt), FUNC(z80pio_device::write_alt));
}
@@ -307,9 +303,9 @@ void super80v_state::super80v_io(address_map &map)
map(0x3e, 0x3e).r(FUNC(super80v_state::port3e_r));
map(0x3f, 0x3f).w(FUNC(super80v_state::port3f_w));
map(0xdc, 0xdc).r("cent_status_in", FUNC(input_buffer_device::read));
- map(0xdc, 0xdc).lw8(NAME([this](u8 data) { super80v_state::portdc_w(data); }));
- map(0xe0, 0xe0).mirror(0x14).lw8(NAME([this](u8 data) { super80v_state::portf0_w(data); }));
- map(0xe2, 0xe2).mirror(0x14).lr8(NAME([this]() { return super80v_state::portf2_r(); }));
+ map(0xdc, 0xdc).w(FUNC(super80v_state::portdc_w));
+ map(0xe0, 0xe0).mirror(0x14).w(FUNC(super80v_state::portf0_w));
+ map(0xe2, 0xe2).mirror(0x14).r(FUNC(super80v_state::portf2_r));
map(0xf8, 0xfb).mirror(0x04).rw(m_pio, FUNC(z80pio_device::read_alt), FUNC(z80pio_device::write_alt));
}
diff --git a/src/mame/includes/super80.h b/src/mame/includes/super80.h
index 39e6d7a3ae8..940c312f423 100644
--- a/src/mame/includes/super80.h
+++ b/src/mame/includes/super80.h
@@ -157,10 +157,10 @@ protected:
private:
void machine_reset() override;
void machine_start() override;
- void low_w(u16 offset, u8 data);
- void high_w(u16 offset, u8 data);
- u8 low_r(u16 offset);
- u8 high_r(u16 offset);
+ void low_w(offs_t offset, u8 data);
+ void high_w(offs_t offset, u8 data);
+ u8 low_r(offs_t offset);
+ u8 high_r(offs_t offset);
};
class super80r_state : public super80v_state
@@ -174,11 +174,11 @@ private:
void machine_reset() override;
void machine_start() override;
- void low_w(u16 offset, u8 data);
- void high_w(u16 offset, u8 data);
+ void low_w(offs_t offset, u8 data);
+ void high_w(offs_t offset, u8 data);
void super80r_map(address_map &map);
- u8 low_r(u16 offset);
- u8 high_r(u16 offset);
+ u8 low_r(offs_t offset);
+ u8 high_r(offs_t offset);
};
diff --git a/src/mame/video/super80.cpp b/src/mame/video/super80.cpp
index 1763f36a2f6..ac91ecf3cc0 100644
--- a/src/mame/video/super80.cpp
+++ b/src/mame/video/super80.cpp
@@ -295,28 +295,28 @@ void super80_state::portf1_w(u8 data)
---------------------------------------------------------------*/
// we place the colour ram at m_ram[0x9000], and the videoram at m_ram[0x8000].
-u8 super80r_state::low_r(u16 offset)
+u8 super80r_state::low_r(offs_t offset)
{
return m_ram[offset+0x8000];
}
-void super80r_state::low_w(u16 offset, u8 data)
+void super80r_state::low_w(offs_t offset, u8 data)
{
m_ram[offset+0x8000] = data; // video
}
-u8 super80r_state::high_r(u16 offset)
+u8 super80r_state::high_r(offs_t offset)
{
return m_ram[offset+0x8800]; // video
}
-void super80r_state::high_w(u16 offset, u8 data)
+void super80r_state::high_w(offs_t offset, u8 data)
{
m_ram[offset+0x8800] = data; // video
m_ram[offset+0xf800] = data; // pcg
}
-u8 super80v_state::low_r(u16 offset)
+u8 super80v_state::low_r(offs_t offset)
{
if (BIT(m_portf0, 2))
return m_ram[offset+0x8000]; // video
@@ -324,7 +324,7 @@ u8 super80v_state::low_r(u16 offset)
return m_ram[offset+0x9000]; // colour
}
-void super80v_state::low_w(u16 offset, u8 data)
+void super80v_state::low_w(offs_t offset, u8 data)
{
if (BIT(m_portf0, 2))
m_ram[offset+0x8000] = data; // video
@@ -332,7 +332,7 @@ void super80v_state::low_w(u16 offset, u8 data)
m_ram[offset+0x9000] = data; // colour
}
-u8 super80v_state::high_r(u16 offset)
+u8 super80v_state::high_r(offs_t offset)
{
if (!BIT(m_portf0, 2))
return m_ram[offset+0x9800]; // colour
@@ -343,7 +343,7 @@ u8 super80v_state::high_r(u16 offset)
return m_p_chargen[offset]; // char rom
}
-void super80v_state::high_w(u16 offset, u8 data)
+void super80v_state::high_w(offs_t offset, u8 data)
{
if (!BIT(m_portf0, 2))
m_ram[offset+0x9800] = data; // colour