(nw) via6522: removed unneeded space and offset

This commit is contained in:
Robbbert 2019-04-20 00:50:19 +10:00
parent ad6f47d693
commit a89e6f3cc4
3 changed files with 11 additions and 11 deletions

View File

@ -1002,7 +1002,7 @@ void via6522_device::set_pa_line(int line, int state)
m_in_a &= ~(1 << line); m_in_a &= ~(1 << line);
} }
WRITE8_MEMBER( via6522_device::write_pa ) void via6522_device::write_pa( u8 data )
{ {
m_in_a = data; m_in_a = data;
} }
@ -1073,7 +1073,7 @@ void via6522_device::set_pb_line(int line, int state)
} }
} }
WRITE8_MEMBER( via6522_device::write_pb ) void via6522_device::write_pb( u8 data )
{ {
if (!BIT(data, 6) && BIT(m_in_b, 6)) if (!BIT(data, 6) && BIT(m_in_b, 6))
counter2_decrement(); counter2_decrement();

View File

@ -77,7 +77,7 @@ public:
DECLARE_WRITE_LINE_MEMBER( write_pa5 ) { set_pa_line(5, state); } DECLARE_WRITE_LINE_MEMBER( write_pa5 ) { set_pa_line(5, state); }
DECLARE_WRITE_LINE_MEMBER( write_pa6 ) { set_pa_line(6, state); } DECLARE_WRITE_LINE_MEMBER( write_pa6 ) { set_pa_line(6, state); }
DECLARE_WRITE_LINE_MEMBER( write_pa7 ) { set_pa_line(7, state); } DECLARE_WRITE_LINE_MEMBER( write_pa7 ) { set_pa_line(7, state); }
DECLARE_WRITE8_MEMBER( write_pa ); void write_pa( u8 data );
DECLARE_WRITE_LINE_MEMBER( write_ca1 ); DECLARE_WRITE_LINE_MEMBER( write_ca1 );
DECLARE_WRITE_LINE_MEMBER( write_ca2 ); DECLARE_WRITE_LINE_MEMBER( write_ca2 );
@ -89,7 +89,7 @@ public:
DECLARE_WRITE_LINE_MEMBER( write_pb5 ) { set_pb_line(5, state); } DECLARE_WRITE_LINE_MEMBER( write_pb5 ) { set_pb_line(5, state); }
DECLARE_WRITE_LINE_MEMBER( write_pb6 ) { set_pb_line(6, state); } DECLARE_WRITE_LINE_MEMBER( write_pb6 ) { set_pb_line(6, state); }
DECLARE_WRITE_LINE_MEMBER( write_pb7 ) { set_pb_line(7, state); } DECLARE_WRITE_LINE_MEMBER( write_pb7 ) { set_pb_line(7, state); }
DECLARE_WRITE8_MEMBER( write_pb ); void write_pb( u8 data );
DECLARE_WRITE_LINE_MEMBER( write_cb1 ); DECLARE_WRITE_LINE_MEMBER( write_cb1 );
DECLARE_WRITE_LINE_MEMBER( write_cb2 ); DECLARE_WRITE_LINE_MEMBER( write_cb2 );

View File

@ -123,7 +123,7 @@ protected:
bool m_ext_irq; bool m_ext_irq;
virtual void update_irq(); virtual void update_irq();
void update_psg(address_space &space); void update_psg();
void update_keyboard(); void update_keyboard();
void machine_start_common(); void machine_start_common();
}; };
@ -303,13 +303,13 @@ void oric_state::update_keyboard()
m_via->write_pb3((m_kbd_row[m_via_b & 7]->read() | m_psg_a) != 0xff); m_via->write_pb3((m_kbd_row[m_via_b & 7]->read() | m_psg_a) != 0xff);
} }
void oric_state::update_psg(address_space &space) void oric_state::update_psg()
{ {
if(m_via_ca2) if(m_via_ca2)
if(m_via_cb2) if(m_via_cb2)
m_psg->address_w(m_via_a); m_psg->address_w(m_via_a);
else else
m_via->write_pa(space, 0, m_psg->data_r()); m_via->write_pa(m_psg->data_r());
else if(m_via_cb2) else if(m_via_cb2)
m_psg->data_w(m_via_a); m_psg->data_w(m_via_a);
} }
@ -328,7 +328,7 @@ WRITE8_MEMBER(oric_state::via_a_w)
{ {
m_via_a = data; m_via_a = data;
m_cent_data_out->write(m_via_a); m_cent_data_out->write(m_via_a);
update_psg(space); update_psg();
} }
WRITE8_MEMBER(oric_state::via_b_w) WRITE8_MEMBER(oric_state::via_b_w)
@ -344,13 +344,13 @@ WRITE8_MEMBER(oric_state::via_b_w)
WRITE_LINE_MEMBER(oric_state::via_ca2_w) WRITE_LINE_MEMBER(oric_state::via_ca2_w)
{ {
m_via_ca2 = state; m_via_ca2 = state;
update_psg(m_maincpu->space(AS_PROGRAM)); update_psg();
} }
WRITE_LINE_MEMBER(oric_state::via_cb2_w) WRITE_LINE_MEMBER(oric_state::via_cb2_w)
{ {
m_via_cb2 = state; m_via_cb2 = state;
update_psg(m_maincpu->space(AS_PROGRAM)); update_psg();
} }
WRITE_LINE_MEMBER(oric_state::via_irq_w) WRITE_LINE_MEMBER(oric_state::via_irq_w)
@ -465,7 +465,7 @@ WRITE8_MEMBER(telestrat_state::via2_b_w)
if(!(m_via2_b & 0x80)) if(!(m_via2_b & 0x80))
port &= m_joy2->read(); port &= m_joy2->read();
m_via2->write_pb(space, 0, port); m_via2->write_pb(port);
} }
WRITE_LINE_MEMBER(telestrat_state::via2_ca2_w) WRITE_LINE_MEMBER(telestrat_state::via2_ca2_w)