summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/machine/upd65031.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/machine/upd65031.h')
-rw-r--r--src/mame/machine/upd65031.h14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/mame/machine/upd65031.h b/src/mame/machine/upd65031.h
index e6c1b6d927c..5dd208fbe7c 100644
--- a/src/mame/machine/upd65031.h
+++ b/src/mame/machine/upd65031.h
@@ -16,9 +16,6 @@
// TYPE DEFINITIONS
//**************************************************************************
-typedef device_delegate<void (bitmap_ind16 &bitmap, uint16_t sbf, uint16_t hires0, uint16_t hires1, uint16_t lores0, uint16_t lores1, int flash)> upd65031_screen_update_delegate;
-typedef device_delegate<void (int bank, uint16_t page, int rams)> upd65031_memory_update_delegate;
-
#define UPD65031_SCREEN_UPDATE(_name) void _name(bitmap_ind16 &bitmap, uint16_t sbf, uint16_t hires0, uint16_t hires1, uint16_t lores0, uint16_t lores1, int flash)
#define UPD65031_MEMORY_UPDATE(_name) void _name(int bank, uint16_t page, int rams)
@@ -28,6 +25,9 @@ typedef device_delegate<void (int bank, uint16_t page, int rams)> upd65031_memor
class upd65031_device : public device_t
{
public:
+ typedef device_delegate<void (bitmap_ind16 &bitmap, uint16_t sbf, uint16_t hires0, uint16_t hires1, uint16_t lores0, uint16_t lores1, int flash)> screen_update_delegate;
+ typedef device_delegate<void (int bank, uint16_t page, int rams)> memory_update_delegate;
+
// construction/destruction
upd65031_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
@@ -36,8 +36,8 @@ public:
auto nmi_wr_callback() { return m_write_nmi.bind(); }
auto spkr_wr_callback() { return m_write_spkr.bind(); }
- template <typename... T> void set_screen_update_callback(T &&... args) { m_screen_update_cb = upd65031_screen_update_delegate(std::forward<T>(args)...); }
- template <typename... T> void set_memory_update_callback(T &&... args) { m_out_mem_cb = upd65031_memory_update_delegate(std::forward<T>(args)...); }
+ template <typename... T> void set_screen_update_callback(T &&... args) { m_screen_update_cb.set(std::forward<T>(args)...); }
+ template <typename... T> void set_memory_update_callback(T &&... args) { m_out_mem_cb.set(std::forward<T>(args)...); }
DECLARE_READ8_MEMBER( read );
DECLARE_WRITE8_MEMBER( write );
@@ -64,8 +64,8 @@ private:
devcb_write_line m_write_nmi;
devcb_write_line m_write_spkr;
- upd65031_screen_update_delegate m_screen_update_cb; // callback for update the LCD
- upd65031_memory_update_delegate m_out_mem_cb; // callback for update bankswitch
+ screen_update_delegate m_screen_update_cb; // callback for update the LCD
+ memory_update_delegate m_out_mem_cb; // callback for update bankswitch
int m_mode;
uint16_t m_lcd_regs[5]; // LCD registers