diff options
Diffstat (limited to 'src/devices/bus/a2bus/grappler.cpp')
-rw-r--r-- | src/devices/bus/a2bus/grappler.cpp | 66 |
1 files changed, 33 insertions, 33 deletions
diff --git a/src/devices/bus/a2bus/grappler.cpp b/src/devices/bus/a2bus/grappler.cpp index 503fc95fd18..057e9718667 100644 --- a/src/devices/bus/a2bus/grappler.cpp +++ b/src/devices/bus/a2bus/grappler.cpp @@ -84,14 +84,14 @@ protected: private: // printer status inputs - DECLARE_WRITE_LINE_MEMBER(busy_w); - DECLARE_WRITE_LINE_MEMBER(pe_w); - DECLARE_WRITE_LINE_MEMBER(slct_w); + void busy_w(int state); + void pe_w(int state); + void slct_w(int state); // synchronised printer status inputs - void set_busy_in(void *ptr, s32 param); - void set_pe_in(void *ptr, s32 param); - void set_slct_in(void *ptr, s32 param); + void set_busy_in(s32 param); + void set_pe_in(s32 param); + void set_slct_in(s32 param); u16 m_rom_bank; // U2D (pin 13) u8 m_busy_in; // printer connector pin 21 (synchronised) @@ -169,19 +169,19 @@ void a2bus_grappler_device_base::set_rom_bank(u16 rom_bank) // printer status inputs //-------------------------------------------------- -WRITE_LINE_MEMBER(a2bus_grappler_device_base::busy_w) +void a2bus_grappler_device_base::busy_w(int state) { machine().scheduler().synchronize(timer_expired_delegate(FUNC(a2bus_grappler_device_base::set_busy_in), this), state ? 1 : 0); } -WRITE_LINE_MEMBER(a2bus_grappler_device_base::pe_w) +void a2bus_grappler_device_base::pe_w(int state) { machine().scheduler().synchronize(timer_expired_delegate(FUNC(a2bus_grappler_device_base::set_pe_in), this), state ? 1 : 0); } -WRITE_LINE_MEMBER(a2bus_grappler_device_base::slct_w) +void a2bus_grappler_device_base::slct_w(int state) { machine().scheduler().synchronize(timer_expired_delegate(FUNC(a2bus_grappler_device_base::set_slct_in), this), state ? 1 : 0); } @@ -192,7 +192,7 @@ WRITE_LINE_MEMBER(a2bus_grappler_device_base::slct_w) // synchronised printer status inputs //-------------------------------------------------- -void a2bus_grappler_device_base::set_busy_in(void *ptr, s32 param) +void a2bus_grappler_device_base::set_busy_in(s32 param) { if (u32(param) != m_busy_in) { @@ -202,7 +202,7 @@ void a2bus_grappler_device_base::set_busy_in(void *ptr, s32 param) } -void a2bus_grappler_device_base::set_pe_in(void *ptr, s32 param) +void a2bus_grappler_device_base::set_pe_in(s32 param) { if (u32(param) != m_pe_in) { @@ -212,7 +212,7 @@ void a2bus_grappler_device_base::set_pe_in(void *ptr, s32 param) } -void a2bus_grappler_device_base::set_slct_in(void *ptr, s32 param) +void a2bus_grappler_device_base::set_slct_in(s32 param) { if (u32(param) != m_slct_in) { @@ -247,12 +247,12 @@ protected: private: // printer status inputs - DECLARE_WRITE_LINE_MEMBER(ack_w); + void ack_w(int state); // synchronised signals - void set_data(void *ptr, s32 param); - void set_strobe(void *ptr, s32 param); - void set_ack_in(void *ptr, s32 param); + void set_data(s32 param); + void set_strobe(s32 param); + void set_ack_in(s32 param); u8 m_strobe; // U3 (pin 4) u8 m_ack_latch; // U3 (pin 13) @@ -362,7 +362,7 @@ void a2bus_grappler_device::device_reset() // printer status inputs //-------------------------------------------------- -WRITE_LINE_MEMBER(a2bus_grappler_device::ack_w) +void a2bus_grappler_device::ack_w(int state) { machine().scheduler().synchronize(timer_expired_delegate(FUNC(a2bus_grappler_device::set_ack_in), this), state ? 1 : 0); } @@ -373,14 +373,14 @@ WRITE_LINE_MEMBER(a2bus_grappler_device::ack_w) // synchronised signals //-------------------------------------------------- -void a2bus_grappler_device::set_data(void *ptr, s32 param) +void a2bus_grappler_device::set_data(s32 param) { LOG("Output data %02X\n", u8(u32(param))); m_printer_out->write(u8(u32(param))); } -void a2bus_grappler_device::set_strobe(void *ptr, s32 param) +void a2bus_grappler_device::set_strobe(s32 param) { LOG("Output /STROBE=%d\n", param); m_printer_conn->write_strobe(param); @@ -403,7 +403,7 @@ void a2bus_grappler_device::set_strobe(void *ptr, s32 param) } -void a2bus_grappler_device::set_ack_in(void *ptr, s32 param) +void a2bus_grappler_device::set_ack_in(s32 param) { if (u32(param) != m_ack_in) { @@ -451,7 +451,7 @@ protected: virtual void device_reset() override; // ACK latch set input - DECLARE_WRITE_LINE_MEMBER(ack_w); + void ack_w(int state); // signal state u8 ack_latch() const { return m_ack_latch; } @@ -460,7 +460,7 @@ protected: private: // synchronised printer status inputs - void set_ack_in(void *ptr, s32 param); + void set_ack_in(s32 param); // for derived devices to implement virtual void data_latched(u8 data) = 0; @@ -581,7 +581,7 @@ void a2bus_grapplerplus_device_base::write_cnxx(u8 offset, u8 data) // ACK latch set input //-------------------------------------------------- -WRITE_LINE_MEMBER(a2bus_grapplerplus_device_base::ack_w) +void a2bus_grapplerplus_device_base::ack_w(int state) { machine().scheduler().synchronize(timer_expired_delegate(FUNC(a2bus_grapplerplus_device_base::set_ack_in), this), state ? 1 : 0); } @@ -592,7 +592,7 @@ WRITE_LINE_MEMBER(a2bus_grapplerplus_device_base::ack_w) // synchronised printer status inputs //-------------------------------------------------- -void a2bus_grapplerplus_device_base::set_ack_in(void *ptr, s32 param) +void a2bus_grapplerplus_device_base::set_ack_in(s32 param) { if (u32(param) != m_ack_in) { @@ -746,7 +746,7 @@ void a2bus_grapplerplus_device::device_start() { a2bus_grapplerplus_device_base::device_start(); - m_strobe_timer = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(a2bus_grapplerplus_device::update_strobe), this)); + m_strobe_timer = timer_alloc(FUNC(a2bus_grapplerplus_device::update_strobe), this); m_next_strobe = 1U; @@ -868,7 +868,7 @@ private: virtual void data_latched(u8 data) override; // printer status inputs - DECLARE_WRITE_LINE_MEMBER(buf_ack_w); + void buf_ack_w(int state); // MCU I/O handlers void mcu_io(address_map &map); @@ -877,9 +877,9 @@ private: void mcu_bus_w(u8 data); // synchronised signals - void set_buf_data(void *ptr, s32 param); - void set_buf_ack_in(void *ptr, s32 param); - void clear_ibusy(void *ptr, s32 param); + void set_buf_data(s32 param); + void set_buf_ack_in(s32 param); + void clear_ibusy(s32 param); required_device<mcs48_cpu_device> m_mcu; std::unique_ptr<u8 []> m_ram; @@ -1039,7 +1039,7 @@ void a2bus_buf_grapplerplus_device::data_latched(u8 data) // printer status inputs //-------------------------------------------------- -DECLARE_WRITE_LINE_MEMBER(a2bus_buf_grapplerplus_device::buf_ack_w) +void a2bus_buf_grapplerplus_device::buf_ack_w(int state) { machine().scheduler().synchronize(timer_expired_delegate(FUNC(a2bus_buf_grapplerplus_device::set_buf_ack_in), this), state ? 1 : 0); } @@ -1177,13 +1177,13 @@ void a2bus_buf_grapplerplus_device::mcu_bus_w(u8 data) // synchronised signals //-------------------------------------------------- -void a2bus_buf_grapplerplus_device::set_buf_data(void *ptr, s32 param) +void a2bus_buf_grapplerplus_device::set_buf_data(s32 param) { m_data_latch = u8(u32(param)); } -void a2bus_buf_grapplerplus_device::set_buf_ack_in(void *ptr, s32 param) +void a2bus_buf_grapplerplus_device::set_buf_ack_in(s32 param) { if (u32(param) != m_buf_ack_in) { @@ -1201,7 +1201,7 @@ void a2bus_buf_grapplerplus_device::set_buf_ack_in(void *ptr, s32 param) } -void a2bus_buf_grapplerplus_device::clear_ibusy(void *ptr, s32 param) +void a2bus_buf_grapplerplus_device::clear_ibusy(s32 param) { if (m_ibusy) { |