Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-07-04 01:18:59 +03:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

6522via: Don't lose sync on edge count when the serial clock is external [O. Galibert]

Browse Source 
mac: Don't go out-of-bounds on palette writes [O. Galibert]
This commit is contained in:
Olivier Galibert 2020-05-08 10:21:31 +02:00
parent 963a2c166d
commit d96b74baaf
2 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/devices/machine/6522via.cpp
View File

@ -459,7 +459,7 @@ void via6522_device::device_timer(emu_timer &timer, device_timer_id id, int para
} }
// If in continous mode or the shifter is still shifting we re-arm the timer // If in continous mode or the shifter is still shifting we re-arm the timer
if (SO_T2_RATE(m_acr) || (m_shift_counter != 0x0f)) if (SO_T2_RATE(m_acr) || (m_shift_counter < 0x0f))
{ {
if (SI_O2_CONTROL(m_acr) || SO_O2_CONTROL(m_acr)) if (SI_O2_CONTROL(m_acr) || SO_O2_CONTROL(m_acr))
{ {
@ -703,9 +703,14 @@ u8 via6522_device::read(offs_t offset)
val = m_sr; val = m_sr;
if (!machine().side_effects_disabled()) if (!machine().side_effects_disabled())
{ {
m_out_cb1 = 1; if (!(SI_EXT_CONTROL(m_acr) || SO_EXT_CONTROL(m_acr))) {
m_cb1_handler(m_out_cb1); m_out_cb1 = 1;
m_shift_counter = 0x0f; m_cb1_handler(m_out_cb1);
m_shift_counter = 0x0f;
}
else
m_shift_counter = m_in_cb1 ? 0x0f : 0x10;
LOGINT("SR INT "); LOGINT("SR INT ");
clear_int(INT_SR); clear_int(INT_SR);
LOGSHIFT(" - ACR: %02x ", m_acr); LOGSHIFT(" - ACR: %02x ", m_acr);
@ -889,15 +894,14 @@ void via6522_device::write(offs_t offset, u8 data)
m_sr = data; m_sr = data;
LOGSHIFT("Write SR: %02x\n", m_sr); LOGSHIFT("Write SR: %02x\n", m_sr);
// make sure CB1 is high - this should not be needed though if (!(SI_EXT_CONTROL(m_acr) || SO_EXT_CONTROL(m_acr))) {
if (m_out_cb1 != 1)
{
logerror("VIA: CB1 is low starting shifter\n");
m_out_cb1 = 1; m_out_cb1 = 1;
m_cb1_handler(m_out_cb1); m_cb1_handler(m_out_cb1);
m_shift_counter = 0x0f;
} }
else
m_shift_counter = m_in_cb1 ? 0x0f : 0x10;
m_shift_counter = 0x0f;
LOGINT("SR INT "); LOGINT("SR INT ");
clear_int(INT_SR); clear_int(INT_SR);
LOGSHIFT(" - ACR is: %02x ", m_acr); LOGSHIFT(" - ACR is: %02x ", m_acr);

4
src/mame/drivers/mac.cpp
View File

@ -179,14 +179,14 @@ WRITE32_MEMBER( mac_state::ariel_ramdac_w ) // this is for the "Ariel" style RAM
{ {
m_palette->set_pen_color(m_rbv_clutoffs, rgb_t(m_rbv_colors[2], m_rbv_colors[2], m_rbv_colors[2])); m_palette->set_pen_color(m_rbv_clutoffs, rgb_t(m_rbv_colors[2], m_rbv_colors[2], m_rbv_colors[2]));
m_rbv_palette[m_rbv_clutoffs] = rgb_t(m_rbv_colors[2], m_rbv_colors[2], m_rbv_colors[2]); m_rbv_palette[m_rbv_clutoffs] = rgb_t(m_rbv_colors[2], m_rbv_colors[2], m_rbv_colors[2]);
m_rbv_clutoffs++; m_rbv_clutoffs = (m_rbv_clutoffs + 1) & 0xff;
m_rbv_count = 0; m_rbv_count = 0;
} }
else else
{ {
m_palette->set_pen_color(m_rbv_clutoffs, rgb_t(m_rbv_colors[0], m_rbv_colors[1], m_rbv_colors[2])); m_palette->set_pen_color(m_rbv_clutoffs, rgb_t(m_rbv_colors[0], m_rbv_colors[1], m_rbv_colors[2]));
m_rbv_palette[m_rbv_clutoffs] = rgb_t(m_rbv_colors[0], m_rbv_colors[1], m_rbv_colors[2]); m_rbv_palette[m_rbv_clutoffs] = rgb_t(m_rbv_colors[0], m_rbv_colors[1], m_rbv_colors[2]);
m_rbv_clutoffs++; m_rbv_clutoffs = (m_rbv_clutoffs + 1) & 0xff;
m_rbv_count = 0; m_rbv_count = 0;
} }
} }