From b380514764cf857469bae61c11143a19f79a74c5 Mon Sep 17 00:00:00 2001 From: andreasnaive Date: Mon, 25 Mar 2019 23:13:40 +0100 Subject: Revert "conflict resolution (nw)" This reverts commit c24473ddff715ecec2e258a6eb38960cf8c8e98e, reversing changes made to 009cba4fb8102102168ef32870892438327f3705. --- src/devices/video/ef9345.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src/devices/video/ef9345.h') diff --git a/src/devices/video/ef9345.h b/src/devices/video/ef9345.h index d36811e8a60..dfec7d080f2 100644 --- a/src/devices/video/ef9345.h +++ b/src/devices/video/ef9345.h @@ -15,6 +15,8 @@ #include "emupal.h" +#define MCFG_EF9345_PALETTE(_palette_tag) \ + downcast(*device).set_palette_tag(_palette_tag); //************************************************************************** // TYPE DEFINITIONS @@ -34,8 +36,8 @@ public: template void set_palette_tag(T &&tag) { m_palette.set_tag(std::forward(tag)); } // device interface - uint8_t data_r(offs_t offset); - void data_w(offs_t offset, uint8_t data); + DECLARE_READ8_MEMBER( data_r ); + DECLARE_WRITE8_MEMBER( data_w ); void update_scanline(uint16_t scanline); uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); -- cgit v1.2.3