diff options
author | andreasnaive <andreasnaive@gmail.com> | 2019-03-25 22:44:58 +0100 |
---|---|---|
committer | andreasnaive <andreasnaive@gmail.com> | 2019-03-25 22:44:58 +0100 |
commit | c24473ddff715ecec2e258a6eb38960cf8c8e98e (patch) | |
tree | 8ea44b6396a6129913c0aac13859b5de9965e972 /src/devices/video/ef9345.h | |
parent | 009cba4fb8102102168ef32870892438327f3705 (diff) | |
parent | 598cd5227223c3b04ca31f0dbc1981256d9ea3ff (diff) |
conflict resolution (nw)
Diffstat (limited to 'src/devices/video/ef9345.h')
-rw-r--r-- | src/devices/video/ef9345.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/devices/video/ef9345.h b/src/devices/video/ef9345.h index dfec7d080f2..d36811e8a60 100644 --- a/src/devices/video/ef9345.h +++ b/src/devices/video/ef9345.h @@ -15,8 +15,6 @@ #include "emupal.h" -#define MCFG_EF9345_PALETTE(_palette_tag) \ - downcast<ef9345_device &>(*device).set_palette_tag(_palette_tag); //************************************************************************** // TYPE DEFINITIONS @@ -36,8 +34,8 @@ public: template <typename T> void set_palette_tag(T &&tag) { m_palette.set_tag(std::forward<T>(tag)); } // device interface - DECLARE_READ8_MEMBER( data_r ); - DECLARE_WRITE8_MEMBER( data_w ); + uint8_t data_r(offs_t offset); + void data_w(offs_t offset, uint8_t data); void update_scanline(uint16_t scanline); uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); |