summaryrefslogtreecommitdiffstats
path: root/src/devices/video/ef9345.h
diff options
context:
space:
mode:
authorGravatarGravatar andreasnaive <andreasnaive@gmail.com>2019-03-25 23:13:40 +0100
committerGravatarGravatar andreasnaive <andreasnaive@gmail.com>2019-03-25 23:13:40 +0100
commitb380514764cf857469bae61c11143a19f79a74c5 (patch) (github)
tree63c8012e262618f08a332da31dd714281aa2c5ed /src/devices/video/ef9345.h
parentc24473ddff715ecec2e258a6eb38960cf8c8e98e (diff)
downloadmame-b380514764cf857469bae61c11143a19f79a74c5.tar.bz2
mame-b380514764cf857469bae61c11143a19f79a74c5.zip
Revert "conflict resolution (nw)"
Diffstat (limited to 'src/devices/video/ef9345.h')
-rw-r--r--src/devices/video/ef9345.h6
1 files changed, 4 insertions, 2 deletions
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<ef9345_device &>(*device).set_palette_tag(_palette_tag);
//**************************************************************************
// TYPE DEFINITIONS
@@ -34,8 +36,8 @@ public:
template <typename T> void set_palette_tag(T &&tag) { m_palette.set_tag(std::forward<T>(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);