diff options
author | Vas Crabb <vas@vastheman.com> | 2018-06-08 01:29:39 +1000 |
---|---|---|
committer | Vas Crabb <vas@vastheman.com> | 2018-06-08 01:29:39 +1000 |
commit | 93eaa6a4943ade6513257a740fcde97ca9468559 (patch) | |
tree | 1340f2160a7064a839b7ca649b2257489cdd3d6d /src/devices/video | |
parent | fafafe7050e4d04230656215b840ac53aad081e7 (diff) |
as if millions of this pointers suddenly cried out in terror, and were suddenly silenced
* streamline templates in addrmap.h
* get rid of overloads on read/write member names - this will become even more important in the near future
Diffstat (limited to 'src/devices/video')
-rw-r--r-- | src/devices/video/315_5313.cpp | 4 | ||||
-rw-r--r-- | src/devices/video/bt459.cpp | 8 | ||||
-rw-r--r-- | src/devices/video/bt45x.cpp | 32 | ||||
-rw-r--r-- | src/devices/video/imagetek_i4100.cpp | 186 | ||||
-rw-r--r-- | src/devices/video/jangou_blitter.cpp | 28 | ||||
-rw-r--r-- | src/devices/video/m50458.cpp | 16 | ||||
-rw-r--r-- | src/devices/video/mb_vcu.cpp | 2 | ||||
-rw-r--r-- | src/devices/video/mc6845.cpp | 28 | ||||
-rw-r--r-- | src/devices/video/mc6845.h | 16 | ||||
-rw-r--r-- | src/devices/video/msm6255.cpp | 4 | ||||
-rw-r--r-- | src/devices/video/ppu2c0x.cpp | 2 | ||||
-rw-r--r-- | src/devices/video/tms9928a.cpp | 40 | ||||
-rw-r--r-- | src/devices/video/tms9928a.h | 8 | ||||
-rw-r--r-- | src/devices/video/voodoo_pci.cpp | 2 |
14 files changed, 169 insertions, 207 deletions
diff --git a/src/devices/video/315_5313.cpp b/src/devices/video/315_5313.cpp index 106af73b740..6e6182854e7 100644 --- a/src/devices/video/315_5313.cpp +++ b/src/devices/video/315_5313.cpp @@ -918,8 +918,8 @@ WRITE16_MEMBER( sega315_5313_device::vdp_w ) { // accessed by either segapsg_device or sn76496_device sn76496_base_device *sn = machine().device<sn76496_base_device>(":snsnd"); - if (ACCESSING_BITS_0_7) sn->write(space, 0, data & 0xff); - //if (ACCESSING_BITS_8_15) sn->write(space, 0, (data>>8) & 0xff); + if (ACCESSING_BITS_0_7) sn->write(data & 0xff); + //if (ACCESSING_BITS_8_15) sn->write((data>>8) & 0xff); break; } diff --git a/src/devices/video/bt459.cpp b/src/devices/video/bt459.cpp index c66b61c44c6..e26f0af0867 100644 --- a/src/devices/video/bt459.cpp +++ b/src/devices/video/bt459.cpp @@ -26,10 +26,10 @@ DEFINE_DEVICE_TYPE(BT459, bt459_device, "bt459", "Brooktree Bt459 256 Color RAMD void bt459_device::map(address_map &map) { - map(0x00, 0x00).rw(this, FUNC(bt459_device::address_lo_r), FUNC(bt459_device::address_lo_w)); - map(0x01, 0x01).rw(this, FUNC(bt459_device::address_hi_r), FUNC(bt459_device::address_hi_w)); - map(0x02, 0x02).rw(this, FUNC(bt459_device::register_r), FUNC(bt459_device::register_w)); - map(0x03, 0x03).rw(this, FUNC(bt459_device::palette_r), FUNC(bt459_device::palette_w)); + map(0x00, 0x00).rw(FUNC(bt459_device::address_lo_r), FUNC(bt459_device::address_lo_w)); + map(0x01, 0x01).rw(FUNC(bt459_device::address_hi_r), FUNC(bt459_device::address_hi_w)); + map(0x02, 0x02).rw(FUNC(bt459_device::register_r), FUNC(bt459_device::register_w)); + map(0x03, 0x03).rw(FUNC(bt459_device::palette_r), FUNC(bt459_device::palette_w)); } bt459_device::bt459_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) diff --git a/src/devices/video/bt45x.cpp b/src/devices/video/bt45x.cpp index c2e1a3904c6..81723eeda99 100644 --- a/src/devices/video/bt45x.cpp +++ b/src/devices/video/bt45x.cpp @@ -48,36 +48,36 @@ DEFINE_DEVICE_TYPE(BT458, bt458_device, "bt458", "Brooktree Bt458 256 Color RAMD void bt45x_device_base::map(address_map &map) { - map(0x00, 0x00).rw(this, FUNC(bt45x_device_base::address_r), FUNC(bt45x_device_base::address_w)); - map(0x01, 0x01).rw(this, FUNC(bt45x_device_base::palette_r), FUNC(bt45x_device_base::palette_w)); - map(0x02, 0x02).rw(this, FUNC(bt45x_device_base::register_r), FUNC(bt45x_device_base::register_w)); - map(0x03, 0x03).rw(this, FUNC(bt45x_device_base::overlay_r), FUNC(bt45x_device_base::overlay_w)); + map(0x00, 0x00).rw(FUNC(bt45x_device_base::address_r), FUNC(bt45x_device_base::address_w)); + map(0x01, 0x01).rw(FUNC(bt45x_device_base::palette_r), FUNC(bt45x_device_base::palette_w)); + map(0x02, 0x02).rw(FUNC(bt45x_device_base::register_r), FUNC(bt45x_device_base::register_w)); + map(0x03, 0x03).rw(FUNC(bt45x_device_base::overlay_r), FUNC(bt45x_device_base::overlay_w)); } void bt453_device::map(address_map &map) { - map(0x00, 0x00).rw(this, FUNC(bt453_device::address_r), FUNC(bt453_device::address_w)); - map(0x01, 0x01).rw(this, FUNC(bt453_device::palette_r), FUNC(bt453_device::palette_w)); - map(0x02, 0x02).rw(this, FUNC(bt453_device::address_r), FUNC(bt453_device::address_w)); - map(0x03, 0x03).rw(this, FUNC(bt453_device::overlay_r), FUNC(bt453_device::overlay_w)); + map(0x00, 0x00).rw(FUNC(bt453_device::address_r), FUNC(bt453_device::address_w)); + map(0x01, 0x01).rw(FUNC(bt453_device::palette_r), FUNC(bt453_device::palette_w)); + map(0x02, 0x02).rw(FUNC(bt453_device::address_r), FUNC(bt453_device::address_w)); + map(0x03, 0x03).rw(FUNC(bt453_device::overlay_r), FUNC(bt453_device::overlay_w)); } void bt454_device::map(address_map &map) { - map(0x00, 0x00).rw(this, FUNC(bt454_device::address_r), FUNC(bt454_device::address_w)); - map(0x01, 0x01).rw(this, FUNC(bt454_device::palette_r), FUNC(bt454_device::palette_w)); + map(0x00, 0x00).rw(FUNC(bt454_device::address_r), FUNC(bt454_device::address_w)); + map(0x01, 0x01).rw(FUNC(bt454_device::palette_r), FUNC(bt454_device::palette_w)); // FIXME: not clear what happens here - //map(0x02, 0x02).rw(this, FUNC(bt454_device::address_r), FUNC(bt454_device::address_w)); - map(0x03, 0x03).rw(this, FUNC(bt454_device::overlay_r), FUNC(bt454_device::overlay_w)); + //map(0x02, 0x02).rw(FUNC(bt454_device::address_r), FUNC(bt454_device::address_w)); + map(0x03, 0x03).rw(FUNC(bt454_device::overlay_r), FUNC(bt454_device::overlay_w)); } void bt455_device::map(address_map &map) { - map(0x00, 0x00).rw(this, FUNC(bt455_device::address_r), FUNC(bt455_device::address_w)); - map(0x01, 0x01).rw(this, FUNC(bt455_device::palette_r), FUNC(bt455_device::palette_w)); + map(0x00, 0x00).rw(FUNC(bt455_device::address_r), FUNC(bt455_device::address_w)); + map(0x01, 0x01).rw(FUNC(bt455_device::palette_r), FUNC(bt455_device::palette_w)); // FIXME: not clear what happens here - //map(0x02, 0x02).rw(this, FUNC(bt455_device::address_r), FUNC(bt455_device::address_w)); - map(0x03, 0x03).rw(this, FUNC(bt455_device::overlay_r), FUNC(bt455_device::overlay_w)); + //map(0x02, 0x02).rw(FUNC(bt455_device::address_r), FUNC(bt455_device::address_w)); + map(0x03, 0x03).rw(FUNC(bt455_device::overlay_r), FUNC(bt455_device::overlay_w)); } bt45x_device_base::bt45x_device_base(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock, const u32 palette_colors, const u32 overlay_colors) diff --git a/src/devices/video/imagetek_i4100.cpp b/src/devices/video/imagetek_i4100.cpp index 91a05b41a99..5de099ef28a 100644 --- a/src/devices/video/imagetek_i4100.cpp +++ b/src/devices/video/imagetek_i4100.cpp @@ -79,120 +79,120 @@ DEFINE_DEVICE_TYPE(I4300, imagetek_i4300_device, "i4300", "Imagetek I4300 095 VD void imagetek_i4100_device::map(address_map &map) { - map(0x00000, 0x1ffff).rw(this, FUNC(imagetek_i4100_device::vram_0_r), FUNC(imagetek_i4100_device::vram_0_w)).share("vram_0"); - map(0x20000, 0x3ffff).rw(this, FUNC(imagetek_i4100_device::vram_1_r), FUNC(imagetek_i4100_device::vram_1_w)).share("vram_1"); - map(0x40000, 0x5ffff).rw(this, FUNC(imagetek_i4100_device::vram_2_r), FUNC(imagetek_i4100_device::vram_2_w)).share("vram_2"); - map(0x60000, 0x6ffff).r(this, FUNC(imagetek_i4100_device::gfxrom_r)); - map(0x70000, 0x71fff).rw(this, FUNC(imagetek_i4100_device::scratchram_r), FUNC(imagetek_i4100_device::scratchram_w)).share("scratchram"); // unknown, maybe palette + map(0x00000, 0x1ffff).rw(FUNC(imagetek_i4100_device::vram_0_r), FUNC(imagetek_i4100_device::vram_0_w)).share("vram_0"); + map(0x20000, 0x3ffff).rw(FUNC(imagetek_i4100_device::vram_1_r), FUNC(imagetek_i4100_device::vram_1_w)).share("vram_1"); + map(0x40000, 0x5ffff).rw(FUNC(imagetek_i4100_device::vram_2_r), FUNC(imagetek_i4100_device::vram_2_w)).share("vram_2"); + map(0x60000, 0x6ffff).r(FUNC(imagetek_i4100_device::gfxrom_r)); + map(0x70000, 0x71fff).rw(FUNC(imagetek_i4100_device::scratchram_r), FUNC(imagetek_i4100_device::scratchram_w)).share("scratchram"); // unknown, maybe palette map(0x72000, 0x73fff).rw("palette", FUNC(palette_device::read16), FUNC(palette_device::write16)).share("palette"); - map(0x74000, 0x74fff).rw(this, FUNC(imagetek_i4100_device::spriteram_r), FUNC(imagetek_i4100_device::spriteram_w)).share("spriteram"); - map(0x75000, 0x75fff).rw(this, FUNC(imagetek_i4100_device::rmw_vram_0_r), FUNC(imagetek_i4100_device::rmw_vram_0_w)); - map(0x76000, 0x76fff).rw(this, FUNC(imagetek_i4100_device::rmw_vram_1_r), FUNC(imagetek_i4100_device::rmw_vram_1_w)); - map(0x77000, 0x77fff).rw(this, FUNC(imagetek_i4100_device::rmw_vram_2_r), FUNC(imagetek_i4100_device::rmw_vram_2_w)); - map(0x78000, 0x787ff).rw(this, FUNC(imagetek_i4100_device::tiletable_r), FUNC(imagetek_i4100_device::tiletable_w)).share("tiletable"); + map(0x74000, 0x74fff).rw(FUNC(imagetek_i4100_device::spriteram_r), FUNC(imagetek_i4100_device::spriteram_w)).share("spriteram"); + map(0x75000, 0x75fff).rw(FUNC(imagetek_i4100_device::rmw_vram_0_r), FUNC(imagetek_i4100_device::rmw_vram_0_w)); + map(0x76000, 0x76fff).rw(FUNC(imagetek_i4100_device::rmw_vram_1_r), FUNC(imagetek_i4100_device::rmw_vram_1_w)); + map(0x77000, 0x77fff).rw(FUNC(imagetek_i4100_device::rmw_vram_2_r), FUNC(imagetek_i4100_device::rmw_vram_2_w)); + map(0x78000, 0x787ff).rw(FUNC(imagetek_i4100_device::tiletable_r), FUNC(imagetek_i4100_device::tiletable_w)).share("tiletable"); // video registers - map(0x78800, 0x78801).rw(this, FUNC(imagetek_i4100_device::sprite_count_r), FUNC(imagetek_i4100_device::sprite_count_w)); - map(0x78802, 0x78803).rw(this, FUNC(imagetek_i4100_device::sprite_priority_r), FUNC(imagetek_i4100_device::sprite_priority_w)); - map(0x78804, 0x78805).rw(this, FUNC(imagetek_i4100_device::sprite_yoffset_r), FUNC(imagetek_i4100_device::sprite_yoffset_w)); - map(0x78806, 0x78807).rw(this, FUNC(imagetek_i4100_device::sprite_xoffset_r), FUNC(imagetek_i4100_device::sprite_xoffset_w)); - map(0x78808, 0x78809).rw(this, FUNC(imagetek_i4100_device::sprite_color_code_r), FUNC(imagetek_i4100_device::sprite_color_code_w)); - map(0x78810, 0x78811).rw(this, FUNC(imagetek_i4100_device::layer_priority_r), FUNC(imagetek_i4100_device::layer_priority_w)); - map(0x78812, 0x78813).rw(this, FUNC(imagetek_i4100_device::background_color_r), FUNC(imagetek_i4100_device::background_color_w)); - - map(0x78840, 0x7884d).w(this, FUNC(imagetek_i4100_device::blitter_w)).share("blitter_regs"); - map(0x78850, 0x78851).rw(this, FUNC(imagetek_i4100_device::screen_yoffset_r), FUNC(imagetek_i4100_device::screen_yoffset_w)); - map(0x78852, 0x78853).rw(this, FUNC(imagetek_i4100_device::screen_xoffset_r), FUNC(imagetek_i4100_device::screen_xoffset_w)); - map(0x78860, 0x7886b).rw(this, FUNC(imagetek_i4100_device::window_r), FUNC(imagetek_i4100_device::window_w)).share("windowregs"); - map(0x78870, 0x7887b).rw(this, FUNC(imagetek_i4100_device::scroll_r), FUNC(imagetek_i4100_device::scroll_w)).share("scrollregs"); - - map(0x78880, 0x78881).w(this, FUNC(imagetek_i4100_device::crtc_vert_w)); - map(0x78890, 0x78891).w(this, FUNC(imagetek_i4100_device::crtc_horz_w)); - map(0x788a0, 0x788a1).w(this, FUNC(imagetek_i4100_device::crtc_unlock_w)); - map(0x788aa, 0x788ab).w(this, FUNC(imagetek_i4100_device::rombank_w)); - map(0x788ac, 0x788ad).w(this, FUNC(imagetek_i4100_device::screen_ctrl_w)); + map(0x78800, 0x78801).rw(FUNC(imagetek_i4100_device::sprite_count_r), FUNC(imagetek_i4100_device::sprite_count_w)); + map(0x78802, 0x78803).rw(FUNC(imagetek_i4100_device::sprite_priority_r), FUNC(imagetek_i4100_device::sprite_priority_w)); + map(0x78804, 0x78805).rw(FUNC(imagetek_i4100_device::sprite_yoffset_r), FUNC(imagetek_i4100_device::sprite_yoffset_w)); + map(0x78806, 0x78807).rw(FUNC(imagetek_i4100_device::sprite_xoffset_r), FUNC(imagetek_i4100_device::sprite_xoffset_w)); + map(0x78808, 0x78809).rw(FUNC(imagetek_i4100_device::sprite_color_code_r), FUNC(imagetek_i4100_device::sprite_color_code_w)); + map(0x78810, 0x78811).rw(FUNC(imagetek_i4100_device::layer_priority_r), FUNC(imagetek_i4100_device::layer_priority_w)); + map(0x78812, 0x78813).rw(FUNC(imagetek_i4100_device::background_color_r), FUNC(imagetek_i4100_device::background_color_w)); + + map(0x78840, 0x7884d).w(FUNC(imagetek_i4100_device::blitter_w)).share("blitter_regs"); + map(0x78850, 0x78851).rw(FUNC(imagetek_i4100_device::screen_yoffset_r), FUNC(imagetek_i4100_device::screen_yoffset_w)); + map(0x78852, 0x78853).rw(FUNC(imagetek_i4100_device::screen_xoffset_r), FUNC(imagetek_i4100_device::screen_xoffset_w)); + map(0x78860, 0x7886b).rw(FUNC(imagetek_i4100_device::window_r), FUNC(imagetek_i4100_device::window_w)).share("windowregs"); + map(0x78870, 0x7887b).rw(FUNC(imagetek_i4100_device::scroll_r), FUNC(imagetek_i4100_device::scroll_w)).share("scrollregs"); + + map(0x78880, 0x78881).w(FUNC(imagetek_i4100_device::crtc_vert_w)); + map(0x78890, 0x78891).w(FUNC(imagetek_i4100_device::crtc_horz_w)); + map(0x788a0, 0x788a1).w(FUNC(imagetek_i4100_device::crtc_unlock_w)); + map(0x788aa, 0x788ab).w(FUNC(imagetek_i4100_device::rombank_w)); + map(0x788ac, 0x788ad).w(FUNC(imagetek_i4100_device::screen_ctrl_w)); } // same as above but with moved video registers (now at 0x797**) void imagetek_i4220_device::v2_map(address_map &map) { - map(0x00000, 0x1ffff).rw(this, FUNC(imagetek_i4220_device::vram_0_r), FUNC(imagetek_i4220_device::vram_0_w)).share("vram_0"); - map(0x20000, 0x3ffff).rw(this, FUNC(imagetek_i4220_device::vram_1_r), FUNC(imagetek_i4220_device::vram_1_w)).share("vram_1"); - map(0x40000, 0x5ffff).rw(this, FUNC(imagetek_i4220_device::vram_2_r), FUNC(imagetek_i4220_device::vram_2_w)).share("vram_2"); - map(0x60000, 0x6ffff).r(this, FUNC(imagetek_i4220_device::gfxrom_r)); - map(0x70000, 0x71fff).rw(this, FUNC(imagetek_i4220_device::scratchram_r), FUNC(imagetek_i4220_device::scratchram_w)).share("scratchram"); // unknown, maybe palette + map(0x00000, 0x1ffff).rw(FUNC(imagetek_i4220_device::vram_0_r), FUNC(imagetek_i4220_device::vram_0_w)).share("vram_0"); + map(0x20000, 0x3ffff).rw(FUNC(imagetek_i4220_device::vram_1_r), FUNC(imagetek_i4220_device::vram_1_w)).share("vram_1"); + map(0x40000, 0x5ffff).rw(FUNC(imagetek_i4220_device::vram_2_r), FUNC(imagetek_i4220_device::vram_2_w)).share("vram_2"); + map(0x60000, 0x6ffff).r(FUNC(imagetek_i4220_device::gfxrom_r)); + map(0x70000, 0x71fff).rw(FUNC(imagetek_i4220_device::scratchram_r), FUNC(imagetek_i4220_device::scratchram_w)).share("scratchram"); // unknown, maybe palette map(0x72000, 0x73fff).rw("palette", FUNC(palette_device::read16), FUNC(palette_device::write16)).share("palette"); - map(0x74000, 0x74fff).rw(this, FUNC(imagetek_i4220_device::spriteram_r), FUNC(imagetek_i4220_device::spriteram_w)).share("spriteram"); - map(0x75000, 0x75fff).rw(this, FUNC(imagetek_i4220_device::rmw_vram_0_r), FUNC(imagetek_i4220_device::rmw_vram_0_w)); - map(0x76000, 0x76fff).rw(this, FUNC(imagetek_i4220_device::rmw_vram_1_r), FUNC(imagetek_i4220_device::rmw_vram_1_w)); - map(0x77000, 0x77fff).rw(this, FUNC(imagetek_i4220_device::rmw_vram_2_r), FUNC(imagetek_i4220_device::rmw_vram_2_w)); - map(0x78000, 0x787ff).rw(this, FUNC(imagetek_i4220_device::tiletable_r), FUNC(imagetek_i4220_device::tiletable_w)).share("tiletable"); - - map(0x78840, 0x7884d).w(this, FUNC(imagetek_i4220_device::blitter_w)).share("blitter_regs"); - map(0x78850, 0x78851).rw(this, FUNC(imagetek_i4220_device::screen_yoffset_r), FUNC(imagetek_i4220_device::screen_yoffset_w)); - map(0x78852, 0x78853).rw(this, FUNC(imagetek_i4220_device::screen_xoffset_r), FUNC(imagetek_i4220_device::screen_xoffset_w)); - map(0x78860, 0x7886b).rw(this, FUNC(imagetek_i4220_device::window_r), FUNC(imagetek_i4220_device::window_w)).share("windowregs"); - map(0x78870, 0x7887b).rw(this, FUNC(imagetek_i4220_device::scroll_r), FUNC(imagetek_i4220_device::scroll_w)).share("scrollregs"); - - map(0x78880, 0x78881).w(this, FUNC(imagetek_i4220_device::crtc_vert_w)); - map(0x78890, 0x78891).w(this, FUNC(imagetek_i4220_device::crtc_horz_w)); - map(0x788a0, 0x788a1).w(this, FUNC(imagetek_i4220_device::crtc_unlock_w)); - map(0x788aa, 0x788ab).w(this, FUNC(imagetek_i4220_device::rombank_w)); - map(0x788ac, 0x788ad).w(this, FUNC(imagetek_i4220_device::screen_ctrl_w)); + map(0x74000, 0x74fff).rw(FUNC(imagetek_i4220_device::spriteram_r), FUNC(imagetek_i4220_device::spriteram_w)).share("spriteram"); + map(0x75000, 0x75fff).rw(FUNC(imagetek_i4220_device::rmw_vram_0_r), FUNC(imagetek_i4220_device::rmw_vram_0_w)); + map(0x76000, 0x76fff).rw(FUNC(imagetek_i4220_device::rmw_vram_1_r), FUNC(imagetek_i4220_device::rmw_vram_1_w)); + map(0x77000, 0x77fff).rw(FUNC(imagetek_i4220_device::rmw_vram_2_r), FUNC(imagetek_i4220_device::rmw_vram_2_w)); + map(0x78000, 0x787ff).rw(FUNC(imagetek_i4220_device::tiletable_r), FUNC(imagetek_i4220_device::tiletable_w)).share("tiletable"); + + map(0x78840, 0x7884d).w(FUNC(imagetek_i4220_device::blitter_w)).share("blitter_regs"); + map(0x78850, 0x78851).rw(FUNC(imagetek_i4220_device::screen_yoffset_r), FUNC(imagetek_i4220_device::screen_yoffset_w)); + map(0x78852, 0x78853).rw(FUNC(imagetek_i4220_device::screen_xoffset_r), FUNC(imagetek_i4220_device::screen_xoffset_w)); + map(0x78860, 0x7886b).rw(FUNC(imagetek_i4220_device::window_r), FUNC(imagetek_i4220_device::window_w)).share("windowregs"); + map(0x78870, 0x7887b).rw(FUNC(imagetek_i4220_device::scroll_r), FUNC(imagetek_i4220_device::scroll_w)).share("scrollregs"); + + map(0x78880, 0x78881).w(FUNC(imagetek_i4220_device::crtc_vert_w)); + map(0x78890, 0x78891).w(FUNC(imagetek_i4220_device::crtc_horz_w)); + map(0x788a0, 0x788a1).w(FUNC(imagetek_i4220_device::crtc_unlock_w)); + map(0x788aa, 0x788ab).w(FUNC(imagetek_i4220_device::rombank_w)); + map(0x788ac, 0x788ad).w(FUNC(imagetek_i4220_device::screen_ctrl_w)); // video registers - map(0x79700, 0x79701).rw(this, FUNC(imagetek_i4220_device::sprite_count_r), FUNC(imagetek_i4220_device::sprite_count_w)); - map(0x79702, 0x79703).rw(this, FUNC(imagetek_i4220_device::sprite_priority_r), FUNC(imagetek_i4220_device::sprite_priority_w)); - map(0x79704, 0x79705).rw(this, FUNC(imagetek_i4220_device::sprite_yoffset_r), FUNC(imagetek_i4220_device::sprite_yoffset_w)); - map(0x79706, 0x79707).rw(this, FUNC(imagetek_i4220_device::sprite_xoffset_r), FUNC(imagetek_i4220_device::sprite_xoffset_w)); - map(0x79708, 0x79709).rw(this, FUNC(imagetek_i4220_device::sprite_color_code_r), FUNC(imagetek_i4220_device::sprite_color_code_w)); - map(0x79710, 0x79711).rw(this, FUNC(imagetek_i4220_device::layer_priority_r), FUNC(imagetek_i4220_device::layer_priority_w)); - map(0x79712, 0x79713).rw(this, FUNC(imagetek_i4220_device::background_color_r), FUNC(imagetek_i4220_device::background_color_w)); + map(0x79700, 0x79701).rw(FUNC(imagetek_i4220_device::sprite_count_r), FUNC(imagetek_i4220_device::sprite_count_w)); + map(0x79702, 0x79703).rw(FUNC(imagetek_i4220_device::sprite_priority_r), FUNC(imagetek_i4220_device::sprite_priority_w)); + map(0x79704, 0x79705).rw(FUNC(imagetek_i4220_device::sprite_yoffset_r), FUNC(imagetek_i4220_device::sprite_yoffset_w)); + map(0x79706, 0x79707).rw(FUNC(imagetek_i4220_device::sprite_xoffset_r), FUNC(imagetek_i4220_device::sprite_xoffset_w)); + map(0x79708, 0x79709).rw(FUNC(imagetek_i4220_device::sprite_color_code_r), FUNC(imagetek_i4220_device::sprite_color_code_w)); + map(0x79710, 0x79711).rw(FUNC(imagetek_i4220_device::layer_priority_r), FUNC(imagetek_i4220_device::layer_priority_w)); + map(0x79712, 0x79713).rw(FUNC(imagetek_i4220_device::background_color_r), FUNC(imagetek_i4220_device::background_color_w)); // repeated here in Puzzlet compatibility mode - map(0x78800, 0x78801).rw(this, FUNC(imagetek_i4220_device::sprite_count_r), FUNC(imagetek_i4220_device::sprite_count_w)); + map(0x78800, 0x78801).rw(FUNC(imagetek_i4220_device::sprite_count_r), FUNC(imagetek_i4220_device::sprite_count_w)); // ... this one breaks Blazing Tornado tho // AM_RANGE(0x78802, 0x78803) AM_READWRITE(sprite_priority_r, sprite_priority_w) - map(0x78804, 0x78805).rw(this, FUNC(imagetek_i4220_device::sprite_yoffset_r), FUNC(imagetek_i4220_device::sprite_yoffset_w)); - map(0x78806, 0x78807).rw(this, FUNC(imagetek_i4220_device::sprite_xoffset_r), FUNC(imagetek_i4220_device::sprite_xoffset_w)); - map(0x78808, 0x78809).rw(this, FUNC(imagetek_i4220_device::sprite_color_code_r), FUNC(imagetek_i4220_device::sprite_color_code_w)); - map(0x78810, 0x78811).rw(this, FUNC(imagetek_i4220_device::layer_priority_r), FUNC(imagetek_i4220_device::layer_priority_w)); - map(0x78812, 0x78813).rw(this, FUNC(imagetek_i4220_device::background_color_r), FUNC(imagetek_i4220_device::background_color_w)); + map(0x78804, 0x78805).rw(FUNC(imagetek_i4220_device::sprite_yoffset_r), FUNC(imagetek_i4220_device::sprite_yoffset_w)); + map(0x78806, 0x78807).rw(FUNC(imagetek_i4220_device::sprite_xoffset_r), FUNC(imagetek_i4220_device::sprite_xoffset_w)); + map(0x78808, 0x78809).rw(FUNC(imagetek_i4220_device::sprite_color_code_r), FUNC(imagetek_i4220_device::sprite_color_code_w)); + map(0x78810, 0x78811).rw(FUNC(imagetek_i4220_device::layer_priority_r), FUNC(imagetek_i4220_device::layer_priority_w)); + map(0x78812, 0x78813).rw(FUNC(imagetek_i4220_device::background_color_r), FUNC(imagetek_i4220_device::background_color_w)); } // more changes around, namely the screen offsets being reversed here void imagetek_i4300_device::v3_map(address_map &map) { - map(0x00000, 0x1ffff).rw(this, FUNC(imagetek_i4300_device::vram_0_r), FUNC(imagetek_i4300_device::vram_0_w)).share("vram_0"); - map(0x20000, 0x3ffff).rw(this, FUNC(imagetek_i4300_device::vram_1_r), FUNC(imagetek_i4300_device::vram_1_w)).share("vram_1"); - map(0x40000, 0x5ffff).rw(this, FUNC(imagetek_i4300_device::vram_2_r), FUNC(imagetek_i4300_device::vram_2_w)).share("vram_2"); - map(0x60000, 0x6ffff).r(this, FUNC(imagetek_i4300_device::gfxrom_r)); - map(0x70000, 0x71fff).rw(this, FUNC(imagetek_i4300_device::scratchram_r), FUNC(imagetek_i4300_device::scratchram_w)).share("scratchram"); // unknown, maybe palette + map(0x00000, 0x1ffff).rw(FUNC(imagetek_i4300_device::vram_0_r), FUNC(imagetek_i4300_device::vram_0_w)).share("vram_0"); + map(0x20000, 0x3ffff).rw(FUNC(imagetek_i4300_device::vram_1_r), FUNC(imagetek_i4300_device::vram_1_w)).share("vram_1"); + map(0x40000, 0x5ffff).rw(FUNC(imagetek_i4300_device::vram_2_r), FUNC(imagetek_i4300_device::vram_2_w)).share("vram_2"); + map(0x60000, 0x6ffff).r(FUNC(imagetek_i4300_device::gfxrom_r)); + map(0x70000, 0x71fff).rw(FUNC(imagetek_i4300_device::scratchram_r), FUNC(imagetek_i4300_device::scratchram_w)).share("scratchram"); // unknown, maybe palette map(0x72000, 0x73fff).rw("palette", FUNC(palette_device::read16), FUNC(palette_device::write16)).share("palette"); - map(0x74000, 0x74fff).rw(this, FUNC(imagetek_i4300_device::spriteram_r), FUNC(imagetek_i4300_device::spriteram_w)).share("spriteram"); - map(0x75000, 0x75fff).rw(this, FUNC(imagetek_i4300_device::rmw_vram_0_r), FUNC(imagetek_i4300_device::rmw_vram_0_w)); - map(0x76000, 0x76fff).rw(this, FUNC(imagetek_i4300_device::rmw_vram_1_r), FUNC(imagetek_i4300_device::rmw_vram_1_w)); - map(0x77000, 0x77fff).rw(this, FUNC(imagetek_i4300_device::rmw_vram_2_r), FUNC(imagetek_i4300_device::rmw_vram_2_w)); - map(0x78000, 0x787ff).rw(this, FUNC(imagetek_i4300_device::tiletable_r), FUNC(imagetek_i4300_device::tiletable_w)).share("tiletable"); - map(0x78808, 0x78809).rw(this, FUNC(imagetek_i4300_device::screen_xoffset_r), FUNC(imagetek_i4300_device::screen_xoffset_w)); - map(0x7880a, 0x7880b).rw(this, FUNC(imagetek_i4300_device::screen_yoffset_r), FUNC(imagetek_i4300_device::screen_yoffset_w)); - map(0x7880e, 0x7880f).w(this, FUNC(imagetek_i4300_device::screen_ctrl_w)); // TODO: can be read back here (gakusai) - - map(0x78800, 0x78801).w(this, FUNC(imagetek_i4300_device::crtc_unlock_w)); - map(0x78802, 0x78803).w(this, FUNC(imagetek_i4300_device::crtc_horz_w)); - map(0x78804, 0x78805).w(this, FUNC(imagetek_i4300_device::crtc_vert_w)); - - map(0x78840, 0x7884d).w(this, FUNC(imagetek_i4300_device::blitter_w)).share("blitter_regs"); - map(0x78850, 0x7885b).rw(this, FUNC(imagetek_i4300_device::scroll_r), FUNC(imagetek_i4300_device::scroll_w)).share("scrollregs"); - map(0x78860, 0x7886b).rw(this, FUNC(imagetek_i4300_device::window_r), FUNC(imagetek_i4300_device::window_w)).share("windowregs"); - map(0x78870, 0x78871).w(this, FUNC(imagetek_i4300_device::rombank_w)); + map(0x74000, 0x74fff).rw(FUNC(imagetek_i4300_device::spriteram_r), FUNC(imagetek_i4300_device::spriteram_w)).share("spriteram"); + map(0x75000, 0x75fff).rw(FUNC(imagetek_i4300_device::rmw_vram_0_r), FUNC(imagetek_i4300_device::rmw_vram_0_w)); + map(0x76000, 0x76fff).rw(FUNC(imagetek_i4300_device::rmw_vram_1_r), FUNC(imagetek_i4300_device::rmw_vram_1_w)); + map(0x77000, 0x77fff).rw(FUNC(imagetek_i4300_device::rmw_vram_2_r), FUNC(imagetek_i4300_device::rmw_vram_2_w)); + map(0x78000, 0x787ff).rw(FUNC(imagetek_i4300_device::tiletable_r), FUNC(imagetek_i4300_device::tiletable_w)).share("tiletable"); + map(0x78808, 0x78809).rw(FUNC(imagetek_i4300_device::screen_xoffset_r), FUNC(imagetek_i4300_device::screen_xoffset_w)); + map(0x7880a, 0x7880b).rw(FUNC(imagetek_i4300_device::screen_yoffset_r), FUNC(imagetek_i4300_device::screen_yoffset_w)); + map(0x7880e, 0x7880f).w(FUNC(imagetek_i4300_device::screen_ctrl_w)); // TODO: can be read back here (gakusai) + + map(0x78800, 0x78801).w(FUNC(imagetek_i4300_device::crtc_unlock_w)); + map(0x78802, 0x78803).w(FUNC(imagetek_i4300_device::crtc_horz_w)); + map(0x78804, 0x78805).w(FUNC(imagetek_i4300_device::crtc_vert_w)); + + map(0x78840, 0x7884d).w(FUNC(imagetek_i4300_device::blitter_w)).share("blitter_regs"); + map(0x78850, 0x7885b).rw(FUNC(imagetek_i4300_device::scroll_r), FUNC(imagetek_i4300_device::scroll_w)).share("scrollregs"); + map(0x78860, 0x7886b).rw(FUNC(imagetek_i4300_device::window_r), FUNC(imagetek_i4300_device::window_w)).share("windowregs"); + map(0x78870, 0x78871).w(FUNC(imagetek_i4300_device::rombank_w)); // video registers - map(0x79700, 0x79701).rw(this, FUNC(imagetek_i4300_device::sprite_count_r), FUNC(imagetek_i4300_device::sprite_count_w)); - map(0x79702, 0x79703).rw(this, FUNC(imagetek_i4300_device::sprite_priority_r), FUNC(imagetek_i4300_device::sprite_priority_w)); - map(0x79704, 0x79705).rw(this, FUNC(imagetek_i4300_device::sprite_yoffset_r), FUNC(imagetek_i4300_device::sprite_yoffset_w)); - map(0x79706, 0x79707).rw(this, FUNC(imagetek_i4300_device::sprite_xoffset_r), FUNC(imagetek_i4300_device::sprite_xoffset_w)); - map(0x79708, 0x79709).rw(this, FUNC(imagetek_i4300_device::sprite_color_code_r), FUNC(imagetek_i4300_device::sprite_color_code_w)); - map(0x79710, 0x79711).rw(this, FUNC(imagetek_i4300_device::layer_priority_r), FUNC(imagetek_i4300_device::layer_priority_w)); - map(0x79712, 0x79713).rw(this, FUNC(imagetek_i4300_device::background_color_r), FUNC(imagetek_i4300_device::background_color_w)); + map(0x79700, 0x79701).rw(FUNC(imagetek_i4300_device::sprite_count_r), FUNC(imagetek_i4300_device::sprite_count_w)); + map(0x79702, 0x79703).rw(FUNC(imagetek_i4300_device::sprite_priority_r), FUNC(imagetek_i4300_device::sprite_priority_w)); + map(0x79704, 0x79705).rw(FUNC(imagetek_i4300_device::sprite_yoffset_r), FUNC(imagetek_i4300_device::sprite_yoffset_w)); + map(0x79706, 0x79707).rw(FUNC(imagetek_i4300_device::sprite_xoffset_r), FUNC(imagetek_i4300_device::sprite_xoffset_w)); + map(0x79708, 0x79709).rw(FUNC(imagetek_i4300_device::sprite_color_code_r), FUNC(imagetek_i4300_device::sprite_color_code_w)); + map(0x79710, 0x79711).rw(FUNC(imagetek_i4300_device::layer_priority_r), FUNC(imagetek_i4300_device::layer_priority_w)); + map(0x79712, 0x79713).rw(FUNC(imagetek_i4300_device::background_color_r), FUNC(imagetek_i4300_device::background_color_w)); } diff --git a/src/devices/video/jangou_blitter.cpp b/src/devices/video/jangou_blitter.cpp index 6eda24f873d..5cebf751cb1 100644 --- a/src/devices/video/jangou_blitter.cpp +++ b/src/devices/video/jangou_blitter.cpp @@ -43,25 +43,25 @@ jangou_blitter_device::jangou_blitter_device(const machine_config &mconfig, cons void jangou_blitter_device::blit_v1_regs(address_map &map) { - map(0x00, 0x00).w(this, FUNC(jangou_blitter_device::src_lo_address_w)); - map(0x01, 0x01).w(this, FUNC(jangou_blitter_device::src_md_address_w)); - map(0x02, 0x02).w(this, FUNC(jangou_blitter_device::x_w)); - map(0x03, 0x03).w(this, FUNC(jangou_blitter_device::y_w)); - map(0x04, 0x04).w(this, FUNC(jangou_blitter_device::width_w)); - map(0x05, 0x05).w(this, FUNC(jangou_blitter_device::height_and_trigger_w)); - map(0x06, 0x06).w(this, FUNC(jangou_blitter_device::src_hi_address_w)); + map(0x00, 0x00).w(FUNC(jangou_blitter_device::src_lo_address_w)); + map(0x01, 0x01).w(FUNC(jangou_blitter_device::src_md_address_w)); + map(0x02, 0x02).w(FUNC(jangou_blitter_device::x_w)); + map(0x03, 0x03).w(FUNC(jangou_blitter_device::y_w)); + map(0x04, 0x04).w(FUNC(jangou_blitter_device::width_w)); + map(0x05, 0x05).w(FUNC(jangou_blitter_device::height_and_trigger_w)); + map(0x06, 0x06).w(FUNC(jangou_blitter_device::src_hi_address_w)); } // Sexy Gal and variants (v2) swaps around upper src address void jangou_blitter_device::blit_v2_regs(address_map &map) { - map(0x00, 0x00).w(this, FUNC(jangou_blitter_device::src_lo_address_w)); - map(0x01, 0x01).w(this, FUNC(jangou_blitter_device::src_md_address_w)); - map(0x02, 0x02).w(this, FUNC(jangou_blitter_device::src_hi_address_w)); - map(0x03, 0x03).w(this, FUNC(jangou_blitter_device::x_w)); - map(0x04, 0x04).w(this, FUNC(jangou_blitter_device::y_w)); - map(0x05, 0x05).w(this, FUNC(jangou_blitter_device::width_w)); - map(0x06, 0x06).w(this, FUNC(jangou_blitter_device::height_and_trigger_w)); + map(0x00, 0x00).w(FUNC(jangou_blitter_device::src_lo_address_w)); + map(0x01, 0x01).w(FUNC(jangou_blitter_device::src_md_address_w)); + map(0x02, 0x02).w(FUNC(jangou_blitter_device::src_hi_address_w)); + map(0x03, 0x03).w(FUNC(jangou_blitter_device::x_w)); + map(0x04, 0x04).w(FUNC(jangou_blitter_device::y_w)); + map(0x05, 0x05).w(FUNC(jangou_blitter_device::width_w)); + map(0x06, 0x06).w(FUNC(jangou_blitter_device::height_and_trigger_w)); } //------------------------------------------------- diff --git a/src/devices/video/m50458.cpp b/src/devices/video/m50458.cpp index 4544fb3f6c2..41a6bd1651f 100644 --- a/src/devices/video/m50458.cpp +++ b/src/devices/video/m50458.cpp @@ -32,14 +32,14 @@ DEFINE_DEVICE_TYPE(M50458, m50458_device, "m50458", "Mitsubishi M50458 OSD") void m50458_device::m50458_vram(address_map &map) { map(0x0000, 0x023f).ram(); // vram - map(0x0240, 0x0241).w(this, FUNC(m50458_device::vreg_120_w)); - map(0x0242, 0x0243).w(this, FUNC(m50458_device::vreg_121_w)); - map(0x0244, 0x0245).w(this, FUNC(m50458_device::vreg_122_w)); - map(0x0246, 0x0247).w(this, FUNC(m50458_device::vreg_123_w)); - map(0x0248, 0x0249).w(this, FUNC(m50458_device::vreg_124_w)); - map(0x024a, 0x024b).w(this, FUNC(m50458_device::vreg_125_w)); - map(0x024c, 0x024d).w(this, FUNC(m50458_device::vreg_126_w)); - map(0x024e, 0x024f).w(this, FUNC(m50458_device::vreg_127_w)); + map(0x0240, 0x0241).w(FUNC(m50458_device::vreg_120_w)); + map(0x0242, 0x0243).w(FUNC(m50458_device::vreg_121_w)); + map(0x0244, 0x0245).w(FUNC(m50458_device::vreg_122_w)); + map(0x0246, 0x0247).w(FUNC(m50458_device::vreg_123_w)); + map(0x0248, 0x0249).w(FUNC(m50458_device::vreg_124_w)); + map(0x024a, 0x024b).w(FUNC(m50458_device::vreg_125_w)); + map(0x024c, 0x024d).w(FUNC(m50458_device::vreg_126_w)); + map(0x024e, 0x024f).w(FUNC(m50458_device::vreg_127_w)); } // internal GFX ROM (TODO: GFXs in here should be 12x18, not 16x18) diff --git a/src/devices/video/mb_vcu.cpp b/src/devices/video/mb_vcu.cpp index fd310624d7d..d0c385f94dd 100644 --- a/src/devices/video/mb_vcu.cpp +++ b/src/devices/video/mb_vcu.cpp @@ -47,7 +47,7 @@ void mb_vcu_device::mb_vcu_pal_ram(address_map &map) map(0x0000, 0x00ff).ram(); map(0x0200, 0x02ff).ram(); map(0x0400, 0x04ff).ram(); - map(0x0600, 0x06ff).rw(this, FUNC(mb_vcu_device::mb_vcu_paletteram_r), FUNC(mb_vcu_device::mb_vcu_paletteram_w)); + map(0x0600, 0x06ff).rw(FUNC(mb_vcu_device::mb_vcu_paletteram_r), FUNC(mb_vcu_device::mb_vcu_paletteram_w)); } READ8_MEMBER( mb_vcu_device::mb_vcu_paletteram_r ) diff --git a/src/devices/video/mc6845.cpp b/src/devices/video/mc6845.cpp index ffcca065d5b..13c1c8a6155 100644 --- a/src/devices/video/mc6845.cpp +++ b/src/devices/video/mc6845.cpp @@ -129,23 +129,13 @@ void mc6845_device::call_on_update_address(int strobe) } -WRITE8_MEMBER( mc6845_device::address_w ) -{ - address_w(data); -} - -void mc6845_device::address_w(uint8_t data) +void mc6845_device::write_address(uint8_t data) { m_register_address_latch = data & 0x1f; } -READ8_MEMBER( mc6845_device::status_r ) -{ - return status_r(); -} - -uint8_t mc6845_device::status_r() +uint8_t mc6845_device::read_status() { uint8_t ret = 0; @@ -188,12 +178,7 @@ void mc6845_device::transparent_update() } -READ8_MEMBER( mc6845_device::register_r ) -{ - return register_r(); -} - -uint8_t mc6845_device::register_r() +uint8_t mc6845_device::read_register() { uint8_t ret = 0; @@ -215,12 +200,7 @@ uint8_t mc6845_device::register_r() } -WRITE8_MEMBER( mc6845_device::register_w ) -{ - register_w(data); -} - -void mc6845_device::register_w(uint8_t data) +void mc6845_device::write_register(uint8_t data) { LOG("%s:M6845 reg 0x%02x = 0x%02x\n", machine().describe_context(), m_register_address_latch, data); diff --git a/src/devices/video/mc6845.h b/src/devices/video/mc6845.h index 966b81d3cb3..d590141c102 100644 --- a/src/devices/video/mc6845.h +++ b/src/devices/video/mc6845.h @@ -113,20 +113,20 @@ public: template <class Object> devcb_base &set_out_vsync_callback(Object &&cb) { return m_out_vsync_cb.set_callback(std::forward<Object>(cb)); } /* select one of the registers for reading or writing */ - DECLARE_WRITE8_MEMBER( address_w ); - void address_w(uint8_t data); + DECLARE_WRITE8_MEMBER( address_w ) { write_address(data); } + void write_address(uint8_t data); /* read from the status register */ - DECLARE_READ8_MEMBER( status_r ); - uint8_t status_r(); + DECLARE_READ8_MEMBER( status_r ) { return read_status(); } + uint8_t read_status(); /* read from the currently selected register */ - DECLARE_READ8_MEMBER( register_r ); - uint8_t register_r(); + DECLARE_READ8_MEMBER( register_r ) { return read_register(); } + uint8_t read_register(); /* write to the currently selected register */ - DECLARE_WRITE8_MEMBER( register_w ); - void register_w(uint8_t data); + DECLARE_WRITE8_MEMBER( register_w ) { write_register(data); } + void write_register(uint8_t data); // read display enable line state DECLARE_READ_LINE_MEMBER( de_r ); diff --git a/src/devices/video/msm6255.cpp b/src/devices/video/msm6255.cpp index a8cab0ba266..ffca4414314 100644 --- a/src/devices/video/msm6255.cpp +++ b/src/devices/video/msm6255.cpp @@ -56,8 +56,8 @@ DEFINE_DEVICE_TYPE(MSM6255, msm6255_device, "msm6255", "Oki MSM6255 LCD Controll // I/O map void msm6255_device::map(address_map &map) { - map(0x00, 0x00).rw(this, FUNC(msm6255_device::dr_r), FUNC(msm6255_device::dr_w)); - map(0x01, 0x01).rw(this, FUNC(msm6255_device::ir_r), FUNC(msm6255_device::ir_w)); + map(0x00, 0x00).rw(FUNC(msm6255_device::dr_r), FUNC(msm6255_device::dr_w)); + map(0x01, 0x01).rw(FUNC(msm6255_device::ir_r), FUNC(msm6255_device::ir_w)); } // default address map diff --git a/src/devices/video/ppu2c0x.cpp b/src/devices/video/ppu2c0x.cpp index 98dd5d9b5d4..579805ee447 100644 --- a/src/devices/video/ppu2c0x.cpp +++ b/src/devices/video/ppu2c0x.cpp @@ -90,7 +90,7 @@ DEFINE_DEVICE_TYPE(PPU_2C05_04, ppu2c05_04_device, "ppu2c05_04", "2C05_04 PPU") void ppu2c0x_device::ppu2c0x(address_map &map) { map(0x0000, 0x3eff).ram(); - map(0x3f00, 0x3fff).rw(this, FUNC(ppu2c0x_device::palette_read), FUNC(ppu2c0x_device::palette_write)); + map(0x3f00, 0x3fff).rw(FUNC(ppu2c0x_device::palette_read), FUNC(ppu2c0x_device::palette_write)); // AM_RANGE(0x0000, 0x3fff) AM_RAM } diff --git a/src/devices/video/tms9928a.cpp b/src/devices/video/tms9928a.cpp index d943d0357f3..8af4ba861f0 100644 --- a/src/devices/video/tms9928a.cpp +++ b/src/devices/video/tms9928a.cpp @@ -122,9 +122,9 @@ READ8_MEMBER( tms9928a_device::read ) uint8_t value = 0; if ((offset & 1) == 0) - value = vram_read(space, 0); + value = vram_read(); else - value = register_read(space, 0); + value = register_read(); return value; } @@ -132,9 +132,9 @@ READ8_MEMBER( tms9928a_device::read ) WRITE8_MEMBER( tms9928a_device::write ) { if ((offset & 1) == 0) - vram_write(space, 0, data); + vram_write(data); else - register_write(space, 0, data); + register_write(data); } u8 tms9928a_device::vram_read() @@ -151,25 +151,17 @@ u8 tms9928a_device::vram_read() return data; } -READ8_MEMBER( tms9928a_device::vram_read ) -{ - return vram_read(); -} - void tms9928a_device::vram_write(u8 data) { - // prevent debugger from changing the address base - if (machine().side_effects_disabled()) return; - m_vram_space->write_byte(m_Addr, data); - m_Addr = (m_Addr + 1) & (m_vram_size - 1); - m_ReadAhead = data; - m_latch = 0; -} -WRITE8_MEMBER( tms9928a_device::vram_write ) -{ - vram_write(data); + // prevent debugger from changing the address base + if (!machine().side_effects_disabled()) + { + m_Addr = (m_Addr + 1) & (m_vram_size - 1); + m_ReadAhead = data; + m_latch = 0; + } } u8 tms9928a_device::register_read() @@ -186,11 +178,6 @@ u8 tms9928a_device::register_read() return data; } -READ8_MEMBER( tms9928a_device::register_read ) -{ - return register_read(); -} - void tms9928a_device::check_interrupt() { // trigger if vblank and interrupt-enable bits are set @@ -337,11 +324,6 @@ void tms9928a_device::register_write(u8 data) } } -WRITE8_MEMBER( tms9928a_device::register_write ) -{ - register_write(data); -} - void tms9928a_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) { // Handle GROM clock if present diff --git a/src/devices/video/tms9928a.h b/src/devices/video/tms9928a.h index 607c914727d..f6e934664a3 100644 --- a/src/devices/video/tms9928a.h +++ b/src/devices/video/tms9928a.h @@ -95,10 +95,10 @@ public: DECLARE_READ8_MEMBER( read ); DECLARE_WRITE8_MEMBER( write ); - DECLARE_READ8_MEMBER( vram_read ); - DECLARE_WRITE8_MEMBER( vram_write ); - DECLARE_READ8_MEMBER( register_read ); - DECLARE_WRITE8_MEMBER( register_write ); + DECLARE_READ8_MEMBER( vram_r ) { return vram_read(); } + DECLARE_WRITE8_MEMBER( vram_w ) { vram_write(data); } + DECLARE_READ8_MEMBER( register_r ) { return register_read(); } + DECLARE_WRITE8_MEMBER( register_w ) { register_write(data); } u8 vram_read(); void vram_write(u8 data); diff --git a/src/devices/video/voodoo_pci.cpp b/src/devices/video/voodoo_pci.cpp index 0bb099a2db7..a481f10033b 100644 --- a/src/devices/video/voodoo_pci.cpp +++ b/src/devices/video/voodoo_pci.cpp @@ -36,7 +36,7 @@ DEFINE_DEVICE_TYPE(VOODOO_3_PCI, voodoo_3_pci_device, "voodoo_3_pci", "Voodoo 3 void voodoo_pci_device::config_map(address_map &map) { pci_device::config_map(map); - map(0x40, 0x5f).rw(this, FUNC(voodoo_pci_device::pcictrl_r), FUNC(voodoo_pci_device::pcictrl_w)); + map(0x40, 0x5f).rw(FUNC(voodoo_pci_device::pcictrl_r), FUNC(voodoo_pci_device::pcictrl_w)); } // VOODOO_1 & VOODOO_2 map |