diff options
Diffstat (limited to 'src/mame/machine/tait8741.h')
-rw-r--r-- | src/mame/machine/tait8741.h | 52 |
1 files changed, 26 insertions, 26 deletions
diff --git a/src/mame/machine/tait8741.h b/src/mame/machine/tait8741.h index 7be855fc8c2..c487f6acf83 100644 --- a/src/mame/machine/tait8741.h +++ b/src/mame/machine/tait8741.h @@ -17,27 +17,27 @@ #define MCFG_TAITO8741_PORT_HANDLERS(_devcb0, _devcb1, _devcb2, _devcb3) \ devcb = &taito8741_4pack_device::set_port_handler_0_callback(*device, DEVCB2_##_devcb0); \ devcb = &taito8741_4pack_device::set_port_handler_1_callback(*device, DEVCB2_##_devcb1); \ - devcb = &taito8741_4pack_device::set_port_handler_2_callback(*device, DEVCB2_##_devcb2); \ + devcb = &taito8741_4pack_device::set_port_handler_2_callback(*device, DEVCB2_##_devcb2); \ devcb = &taito8741_4pack_device::set_port_handler_3_callback(*device, DEVCB2_##_devcb3); #define MCFG_TAITO8741_MODES(_mode0, _mode1, _mode2, _mode3) \ - taito8741_4pack_device::static_set_mode(*device, 0, _mode0); \ - taito8741_4pack_device::static_set_mode(*device, 1, _mode1); \ - taito8741_4pack_device::static_set_mode(*device, 2, _mode2); \ + taito8741_4pack_device::static_set_mode(*device, 0, _mode0); \ + taito8741_4pack_device::static_set_mode(*device, 1, _mode1); \ + taito8741_4pack_device::static_set_mode(*device, 2, _mode2); \ taito8741_4pack_device::static_set_mode(*device, 3, _mode3); #define MCFG_TAITO8741_CONNECT(_con0, _con1, _con2, _con3) \ - taito8741_4pack_device::static_set_connect(*device, 0, _con0); \ - taito8741_4pack_device::static_set_connect(*device, 1, _con1); \ - taito8741_4pack_device::static_set_connect(*device, 2, _con2); \ + taito8741_4pack_device::static_set_connect(*device, 0, _con0); \ + taito8741_4pack_device::static_set_connect(*device, 1, _con1); \ + taito8741_4pack_device::static_set_connect(*device, 2, _con2); \ taito8741_4pack_device::static_set_connect(*device, 3, _con3); - + class taito8741_4pack_device : public device_t { struct I8741 { - int number; + int number; UINT8 toData; /* to host data */ UINT8 fromData; /* from host data */ UINT8 fromCmd; /* from host command */ @@ -62,10 +62,10 @@ public: template<class _Object> static devcb2_base &set_port_handler_1_callback(device_t &device, _Object object) { return downcast<taito8741_4pack_device &>(device).m_port_handler_1_r.set_callback(object); } template<class _Object> static devcb2_base &set_port_handler_2_callback(device_t &device, _Object object) { return downcast<taito8741_4pack_device &>(device).m_port_handler_2_r.set_callback(object); } template<class _Object> static devcb2_base &set_port_handler_3_callback(device_t &device, _Object object) { return downcast<taito8741_4pack_device &>(device).m_port_handler_3_r.set_callback(object); } - - static void static_set_mode(device_t &device, int num, UINT8 mode) { downcast<taito8741_4pack_device &>(device).m_taito8741[num].mode = mode; } - static void static_set_connect(device_t &device, int num, int conn) { downcast<taito8741_4pack_device &>(device).m_taito8741[num].connect = conn; } - + + static void static_set_mode(device_t &device, int num, UINT8 mode) { downcast<taito8741_4pack_device &>(device).m_taito8741[num].mode = mode; } + static void static_set_connect(device_t &device, int num, int conn) { downcast<taito8741_4pack_device &>(device).m_taito8741[num].connect = conn; } + DECLARE_READ8_MEMBER( read_0 ) { if(offset&1) return status_r(0); else return data_r(0); } DECLARE_WRITE8_MEMBER( write_0 ) { if(offset&1) command_w(0,data); else data_w(0,data); } DECLARE_READ8_MEMBER( read_1 ) { if(offset&1) return status_r(1); else return data_r(1); } @@ -81,7 +81,7 @@ public: int data_r(int num); void data_w(int num, int data); void command_w(int num, int data); - + UINT8 port_read(int num, int offset); protected: @@ -96,7 +96,7 @@ private: void serial_rx(I8741 *st,UINT8 *data); // internal state - I8741 m_taito8741[4]; + I8741 m_taito8741[4]; devcb2_read8 m_port_handler_0_r; devcb2_read8 m_port_handler_1_r; @@ -118,16 +118,16 @@ extern const device_type TAITO8741_4PACK; #define MCFG_JOSVOLLY8741_PORT_HANDLERS(_devcb0, _devcb1, _devcb2, _devcb3) \ devcb = &josvolly8741_4pack_device::set_port_handler_0_callback(*device, DEVCB2_##_devcb0); \ devcb = &josvolly8741_4pack_device::set_port_handler_1_callback(*device, DEVCB2_##_devcb1); \ - devcb = &josvolly8741_4pack_device::set_port_handler_2_callback(*device, DEVCB2_##_devcb2); \ + devcb = &josvolly8741_4pack_device::set_port_handler_2_callback(*device, DEVCB2_##_devcb2); \ devcb = &josvolly8741_4pack_device::set_port_handler_3_callback(*device, DEVCB2_##_devcb3); #define MCFG_JOSVOLLY8741_CONNECT(_con0, _con1, _con2, _con3) \ - josvolly8741_4pack_device::static_set_connect(*device, 0, _con0); \ - josvolly8741_4pack_device::static_set_connect(*device, 1, _con1); \ - josvolly8741_4pack_device::static_set_connect(*device, 2, _con2); \ + josvolly8741_4pack_device::static_set_connect(*device, 0, _con0); \ + josvolly8741_4pack_device::static_set_connect(*device, 1, _con1); \ + josvolly8741_4pack_device::static_set_connect(*device, 2, _con2); \ josvolly8741_4pack_device::static_set_connect(*device, 3, _con3); - + class josvolly8741_4pack_device : public device_t { struct JV8741 { @@ -148,15 +148,15 @@ public: template<class _Object> static devcb2_base &set_port_handler_1_callback(device_t &device, _Object object) { return downcast<josvolly8741_4pack_device &>(device).m_port_handler_1_r.set_callback(object); } template<class _Object> static devcb2_base &set_port_handler_2_callback(device_t &device, _Object object) { return downcast<josvolly8741_4pack_device &>(device).m_port_handler_2_r.set_callback(object); } template<class _Object> static devcb2_base &set_port_handler_3_callback(device_t &device, _Object object) { return downcast<josvolly8741_4pack_device &>(device).m_port_handler_3_r.set_callback(object); } - - static void static_set_connect(device_t &device, int num, int conn) { downcast<josvolly8741_4pack_device &>(device).m_i8741[num].connect = conn; } - + + static void static_set_connect(device_t &device, int num, int conn) { downcast<josvolly8741_4pack_device &>(device).m_i8741[num].connect = conn; } + DECLARE_READ8_MEMBER( read_0 ) { return read(0,offset); } DECLARE_WRITE8_MEMBER( write_0 ) { write(0,offset,data); } DECLARE_READ8_MEMBER( read_1 ) { return read(1,offset); } DECLARE_WRITE8_MEMBER( write_1 ) { write(1,offset,data); } - - DECLARE_WRITE8_HANDLER( nmi_enable_w ) { m_nmi_enable = 1; } + + DECLARE_WRITE8_HANDLER( nmi_enable_w ) { m_nmi_enable = 1; } TIMER_CALLBACK_MEMBER( tx ); protected: @@ -173,7 +173,7 @@ private: // internal state JV8741 m_i8741[4]; int m_nmi_enable; - + devcb2_read8 m_port_handler_0_r; devcb2_read8 m_port_handler_1_r; devcb2_read8 m_port_handler_2_r; |