diff options
author | 2023-05-31 17:43:46 +0200 | |
---|---|---|
committer | 2023-06-01 01:43:46 +1000 | |
commit | 9f661e567c4528e7f7f662209e4b677f12b99875 (patch) | |
tree | 5dbd6f4cc4c274c296511dbde1d802d68dea4743 /src/devices/bus/abcbus | |
parent | a9935073709fffa95130ef1b7ea701c3a2325b9b (diff) |
emu/device.h: Removed device (READ|WRITE)_LINE_MEMBER in favor of explicit function signatures. (#11283) [Ryan Holtz]
Diffstat (limited to 'src/devices/bus/abcbus')
-rw-r--r-- | src/devices/bus/abcbus/abcbus.h | 48 | ||||
-rw-r--r-- | src/devices/bus/abcbus/lux10828.cpp | 4 | ||||
-rw-r--r-- | src/devices/bus/abcbus/lux10828.h | 4 | ||||
-rw-r--r-- | src/devices/bus/abcbus/lux21046.cpp | 4 | ||||
-rw-r--r-- | src/devices/bus/abcbus/lux21046.h | 4 | ||||
-rw-r--r-- | src/devices/bus/abcbus/lux21056.cpp | 10 | ||||
-rw-r--r-- | src/devices/bus/abcbus/lux21056.h | 10 | ||||
-rw-r--r-- | src/devices/bus/abcbus/lux4105.cpp | 10 | ||||
-rw-r--r-- | src/devices/bus/abcbus/lux4105.h | 10 |
9 files changed, 52 insertions, 52 deletions
diff --git a/src/devices/bus/abcbus/abcbus.h b/src/devices/bus/abcbus/abcbus.h index e8ce92a2d9b..638d460efa3 100644 --- a/src/devices/bus/abcbus/abcbus.h +++ b/src/devices/bus/abcbus/abcbus.h @@ -192,16 +192,16 @@ public: void write_c4(uint8_t data) { if (m_card) m_card->abcbus_c4(data); } uint8_t xmemfl_r(offs_t offset) { return m_card ? m_card->abcbus_xmemfl(offset) : 0xff; } void xmemw_w(offs_t offset, uint8_t data) { if (m_card) m_card->abcbus_xmemw(offset, data); } - DECLARE_READ_LINE_MEMBER( csb_r ) { return m_card ? m_card->abcbus_csb() : 1; } + int csb_r() { return m_card ? m_card->abcbus_csb() : 1; } uint8_t ops_r() { return m_card ? m_card->abcbus_ops() : 0xff; } uint8_t exp_r() { return m_card ? m_card->abcbus_exp() : 0xff; } - DECLARE_READ_LINE_MEMBER( xcsb2_r ) { return m_card ? m_card->abcbus_xcsb2() : 1; } - DECLARE_READ_LINE_MEMBER( xcsb3_r ) { return m_card ? m_card->abcbus_xcsb3() : 1; } - DECLARE_READ_LINE_MEMBER( xcsb4_r ) { return m_card ? m_card->abcbus_xcsb4() : 1; } - DECLARE_READ_LINE_MEMBER( xcsb5_r ) { return m_card ? m_card->abcbus_xcsb5() : 1; } + int xcsb2_r() { return m_card ? m_card->abcbus_xcsb2() : 1; } + int xcsb3_r() { return m_card ? m_card->abcbus_xcsb3() : 1; } + int xcsb4_r() { return m_card ? m_card->abcbus_xcsb4() : 1; } + int xcsb5_r() { return m_card ? m_card->abcbus_xcsb5() : 1; } uint8_t read_tren() { return m_card ? m_card->abcbus_tren() : 0xff; } void write_tren(uint8_t data) { if (m_card) m_card->abcbus_tren(data); } - DECLARE_WRITE_LINE_MEMBER( prac_w ) { if (m_card) m_card->abcbus_prac(state); } + void prac_w(int state) { if (m_card) m_card->abcbus_prac(state); } void cs_w(uint8_t data) { write_cs(data); } uint8_t rst_r() { return read_rst(); } @@ -213,26 +213,26 @@ public: void c3_w(uint8_t data) { write_c3(data); } void c4_w(uint8_t data) { write_c4(data); } - DECLARE_READ_LINE_MEMBER( irq_r ) { return m_irq; } - DECLARE_READ_LINE_MEMBER( nmi_r ) { return m_nmi; } - DECLARE_READ_LINE_MEMBER( pren_r ) { return m_pren; } - DECLARE_READ_LINE_MEMBER( trrq_r ) { return m_trrq; } - DECLARE_READ_LINE_MEMBER( xint2_r ) { return m_xint2; } - DECLARE_READ_LINE_MEMBER( xint3_r ) { return m_xint3; } - DECLARE_READ_LINE_MEMBER( xint4_r ) { return m_xint4; } - DECLARE_READ_LINE_MEMBER( xint5_r ) { return m_xint5; } + int irq_r() { return m_irq; } + int nmi_r() { return m_nmi; } + int pren_r() { return m_pren; } + int trrq_r() { return m_trrq; } + int xint2_r() { return m_xint2; } + int xint3_r() { return m_xint3; } + int xint4_r() { return m_xint4; } + int xint5_r() { return m_xint5; } // card interface - DECLARE_WRITE_LINE_MEMBER( irq_w ) { if (m_irq != state) { m_irq = state; m_write_irq(state); } } - DECLARE_WRITE_LINE_MEMBER( nmi_w ) { m_nmi = state; m_write_nmi(state); } - DECLARE_WRITE_LINE_MEMBER( rdy_w ) { m_write_rdy(state); } - DECLARE_WRITE_LINE_MEMBER( resin_w ) { m_write_resin(state); } - DECLARE_WRITE_LINE_MEMBER( pren_w ) { if (m_pren != state) { m_pren = state; m_write_pren(state); } } - DECLARE_WRITE_LINE_MEMBER( trrq_w ) { if (m_trrq != state) { m_trrq = state; m_write_trrq(state); } } - DECLARE_WRITE_LINE_MEMBER( xint2_w ) { m_xint2 = state; m_write_xint2(state); } - DECLARE_WRITE_LINE_MEMBER( xint3_w ) { m_xint3 = state; m_write_xint3(state); } - DECLARE_WRITE_LINE_MEMBER( xint4_w ) { m_xint4 = state; m_write_xint4(state); } - DECLARE_WRITE_LINE_MEMBER( xint5_w ) { m_xint5 = state; m_write_xint5(state); } + void irq_w(int state) { if (m_irq != state) { m_irq = state; m_write_irq(state); } } + void nmi_w(int state) { m_nmi = state; m_write_nmi(state); } + void rdy_w(int state) { m_write_rdy(state); } + void resin_w(int state) { m_write_resin(state); } + void pren_w(int state) { if (m_pren != state) { m_pren = state; m_write_pren(state); } } + void trrq_w(int state) { if (m_trrq != state) { m_trrq = state; m_write_trrq(state); } } + void xint2_w(int state) { m_xint2 = state; m_write_xint2(state); } + void xint3_w(int state) { m_xint3 = state; m_write_xint3(state); } + void xint4_w(int state) { m_xint4 = state; m_write_xint4(state); } + void xint5_w(int state) { m_xint5 = state; m_write_xint5(state); } protected: // device-level overrides diff --git a/src/devices/bus/abcbus/lux10828.cpp b/src/devices/bus/abcbus/lux10828.cpp index 1c1535e9b87..34288b40257 100644 --- a/src/devices/bus/abcbus/lux10828.cpp +++ b/src/devices/bus/abcbus/lux10828.cpp @@ -306,7 +306,7 @@ void luxor_55_10828_device::floppy_formats(format_registration &fr) fr.add(FLOPPY_ABC800_FORMAT); } -WRITE_LINE_MEMBER( luxor_55_10828_device::fdc_intrq_w ) +void luxor_55_10828_device::fdc_intrq_w(int state) { m_fdc_irq = state; m_pio->port_b_write(state << 7); @@ -314,7 +314,7 @@ WRITE_LINE_MEMBER( luxor_55_10828_device::fdc_intrq_w ) //if (state) m_maincpu->wait_w(CLEAR_LINE); } -WRITE_LINE_MEMBER( luxor_55_10828_device::fdc_drq_w ) +void luxor_55_10828_device::fdc_drq_w(int state) { m_fdc_drq = state; diff --git a/src/devices/bus/abcbus/lux10828.h b/src/devices/bus/abcbus/lux10828.h index 0766de4d547..d23820b93af 100644 --- a/src/devices/bus/abcbus/lux10828.h +++ b/src/devices/bus/abcbus/lux10828.h @@ -81,8 +81,8 @@ private: uint8_t pio_pb_r(); void pio_pb_w(uint8_t data); - DECLARE_WRITE_LINE_MEMBER( fdc_intrq_w ); - DECLARE_WRITE_LINE_MEMBER( fdc_drq_w ); + void fdc_intrq_w(int state); + void fdc_drq_w(int state); void ctrl_w(uint8_t data); void status_w(uint8_t data); diff --git a/src/devices/bus/abcbus/lux21046.cpp b/src/devices/bus/abcbus/lux21046.cpp index f004990a8fc..6d17cbbf315 100644 --- a/src/devices/bus/abcbus/lux21046.cpp +++ b/src/devices/bus/abcbus/lux21046.cpp @@ -226,7 +226,7 @@ void luxor_55_21046_device::luxor_55_21046_io(address_map &map) */ -WRITE_LINE_MEMBER( luxor_55_21046_device::dma_int_w ) +void luxor_55_21046_device::dma_int_w(int state) { m_dma_irq = state; @@ -271,7 +271,7 @@ static void abc_floppies(device_slot_interface &device) device.option_add("8dsdd", FLOPPY_8_DSDD); } -WRITE_LINE_MEMBER( luxor_55_21046_device::fdc_intrq_w ) +void luxor_55_21046_device::fdc_intrq_w(int state) { m_fdc_irq = state; diff --git a/src/devices/bus/abcbus/lux21046.h b/src/devices/bus/abcbus/lux21046.h index a45eb11d130..89c2adba047 100644 --- a/src/devices/bus/abcbus/lux21046.h +++ b/src/devices/bus/abcbus/lux21046.h @@ -84,14 +84,14 @@ protected: required_device<floppy_connector> m_floppy1; private: - DECLARE_WRITE_LINE_MEMBER( dma_int_w ); + void dma_int_w(int state); uint8_t memory_read_byte(offs_t offset); void memory_write_byte(offs_t offset, uint8_t data); uint8_t io_read_byte(offs_t offset); void io_write_byte(offs_t offset, uint8_t data); - DECLARE_WRITE_LINE_MEMBER( fdc_intrq_w ); + void fdc_intrq_w(int state); uint8_t out_r(); void inp_w(uint8_t data); diff --git a/src/devices/bus/abcbus/lux21056.cpp b/src/devices/bus/abcbus/lux21056.cpp index f14ea5a0f68..f1f4ca536b0 100644 --- a/src/devices/bus/abcbus/lux21056.cpp +++ b/src/devices/bus/abcbus/lux21056.cpp @@ -198,7 +198,7 @@ void luxor_55_21056_device::io_write_byte(offs_t offset, uint8_t data) } -WRITE_LINE_MEMBER( luxor_55_21056_device::write_sasi_bsy ) +void luxor_55_21056_device::write_sasi_bsy(int state) { m_sasi_bsy = state; @@ -208,7 +208,7 @@ WRITE_LINE_MEMBER( luxor_55_21056_device::write_sasi_bsy ) } } -WRITE_LINE_MEMBER( luxor_55_21056_device::write_sasi_io ) +void luxor_55_21056_device::write_sasi_io(int state) { m_sasi_io = state; @@ -222,7 +222,7 @@ WRITE_LINE_MEMBER( luxor_55_21056_device::write_sasi_io ) } } -WRITE_LINE_MEMBER( luxor_55_21056_device::write_sasi_req ) +void luxor_55_21056_device::write_sasi_req(int state) { m_sasi_req = state; @@ -233,12 +233,12 @@ WRITE_LINE_MEMBER( luxor_55_21056_device::write_sasi_req ) } } -WRITE_LINE_MEMBER( luxor_55_21056_device::write_sasi_cd ) +void luxor_55_21056_device::write_sasi_cd(int state) { m_sasi_cd = state; } -WRITE_LINE_MEMBER( luxor_55_21056_device::write_sasi_msg ) +void luxor_55_21056_device::write_sasi_msg(int state) { m_sasi_msg = state; } diff --git a/src/devices/bus/abcbus/lux21056.h b/src/devices/bus/abcbus/lux21056.h index 812bb8325a3..bf70c79bae1 100644 --- a/src/devices/bus/abcbus/lux21056.h +++ b/src/devices/bus/abcbus/lux21056.h @@ -58,11 +58,11 @@ private: uint8_t io_read_byte(offs_t offset); void io_write_byte(offs_t offset, uint8_t data); - DECLARE_WRITE_LINE_MEMBER( write_sasi_req ); - DECLARE_WRITE_LINE_MEMBER( write_sasi_io ); - DECLARE_WRITE_LINE_MEMBER( write_sasi_cd ); - DECLARE_WRITE_LINE_MEMBER( write_sasi_msg ); - DECLARE_WRITE_LINE_MEMBER( write_sasi_bsy ); + void write_sasi_req(int state); + void write_sasi_io(int state); + void write_sasi_cd(int state); + void write_sasi_msg(int state); + void write_sasi_bsy(int state); uint8_t sasi_status_r(); void stat_w(uint8_t data); diff --git a/src/devices/bus/abcbus/lux4105.cpp b/src/devices/bus/abcbus/lux4105.cpp index 85400f57786..1db5d0d3869 100644 --- a/src/devices/bus/abcbus/lux4105.cpp +++ b/src/devices/bus/abcbus/lux4105.cpp @@ -286,7 +286,7 @@ void luxor_4105_device::write_sasi_data(uint8_t data) } -WRITE_LINE_MEMBER( luxor_4105_device::write_sasi_bsy ) +void luxor_4105_device::write_sasi_bsy(int state) { if (state) { @@ -295,13 +295,13 @@ WRITE_LINE_MEMBER( luxor_4105_device::write_sasi_bsy ) } -WRITE_LINE_MEMBER( luxor_4105_device::write_sasi_cd ) +void luxor_4105_device::write_sasi_cd(int state) { update_dma(); } -WRITE_LINE_MEMBER( luxor_4105_device::write_sasi_req ) +void luxor_4105_device::write_sasi_req(int state) { if (LOG) logerror("%s REQ %u\n", machine().describe_context(), state); @@ -316,13 +316,13 @@ WRITE_LINE_MEMBER( luxor_4105_device::write_sasi_req ) } -WRITE_LINE_MEMBER( luxor_4105_device::write_sasi_msg ) +void luxor_4105_device::write_sasi_msg(int state) { update_ack(); } -WRITE_LINE_MEMBER( luxor_4105_device::write_sasi_io ) +void luxor_4105_device::write_sasi_io(int state) { if (state) { diff --git a/src/devices/bus/abcbus/lux4105.h b/src/devices/bus/abcbus/lux4105.h index dde20ad3075..75003907c65 100644 --- a/src/devices/bus/abcbus/lux4105.h +++ b/src/devices/bus/abcbus/lux4105.h @@ -61,11 +61,11 @@ private: void write_dma_register(uint8_t data); void write_sasi_data(uint8_t data); - DECLARE_WRITE_LINE_MEMBER( write_sasi_bsy ); - DECLARE_WRITE_LINE_MEMBER( write_sasi_cd ); - DECLARE_WRITE_LINE_MEMBER( write_sasi_req ); - DECLARE_WRITE_LINE_MEMBER( write_sasi_msg ); - DECLARE_WRITE_LINE_MEMBER( write_sasi_io ); + void write_sasi_bsy(int state); + void write_sasi_cd(int state); + void write_sasi_req(int state); + void write_sasi_msg(int state); + void write_sasi_io(int state); required_device<nscsi_callback_device> m_sasi; required_ioport m_1e; |