cleaner mac fix (nw)

This commit is contained in:
arbee 2017-04-20 23:02:58 -04:00
parent d4569e3b99
commit bf6d752dc7

View File

@ -283,7 +283,7 @@ void mac_state::adb_talk()
addr = (m_adb_command>>4);
reg = (m_adb_command & 3);
// printf("Mac sent %x (cmd %d addr %d reg %d mr %d kr %d)\n", mac->m_adb_command, (mac->m_adb_command>>2)&3, addr, reg, m_adb_mouseaddr, m_adb_keybaddr);
//printf("Mac sent %x (cmd %d addr %d reg %d mr %d kr %d)\n", m_adb_command, (m_adb_command>>2)&3, addr, reg, m_adb_mouseaddr, m_adb_keybaddr);
if (m_adb_waiting_cmd)
{
@ -642,16 +642,13 @@ TIMER_CALLBACK_MEMBER(mac_state::mac_adb_tick)
m_via1->write_cb2((m_adb_send & 0x80)>>7);
m_adb_send <<= 1;
}
// do one clock transition on CB1 to advance the VIA shifter
m_adb_extclock ^= 1;
m_via1->write_cb1(m_adb_extclock);
if (m_adb_direction)
else
{
m_adb_command <<= 1;
}
m_adb_extclock ^= 1;
// do one clock transition on CB1 to advance the VIA shifter
m_via1->write_cb1(m_adb_extclock ^ 1);
m_via1->write_cb1(m_adb_extclock);
m_adb_timer_ticks--;
@ -662,7 +659,8 @@ TIMER_CALLBACK_MEMBER(mac_state::mac_adb_tick)
if ((m_adb_direction) && (ADB_IS_BITBANG_CLASS))
{
adb_talk();
if((m_adb_last_talk == 2) && m_adb_datasize) {
if((m_adb_last_talk == 2) && m_adb_datasize)
{
m_adb_timer_ticks = 8;
m_adb_timer->adjust(attotime(0, ATTOSECONDS_IN_USEC(100)));
}
@ -693,6 +691,8 @@ void mac_state::mac_adb_newaction(int state)
m_adb_direction = 1; // Mac is shifting us a command
m_adb_waiting_cmd = 1; // we're going to get a command
m_adb_irq_pending = 0;
m_adb_extclock = 1; // VIA output shifts on falling clock
m_via1->write_cb1(m_adb_extclock);
m_adb_timer->adjust(attotime(0, ATTOSECONDS_IN_USEC(100)));
break;
@ -709,6 +709,9 @@ void mac_state::mac_adb_newaction(int state)
m_adb_send = m_adb_buffer[0];
m_adb_datasize--;
m_adb_extclock = 0; // VIA input shifts on rising clock
m_via1->write_cb1(m_adb_extclock);
// move down the rest of the buffer, if any
for (i = 0; i < m_adb_datasize; i++)
{
@ -1122,6 +1125,8 @@ void mac_state::adb_vblank()
this->adb_talk();
m_adb_timer_ticks = 8;
m_adb_extclock = 0; // VIA input shifts on rising clock
m_via1->write_cb1(m_adb_extclock);
this->m_adb_timer->adjust(attotime(0, ATTOSECONDS_IN_USEC(100)));
}
#if 0
@ -1159,6 +1164,8 @@ void mac_state::adb_vblank()
this->adb_talk();
m_adb_timer_ticks = 8;
m_adb_extclock = 0; // VIA input shifts on rising clock
m_via1->write_cb1(m_adb_extclock);
this->m_adb_timer->adjust(attotime(0, ATTOSECONDS_IN_USEC(100)));
}
#if 0