diff options
author | Ivan Vangelista <mesgnet@yahoo.it> | 2019-01-11 18:13:29 +0100 |
---|---|---|
committer | Ivan Vangelista <mesgnet@yahoo.it> | 2019-01-11 18:13:29 +0100 |
commit | dc7008ac9eac9e9bd52aa6d045fcd50f1a9f3ee2 (patch) | |
tree | abc05baa1f6524124051f67c28b85a4ab3fe0900 /src/devices/video | |
parent | 8b06f277f0c6c098d03f0ef2e90519a38f85c0b3 (diff) |
src/devices: some more MCFG macros removal (nw)
Diffstat (limited to 'src/devices/video')
-rw-r--r-- | src/devices/video/hd44102.h | 13 | ||||
-rw-r--r-- | src/devices/video/i8275.h | 24 | ||||
-rw-r--r-- | src/devices/video/mb88303.h | 21 | ||||
-rw-r--r-- | src/devices/video/msm6222b.h | 5 | ||||
-rw-r--r-- | src/devices/video/saa5050.h | 16 | ||||
-rw-r--r-- | src/devices/video/sed1200.h | 11 | ||||
-rw-r--r-- | src/devices/video/t6a04.h | 3 | ||||
-rw-r--r-- | src/devices/video/tea1002.h | 9 | ||||
-rw-r--r-- | src/devices/video/upd3301.h | 24 |
9 files changed, 3 insertions, 123 deletions
diff --git a/src/devices/video/hd44102.h b/src/devices/video/hd44102.h index f383094f127..1688a502441 100644 --- a/src/devices/video/hd44102.h +++ b/src/devices/video/hd44102.h @@ -12,19 +12,6 @@ #pragma once - - -///************************************************************************* -// INTERFACE CONFIGURATION MACROS -///************************************************************************* - -#define MCFG_HD44102_ADD(_tag, _screen_tag, _sx, _sy) \ - MCFG_DEVICE_ADD(_tag, HD44102, 0) \ - MCFG_VIDEO_SET_SCREEN(_screen_tag) \ - downcast<hd44102_device &>(*device).set_offsets(_sx, _sy); - - - ///************************************************************************* // TYPE DEFINITIONS ///************************************************************************* diff --git a/src/devices/video/i8275.h b/src/devices/video/i8275.h index 44bede3ace4..f5d6b3633bc 100644 --- a/src/devices/video/i8275.h +++ b/src/devices/video/i8275.h @@ -44,26 +44,6 @@ #define I8275_DRAW_CHARACTER_MEMBER(_name) void _name(bitmap_rgb32 &bitmap, int x, int y, uint8_t linecount, uint8_t charcode, uint8_t lineattr, uint8_t lten, uint8_t rvv, uint8_t vsp, uint8_t gpa, uint8_t hlgt) -#define MCFG_I8275_CHARACTER_WIDTH(_value) \ - downcast<i8275_device &>(*device).set_character_width(_value); - -#define MCFG_I8275_DRAW_CHARACTER_CALLBACK_OWNER(_class, _method) \ - downcast<i8275_device &>(*device).set_display_callback(&_class::_method, #_class "::" #_method, this); - -#define MCFG_I8275_DRQ_CALLBACK(_write) \ - downcast<i8275_device &>(*device).set_drq_wr_callback(DEVCB_##_write); - -#define MCFG_I8275_IRQ_CALLBACK(_write) \ - downcast<i8275_device &>(*device).set_irq_wr_callback(DEVCB_##_write); - -#define MCFG_I8275_HRTC_CALLBACK(_write) \ - downcast<i8275_device &>(*device).set_hrtc_wr_callback(DEVCB_##_write); - -#define MCFG_I8275_VRTC_CALLBACK(_write) \ - downcast<i8275_device &>(*device).set_vrtc_wr_callback(DEVCB_##_write); - - - //************************************************************************** // TYPE DEFINITIONS //************************************************************************** @@ -96,10 +76,6 @@ public: set_display_callback(draw_character_delegate(callback, name, nullptr, static_cast<FunctionClass *>(nullptr))); } - template <class Object> devcb_base &set_drq_wr_callback(Object &&cb) { return m_write_drq.set_callback(std::forward<Object>(cb)); } - template <class Object> devcb_base &set_irq_wr_callback(Object &&cb) { return m_write_irq.set_callback(std::forward<Object>(cb)); } - template <class Object> devcb_base &set_hrtc_wr_callback(Object &&cb) { return m_write_hrtc.set_callback(std::forward<Object>(cb)); } - template <class Object> devcb_base &set_vrtc_wr_callback(Object &&cb) { return m_write_vrtc.set_callback(std::forward<Object>(cb)); } auto drq_wr_callback() { return m_write_drq.bind(); } auto irq_wr_callback() { return m_write_irq.bind(); } auto hrtc_wr_callback() { return m_write_hrtc.bind(); } diff --git a/src/devices/video/mb88303.h b/src/devices/video/mb88303.h index 9c088d8d56b..f8804adff61 100644 --- a/src/devices/video/mb88303.h +++ b/src/devices/video/mb88303.h @@ -26,21 +26,6 @@ #pragma once - -//************************************************************************** -// INTERFACE CONFIGURATION MACROS -//************************************************************************** - -#define MCFG_MB88303_VOW_CALLBACK(_write) \ - downcast<mb88303_device &>(*device).set_vow_callback(DEVCB_##_write); - -#define MCFG_MB88303_VOBN_CALLBACK(_write) \ - downcast<mb88303_device &>(*device).set_vob_n_callback(DEVCB_##_write); - -#define MCFG_MB88303_DO_CALLBACK(_write) \ - downcast<mb88303_device &>(*device).set_do_callback(DEVCB_##_write); - - //************************************************************************** // TYPE DEFINITIONS //************************************************************************** @@ -56,9 +41,9 @@ public: // construction/destruction mb88303_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - template <class Object> devcb_base &set_vow_callback(Object &&cb) { return m_write_vow.set_callback(std::forward<Object>(cb)); } - template <class Object> devcb_base &set_vobn_callback(Object &&cb) { return m_write_vobn.set_callback(std::forward<Object>(cb)); } - template <class Object> devcb_base &set_do_callback(Object &&cb) { return m_write_do.set_callback(std::forward<Object>(cb)); } + auto vow_callback() { return m_write_vow.bind(); } + auto vobn_callback() { return m_write_vobn.bind(); } + auto do_callback() { return m_write_do.bind(); } DECLARE_WRITE8_MEMBER(da_w); DECLARE_WRITE_LINE_MEMBER(adm_w); diff --git a/src/devices/video/msm6222b.h b/src/devices/video/msm6222b.h index 9cf3623e25f..7a2cb00fd89 100644 --- a/src/devices/video/msm6222b.h +++ b/src/devices/video/msm6222b.h @@ -15,11 +15,6 @@ #pragma once -#define MCFG_MSM6222B_ADD( _tag ) \ - MCFG_DEVICE_ADD( _tag, MSM6222B, 0 ) - -#define MCFG_MSM6222B_01_ADD( _tag ) \ - MCFG_DEVICE_ADD( _tag, MSM6222B_01, 0 ) class msm6222b_device : public device_t { public: diff --git a/src/devices/video/saa5050.h b/src/devices/video/saa5050.h index 6e1aa5cec6a..a9bb680f347 100644 --- a/src/devices/video/saa5050.h +++ b/src/devices/video/saa5050.h @@ -29,21 +29,6 @@ #pragma once - - -//************************************************************************** -// INTERFACE CONFIGURATION MACROS -//************************************************************************** - -#define MCFG_SAA5050_D_CALLBACK(_read) \ - downcast<saa5050_device &>(*device).set_d_rd_callback(DEVCB_##_read); - - -#define MCFG_SAA5050_SCREEN_SIZE(_cols, _rows, _size) \ - downcast<saa5050_device &>(*device).set_screen_size(_cols, _rows, _size); - - - //************************************************************************** // TYPE DEFINITIONS //************************************************************************** @@ -58,7 +43,6 @@ public: void set_screen_size(int cols, int rows, int size) { m_cols = cols; m_rows = rows; m_size = size; } - template <class Object> devcb_base &set_d_rd_callback(Object &&cb) { return m_read_d.set_callback(std::forward<Object>(cb)); } auto d_cb() { return m_read_d.bind(); } // optional information overrides diff --git a/src/devices/video/sed1200.h b/src/devices/video/sed1200.h index 521bd4e027c..d6590af49ab 100644 --- a/src/devices/video/sed1200.h +++ b/src/devices/video/sed1200.h @@ -17,17 +17,6 @@ #pragma once -#define MCFG_SED1200D0A_ADD( _tag ) \ - MCFG_DEVICE_ADD( _tag, SED1200D0A, 0 ) - -#define MCFG_SED1200F0A_ADD( _tag ) \ - MCFG_DEVICE_ADD( _tag, SED1200F0A, 0 ) - -#define MCFG_SED1200D0B_ADD( _tag ) \ - MCFG_DEVICE_ADD( _tag, SED1200D0B, 0 ) - -#define MCFG_SED1200F0B_ADD( _tag ) \ - MCFG_DEVICE_ADD( _tag, SED1200F0B, 0 ) class sed1200_device : public device_t { public: diff --git a/src/devices/video/t6a04.h b/src/devices/video/t6a04.h index 0232ffc71a6..38906063f02 100644 --- a/src/devices/video/t6a04.h +++ b/src/devices/video/t6a04.h @@ -65,7 +65,4 @@ private: // device type definition DECLARE_DEVICE_TYPE(T6A04, t6a04_device) -#define MCFG_T6A04_SIZE(_width, _height) \ - downcast<t6a04_device &>(*device).set_size(_width, _height); - #endif // MAME_VIDEO_T6A04_H diff --git a/src/devices/video/tea1002.h b/src/devices/video/tea1002.h index 067ec5583bc..44898c625ac 100644 --- a/src/devices/video/tea1002.h +++ b/src/devices/video/tea1002.h @@ -25,15 +25,6 @@ #pragma once - -//************************************************************************** -// INTERFACE CONFIGURATION MACROS -//************************************************************************** - -#define MCFG_TEA1002_ADD(_tag, _clock) \ - MCFG_DEVICE_ADD(_tag, TEA1002, _clock) - - //************************************************************************** // TYPE DEFINITIONS //************************************************************************** diff --git a/src/devices/video/upd3301.h b/src/devices/video/upd3301.h index 80e9346eb6c..147c12c5b7d 100644 --- a/src/devices/video/upd3301.h +++ b/src/devices/video/upd3301.h @@ -43,26 +43,6 @@ #define UPD3301_DRAW_CHARACTER_MEMBER(_name) void _name(bitmap_rgb32 &bitmap, int y, int sx, uint8_t cc, uint8_t lc, int hlgt, int rvv, int vsp, int sl0, int sl12, int csr, int gpa) -#define MCFG_UPD3301_CHARACTER_WIDTH(_value) \ - downcast<upd3301_device &>(*device).set_character_width(_value); - -#define MCFG_UPD3301_DRAW_CHARACTER_CALLBACK_OWNER(_class, _method) \ - downcast<upd3301_device &>(*device).set_display_callback(&_class::_method, #_class "::" #_method, this); - -#define MCFG_UPD3301_DRQ_CALLBACK(_write) \ - downcast<upd3301_device &>(*device).set_drq_wr_callback(DEVCB_##_write); - -#define MCFG_UPD3301_INT_CALLBACK(_write) \ - downcast<upd3301_device &>(*device).set_int_wr_callback(DEVCB_##_write); - -#define MCFG_UPD3301_HRTC_CALLBACK(_write) \ - downcast<upd3301_device &>(*device).set_hrtc_wr_callback(DEVCB_##_write); - -#define MCFG_UPD3301_VRTC_CALLBACK(_write) \ - downcast<upd3301_device &>(*device).set_vrtc_wr_callback(DEVCB_##_write); - - - //************************************************************************** // TYPE DEFINITIONS //************************************************************************** @@ -93,10 +73,6 @@ public: set_display_callback(draw_character_delegate(callback, name, nullptr, static_cast<FunctionClass *>(nullptr))); } - template <class Object> devcb_base &set_drq_wr_callback(Object &&cb) { return m_write_drq.set_callback(std::forward<Object>(cb)); } - template <class Object> devcb_base &set_int_wr_callback(Object &&cb) { return m_write_int.set_callback(std::forward<Object>(cb)); } - template <class Object> devcb_base &set_hrtc_wr_callback(Object &&cb) { return m_write_hrtc.set_callback(std::forward<Object>(cb)); } - template <class Object> devcb_base &set_vrtc_wr_callback(Object &&cb) { return m_write_vrtc.set_callback(std::forward<Object>(cb)); } auto drq_wr_callback() { return m_write_drq.bind(); } auto int_wr_callback() { return m_write_int.bind(); } auto hrtc_wr_callback() { return m_write_hrtc.bind(); } |