summaryrefslogtreecommitdiffstatshomepage
path: root/src/devices/bus/pet
diff options
context:
space:
mode:
Diffstat (limited to 'src/devices/bus/pet')
-rw-r--r--src/devices/bus/pet/cass.h2
-rw-r--r--src/devices/bus/pet/user.h57
2 files changed, 39 insertions, 20 deletions
diff --git a/src/devices/bus/pet/cass.h b/src/devices/bus/pet/cass.h
index c843f58282b..29d64278a3b 100644
--- a/src/devices/bus/pet/cass.h
+++ b/src/devices/bus/pet/cass.h
@@ -39,7 +39,7 @@
#define MCFG_PET_DATASSETTE_PORT_ADD(_tag, _slot_intf, _def_slot, _devcb) \
MCFG_DEVICE_ADD(_tag, PET_DATASSETTE_PORT, 0) \
MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, _def_slot, false) \
- devcb = &downcast<pet_datassette_port_device &>(*device).set_read_handler(DEVCB_##_devcb);
+ downcast<pet_datassette_port_device &>(*device).set_read_handler(DEVCB_##_devcb);
diff --git a/src/devices/bus/pet/user.h b/src/devices/bus/pet/user.h
index 651e121a2fa..71e1c19e799 100644
--- a/src/devices/bus/pet/user.h
+++ b/src/devices/bus/pet/user.h
@@ -28,61 +28,61 @@
#define MCFG_PET_USER_PORT_2_HANDLER(_devcb) \
- devcb = &downcast<pet_user_port_device &>(*device).set_2_handler(DEVCB_##_devcb);
+ downcast<pet_user_port_device &>(*device).set_2_handler(DEVCB_##_devcb);
#define MCFG_PET_USER_PORT_3_HANDLER(_devcb) \
- devcb = &downcast<pet_user_port_device &>(*device).set_3_handler(DEVCB_##_devcb);
+ downcast<pet_user_port_device &>(*device).set_3_handler(DEVCB_##_devcb);
#define MCFG_PET_USER_PORT_4_HANDLER(_devcb) \
- devcb = &downcast<pet_user_port_device &>(*device).set_4_handler(DEVCB_##_devcb);
+ downcast<pet_user_port_device &>(*device).set_4_handler(DEVCB_##_devcb);
#define MCFG_PET_USER_PORT_5_HANDLER(_devcb) \
- devcb = &downcast<pet_user_port_device &>(*device).set_5_handler(DEVCB_##_devcb);
+ downcast<pet_user_port_device &>(*device).set_5_handler(DEVCB_##_devcb);
#define MCFG_PET_USER_PORT_6_HANDLER(_devcb) \
- devcb = &downcast<pet_user_port_device &>(*device).set_6_handler(DEVCB_##_devcb);
+ downcast<pet_user_port_device &>(*device).set_6_handler(DEVCB_##_devcb);
#define MCFG_PET_USER_PORT_7_HANDLER(_devcb) \
- devcb = &downcast<pet_user_port_device &>(*device).set_7_handler(DEVCB_##_devcb);
+ downcast<pet_user_port_device &>(*device).set_7_handler(DEVCB_##_devcb);
#define MCFG_PET_USER_PORT_8_HANDLER(_devcb) \
- devcb = &downcast<pet_user_port_device &>(*device).set_8_handler(DEVCB_##_devcb);
+ downcast<pet_user_port_device &>(*device).set_8_handler(DEVCB_##_devcb);
#define MCFG_PET_USER_PORT_9_HANDLER(_devcb) \
- devcb = &downcast<pet_user_port_device &>(*device).set_9_handler(DEVCB_##_devcb);
+ downcast<pet_user_port_device &>(*device).set_9_handler(DEVCB_##_devcb);
#define MCFG_PET_USER_PORT_10_HANDLER(_devcb) \
- devcb = &downcast<pet_user_port_device &>(*device).set_10_handler(DEVCB_##_devcb);
+ downcast<pet_user_port_device &>(*device).set_10_handler(DEVCB_##_devcb);
#define MCFG_PET_USER_PORT_B_HANDLER(_devcb) \
- devcb = &downcast<pet_user_port_device &>(*device).set_b_handler(DEVCB_##_devcb);
+ downcast<pet_user_port_device &>(*device).set_b_handler(DEVCB_##_devcb);
#define MCFG_PET_USER_PORT_C_HANDLER(_devcb) \
- devcb = &downcast<pet_user_port_device &>(*device).set_c_handler(DEVCB_##_devcb);
+ downcast<pet_user_port_device &>(*device).set_c_handler(DEVCB_##_devcb);
#define MCFG_PET_USER_PORT_D_HANDLER(_devcb) \
- devcb = &downcast<pet_user_port_device &>(*device).set_d_handler(DEVCB_##_devcb);
+ downcast<pet_user_port_device &>(*device).set_d_handler(DEVCB_##_devcb);
#define MCFG_PET_USER_PORT_E_HANDLER(_devcb) \
- devcb = &downcast<pet_user_port_device &>(*device).set_e_handler(DEVCB_##_devcb);
+ downcast<pet_user_port_device &>(*device).set_e_handler(DEVCB_##_devcb);
#define MCFG_PET_USER_PORT_F_HANDLER(_devcb) \
- devcb = &downcast<pet_user_port_device &>(*device).set_f_handler(DEVCB_##_devcb);
+ downcast<pet_user_port_device &>(*device).set_f_handler(DEVCB_##_devcb);
#define MCFG_PET_USER_PORT_H_HANDLER(_devcb) \
- devcb = &downcast<pet_user_port_device &>(*device).set_h_handler(DEVCB_##_devcb);
+ downcast<pet_user_port_device &>(*device).set_h_handler(DEVCB_##_devcb);
#define MCFG_PET_USER_PORT_J_HANDLER(_devcb) \
- devcb = &downcast<pet_user_port_device &>(*device).set_j_handler(DEVCB_##_devcb);
+ downcast<pet_user_port_device &>(*device).set_j_handler(DEVCB_##_devcb);
#define MCFG_PET_USER_PORT_K_HANDLER(_devcb) \
- devcb = &downcast<pet_user_port_device &>(*device).set_k_handler(DEVCB_##_devcb);
+ downcast<pet_user_port_device &>(*device).set_k_handler(DEVCB_##_devcb);
#define MCFG_PET_USER_PORT_L_HANDLER(_devcb) \
- devcb = &downcast<pet_user_port_device &>(*device).set_l_handler(DEVCB_##_devcb);
+ downcast<pet_user_port_device &>(*device).set_l_handler(DEVCB_##_devcb);
#define MCFG_PET_USER_PORT_M_HANDLER(_devcb) \
- devcb = &downcast<pet_user_port_device &>(*device).set_m_handler(DEVCB_##_devcb);
+ downcast<pet_user_port_device &>(*device).set_m_handler(DEVCB_##_devcb);
DECLARE_DEVICE_TYPE(PET_USER_PORT, pet_user_port_device)
@@ -125,6 +125,25 @@ public:
template <class Object> devcb_base &set_k_handler(Object &&cb) { return m_k_handler.set_callback(std::forward<Object>(cb)); }
template <class Object> devcb_base &set_l_handler(Object &&cb) { return m_l_handler.set_callback(std::forward<Object>(cb)); }
template <class Object> devcb_base &set_m_handler(Object &&cb) { return m_m_handler.set_callback(std::forward<Object>(cb)); }
+ auto p2_handler() { return m_2_handler.bind(); }
+ auto p3_handler() { return m_3_handler.bind(); }
+ auto p4_handler() { return m_4_handler.bind(); }
+ auto p5_handler() { return m_5_handler.bind(); }
+ auto p6_handler() { return m_6_handler.bind(); }
+ auto p7_handler() { return m_7_handler.bind(); }
+ auto p8_handler() { return m_8_handler.bind(); }
+ auto p9_handler() { return m_9_handler.bind(); }
+ auto p10_handler() { return m_10_handler.bind(); }
+ auto pb_handler() { return m_b_handler.bind(); }
+ auto pc_handler() { return m_c_handler.bind(); }
+ auto pd_handler() { return m_d_handler.bind(); }
+ auto pe_handler() { return m_e_handler.bind(); }
+ auto pf_handler() { return m_f_handler.bind(); }
+ auto ph_handler() { return m_h_handler.bind(); }
+ auto pj_handler() { return m_j_handler.bind(); }
+ auto pk_handler() { return m_k_handler.bind(); }
+ auto pl_handler() { return m_l_handler.bind(); }
+ auto pm_handler() { return m_m_handler.bind(); }
DECLARE_WRITE_LINE_MEMBER( write_2 );
DECLARE_WRITE_LINE_MEMBER( write_3 );