(nw) forward some objects; line continuations are not scope dammit

This commit is contained in:
Vas Crabb 2018-03-04 04:22:32 +11:00
parent 3b923d59cc
commit 17f68f309a
6 changed files with 29 additions and 29 deletions

View File

@ -115,40 +115,40 @@ to implement the card in both systems.
#define MCFG_INTELLEC4_UNIV_SLOT_ADD(bus_tag, slot_tag, clock, slot_intf, def_slot) \
MCFG_DEVICE_ADD(slot_tag, INTELLEC4_UNIV_SLOT, clock) \
MCFG_DEVICE_SLOT_INTERFACE(slot_intf, def_slot, false) \
downcast<bus::intellec4::univ_slot_device &>(*device).set_bus_tag("^" bus_tag);
MCFG_DEVICE_ADD(slot_tag, INTELLEC4_UNIV_SLOT, clock) \
MCFG_DEVICE_SLOT_INTERFACE(slot_intf, def_slot, false) \
downcast<bus::intellec4::univ_slot_device &>(*device).set_bus_tag("^" bus_tag);
#define MCFG_INTELLEC4_UNIV_SLOT_REMOVE(slot_tag) \
MCFG_DEVICE_REMOVE(slot_tag)
MCFG_DEVICE_REMOVE(slot_tag)
#define MCFG_INTELLEC4_UNIV_BUS_ROM_SPACE(tag, space) \
downcast<bus::intellec4::univ_bus_device &>(*device).set_rom_space("^" tag, space);
downcast<bus::intellec4::univ_bus_device &>(*device).set_rom_space("^" tag, space);
#define MCFG_INTELLEC4_UNIV_BUS_ROM_PORTS_SPACE(tag, space) \
downcast<bus::intellec4::univ_bus_device &>(*device).set_rom_ports_space("^" tag, space);
downcast<bus::intellec4::univ_bus_device &>(*device).set_rom_ports_space("^" tag, space);
#define MCFG_INTELLEC4_UNIV_BUS_MEMORY_SPACE(tag, space) \
downcast<bus::intellec4::univ_bus_device &>(*device).set_memory_space("^" tag, space);
downcast<bus::intellec4::univ_bus_device &>(*device).set_memory_space("^" tag, space);
#define MCFG_INTELLEC4_UNIV_BUS_STATUS_SPACE(tag, space) \
downcast<bus::intellec4::univ_bus_device &>(*device).set_status_space("^" tag, space);
downcast<bus::intellec4::univ_bus_device &>(*device).set_status_space("^" tag, space);
#define MCFG_INTELLEC4_UNIV_BUS_RAM_PORTS_SPACE(tag, space) \
downcast<bus::intellec4::univ_bus_device &>(*device).set_ram_ports_space("^" tag, space);
downcast<bus::intellec4::univ_bus_device &>(*device).set_ram_ports_space("^" tag, space);
#define MCFG_INTELLEC4_UNIV_BUS_TEST_CB(obj) \
downcast<bus::intellec4::univ_bus_device &>(*device).set_test_out_cb(DEVCB_##obj);
downcast<bus::intellec4::univ_bus_device &>(*device).set_test_out_cb(DEVCB_##obj);
#define MCFG_INTELLEC4_UNIV_BUS_STOP_CB(obj) \
downcast<bus::intellec4::univ_bus_device &>(*device).set_stop_out_cb(DEVCB_##obj);
downcast<bus::intellec4::univ_bus_device &>(*device).set_stop_out_cb(DEVCB_##obj);
#define MCFG_INTELLEC4_UNIV_BUS_RESET_4002_CB(obj) \
downcast<bus::intellec4::univ_bus_device &>(*device).set_reset_4002_out_cb(DEVCB_##obj);
downcast<bus::intellec4::univ_bus_device &>(*device).set_reset_4002_out_cb(DEVCB_##obj);
#define MCFG_INTELLEC4_UNIV_BUS_USER_RESET_CB(obj) \
downcast<bus::intellec4::univ_bus_device &>(*device).set_user_reset_out_cb(DEVCB_##obj);
downcast<bus::intellec4::univ_bus_device &>(*device).set_user_reset_out_cb(DEVCB_##obj);
namespace bus { namespace intellec4 {

View File

@ -46,11 +46,11 @@ public:
// construction/destruction
riot6532_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
template<class _Object> devcb_base &set_in_pa_callback(_Object object) { return m_in_pa_cb.set_callback(object); }
template<class _Object> devcb_base &set_out_pa_callback(_Object object) { return m_out_pa_cb.set_callback(object); }
template<class _Object> devcb_base &set_in_pb_callback(_Object object) { return m_in_pb_cb.set_callback(object); }
template<class _Object> devcb_base &set_out_pb_callback(_Object object) { return m_out_pb_cb.set_callback(object); }
template<class _Object> devcb_base &set_irq_callback(_Object object) { return m_irq_cb.set_callback(object); }
template <class Object> devcb_base &set_in_pa_callback(Object &&cb) { return m_in_pa_cb.set_callback(std::forward<Object>(cb)); }
template <class Object> devcb_base &set_out_pa_callback(Object &&cb) { return m_out_pa_cb.set_callback(std::forward<Object>(cb)); }
template <class Object> devcb_base &set_in_pb_callback(Object &&cb) { return m_in_pb_cb.set_callback(std::forward<Object>(cb)); }
template <class Object> devcb_base &set_out_pb_callback(Object &&cb) { return m_out_pb_cb.set_callback(std::forward<Object>(cb)); }
template <class Object> devcb_base &set_irq_callback(Object &&cb) { return m_irq_cb.set_callback(std::forward<Object>(cb)); }
DECLARE_READ8_MEMBER( read );
DECLARE_WRITE8_MEMBER( write );

View File

@ -19,16 +19,16 @@
///*************************************************************************
#define MCFG_PLA_ADD(tag, inputs, outputs, terms) \
MCFG_DEVICE_ADD((tag), PLA, 0) \
downcast<pla_device &>(*device).set_num_inputs((inputs)); \
downcast<pla_device &>(*device).set_num_outputs((outputs)); \
downcast<pla_device &>(*device).set_num_terms((terms));
MCFG_DEVICE_ADD((tag), PLA, 0) \
downcast<pla_device &>(*device).set_num_inputs((inputs)); \
downcast<pla_device &>(*device).set_num_outputs((outputs)); \
downcast<pla_device &>(*device).set_num_terms((terms));
#define MCFG_PLA_INPUTMASK(mask) \
downcast<pla_device &>(*device).set_inputmask((mask));
downcast<pla_device &>(*device).set_inputmask((mask));
#define MCFG_PLA_FILEFORMAT(format) \
downcast<pla_device &>(*device).set_format((pla_device::FMT::format));
downcast<pla_device &>(*device).set_format((pla_device::FMT::format));
// macros for known (and used) devices

View File

@ -27,7 +27,7 @@
/* Set the writer used to update a display digit */
#define MCFG_R10788_UPDATE(devcb) \
downcast<r10788_device &>(*device).set_update(DEVCB_##devcb);
downcast<r10788_device &>(*device).set_update(DEVCB_##devcb);
class r10788_device : public device_t
{

View File

@ -109,8 +109,8 @@ private:
};
#define MCFG_GROM_ADD(_tag, _ident, _region, _offset, _ready) \
MCFG_DEVICE_ADD(_tag, TMC0430, 0) \
downcast<tmc0430_device &>(*device).set_region_and_ident(_region, _offset, _ident); \
downcast<tmc0430_device &>(*device).set_ready_wr_callback(DEVCB_##_ready);
MCFG_DEVICE_ADD(_tag, TMC0430, 0) \
downcast<tmc0430_device &>(*device).set_region_and_ident(_region, _offset, _ident); \
downcast<tmc0430_device &>(*device).set_ready_wr_callback(DEVCB_##_ready);
#endif // MAME_MACHINE_TMC0430_H

View File

@ -15,7 +15,7 @@
#define TELEPRINTER_SCREEN_TAG "tty_screen"
#define MCFG_GENERIC_TELEPRINTER_KEYBOARD_CB(cb) \
downcast<generic_terminal_device &>(*device).set_keyboard_callback(KEYBOARDCB_##cb);
downcast<generic_terminal_device &>(*device).set_keyboard_callback(KEYBOARDCB_##cb);
/***************************************************************************
FUNCTION PROTOTYPES