Fix for gx4000 problems in debug builds regression test run. (nw)

This commit is contained in:
Ivan Vangelista 2014-03-15 14:50:51 +00:00
parent b9717d0fcc
commit 3e1212e6eb

View File

@ -2677,6 +2677,8 @@ READ8_MEMBER(amstrad_state::amstrad_psg_porta_read)
return 0xff;
if (keyrow[m_ppi_port_outputs[amstrad_ppi_PortC] & 0x0F])
{
if(m_system_type != SYSTEM_GX4000)
{
if((m_io_ctrltype->read_safe(0) == 1) && (m_ppi_port_outputs[amstrad_ppi_PortC] & 0x0F) == 9)
{
@ -2686,6 +2688,8 @@ READ8_MEMBER(amstrad_state::amstrad_psg_porta_read)
{
return (keyrow[m_ppi_port_outputs[amstrad_ppi_PortC] & 0x0F]->read_safe(0) & 0x80) | 0x7f;
}
}
return keyrow[m_ppi_port_outputs[amstrad_ppi_PortC] & 0x0F]->read_safe(0) & 0xFF;
}
return 0xFF;
@ -2718,6 +2722,8 @@ IRQ_CALLBACK_MEMBER(amstrad_state::amstrad_cpu_acknowledge_int)
}
return (m_asic.ram[0x2805] & 0xf8) | m_plus_irq_cause;
}
if(m_system_type != SYSTEM_GX4000)
{
// update AMX mouse inputs (normally done every 1/300th of a second)
if(m_io_ctrltype->read_safe(0) == 1)
{
@ -2742,6 +2748,7 @@ IRQ_CALLBACK_MEMBER(amstrad_state::amstrad_cpu_acknowledge_int)
m_amx_mouse_data |= (m_io_keyboard_row_9->read_safe(0) & 0x80); // DEL key
}
}
return 0xFF;
}