Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-04-22 16:31:49 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

iwm, swim1: devsel makes more sense now, I think

Browse Source
This commit is contained in:
Olivier Galibert 2021-01-23 17:35:08 +01:00
parent a0ab265c94
commit d13ad48606
2 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/devices/machine/iwm.cpp
View File

@ -86,7 +86,7 @@ void iwm_device::device_reset()
m_rsh = 0x00;
m_flux_write_start = 0;
m_flux_write_count = 0;
m_devsel_cb(1);
m_devsel_cb(0);
}
void iwm_device::device_timer(emu_timer &, device_timer_id, int, void *)
@ -95,8 +95,7 @@ void iwm_device::device_timer(emu_timer &, device_timer_id, int, void *)
m_active = MODE_IDLE;
if(m_floppy && !m_disable_mon)
m_floppy->mon_w(true);
if(m_disable_mon)
m_devsel_cb(0);
m_devsel_cb(0);
m_status &= ~0x20;
}
}
@ -108,10 +107,10 @@ void iwm_device::set_floppy(floppy_image_device *floppy)
sync();
if(m_floppy && !m_disable_mon)
if(m_floppy && (m_control & 0x10) && !m_disable_mon)
m_floppy->mon_w(true);
m_floppy = floppy;
if(m_floppy && !m_disable_mon)
if(m_floppy && (m_control & 0x10) && !m_disable_mon)
m_floppy->mon_w(false);
update_phases();
}
@ -167,18 +166,23 @@ u8 iwm_device::control(int offset, u8 data)
changed ^= m_control | (m_phases & 0xf);
if(changed & 0x20)
m_devsel_cb(m_control & 0x20 ? 2 : 1);
if(changed & 0x30)
m_devsel_cb(m_control & 0x10 ? m_control & 0x20 ? 2 : 1 : 0);
if(changed & 0x10) {
if(m_control & 0x10) {
m_active = MODE_ACTIVE;
m_status |= 0x20;
if(m_floppy && !m_disable_mon)
m_floppy->mon_w(false);
} else {
if(m_mode & 0x04) {
m_active = MODE_IDLE;
m_status &= ~0x20;
if(m_floppy && !m_disable_mon)
m_floppy->mon_w(true);
} else {
m_devsel_cb(m_control & 0x20 ? 2 : 1);
m_active = MODE_DELAY;
m_timer->adjust(cycles_to_time(8388608));
}
@ -249,7 +253,7 @@ u8 iwm_device::control(int offset, u8 data)
switch(m_control & 0xc0) {
case 0x00: return m_active ? m_data : 0xff;
case 0x40: return (m_status & 0x7f) | (!m_floppy || m_floppy->wpt_r() ? 0x80 : 0);;
case 0x40: return (m_status & 0x7f) | ((!m_floppy || m_floppy->wpt_r()) ? 0x80 : 0);;
case 0x80: return m_whd;
case 0xc0: if(offset & 1) { if(m_active) data_w(data); else mode_w(data); } return 0xff;
}

4
src/devices/machine/swim1.cpp
View File

@ -93,6 +93,8 @@ void swim1_device::set_floppy(floppy_image_device *floppy)
if(m_floppy == floppy)
return;
sync();
m_floppy = floppy;
update_phases();
if(m_ism_mode & 0x40)
@ -284,8 +286,8 @@ u8 swim1_device::iwm_control(int offset, u8 data)
if(m_iwm_mode & 0x04) {
m_iwm_active = MODE_IDLE;
m_iwm_status &= ~0x20;
m_devsel_cb(0);
} else {
m_devsel_cb(m_iwm_control & 0x20 ? 2 : 1);
m_iwm_active = MODE_DELAY;
m_timer->adjust(cycles_to_time(8388608));
}