diff options
author | Ivan Vangelista <mesgnet@yahoo.it> | 2020-05-21 19:57:43 +0200 |
---|---|---|
committer | Ivan Vangelista <mesgnet@yahoo.it> | 2020-05-21 19:57:43 +0200 |
commit | 889e65792ed3eb0e90c1c6cf266b6f4a08b9a26b (patch) | |
tree | 65d69f004e494e2fa57526066e022886416d07e6 /src/devices/machine | |
parent | 6b8cb09ee7cfdbc6415aebe4670b44e5b5756a2a (diff) |
last batch of changes to make the https://github.com/mamedev/mame/tree/devcb-no-space branch build. (nw)
Diffstat (limited to 'src/devices/machine')
-rw-r--r-- | src/devices/machine/68307.h | 4 | ||||
-rw-r--r-- | src/devices/machine/dp8390.cpp | 4 | ||||
-rw-r--r-- | src/devices/machine/dp8390.h | 4 | ||||
-rw-r--r-- | src/devices/machine/gayle.cpp | 8 | ||||
-rw-r--r-- | src/devices/machine/i82371sb.cpp | 38 | ||||
-rw-r--r-- | src/devices/machine/i82371sb.h | 38 | ||||
-rw-r--r-- | src/devices/machine/ie15.cpp | 2 | ||||
-rw-r--r-- | src/devices/machine/ie15.h | 2 | ||||
-rw-r--r-- | src/devices/machine/pxa255.cpp | 18 | ||||
-rw-r--r-- | src/devices/machine/sega_scu.cpp | 4 | ||||
-rw-r--r-- | src/devices/machine/sega_scu.h | 4 | ||||
-rw-r--r-- | src/devices/machine/sis85c496.cpp | 38 | ||||
-rw-r--r-- | src/devices/machine/sis85c496.h | 38 | ||||
-rw-r--r-- | src/devices/machine/spg110.cpp | 2 | ||||
-rw-r--r-- | src/devices/machine/spg110.h | 20 | ||||
-rw-r--r-- | src/devices/machine/spg2xx.cpp | 4 | ||||
-rw-r--r-- | src/devices/machine/spg2xx.h | 34 |
17 files changed, 131 insertions, 131 deletions
diff --git a/src/devices/machine/68307.h b/src/devices/machine/68307.h index 135a51c723d..cecdda219d1 100644 --- a/src/devices/machine/68307.h +++ b/src/devices/machine/68307.h @@ -53,8 +53,8 @@ private: DECLARE_WRITE_LINE_MEMBER(m68307_duart_irq_handler); DECLARE_WRITE_LINE_MEMBER(m68307_duart_txa) { m_write_a_tx(state); } DECLARE_WRITE_LINE_MEMBER(m68307_duart_txb) { m_write_b_tx(state); } - DECLARE_READ8_MEMBER(m68307_duart_input_r) { return m_read_inport(); } - DECLARE_WRITE8_MEMBER(m68307_duart_output_w) { m_write_outport(data); } + uint8_t m68307_duart_input_r() { return m_read_inport(); } + void m68307_duart_output_w(uint8_t data) { m_write_outport(data); } void init16_m68307(address_space &space); diff --git a/src/devices/machine/dp8390.cpp b/src/devices/machine/dp8390.cpp index c096bd7d208..c898332d1f4 100644 --- a/src/devices/machine/dp8390.cpp +++ b/src/devices/machine/dp8390.cpp @@ -180,7 +180,7 @@ WRITE_LINE_MEMBER(dp8390_device::dp8390_reset) { if(!state) device_reset(); } -READ16_MEMBER(dp8390_device::dp8390_r) { +uint16_t dp8390_device::dp8390_r(offs_t offset) { uint16_t data; if(m_cs) { uint32_t high16 = (m_regs.dcr & 4)?m_regs.rsar<<16:0; @@ -350,7 +350,7 @@ READ16_MEMBER(dp8390_device::dp8390_r) { return data; } -WRITE16_MEMBER(dp8390_device::dp8390_w) { +void dp8390_device::dp8390_w(offs_t offset, uint16_t data) { if(m_cs) { uint32_t high16 = (m_regs.dcr & 4)?m_regs.rsar<<16:0; if(m_regs.dcr & 1) { diff --git a/src/devices/machine/dp8390.h b/src/devices/machine/dp8390.h index c13fe53e1d3..adaed69d529 100644 --- a/src/devices/machine/dp8390.h +++ b/src/devices/machine/dp8390.h @@ -16,8 +16,8 @@ public: auto mem_read_callback() { return m_mem_read_cb.bind(); } auto mem_write_callback() { return m_mem_write_cb.bind(); } - DECLARE_WRITE16_MEMBER( dp8390_w ); - DECLARE_READ16_MEMBER( dp8390_r ); + void dp8390_w(offs_t offset, uint16_t data); + uint16_t dp8390_r(offs_t offset); DECLARE_WRITE_LINE_MEMBER( dp8390_cs ); DECLARE_WRITE_LINE_MEMBER( dp8390_reset ); void recv_cb(uint8_t *buf, int len) override; diff --git a/src/devices/machine/gayle.cpp b/src/devices/machine/gayle.cpp index 0115c7f7a24..95db4ad9e47 100644 --- a/src/devices/machine/gayle.cpp +++ b/src/devices/machine/gayle.cpp @@ -103,9 +103,9 @@ READ16_MEMBER( gayle_device::gayle_r ) if (!BIT(offset, 14)) { if (BIT(offset, 13)) - data = m_cs0_read(space, (offset >> 2) & 0x07, mem_mask); + data = m_cs0_read((offset >> 2) & 0x07, mem_mask); else - data = m_cs1_read(space, (offset >> 2) & 0x07, mem_mask); + data = m_cs1_read((offset >> 2) & 0x07, mem_mask); } } @@ -153,9 +153,9 @@ WRITE16_MEMBER( gayle_device::gayle_w ) if (!BIT(offset, 14)) { if (BIT(offset, 13)) - m_cs0_write(space, (offset >> 2) & 0x07, data, mem_mask); + m_cs0_write((offset >> 2) & 0x07, data, mem_mask); else - m_cs1_write(space, (offset >> 2) & 0x07, data, mem_mask); + m_cs1_write((offset >> 2) & 0x07, data, mem_mask); } } } diff --git a/src/devices/machine/i82371sb.cpp b/src/devices/machine/i82371sb.cpp index 8a83514ed82..09399473564 100644 --- a/src/devices/machine/i82371sb.cpp +++ b/src/devices/machine/i82371sb.cpp @@ -492,7 +492,7 @@ void i82371sb_isa_device::map_extra(uint64_t memory_window_start, uint64_t memor // Southbridge -READ8_MEMBER( i82371sb_isa_device::get_slave_ack ) +uint8_t i82371sb_isa_device::get_slave_ack(offs_t offset) { if (offset==2) // IRQ = 2 return m_pic8259_slave->acknowledge(); @@ -582,7 +582,7 @@ WRITE_LINE_MEMBER( i82371sb_isa_device::pc_dma_hrq_changed ) m_dma8237_2->hack_w( state ); } -READ8_MEMBER(i82371sb_isa_device::pc_dma_read_byte) +uint8_t i82371sb_isa_device::pc_dma_read_byte(offs_t offset) { address_space& prog_space = m_maincpu->space(AS_PROGRAM); // get the right address space if(m_dma_channel == -1) @@ -595,7 +595,7 @@ READ8_MEMBER(i82371sb_isa_device::pc_dma_read_byte) } -WRITE8_MEMBER(i82371sb_isa_device::pc_dma_write_byte) +void i82371sb_isa_device::pc_dma_write_byte(offs_t offset, uint8_t data) { address_space& prog_space = m_maincpu->space(AS_PROGRAM); // get the right address space if(m_dma_channel == -1) @@ -606,7 +606,7 @@ WRITE8_MEMBER(i82371sb_isa_device::pc_dma_write_byte) } -READ8_MEMBER(i82371sb_isa_device::pc_dma_read_word) +uint8_t i82371sb_isa_device::pc_dma_read_word(offs_t offset) { address_space& prog_space = m_maincpu->space(AS_PROGRAM); // get the right address space if(m_dma_channel == -1) @@ -621,7 +621,7 @@ READ8_MEMBER(i82371sb_isa_device::pc_dma_read_word) } -WRITE8_MEMBER(i82371sb_isa_device::pc_dma_write_word) +void i82371sb_isa_device::pc_dma_write_word(offs_t offset, uint8_t data) { address_space& prog_space = m_maincpu->space(AS_PROGRAM); // get the right address space if(m_dma_channel == -1) @@ -632,22 +632,22 @@ WRITE8_MEMBER(i82371sb_isa_device::pc_dma_write_word) } -READ8_MEMBER( i82371sb_isa_device::pc_dma8237_0_dack_r ) { return m_isabus->dack_r(0); } -READ8_MEMBER( i82371sb_isa_device::pc_dma8237_1_dack_r ) { return m_isabus->dack_r(1); } -READ8_MEMBER( i82371sb_isa_device::pc_dma8237_2_dack_r ) { return m_isabus->dack_r(2); } -READ8_MEMBER( i82371sb_isa_device::pc_dma8237_3_dack_r ) { return m_isabus->dack_r(3); } -READ8_MEMBER( i82371sb_isa_device::pc_dma8237_5_dack_r ) { return m_isabus->dack_r(5); } -READ8_MEMBER( i82371sb_isa_device::pc_dma8237_6_dack_r ) { return m_isabus->dack_r(6); } -READ8_MEMBER( i82371sb_isa_device::pc_dma8237_7_dack_r ) { return m_isabus->dack_r(7); } +uint8_t i82371sb_isa_device::pc_dma8237_0_dack_r() { return m_isabus->dack_r(0); } +uint8_t i82371sb_isa_device::pc_dma8237_1_dack_r() { return m_isabus->dack_r(1); } +uint8_t i82371sb_isa_device::pc_dma8237_2_dack_r() { return m_isabus->dack_r(2); } +uint8_t i82371sb_isa_device::pc_dma8237_3_dack_r() { return m_isabus->dack_r(3); } +uint8_t i82371sb_isa_device::pc_dma8237_5_dack_r() { return m_isabus->dack_r(5); } +uint8_t i82371sb_isa_device::pc_dma8237_6_dack_r() { return m_isabus->dack_r(6); } +uint8_t i82371sb_isa_device::pc_dma8237_7_dack_r() { return m_isabus->dack_r(7); } -WRITE8_MEMBER( i82371sb_isa_device::pc_dma8237_0_dack_w ) { m_isabus->dack_w(0, data); } -WRITE8_MEMBER( i82371sb_isa_device::pc_dma8237_1_dack_w ) { m_isabus->dack_w(1, data); } -WRITE8_MEMBER( i82371sb_isa_device::pc_dma8237_2_dack_w ) { m_isabus->dack_w(2, data); } -WRITE8_MEMBER( i82371sb_isa_device::pc_dma8237_3_dack_w ) { m_isabus->dack_w(3, data); } -WRITE8_MEMBER( i82371sb_isa_device::pc_dma8237_5_dack_w ) { m_isabus->dack_w(5, data); } -WRITE8_MEMBER( i82371sb_isa_device::pc_dma8237_6_dack_w ) { m_isabus->dack_w(6, data); } -WRITE8_MEMBER( i82371sb_isa_device::pc_dma8237_7_dack_w ) { m_isabus->dack_w(7, data); } +void i82371sb_isa_device::pc_dma8237_0_dack_w(uint8_t data) { m_isabus->dack_w(0, data); } +void i82371sb_isa_device::pc_dma8237_1_dack_w(uint8_t data) { m_isabus->dack_w(1, data); } +void i82371sb_isa_device::pc_dma8237_2_dack_w(uint8_t data) { m_isabus->dack_w(2, data); } +void i82371sb_isa_device::pc_dma8237_3_dack_w(uint8_t data) { m_isabus->dack_w(3, data); } +void i82371sb_isa_device::pc_dma8237_5_dack_w(uint8_t data) { m_isabus->dack_w(5, data); } +void i82371sb_isa_device::pc_dma8237_6_dack_w(uint8_t data) { m_isabus->dack_w(6, data); } +void i82371sb_isa_device::pc_dma8237_7_dack_w(uint8_t data) { m_isabus->dack_w(7, data); } WRITE_LINE_MEMBER( i82371sb_isa_device::at_dma8237_out_eop ) { diff --git a/src/devices/machine/i82371sb.h b/src/devices/machine/i82371sb.h index ce52bc7eefa..71a5a96b429 100644 --- a/src/devices/machine/i82371sb.h +++ b/src/devices/machine/i82371sb.h @@ -71,20 +71,20 @@ private: DECLARE_WRITE_LINE_MEMBER(at_pit8254_out0_changed); DECLARE_WRITE_LINE_MEMBER(at_pit8254_out1_changed); DECLARE_WRITE_LINE_MEMBER(at_pit8254_out2_changed); - DECLARE_READ8_MEMBER(pc_dma8237_0_dack_r); - DECLARE_READ8_MEMBER(pc_dma8237_1_dack_r); - DECLARE_READ8_MEMBER(pc_dma8237_2_dack_r); - DECLARE_READ8_MEMBER(pc_dma8237_3_dack_r); - DECLARE_READ8_MEMBER(pc_dma8237_5_dack_r); - DECLARE_READ8_MEMBER(pc_dma8237_6_dack_r); - DECLARE_READ8_MEMBER(pc_dma8237_7_dack_r); - DECLARE_WRITE8_MEMBER(pc_dma8237_0_dack_w); - DECLARE_WRITE8_MEMBER(pc_dma8237_1_dack_w); - DECLARE_WRITE8_MEMBER(pc_dma8237_2_dack_w); - DECLARE_WRITE8_MEMBER(pc_dma8237_3_dack_w); - DECLARE_WRITE8_MEMBER(pc_dma8237_5_dack_w); - DECLARE_WRITE8_MEMBER(pc_dma8237_6_dack_w); - DECLARE_WRITE8_MEMBER(pc_dma8237_7_dack_w); + uint8_t pc_dma8237_0_dack_r(); + uint8_t pc_dma8237_1_dack_r(); + uint8_t pc_dma8237_2_dack_r(); + uint8_t pc_dma8237_3_dack_r(); + uint8_t pc_dma8237_5_dack_r(); + uint8_t pc_dma8237_6_dack_r(); + uint8_t pc_dma8237_7_dack_r(); + void pc_dma8237_0_dack_w(uint8_t data); + void pc_dma8237_1_dack_w(uint8_t data); + void pc_dma8237_2_dack_w(uint8_t data); + void pc_dma8237_3_dack_w(uint8_t data); + void pc_dma8237_5_dack_w(uint8_t data); + void pc_dma8237_6_dack_w(uint8_t data); + void pc_dma8237_7_dack_w(uint8_t data); DECLARE_WRITE_LINE_MEMBER(pc_dack0_w); DECLARE_WRITE_LINE_MEMBER(pc_dack1_w); DECLARE_WRITE_LINE_MEMBER(pc_dack2_w); @@ -95,11 +95,11 @@ private: DECLARE_WRITE_LINE_MEMBER(pc_dack7_w); DECLARE_WRITE_LINE_MEMBER(at_dma8237_out_eop); DECLARE_WRITE_LINE_MEMBER(pc_dma_hrq_changed); - DECLARE_READ8_MEMBER(pc_dma_read_byte); - DECLARE_WRITE8_MEMBER(pc_dma_write_byte); - DECLARE_READ8_MEMBER(pc_dma_read_word); - DECLARE_WRITE8_MEMBER(pc_dma_write_word); - DECLARE_READ8_MEMBER(get_slave_ack); + uint8_t pc_dma_read_byte(offs_t offset); + void pc_dma_write_byte(offs_t offset, uint8_t data); + uint8_t pc_dma_read_word(offs_t offset); + void pc_dma_write_word(offs_t offset,uint8_t data); + uint8_t get_slave_ack(offs_t offset); void internal_io_map(address_map &map); diff --git a/src/devices/machine/ie15.cpp b/src/devices/machine/ie15.cpp index 5f19830f537..07f0a2a011b 100644 --- a/src/devices/machine/ie15.cpp +++ b/src/devices/machine/ie15.cpp @@ -451,7 +451,7 @@ INPUT_PORTS_START( ie15 ) INPUT_PORTS_END -WRITE16_MEMBER( ie15_device::kbd_put ) +void ie15_device::kbd_put(uint16_t data) { DBG_LOG(2,"keyboard",("W %02X<-%02X '%c' %02X (%c)\n", m_kb_data, data, 'x' /* data < 0x20 ? ' ' : (data & 255) */, m_kb_flag, m_kb_flag ? 'n' : 'y')); diff --git a/src/devices/machine/ie15.h b/src/devices/machine/ie15.h index 291bcf232a6..5c870ce8ce4 100644 --- a/src/devices/machine/ie15.h +++ b/src/devices/machine/ie15.h @@ -75,7 +75,7 @@ private: void ie15core(machine_config &config); - DECLARE_WRITE16_MEMBER(kbd_put); + void kbd_put(uint16_t data); DECLARE_WRITE8_MEMBER(mem_w); DECLARE_READ8_MEMBER(mem_r); DECLARE_WRITE8_MEMBER(mem_addr_lo_w); diff --git a/src/devices/machine/pxa255.cpp b/src/devices/machine/pxa255.cpp index 6788c10a3ce..54fdade2f83 100644 --- a/src/devices/machine/pxa255.cpp +++ b/src/devices/machine/pxa255.cpp @@ -669,19 +669,19 @@ READ32_MEMBER(pxa255_periphs_device::gpio_r) { case PXA255_GPLR0: { - const uint32_t value = (m_gpio_regs.gplr0 & m_gpio_regs.gpdr0) | m_gpio0_r(space, 0, ~m_gpio_regs.gpdr0); + const uint32_t value = (m_gpio_regs.gplr0 & m_gpio_regs.gpdr0) | m_gpio0_r(0, ~m_gpio_regs.gpdr0); LOGMASKED(LOG_GPIO, "pxa255_gpio_r: GPIO Pin-Level Register 0: %08x & %08x\n", m_gpio_regs.gplr0, mem_mask); return value; } case PXA255_GPLR1: { - const uint32_t value = (m_gpio_regs.gplr1 & m_gpio_regs.gpdr1) | m_gpio1_r(space, 0, ~m_gpio_regs.gpdr1); + const uint32_t value = (m_gpio_regs.gplr1 & m_gpio_regs.gpdr1) | m_gpio1_r(0, ~m_gpio_regs.gpdr1); LOGMASKED(LOG_GPIO, "pxa255_gpio_r: GPIO Pin-Level Register 1: %08x & %08x\n", m_gpio_regs.gplr1, mem_mask); return value; } case PXA255_GPLR2: { - const uint32_t value = (m_gpio_regs.gplr2 & m_gpio_regs.gpdr2) | m_gpio2_r(space, 0, ~m_gpio_regs.gpdr2); + const uint32_t value = (m_gpio_regs.gplr2 & m_gpio_regs.gpdr2) | m_gpio2_r(0, ~m_gpio_regs.gpdr2); LOGMASKED(LOG_GPIO, "pxa255_gpio_r: GPIO Pin-Level Register 2: %08x & %08x\n", m_gpio_regs.gplr2, mem_mask); return value; } @@ -792,32 +792,32 @@ WRITE32_MEMBER(pxa255_periphs_device::gpio_w) case PXA255_GPSR0: LOGMASKED(LOG_GPIO, "pxa255_gpio_w: GPIO Pin Output Set Register 0: %08x & %08x\n", data, mem_mask); m_gpio_regs.gpsr0 |= data & m_gpio_regs.gpdr0; - m_gpio0_w(space, 0, data, m_gpio_regs.gpdr0); + m_gpio0_w(0, data, m_gpio_regs.gpdr0); break; case PXA255_GPSR1: LOGMASKED(LOG_GPIO, "pxa255_gpio_w: GPIO Pin Output Set Register 1: %08x & %08x\n", data, mem_mask); m_gpio_regs.gpsr1 |= data & m_gpio_regs.gpdr1; - m_gpio1_w(space, 0, data, m_gpio_regs.gpdr1); + m_gpio1_w(0, data, m_gpio_regs.gpdr1); break; case PXA255_GPSR2: LOGMASKED(LOG_GPIO, "pxa255_gpio_w: GPIO Pin Output Set Register 2: %08x & %08x\n", data, mem_mask); m_gpio_regs.gpsr2 |= data & m_gpio_regs.gpdr2; - m_gpio2_w(space, 0, data, m_gpio_regs.gpdr2); + m_gpio2_w(0, data, m_gpio_regs.gpdr2); break; case PXA255_GPCR0: LOGMASKED(LOG_GPIO, "pxa255_gpio_w: GPIO Pin Output Clear Register 0: %08x & %08x\n", data, mem_mask); m_gpio_regs.gpsr0 &= ~(data & m_gpio_regs.gpdr0); - m_gpio0_w(space, 0, data, m_gpio_regs.gpdr0); + m_gpio0_w(0, data, m_gpio_regs.gpdr0); break; case PXA255_GPCR1: LOGMASKED(LOG_GPIO, "pxa255_gpio_w: GPIO Pin Output Clear Register 1: %08x & %08x\n", data, mem_mask); m_gpio_regs.gpsr1 &= ~(data & m_gpio_regs.gpdr1); - m_gpio1_w(space, 0, data, m_gpio_regs.gpdr1); + m_gpio1_w(0, data, m_gpio_regs.gpdr1); break; case PXA255_GPCR2: LOGMASKED(LOG_GPIO, "pxa255_gpio_w: GPIO Pin Output Clear Register 2: %08x & %08x\n", data, mem_mask); m_gpio_regs.gpsr2 &= ~(data & m_gpio_regs.gpdr2); - m_gpio2_w(space, 0, data, m_gpio_regs.gpdr2); + m_gpio2_w(0, data, m_gpio_regs.gpdr2); break; case PXA255_GRER0: LOGMASKED(LOG_GPIO, "pxa255_gpio_w: GPIO Rising Edge Detect Enable Register 0: %08x & %08x\n", data, mem_mask); diff --git a/src/devices/machine/sega_scu.cpp b/src/devices/machine/sega_scu.cpp index 468a0b686a5..cbfcdf644b4 100644 --- a/src/devices/machine/sega_scu.cpp +++ b/src/devices/machine/sega_scu.cpp @@ -157,7 +157,7 @@ sega_scu_device::sega_scu_device(const machine_config &mconfig, const char *tag, // configuration addiitons //------------------------------------------------- -READ16_MEMBER(sega_scu_device::scudsp_dma_r) +uint16_t sega_scu_device::scudsp_dma_r(offs_t offset, uint16_t mem_mask) { //address_space &program = m_maincpu->space(AS_PROGRAM); offs_t addr = offset; @@ -168,7 +168,7 @@ READ16_MEMBER(sega_scu_device::scudsp_dma_r) } -WRITE16_MEMBER(sega_scu_device::scudsp_dma_w) +void sega_scu_device::scudsp_dma_w(offs_t offset, uint16_t data, uint16_t mem_mask) { //address_space &program = m_maincpu->space(AS_PROGRAM); offs_t addr = offset; diff --git a/src/devices/machine/sega_scu.h b/src/devices/machine/sega_scu.h index 58751a2405f..fb1a0672884 100644 --- a/src/devices/machine/sega_scu.h +++ b/src/devices/machine/sega_scu.h @@ -110,8 +110,8 @@ private: void dma_start_factor_ack(uint8_t event); DECLARE_WRITE_LINE_MEMBER(scudsp_end_w); - DECLARE_READ16_MEMBER(scudsp_dma_r); - DECLARE_WRITE16_MEMBER(scudsp_dma_w); + uint16_t scudsp_dma_r(offs_t offset, uint16_t mem_mask = ~0); + void scudsp_dma_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); // DMA DECLARE_READ32_MEMBER(dma_lv0_r); diff --git a/src/devices/machine/sis85c496.cpp b/src/devices/machine/sis85c496.cpp index 87b01edf2e6..5b03f841dfa 100644 --- a/src/devices/machine/sis85c496.cpp +++ b/src/devices/machine/sis85c496.cpp @@ -327,7 +327,7 @@ void sis85c496_host_device::map_extra(uint64_t memory_window_start, uint64_t mem } // Southbridge -READ8_MEMBER( sis85c496_host_device::get_slave_ack ) +uint8_t sis85c496_host_device::get_slave_ack(offs_t offset) { if (offset==2) // IRQ = 2 return m_pic8259_slave->acknowledge(); @@ -417,7 +417,7 @@ WRITE_LINE_MEMBER( sis85c496_host_device::pc_dma_hrq_changed ) m_dma8237_2->hack_w( state ); } -READ8_MEMBER(sis85c496_host_device::pc_dma_read_byte) +uint8_t sis85c496_host_device::pc_dma_read_byte(offs_t offset) { address_space& prog_space = m_maincpu->space(AS_PROGRAM); // get the right address space if(m_dma_channel == -1) @@ -430,7 +430,7 @@ READ8_MEMBER(sis85c496_host_device::pc_dma_read_byte) } -WRITE8_MEMBER(sis85c496_host_device::pc_dma_write_byte) +void sis85c496_host_device::pc_dma_write_byte(offs_t offset, uint8_t data) { address_space& prog_space = m_maincpu->space(AS_PROGRAM); // get the right address space if(m_dma_channel == -1) @@ -441,7 +441,7 @@ WRITE8_MEMBER(sis85c496_host_device::pc_dma_write_byte) } -READ8_MEMBER(sis85c496_host_device::pc_dma_read_word) +uint8_t sis85c496_host_device::pc_dma_read_word(offs_t offset) { address_space& prog_space = m_maincpu->space(AS_PROGRAM); // get the right address space if(m_dma_channel == -1) @@ -456,7 +456,7 @@ READ8_MEMBER(sis85c496_host_device::pc_dma_read_word) } -WRITE8_MEMBER(sis85c496_host_device::pc_dma_write_word) +void sis85c496_host_device::pc_dma_write_word(offs_t offset, uint8_t data) { address_space& prog_space = m_maincpu->space(AS_PROGRAM); // get the right address space if(m_dma_channel == -1) @@ -467,22 +467,22 @@ WRITE8_MEMBER(sis85c496_host_device::pc_dma_write_word) } -READ8_MEMBER( sis85c496_host_device::pc_dma8237_0_dack_r ) { return 0; } //m_isabus->dack_r(0); } -READ8_MEMBER( sis85c496_host_device::pc_dma8237_1_dack_r ) { return 0; } //m_isabus->dack_r(1); } -READ8_MEMBER( sis85c496_host_device::pc_dma8237_2_dack_r ) { return 0; } //m_isabus->dack_r(2); } -READ8_MEMBER( sis85c496_host_device::pc_dma8237_3_dack_r ) { return 0; } //m_isabus->dack_r(3); } -READ8_MEMBER( sis85c496_host_device::pc_dma8237_5_dack_r ) { return 0; } //m_isabus->dack_r(5); } -READ8_MEMBER( sis85c496_host_device::pc_dma8237_6_dack_r ) { return 0; } //m_isabus->dack_r(6); } -READ8_MEMBER( sis85c496_host_device::pc_dma8237_7_dack_r ) { return 0; } //m_isabus->dack_r(7); } +uint8_t sis85c496_host_device::pc_dma8237_0_dack_r() { return 0; } //m_isabus->dack_r(0); } +uint8_t sis85c496_host_device::pc_dma8237_1_dack_r() { return 0; } //m_isabus->dack_r(1); } +uint8_t sis85c496_host_device::pc_dma8237_2_dack_r() { return 0; } //m_isabus->dack_r(2); } +uint8_t sis85c496_host_device::pc_dma8237_3_dack_r() { return 0; } //m_isabus->dack_r(3); } +uint8_t sis85c496_host_device::pc_dma8237_5_dack_r() { return 0; } //m_isabus->dack_r(5); } +uint8_t sis85c496_host_device::pc_dma8237_6_dack_r() { return 0; } //m_isabus->dack_r(6); } +uint8_t sis85c496_host_device::pc_dma8237_7_dack_r() { return 0; } //m_isabus->dack_r(7); } -WRITE8_MEMBER( sis85c496_host_device::pc_dma8237_0_dack_w ){ } //m_isabus->dack_w(0, data); } -WRITE8_MEMBER( sis85c496_host_device::pc_dma8237_1_dack_w ){ } //m_isabus->dack_w(1, data); } -WRITE8_MEMBER( sis85c496_host_device::pc_dma8237_2_dack_w ){ } //m_isabus->dack_w(2, data); } -WRITE8_MEMBER( sis85c496_host_device::pc_dma8237_3_dack_w ){ } //m_isabus->dack_w(3, data); } -WRITE8_MEMBER( sis85c496_host_device::pc_dma8237_5_dack_w ){ } //m_isabus->dack_w(5, data); } -WRITE8_MEMBER( sis85c496_host_device::pc_dma8237_6_dack_w ){ } //m_isabus->dack_w(6, data); } -WRITE8_MEMBER( sis85c496_host_device::pc_dma8237_7_dack_w ){ } //m_isabus->dack_w(7, data); } +void sis85c496_host_device::pc_dma8237_0_dack_w(uint8_t data) { } //m_isabus->dack_w(0, data); } +void sis85c496_host_device::pc_dma8237_1_dack_w(uint8_t data) { } //m_isabus->dack_w(1, data); } +void sis85c496_host_device::pc_dma8237_2_dack_w(uint8_t data) { } //m_isabus->dack_w(2, data); } +void sis85c496_host_device::pc_dma8237_3_dack_w(uint8_t data) { } //m_isabus->dack_w(3, data); } +void sis85c496_host_device::pc_dma8237_5_dack_w(uint8_t data) { } //m_isabus->dack_w(5, data); } +void sis85c496_host_device::pc_dma8237_6_dack_w(uint8_t data) { } //m_isabus->dack_w(6, data); } +void sis85c496_host_device::pc_dma8237_7_dack_w(uint8_t data) { } //m_isabus->dack_w(7, data); } WRITE_LINE_MEMBER( sis85c496_host_device::at_dma8237_out_eop ) { diff --git a/src/devices/machine/sis85c496.h b/src/devices/machine/sis85c496.h index af952b20d88..7d157107352 100644 --- a/src/devices/machine/sis85c496.h +++ b/src/devices/machine/sis85c496.h @@ -105,25 +105,25 @@ private: DECLARE_WRITE8_MEMBER(at_page8_w); DECLARE_READ8_MEMBER(at_portb_r); DECLARE_WRITE8_MEMBER(at_portb_w); - DECLARE_READ8_MEMBER(get_slave_ack); + uint8_t get_slave_ack(offs_t offset); DECLARE_WRITE_LINE_MEMBER(at_pit8254_out0_changed); DECLARE_WRITE_LINE_MEMBER(at_pit8254_out1_changed); DECLARE_WRITE_LINE_MEMBER(at_pit8254_out2_changed); DECLARE_WRITE_LINE_MEMBER(pc_dma_hrq_changed); - DECLARE_READ8_MEMBER(pc_dma8237_0_dack_r); - DECLARE_READ8_MEMBER(pc_dma8237_1_dack_r); - DECLARE_READ8_MEMBER(pc_dma8237_2_dack_r); - DECLARE_READ8_MEMBER(pc_dma8237_3_dack_r); - DECLARE_READ8_MEMBER(pc_dma8237_5_dack_r); - DECLARE_READ8_MEMBER(pc_dma8237_6_dack_r); - DECLARE_READ8_MEMBER(pc_dma8237_7_dack_r); - DECLARE_WRITE8_MEMBER(pc_dma8237_0_dack_w); - DECLARE_WRITE8_MEMBER(pc_dma8237_1_dack_w); - DECLARE_WRITE8_MEMBER(pc_dma8237_2_dack_w); - DECLARE_WRITE8_MEMBER(pc_dma8237_3_dack_w); - DECLARE_WRITE8_MEMBER(pc_dma8237_5_dack_w); - DECLARE_WRITE8_MEMBER(pc_dma8237_6_dack_w); - DECLARE_WRITE8_MEMBER(pc_dma8237_7_dack_w); + uint8_t pc_dma8237_0_dack_r(); + uint8_t pc_dma8237_1_dack_r(); + uint8_t pc_dma8237_2_dack_r(); + uint8_t pc_dma8237_3_dack_r(); + uint8_t pc_dma8237_5_dack_r(); + uint8_t pc_dma8237_6_dack_r(); + uint8_t pc_dma8237_7_dack_r(); + void pc_dma8237_0_dack_w(uint8_t data); + void pc_dma8237_1_dack_w(uint8_t data); + void pc_dma8237_2_dack_w(uint8_t data); + void pc_dma8237_3_dack_w(uint8_t data); + void pc_dma8237_5_dack_w(uint8_t data); + void pc_dma8237_6_dack_w(uint8_t data); + void pc_dma8237_7_dack_w(uint8_t data); DECLARE_WRITE_LINE_MEMBER(at_dma8237_out_eop); DECLARE_WRITE_LINE_MEMBER(pc_dack0_w); DECLARE_WRITE_LINE_MEMBER(pc_dack1_w); @@ -142,10 +142,10 @@ private: DECLARE_READ8_MEMBER(at_keybc_r); DECLARE_WRITE8_MEMBER(at_keybc_w); DECLARE_WRITE8_MEMBER(write_rtc); - DECLARE_READ8_MEMBER(pc_dma_read_byte); - DECLARE_WRITE8_MEMBER(pc_dma_write_byte); - DECLARE_READ8_MEMBER(pc_dma_read_word); - DECLARE_WRITE8_MEMBER(pc_dma_write_word); + uint8_t pc_dma_read_byte(offs_t offset); + void pc_dma_write_byte(offs_t offset, uint8_t data); + uint8_t pc_dma_read_word(offs_t offset); + void pc_dma_write_word(offs_t offset, uint8_t data); DECLARE_WRITE_LINE_MEMBER(cpu_int_w); DECLARE_WRITE_LINE_MEMBER(cpu_a20_w); DECLARE_WRITE_LINE_MEMBER(cpu_reset_w); diff --git a/src/devices/machine/spg110.cpp b/src/devices/machine/spg110.cpp index b02362b3780..183c314cf21 100644 --- a/src/devices/machine/spg110.cpp +++ b/src/devices/machine/spg110.cpp @@ -74,7 +74,7 @@ void spg110_device::configure_spg_io(spg2xx_io_device* io) io->write_ffrq_tmr2_irq_callback().set(FUNC(spg110_device::ffreq2_w)); } -READ16_MEMBER(spg110_device::space_r) +uint16_t spg110_device::space_r(offs_t offset) { address_space &cpuspace = this->space(AS_PROGRAM); return cpuspace.read_word(offset); diff --git a/src/devices/machine/spg110.h b/src/devices/machine/spg110.h index f24c68ddf09..692d07c0c90 100644 --- a/src/devices/machine/spg110.h +++ b/src/devices/machine/spg110.h @@ -59,7 +59,7 @@ private: required_device<spg110_video_device> m_spg_video; required_device<spg110_audio_device> m_spg_audio; - DECLARE_READ16_MEMBER(space_r); + uint16_t space_r(offs_t offset); DECLARE_WRITE_LINE_MEMBER(audioirq_w); devcb_write16 m_porta_out; @@ -73,19 +73,19 @@ private: devcb_write8 m_chip_sel; - DECLARE_READ16_MEMBER(porta_r) { return m_porta_in(); } - DECLARE_READ16_MEMBER(portb_r) { return m_portb_in(); } - DECLARE_READ16_MEMBER(portc_r) { return m_portc_in(); } - DECLARE_WRITE16_MEMBER(porta_w) { m_porta_out(offset, data, mem_mask); } - DECLARE_WRITE16_MEMBER(portb_w) { m_portb_out(offset, data, mem_mask); } - DECLARE_WRITE16_MEMBER(portc_w) { m_portc_out(offset, data, mem_mask); } + uint16_t porta_r() { return m_porta_in(); } + uint16_t portb_r() { return m_portb_in(); } + uint16_t portc_r() { return m_portc_in(); } + void porta_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0) { m_porta_out(offset, data, mem_mask); } + void portb_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0) { m_portb_out(offset, data, mem_mask); } + void portc_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0) { m_portc_out(offset, data, mem_mask); } DECLARE_WRITE_LINE_MEMBER(ffreq1_w); DECLARE_WRITE_LINE_MEMBER(ffreq2_w); - template <size_t Line> DECLARE_READ16_MEMBER(adc_r) { return m_adc_in[Line](); } - DECLARE_WRITE8_MEMBER(cs_w) { m_chip_sel(offset, data, mem_mask); } - DECLARE_READ16_MEMBER(get_pal_r) { return 0; /*m_pal_flag;*/ } + template <size_t Line> uint16_t adc_r() { return m_adc_in[Line](); } + void cs_w(offs_t offset, uint8_t data, uint8_t mem_mask = ~0) { m_chip_sel(offset, data, mem_mask); } + uint16_t get_pal_r() { return 0; /*m_pal_flag;*/ } void configure_spg_io(spg2xx_io_device* io); DECLARE_WRITE_LINE_MEMBER(videoirq_w); diff --git a/src/devices/machine/spg2xx.cpp b/src/devices/machine/spg2xx.cpp index 25afcd1a13b..88f63c55f00 100644 --- a/src/devices/machine/spg2xx.cpp +++ b/src/devices/machine/spg2xx.cpp @@ -111,7 +111,7 @@ void spg2xx_device::device_reset() m_fiq_vector = 0xff; } -WRITE8_MEMBER(spg2xx_device::fiq_vector_w) +void spg2xx_device::fiq_vector_w(uint8_t data) { m_fiq_vector = data; } @@ -165,7 +165,7 @@ WRITE_LINE_MEMBER(spg2xx_device::ffreq2_w) -READ16_MEMBER(spg2xx_device::space_r) +uint16_t spg2xx_device::space_r(offs_t offset) { address_space &cpuspace = this->space(AS_PROGRAM); return cpuspace.read_word(offset); diff --git a/src/devices/machine/spg2xx.h b/src/devices/machine/spg2xx.h index 9f1c47f68ee..95f6f999269 100644 --- a/src/devices/machine/spg2xx.h +++ b/src/devices/machine/spg2xx.h @@ -82,7 +82,7 @@ protected: void internal_map(address_map &map); - DECLARE_WRITE8_MEMBER(fiq_vector_w); + void fiq_vector_w(uint8_t data); DECLARE_WRITE_LINE_MEMBER(videoirq_w); DECLARE_WRITE_LINE_MEMBER(audioirq_w); DECLARE_WRITE_LINE_MEMBER(audiochirq_w); @@ -92,7 +92,7 @@ protected: DECLARE_WRITE_LINE_MEMBER(ffreq1_w); DECLARE_WRITE_LINE_MEMBER(ffreq2_w); - DECLARE_READ16_MEMBER(space_r); + uint16_t space_r(offs_t offset); virtual void device_start() override; virtual void device_reset() override; @@ -100,8 +100,8 @@ protected: // TODO: these are fixed values, put them in relevant devices? uint16_t m_sprite_limit; uint16_t m_pal_flag; - DECLARE_READ16_MEMBER(get_sprlimit) { return m_sprite_limit; } - DECLARE_READ16_MEMBER(get_pal_ntsc) { return m_pal_flag; } + uint16_t get_sprlimit() { return m_sprite_limit; } + uint16_t get_pal_ntsc() { return m_pal_flag; } devcb_write16 m_porta_out; devcb_write16 m_portb_out; @@ -131,22 +131,22 @@ protected: void configure_spg_io(spg2xx_io_device* io); - DECLARE_READ16_MEMBER(guny_in_r) { return m_guny_in(); } - DECLARE_READ16_MEMBER(gunx_in_r) { return m_gunx_in(); } - DECLARE_READ16_MEMBER(porta_r) { return m_porta_in(); } - DECLARE_READ16_MEMBER(portb_r) { return m_portb_in(); } - DECLARE_READ16_MEMBER(portc_r) { return m_portc_in(); } - DECLARE_WRITE16_MEMBER(porta_w) { m_porta_out(offset, data, mem_mask); } - DECLARE_WRITE16_MEMBER(portb_w) { m_portb_out(offset, data, mem_mask); } - DECLARE_WRITE16_MEMBER(portc_w) { m_portc_out(offset, data, mem_mask); } - template <size_t Line> DECLARE_READ16_MEMBER(adc_r) { return m_adc_in[Line](); } + uint16_t guny_in_r() { return m_guny_in(); } + uint16_t gunx_in_r() { return m_gunx_in(); } + uint16_t porta_r() { return m_porta_in(); } + uint16_t portb_r() { return m_portb_in(); } + uint16_t portc_r() { return m_portc_in(); } + void porta_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0) { m_porta_out(offset, data, mem_mask); } + void portb_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0) { m_portb_out(offset, data, mem_mask); } + void portc_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0) { m_portc_out(offset, data, mem_mask); } + template <size_t Line> uint16_t adc_r() { return m_adc_in[Line](); } - DECLARE_WRITE8_MEMBER(eepromx_w) { m_i2c_w(offset, data, mem_mask); } - DECLARE_READ8_MEMBER(eepromx_r) { return m_i2c_r(); }; + void eepromx_w(offs_t offset, uint8_t data, uint8_t mem_mask = ~0) { m_i2c_w(offset, data, mem_mask); } + uint8_t eepromx_r() { return m_i2c_r(); }; - DECLARE_WRITE8_MEMBER(uart_tx_w) { m_uart_tx(offset, data, mem_mask); } + void uart_tx_w(offs_t offset, uint8_t data, uint8_t mem_mask = ~0) { m_uart_tx(offset, data, mem_mask); } DECLARE_WRITE_LINE_MEMBER(spi_tx_w) { m_spi_tx(state); } - DECLARE_WRITE8_MEMBER(cs_w) { m_chip_sel(offset, data, mem_mask); } + void cs_w(offs_t offset, uint8_t data, uint8_t mem_mask = ~0) { m_chip_sel(offset, data, mem_mask); } }; class spg24x_device : public spg2xx_device |