From 269e799b267c35b219566d1e673c8a2cca87dfa0 Mon Sep 17 00:00:00 2001 From: Vas Crabb Date: Thu, 14 Jun 2018 12:38:22 +1000 Subject: get rid of some overloaded names - a lot of these will become unnecessary after new memory and devcb are ready (nw) --- src/devices/bus/a2bus/mouse.cpp | 2 +- src/devices/bus/a2bus/timemasterho.cpp | 2 +- src/devices/bus/econet/econet.cpp | 4 ++-- src/devices/bus/econet/econet.h | 4 ++-- src/devices/machine/6821pia.cpp | 10 +++++----- src/devices/machine/6821pia.h | 8 ++++---- src/devices/machine/74259.h | 10 +++++----- src/devices/machine/output_latch.h | 2 +- src/mame/audio/csd.cpp | 2 +- src/mame/audio/exidy.cpp | 8 ++++---- src/mame/audio/midway.cpp | 10 +++++----- src/mame/audio/qix.cpp | 2 +- src/mame/audio/s11c_bg.cpp | 4 ++-- src/mame/audio/spiders.cpp | 4 ++-- src/mame/audio/williams.cpp | 2 +- src/mame/drivers/accomm.cpp | 2 +- src/mame/drivers/apple1.cpp | 2 +- src/mame/drivers/bbc.cpp | 4 ++-- src/mame/drivers/proteus3.cpp | 2 +- src/mame/drivers/s11.cpp | 4 ++-- src/mame/drivers/toratora.cpp | 2 +- src/mame/drivers/williams.cpp | 6 +++--- src/mame/machine/dgnalpha.cpp | 2 +- src/mame/machine/williams.cpp | 10 +++++----- 24 files changed, 54 insertions(+), 54 deletions(-) diff --git a/src/devices/bus/a2bus/mouse.cpp b/src/devices/bus/a2bus/mouse.cpp index 23f3951f128..48e0e9b9c31 100644 --- a/src/devices/bus/a2bus/mouse.cpp +++ b/src/devices/bus/a2bus/mouse.cpp @@ -293,7 +293,7 @@ WRITE8_MEMBER(a2bus_mouse_device::mcu_port_b_w) WRITE8_MEMBER(a2bus_mouse_device::mcu_port_c_w) { - m_pia->portb_w(data << 4); + m_pia->write_portb(data << 4); } template void a2bus_mouse_device::update_axis() diff --git a/src/devices/bus/a2bus/timemasterho.cpp b/src/devices/bus/a2bus/timemasterho.cpp index 860403d60e5..4d0e2d62889 100644 --- a/src/devices/bus/a2bus/timemasterho.cpp +++ b/src/devices/bus/a2bus/timemasterho.cpp @@ -224,7 +224,7 @@ WRITE8_MEMBER(a2bus_timemasterho_device::pia_out_b) // if it's a read, poke it into the PIA if ((data>>5) & 1) { - m_pia->porta_w(m_msm5832->data_r(space, 0)); + m_pia->write_porta(m_msm5832->data_r(space, 0)); } } diff --git a/src/devices/bus/econet/econet.cpp b/src/devices/bus/econet/econet.cpp index 3cc15bc224b..63d30931823 100644 --- a/src/devices/bus/econet/econet.cpp +++ b/src/devices/bus/econet/econet.cpp @@ -255,7 +255,7 @@ econet_device::daisy_entry::daisy_entry(device_t *device) : // clk_w - //------------------------------------------------- -WRITE_LINE_MEMBER( econet_device::clk_w ) +WRITE_LINE_MEMBER( econet_device::host_clk_w ) { set_signal(this, CLK, state); } @@ -265,7 +265,7 @@ WRITE_LINE_MEMBER( econet_device::clk_w ) // data_w - //------------------------------------------------- -WRITE_LINE_MEMBER( econet_device::data_w ) +WRITE_LINE_MEMBER( econet_device::host_data_w ) { set_signal(this, DATA, state); } diff --git a/src/devices/bus/econet/econet.h b/src/devices/bus/econet/econet.h index 9b731d27b67..01040acd84c 100644 --- a/src/devices/bus/econet/econet.h +++ b/src/devices/bus/econet/econet.h @@ -63,8 +63,8 @@ public: void add_device(device_t *target, int address); // writes for host (driver_device) - DECLARE_WRITE_LINE_MEMBER( clk_w ); - DECLARE_WRITE_LINE_MEMBER( data_w ); + DECLARE_WRITE_LINE_MEMBER( host_clk_w ); + DECLARE_WRITE_LINE_MEMBER( host_data_w ); // writes for peripherals (device_t) void clk_w(device_t *device, int state); diff --git a/src/devices/machine/6821pia.cpp b/src/devices/machine/6821pia.cpp index 9d3167506d3..3bf21c9483b 100644 --- a/src/devices/machine/6821pia.cpp +++ b/src/devices/machine/6821pia.cpp @@ -890,7 +890,7 @@ void pia6821_device::reg_w(uint8_t offset, uint8_t data) void pia6821_device::set_a_input(uint8_t data, uint8_t z_mask) { - assert_always(m_in_a_handler.isnull(), "pia6821_porta_w() called when in_a_func implemented"); + assert_always(m_in_a_handler.isnull(), "pia6821_device::set_a_input() called when m_in_a_handler set"); LOG("Set PIA input port A = %02X\n", data); @@ -901,10 +901,10 @@ void pia6821_device::set_a_input(uint8_t data, uint8_t z_mask) //------------------------------------------------- -// pia6821_porta_w +// write_porta //------------------------------------------------- -void pia6821_device::porta_w(uint8_t data) +void pia6821_device::write_porta(uint8_t data) { set_a_input(data, 0); } @@ -1008,10 +1008,10 @@ bool pia6821_device::ca2_output_z() //------------------------------------------------- -// portb_w +// write_portb //------------------------------------------------- -void pia6821_device::portb_w(uint8_t data) +void pia6821_device::write_portb(uint8_t data) { assert_always(m_in_b_handler.isnull(), "pia_set_input_b() called when in_b_func implemented"); diff --git a/src/devices/machine/6821pia.h b/src/devices/machine/6821pia.h index 084ae4c1402..236aae0f301 100644 --- a/src/devices/machine/6821pia.h +++ b/src/devices/machine/6821pia.h @@ -107,8 +107,8 @@ public: uint8_t port_b_z_mask() const { return ~m_ddr_b; } // see first note in .c void set_port_a_z_mask(uint8_t data) { m_port_a_z_mask = data; }// see second note in .c - DECLARE_WRITE8_MEMBER( porta_w ) { porta_w(data); } - void porta_w(uint8_t data); + DECLARE_WRITE8_MEMBER( porta_w ) { write_porta(data); } + void write_porta(uint8_t data); void set_a_input(uint8_t data, uint8_t z_mask); uint8_t a_output(); @@ -118,8 +118,8 @@ public: bool ca2_output(); bool ca2_output_z(); - DECLARE_WRITE8_MEMBER( portb_w ) { portb_w(data); } - void portb_w(uint8_t data); + DECLARE_WRITE8_MEMBER( portb_w ) { write_portb(data); } + void write_portb(uint8_t data); uint8_t b_output(); DECLARE_WRITE_LINE_MEMBER( cb1_w ); diff --git a/src/devices/machine/74259.h b/src/devices/machine/74259.h index 7b2b853bdb2..60a43a2a55d 100644 --- a/src/devices/machine/74259.h +++ b/src/devices/machine/74259.h @@ -129,7 +129,7 @@ private: class ls259_device : public addressable_latch_device { public: - ls259_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + ls259_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock = 0); }; // ======================> hc259_device @@ -137,7 +137,7 @@ public: class hc259_device : public addressable_latch_device { public: - hc259_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + hc259_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock = 0); }; // ======================> hct259_device @@ -145,7 +145,7 @@ public: class hct259_device : public addressable_latch_device { public: - hct259_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + hct259_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock = 0); }; // ======================> f9334_device @@ -153,7 +153,7 @@ public: class f9334_device : public addressable_latch_device { public: - f9334_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + f9334_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock = 0); }; // ======================> cd4099_device @@ -161,7 +161,7 @@ public: class cd4099_device : public addressable_latch_device { public: - cd4099_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + cd4099_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock = 0); }; // device type definition diff --git a/src/devices/machine/output_latch.h b/src/devices/machine/output_latch.h index 7bd63414cad..bdadd772ade 100644 --- a/src/devices/machine/output_latch.h +++ b/src/devices/machine/output_latch.h @@ -33,7 +33,7 @@ class output_latch_device : public device_t { public: - output_latch_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + output_latch_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock = 0); template devcb_base &set_bit_handler(Object &&cb) { return m_bit_handlers[Bit].set_callback(std::forward(cb)); } diff --git a/src/mame/audio/csd.cpp b/src/mame/audio/csd.cpp index 79603509c9a..9447bbc2514 100644 --- a/src/mame/audio/csd.cpp +++ b/src/mame/audio/csd.cpp @@ -118,7 +118,7 @@ READ8_MEMBER( midway_cheap_squeak_deluxe_device::stat_r ) WRITE8_MEMBER( midway_cheap_squeak_deluxe_device::sr_w ) { - m_pia->portb_w(data & 0x0f); + m_pia->write_portb(data & 0x0f); } //------------------------------------------------- diff --git a/src/mame/audio/exidy.cpp b/src/mame/audio/exidy.cpp index 348b98ef214..973a5a255aa 100644 --- a/src/mame/audio/exidy.cpp +++ b/src/mame/audio/exidy.cpp @@ -690,13 +690,13 @@ void exidy_sh8253_sound_device::device_reset() WRITE8_MEMBER(venture_sound_device::pa_w) { - m_pia->porta_w(data); + m_pia->write_porta(data); } WRITE8_MEMBER(venture_sound_device::pb_w) { - m_pia->portb_w(data); + m_pia->write_portb(data); } @@ -886,7 +886,7 @@ READ8_MEMBER(victory_sound_device::status_r) TIMER_CALLBACK_MEMBER(victory_sound_device::delayed_command_w) { - m_pia->porta_w(param); + m_pia->write_porta(param); m_pia_ca1 = 0; m_pia->ca1_w(m_pia_ca1); } @@ -961,7 +961,7 @@ void victory_sound_device::device_reset() /* these two lines shouldn't be needed, but it avoids the log entry as the sound CPU checks port A before the main CPU ever writes to it */ - m_pia->porta_w(0); + m_pia->write_porta(0); m_pia_ca1 = 1; m_pia->ca1_w(m_pia_ca1); } diff --git a/src/mame/audio/midway.cpp b/src/mame/audio/midway.cpp index 92093175f37..d0ae6099fb4 100644 --- a/src/mame/audio/midway.cpp +++ b/src/mame/audio/midway.cpp @@ -622,7 +622,7 @@ void midway_sounds_good_device::device_reset() void midway_sounds_good_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) { - m_pia->portb_w((param >> 1) & 0x0f); + m_pia->write_portb((param >> 1) & 0x0f); m_pia->ca1_w(~param & 0x01); // oftentimes games will write one nibble at a time; the sync on this is very @@ -777,7 +777,7 @@ void midway_turbo_cheap_squeak_device::device_reset() void midway_turbo_cheap_squeak_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) { - m_pia->portb_w((param >> 1) & 0x0f); + m_pia->write_portb((param >> 1) & 0x0f); m_pia->ca1_w(~param & 0x01); // oftentimes games will write one nibble at a time; the sync on this is very @@ -880,7 +880,7 @@ WRITE8_MEMBER(midway_squawk_n_talk_device::portb2_w) // read strobe -- read the current status from the TMS5200 else if (((data ^ m_tms_strobes) & 0x01) && !(data & 0x01)) { - m_pia1->porta_w(m_tms5200->status_r(space, offset)); + m_pia1->write_porta(m_tms5200->status_r(space, offset)); // DoT expects the ready line to transition on a command/write here, so we oblige m_pia1->ca2_w(1); @@ -989,6 +989,6 @@ void midway_squawk_n_talk_device::device_reset() void midway_squawk_n_talk_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) { - m_pia0->porta_w(~param & 0x0f); - m_pia0->cb1_w(~param & 0x10); + m_pia0->write_porta(~param & 0x0f); + m_pia0->cb1_w(BIT(~param, 4)); } diff --git a/src/mame/audio/qix.cpp b/src/mame/audio/qix.cpp index d6f1bded52f..b045ab70f04 100644 --- a/src/mame/audio/qix.cpp +++ b/src/mame/audio/qix.cpp @@ -104,7 +104,7 @@ WRITE8_MEMBER(qix_state::sndpia_2_warning_w) TIMER_CALLBACK_MEMBER(qix_state::deferred_sndpia1_porta_w) { - m_sndpia1->porta_w(param); + m_sndpia1->write_porta(param); } diff --git a/src/mame/audio/s11c_bg.cpp b/src/mame/audio/s11c_bg.cpp index 715a2334bff..d88ee8096b4 100644 --- a/src/mame/audio/s11c_bg.cpp +++ b/src/mame/audio/s11c_bg.cpp @@ -44,7 +44,7 @@ WRITE_LINE_MEMBER( s11c_bg_device::pia40_cb2_w) WRITE8_MEMBER( s11c_bg_device::pia40_pb_w ) { -// m_pia34->portb_w(data); +// m_pia34->write_portb(data); } void s11c_bg_device::ctrl_w(uint8_t data) @@ -54,7 +54,7 @@ void s11c_bg_device::ctrl_w(uint8_t data) void s11c_bg_device::data_w(uint8_t data) { - m_pia40->portb_w(data); + m_pia40->write_portb(data); } MACHINE_CONFIG_START(s11c_bg_device::device_add_mconfig) diff --git a/src/mame/audio/spiders.cpp b/src/mame/audio/spiders.cpp index d05149e7221..de491db21ec 100644 --- a/src/mame/audio/spiders.cpp +++ b/src/mame/audio/spiders.cpp @@ -178,8 +178,8 @@ DISCRETE_SOUND_END WRITE8_MEMBER(spiders_state::spiders_audio_command_w) { - m_pia[3]->porta_w(data & 0xf8); - m_pia[3]->ca1_w(data & 0x80 ? 1 : 0); + m_pia[3]->write_porta(data & 0xf8); + m_pia[3]->ca1_w(BIT(data, 7)); } diff --git a/src/mame/audio/williams.cpp b/src/mame/audio/williams.cpp index 250f24fc8d4..8b814cb1009 100644 --- a/src/mame/audio/williams.cpp +++ b/src/mame/audio/williams.cpp @@ -246,7 +246,7 @@ void williams_cvsd_sound_device::device_reset() void williams_cvsd_sound_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) { // process incoming data write - m_pia->portb_w(param & 0xff); + m_pia->write_portb(param & 0xff); m_pia->cb1_w((param >> 8) & 1); m_pia->cb2_w((param >> 9) & 1); } diff --git a/src/mame/drivers/accomm.cpp b/src/mame/drivers/accomm.cpp index a790155b4bb..172680311ba 100644 --- a/src/mame/drivers/accomm.cpp +++ b/src/mame/drivers/accomm.cpp @@ -885,7 +885,7 @@ MACHINE_CONFIG_START(accomm_state::accomm) /* econet */ MCFG_DEVICE_ADD("mc6854", MC6854, 0) - MCFG_MC6854_OUT_TXD_CB(WRITELINE(ECONET_TAG, econet_device, data_w)) + MCFG_MC6854_OUT_TXD_CB(WRITELINE(ECONET_TAG, econet_device, host_data_w)) MCFG_MC6854_OUT_IRQ_CB(INPUTLINE("maincpu", G65816_LINE_NMI)) MCFG_ECONET_ADD() MCFG_ECONET_CLK_CALLBACK(WRITELINE(*this, accomm_state, econet_clk_w)) diff --git a/src/mame/drivers/apple1.cpp b/src/mame/drivers/apple1.cpp index fccc5159e6b..bb81a6bdc85 100644 --- a/src/mame/drivers/apple1.cpp +++ b/src/mame/drivers/apple1.cpp @@ -495,7 +495,7 @@ WRITE8_MEMBER(apple1_state::pia_display_w) // and to the display hardware WRITE_LINE_MEMBER(apple1_state::pia_display_gate_w) { - m_pia->portb_w((state << 7) ^ 0x80); + m_pia->write_portb((state << 7) ^ 0x80); // falling edge means start the display timer if (state == CLEAR_LINE) diff --git a/src/mame/drivers/bbc.cpp b/src/mame/drivers/bbc.cpp index 3fbd654bf94..77c6c3f6c0d 100644 --- a/src/mame/drivers/bbc.cpp +++ b/src/mame/drivers/bbc.cpp @@ -964,7 +964,7 @@ MACHINE_CONFIG_START(bbc_state::bbcb) /* econet */ MCFG_DEVICE_ADD("mc6854", MC6854, 0) - MCFG_MC6854_OUT_TXD_CB(WRITELINE(ECONET_TAG, econet_device, data_w)) + MCFG_MC6854_OUT_TXD_CB(WRITELINE(ECONET_TAG, econet_device, host_data_w)) MCFG_MC6854_OUT_IRQ_CB(WRITELINE(*this, bbc_state, adlc_irq_w)) MCFG_ECONET_ADD() MCFG_ECONET_CLK_CALLBACK(WRITELINE(*this, bbc_state, econet_clk_w)) @@ -1425,7 +1425,7 @@ MACHINE_CONFIG_START(bbc_state::bbcm) /* econet */ MCFG_DEVICE_ADD("mc6854", MC6854, 0) - MCFG_MC6854_OUT_TXD_CB(WRITELINE(ECONET_TAG, econet_device, data_w)) + MCFG_MC6854_OUT_TXD_CB(WRITELINE(ECONET_TAG, econet_device, host_data_w)) MCFG_MC6854_OUT_IRQ_CB(WRITELINE(*this, bbc_state, adlc_irq_w)) MCFG_ECONET_ADD() MCFG_ECONET_CLK_CALLBACK(WRITELINE(*this, bbc_state, econet_clk_w)) diff --git a/src/mame/drivers/proteus3.cpp b/src/mame/drivers/proteus3.cpp index 57e7bd8f26e..83b4b4681ae 100644 --- a/src/mame/drivers/proteus3.cpp +++ b/src/mame/drivers/proteus3.cpp @@ -177,7 +177,7 @@ void proteus3_state::kbd_put(u8 data) { if (data == 0x08) data = 0x0f; // take care of backspace (bios 1 and 2) - m_pia->portb_w(data); + m_pia->write_portb(data); m_pia->cb1_w(1); m_pia->cb1_w(0); } diff --git a/src/mame/drivers/s11.cpp b/src/mame/drivers/s11.cpp index 785b5d5da31..b29aac58185 100644 --- a/src/mame/drivers/s11.cpp +++ b/src/mame/drivers/s11.cpp @@ -311,7 +311,7 @@ WRITE8_MEMBER( s11_state::pia34_pa_w ) WRITE8_MEMBER( s11_state::pia34_pb_w ) { if(m_pia40) - m_pia40->portb_w(data); + m_pia40->write_portb(data); else m_bg->data_w(data); } @@ -367,7 +367,7 @@ WRITE_LINE_MEMBER( s11_state::pia40_cb2_w ) WRITE8_MEMBER( s11_state::pia40_pb_w ) { - m_pia34->portb_w(data); + m_pia34->write_portb(data); } void s11_state::init_s11() diff --git a/src/mame/drivers/toratora.cpp b/src/mame/drivers/toratora.cpp index 139b861c278..44fc0610828 100644 --- a/src/mame/drivers/toratora.cpp +++ b/src/mame/drivers/toratora.cpp @@ -199,7 +199,7 @@ INTERRUPT_GEN_MEMBER(toratora_state::toratora_timer) if (m_timer & 0x100) popmessage("watchdog!"); - m_pia_u1->porta_w(ioport("INPUT")->read() & 0x0f); + m_pia_u1->write_porta(ioport("INPUT")->read() & 0x0f); m_pia_u1->ca1_w(ioport("INPUT")->read() & 0x10); m_pia_u1->ca2_w(ioport("INPUT")->read() & 0x20); } diff --git a/src/mame/drivers/williams.cpp b/src/mame/drivers/williams.cpp index 18d76ec27c6..812e22af60f 100644 --- a/src/mame/drivers/williams.cpp +++ b/src/mame/drivers/williams.cpp @@ -1497,17 +1497,17 @@ MACHINE_CONFIG_START(williams_state::williams) MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac", -1.0, DAC_VREF_NEG_INPUT) /* pia */ - MCFG_DEVICE_ADD("pia_0", PIA6821, 0) + MCFG_DEVICE_ADD(m_pia_0, PIA6821, 0) MCFG_PIA_READPA_HANDLER(IOPORT("IN0")) MCFG_PIA_READPB_HANDLER(IOPORT("IN1")) - MCFG_DEVICE_ADD("pia_1", PIA6821, 0) + MCFG_DEVICE_ADD(m_pia_1, PIA6821, 0) MCFG_PIA_READPA_HANDLER(IOPORT("IN2")) MCFG_PIA_WRITEPB_HANDLER(WRITE8(*this, williams_state, williams_snd_cmd_w)) MCFG_PIA_IRQA_HANDLER(WRITELINE(*this, williams_state, williams_main_irq)) MCFG_PIA_IRQB_HANDLER(WRITELINE(*this, williams_state, williams_main_irq)) - MCFG_DEVICE_ADD("pia_2", PIA6821, 0) + MCFG_DEVICE_ADD(m_pia_2, PIA6821, 0) MCFG_PIA_WRITEPA_HANDLER(WRITE8("dac", dac_byte_interface, data_w)) MCFG_PIA_IRQA_HANDLER(WRITELINE(*this, williams_state,williams_snd_irq)) MCFG_PIA_IRQB_HANDLER(WRITELINE(*this, williams_state,williams_snd_irq)) diff --git a/src/mame/machine/dgnalpha.cpp b/src/mame/machine/dgnalpha.cpp index 41ff87aeec7..ab1d59d803f 100644 --- a/src/mame/machine/dgnalpha.cpp +++ b/src/mame/machine/dgnalpha.cpp @@ -243,7 +243,7 @@ WRITE8_MEMBER( dragon_alpha_state::pia2_pa_w ) m_ay8912->data_w(space, 0, m_pia_2->b_output()); break; case 0x02: /* Read from selected port */ - m_pia_2->portb_w(m_ay8912->data_r(space, 0)); + m_pia_2->write_portb(m_ay8912->data_r(space, 0)); break; case 0x03: /* Select port to write to */ m_ay8912->address_w(space, 0, m_pia_2->b_output()); diff --git a/src/mame/machine/williams.cpp b/src/mame/machine/williams.cpp index 24aa0b6901e..f300bb0cb1c 100644 --- a/src/mame/machine/williams.cpp +++ b/src/mame/machine/williams.cpp @@ -221,7 +221,7 @@ WRITE8_MEMBER(williams2_state::williams2_bank_select_w) TIMER_CALLBACK_MEMBER(williams_state::williams_deferred_snd_cmd_w) { - m_pia_2->portb_w(param); + m_pia_2->write_portb(param); m_pia_2->cb1_w((param == 0xff) ? 0 : 1); } @@ -238,7 +238,7 @@ WRITE8_MEMBER(williams_state::playball_snd_cmd_w) TIMER_CALLBACK_MEMBER(williams2_state::williams2_deferred_snd_cmd_w) { - m_pia_2->porta_w(param); + m_pia_2->write_porta(param); } WRITE8_MEMBER(williams2_state::williams2_snd_cmd_w) @@ -485,8 +485,8 @@ TIMER_CALLBACK_MEMBER(blaster_state::blaster_deferred_snd_cmd_w) uint8_t l_data = param | 0x80; uint8_t r_data = (param >> 1 & 0x40) | (param & 0x3f) | 0x80; - m_pia_2->portb_w(l_data); m_pia_2->cb1_w((l_data == 0xff) ? 0 : 1); - m_pia_2b->portb_w(r_data); m_pia_2b->cb1_w((r_data == 0xff) ? 0 : 1); + m_pia_2->write_portb(l_data); m_pia_2->cb1_w((l_data == 0xff) ? 0 : 1); + m_pia_2b->write_portb(r_data); m_pia_2b->cb1_w((r_data == 0xff) ? 0 : 1); } @@ -565,7 +565,7 @@ MACHINE_RESET_MEMBER(joust2_state,joust2) TIMER_CALLBACK_MEMBER(joust2_state::joust2_deferred_snd_cmd_w) { - m_pia_2->porta_w(param & 0xff); + m_pia_2->write_porta(param & 0xff); } -- cgit v1.2.3