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

2gs: Fixes, and more fixes

Browse Source
This commit is contained in:
Olivier Galibert 2021-02-04 22:00:37 +01:00
parent 7de71397e8
commit 9399502542
4 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/devices/imagedev/floppy.cpp
View File

@ -2419,7 +2419,7 @@ bool mac_floppy_device::wpt_r()
// actual_ss may have changed after the phases were set
m_reg = (m_reg & 7) | (actual_ss ? 8 : 0);
if(1 || (m_reg != 4 && m_reg != 12 && m_reg != 5 && m_reg != 13))
if(0 && (m_reg != 4 && m_reg != 12 && m_reg != 5 && m_reg != 13))
logerror("fdc disk sense reg %x %s %p\n", m_reg, regnames[m_reg], image.get());
switch(m_reg) {

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

@ -230,7 +230,8 @@ u8 iwm_device::control(int offset, u8 data)
if(s == 0xc0 && m_active)
slot = "write load / write data";
logerror("control %c%c %c%c %c%c%c%c (%s) [%s, %s] whd=%02x data=%02x\n",
logerror("%s control %c%c %c%c %c%c%c%c (%s) [%s, %s] whd=%02x data=%02x\n",
machine().time().to_string(),
m_control & 0x80 ? '1' : '0',
m_control & 0x40 ? '1' : '0',
m_control & 0x20 ? 'b' : 'a',
@ -391,7 +392,8 @@ void iwm_device::sync()
} else if(m_rsh >= 0x80) {
m_data = m_rsh;
// logerror("%s DATAR %02x\n", cycles_to_time(m_last_sync).to_string(), m_data);
m_async_update = 0;
// logerror("%s %010d DATAR %s %02x\n", cycles_to_time(m_last_sync).to_string(), m_last_sync, m_floppy->tag(), m_data);
m_rsh = 0;
}
break;
@ -404,9 +406,8 @@ void iwm_device::sync()
m_sync_update = 0;
}
if(m_async_update && m_async_update <= m_last_sync) {
if(!is_sync()) {
if(!is_sync())
m_data = 0;
}
m_async_update = 0;
}
break;

4
src/lib/formats/ap_dsk35.cpp
View File

@ -1431,10 +1431,10 @@ bool apple_gcr_format::load(io_generic *io, uint32_t form_factor, const std::vec
for(int i=0; i<ns; i++) {
sectors[si].track = track;
sectors[si].head = head;
sectors[si].sector = si;
sectors[si].sector = i;
sectors[si].info = head_count == 2 ? 0x22 : 0x02;
sectors[si].tag = nullptr;
sectors[si].data = sdata + 512*si;
sectors[si].data = sdata + 512*i;
si = (si + 2) % ns;
if(si == 0)
si++;

2
src/mame/drivers/apple2gs.cpp
View File

@ -720,7 +720,7 @@ private:
#define slow_cycle() \
{ \
if (m_last_speed) \
if (!machine().side_effects_disabled() && m_last_speed) \
{\
m_slow_counter += 0x0001999a; \
int cycles = (m_slow_counter >> 16) & 0xffff; \