Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-06-30 16:00:01 +03:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

macadb.cpp: add reset (IIgs) / power/NMI (Mac) key, and swap Command/Option keys to match Apple II layout. [R. Belmont]

Browse Source 
apple2gs.cpp: Building with the ADB MCU actually running instead of the HLE now works 100%.  [R. Belmont, Peter Ferrie]
This is not yet the default config to rate-limit MAME to one major IIgs change per release.
To try it out early, change RUN_ADB_MICRO and ADB_HLE to (1) and rebuild.
This commit is contained in:
arbee 2022-12-19 22:13:35 -05:00
parent 09f97d376a
commit e306757737
3 changed files with 85 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

103
src/mame/apple/apple2gs.cpp
View File

@ -420,6 +420,9 @@ private:
#if RUN_ADB_MICRO #if RUN_ADB_MICRO
u8 keyglu_816_read(u8 offset); u8 keyglu_816_read(u8 offset);
void keyglu_816_write(u8 offset, u8 data); void keyglu_816_write(u8 offset, u8 data);
u8 m_adb_p2_last, m_adb_p3_last;
int m_adb_reset_freeze = 0;
#endif #endif
void keyglu_regen_irqs(); void keyglu_regen_irqs();
@ -1460,6 +1463,10 @@ void apple2gs_state::machine_start()
save_item(NAME(m_transchar)); save_item(NAME(m_transchar));
save_item(NAME(m_anykeydown)); save_item(NAME(m_anykeydown));
save_item(NAME(m_repeatdelay)); save_item(NAME(m_repeatdelay));
#else
save_item(NAME(m_adb_p2_last));
save_item(NAME(m_adb_p3_last));
save_item(NAME(m_adb_reset_freeze));
#endif #endif
save_item(m_mouse_x, "MX"); save_item(m_mouse_x, "MX");
save_item(m_mouse_y, "MY"); save_item(m_mouse_y, "MY");
@ -1480,6 +1487,10 @@ void apple2gs_state::machine_start()
void apple2gs_state::machine_reset() void apple2gs_state::machine_reset()
{ {
#if RUN_ADB_MICRO
m_adb_p2_last = m_adb_p3_last = 0;
m_adb_reset_freeze = 0;
#endif
m_page2 = false; m_page2 = false;
m_romswitch = false; m_romswitch = false;
m_video->m_page2 = false; m_video->m_page2 = false;
@ -2260,49 +2271,49 @@ u8 apple2gs_state::c000_r(offs_t offset)
return uKeyboardC010; return uKeyboardC010;
#endif #endif
case 0x11: // read LCRAM2 (LC Dxxx bank) case 0x11: // read LCRAM2 (LC Dxxx bank)
return uKeyboardC010 | (m_lcram2 ? 0x80 : 0x00); return (uKeyboardC010 & 0x7f) | (m_lcram2 ? 0x80 : 0x00);
case 0x12: // read LCRAM (is LC readable?) case 0x12: // read LCRAM (is LC readable?)
return uKeyboardC010 | (m_lcram ? 0x80 : 0x00); return (uKeyboardC010 & 0x7f) | (m_lcram ? 0x80 : 0x00);
case 0x13: // read RAMRD case 0x13: // read RAMRD
return uKeyboardC010 | (m_ramrd ? 0x80 : 0x00); return (uKeyboardC010 & 0x7f) | (m_ramrd ? 0x80 : 0x00);
case 0x14: // read RAMWRT case 0x14: // read RAMWRT
return uKeyboardC010 | (m_ramwrt ? 0x80 : 0x00); return (uKeyboardC010 & 0x7f) | (m_ramwrt ? 0x80 : 0x00);
case 0x15: // read INTCXROM case 0x15: // read INTCXROM
return uKeyboardC010 | (m_intcxrom ? 0x80 : 0x00); return (uKeyboardC010 & 0x7f) | (m_intcxrom ? 0x80 : 0x00);
case 0x16: // read ALTZP case 0x16: // read ALTZP
return uKeyboardC010 | (m_altzp ? 0x80 : 0x00); return (uKeyboardC010 & 0x7f) | (m_altzp ? 0x80 : 0x00);
case 0x17: // read SLOTC3ROM case 0x17: // read SLOTC3ROM
return uKeyboardC010 | (m_slotc3rom ? 0x80 : 0x00); return (uKeyboardC010 & 0x7f) | (m_slotc3rom ? 0x80 : 0x00);
case 0x18: // read 80STORE case 0x18: // read 80STORE
return uKeyboardC010 | (m_80store ? 0x80 : 0x00); return (uKeyboardC010 & 0x7f) | (m_80store ? 0x80 : 0x00);
case 0x19: // read VBLBAR case 0x19: // read VBLBAR
return uKeyboardC010 | (m_screen->vblank() ? 0x00 : 0x80); return (uKeyboardC010 & 0x7f) | (m_screen->vblank() ? 0x00 : 0x80);
case 0x1a: // read TEXT case 0x1a: // read TEXT
return uKeyboardC010 | (m_video->m_graphics ? 0x00 : 0x80); return (uKeyboardC010 & 0x7f) | (m_video->m_graphics ? 0x00 : 0x80);
case 0x1b: // read MIXED case 0x1b: // read MIXED
return uKeyboardC010 | (m_video->m_mix ? 0x80 : 0x00); return (uKeyboardC010 & 0x7f) | (m_video->m_mix ? 0x80 : 0x00);
case 0x1c: // read PAGE2 case 0x1c: // read PAGE2
return uKeyboardC010 | (m_page2 ? 0x80 : 0x00); return (uKeyboardC010 & 0x7f) | (m_page2 ? 0x80 : 0x00);
case 0x1d: // read HIRES case 0x1d: // read HIRES
return uKeyboardC010 | (m_video->m_hires ? 0x80 : 0x00); return (uKeyboardC010 & 0x7f) | (m_video->m_hires ? 0x80 : 0x00);
case 0x1e: // read ALTCHARSET case 0x1e: // read ALTCHARSET
return uKeyboardC010 | (m_video->m_altcharset ? 0x80 : 0x00); return (uKeyboardC010 & 0x7f) | (m_video->m_altcharset ? 0x80 : 0x00);
case 0x1f: // read 80COL case 0x1f: // read 80COL
return uKeyboardC010 | (m_video->m_80col ? 0x80 : 0x00); return (uKeyboardC010 & 0x7f) | (m_video->m_80col ? 0x80 : 0x00);
case 0x22: // TEXTCOL case 0x22: // TEXTCOL
return m_textcol; return m_textcol;
@ -2485,16 +2496,18 @@ u8 apple2gs_state::c000_r(offs_t offset)
return m_gameio->sw3_r() | uFloatingBus7; return m_gameio->sw3_r() | uFloatingBus7;
#if RUN_ADB_MICRO #if RUN_ADB_MICRO
case 0x61: // button 0 or Open Apple case 0x61: // button 0 or Open Apple
return m_gameio->sw0_r() | uFloatingBus7; // HACK/TODO: the 65816 loses a race to the microcontroller on reset
if (m_adb_reset_freeze > 0) m_adb_reset_freeze--;
return m_gameio->sw0_r() | uFloatingBus7 | ((m_adb_p3_last & 0x20) ? 0x80 : 0);
case 0x62: // button 1 or Option case 0x62: // button 1 or Option
return m_gameio->sw1_r() | uFloatingBus7; return m_gameio->sw1_r() | uFloatingBus7 | ((m_adb_p3_last & 0x10) ? 0x80 : 0);
case 0x63: // button 2 or SHIFT key case 0x63: // button 2 or SHIFT key
return m_gameio->sw2_r() | uFloatingBus7; return m_gameio->sw2_r() | uFloatingBus7;
#else #else
case 0x61: // button 0 or Open Apple case 0x61: // button 0 or Open Apple
return ((m_gameio->sw0_r() || (m_kbspecial->read() & 0x10)) ? 0x80 : 0) | uFloatingBus7; return ((m_gameio->sw0_r() ) ? 0x80 : 0) | uFloatingBus7;
case 0x62: // button 1 or Option case 0x62: // button 1 or Option
return ((m_gameio->sw1_r() || (m_kbspecial->read() & 0x20)) ? 0x80 : 0) | uFloatingBus7; return ((m_gameio->sw1_r() || (m_kbspecial->read() & 0x20)) ? 0x80 : 0) | uFloatingBus7;
@ -4178,7 +4191,14 @@ u8 apple2gs_state::adbmicro_p2_in()
u8 apple2gs_state::adbmicro_p3_in() u8 apple2gs_state::adbmicro_p3_in()
{ {
return 0xc7; if (m_is_rom3)
{
return 0x00; // TODO: 0x40 to remove Control Panel from the Control-Open Apple-Esc menu
}
else
{
return 0x07;
}
} }
void apple2gs_state::adbmicro_p0_out(u8 data) void apple2gs_state::adbmicro_p0_out(u8 data)
@ -4192,6 +4212,14 @@ void apple2gs_state::adbmicro_p1_out(u8 data)
void apple2gs_state::adbmicro_p2_out(u8 data) void apple2gs_state::adbmicro_p2_out(u8 data)
{ {
#if RUN_ADB_MICRO
if (!BIT(data, 5) && BIT(m_adb_p2_last, 5))
{
m_adb_reset_freeze = 2;
m_maincpu->reset();
m_video->m_newvideo = m_newvideo = 0x41;
}
if (!(data & 0x10)) if (!(data & 0x10))
{ {
if (m_adbmicro->are_port_bits_output(0, 0xff)) if (m_adbmicro->are_port_bits_output(0, 0xff))
@ -4207,6 +4235,9 @@ void apple2gs_state::adbmicro_p2_out(u8 data)
{ {
m_glu_kbd_y = data & 0xf; m_glu_kbd_y = data & 0xf;
} }
m_adb_p2_last = data;
#endif
} }
void apple2gs_state::adbmicro_p3_out(u8 data) void apple2gs_state::adbmicro_p3_out(u8 data)
@ -4218,6 +4249,13 @@ void apple2gs_state::adbmicro_p3_out(u8 data)
m_macadb->adb_linechange_w(!m_adb_line); m_macadb->adb_linechange_w(!m_adb_line);
#endif #endif
} }
#if RUN_ADB_MICRO
if (m_adb_reset_freeze == 0)
{
m_adb_p3_last = data;
}
#endif
} }
#if ADB_HLE #if ADB_HLE
void apple2gs_state::set_adb_line(int linestate) void apple2gs_state::set_adb_line(int linestate)
@ -4237,7 +4275,6 @@ u8 apple2gs_state::keyglu_mcu_read(u8 offset)
{ {
m_glu_regs[GLU_KG_STATUS] &= ~KGS_COMMAND_FULL; m_glu_regs[GLU_KG_STATUS] &= ~KGS_COMMAND_FULL;
m_glu_mcu_read_kgs = false; m_glu_mcu_read_kgs = false;
// printf("MCU reads COMMAND = %02x (drop command full)\n", rv);
} }
// prime for the next command register read to clear the command full flag // prime for the next command register read to clear the command full flag
@ -4251,16 +4288,6 @@ u8 apple2gs_state::keyglu_mcu_read(u8 offset)
void apple2gs_state::keyglu_mcu_write(u8 offset, u8 data) void apple2gs_state::keyglu_mcu_write(u8 offset, u8 data)
{ {
// eat ADB SRQ notices - this shouldn't be necessary and breaks ROM 0/1 :(
//if ((offset == GLU_DATA) && (data == 0x08))
//{
// return;
//}
// if (m_glu_regs[offset] != data)
// {
// printf("MCU writes %02x to GLU reg %x (PC=%x)\n", data, offset, m_adbmicro->pc());
// }
m_glu_regs[offset] = data; m_glu_regs[offset] = data;
switch (offset) switch (offset)
@ -4289,16 +4316,15 @@ void apple2gs_state::keyglu_mcu_write(u8 offset, u8 data)
break; break;
case GLU_MOUSEX: case GLU_MOUSEX:
case GLU_MOUSEY:
m_glu_regs[GLU_KG_STATUS] |= KGS_MOUSEX_FULL; m_glu_regs[GLU_KG_STATUS] |= KGS_MOUSEX_FULL;
m_glu_regs[GLU_SYSSTAT] |= GLU_STATUS_MOUSEIRQ; m_glu_regs[GLU_SYSSTAT] |= GLU_STATUS_MOUSEIRQ;
if (offset == GLU_MOUSEX) keyglu_regen_irqs();
{
keyglu_regen_irqs();
}
m_glu_mouse_read_stat = false; // signal next read will be mouse X m_glu_mouse_read_stat = false; // signal next read will be mouse X
break; break;
case GLU_MOUSEY:
break;
case GLU_ANY_KEY_DOWN: // bit 7 is the actual flag here case GLU_ANY_KEY_DOWN: // bit 7 is the actual flag here
if (data & 0x80) if (data & 0x80)
{ {
@ -4311,9 +4337,7 @@ void apple2gs_state::keyglu_mcu_write(u8 offset, u8 data)
m_glu_regs[GLU_KG_STATUS] |= KGS_DATA_FULL; m_glu_regs[GLU_KG_STATUS] |= KGS_DATA_FULL;
m_glu_regs[GLU_SYSSTAT] |= GLU_STATUS_DATAIRQ; m_glu_regs[GLU_SYSSTAT] |= GLU_STATUS_DATAIRQ;
keyglu_regen_irqs(); keyglu_regen_irqs();
m_glu_816_read_dstat = false; m_glu_816_read_dstat = false;
// printf("MCU writes %02x to DATA\n", data);
break; break;
} }
} }
@ -4353,6 +4377,7 @@ u8 apple2gs_state::keyglu_816_read(u8 offset)
{ {
m_glu_mouse_read_stat = 1; m_glu_mouse_read_stat = 1;
m_glu_regs[GLU_KG_STATUS] &= ~KGS_MOUSEX_FULL; m_glu_regs[GLU_KG_STATUS] &= ~KGS_MOUSEX_FULL;
m_glu_regs[GLU_SYSSTAT] &= ~GLU_STATUS_MOUSEIRQ;
keyglu_regen_irqs(); keyglu_regen_irqs();
return m_glu_regs[GLU_MOUSEX]; return m_glu_regs[GLU_MOUSEX];
} }
@ -4445,7 +4470,6 @@ void apple2gs_state::keyglu_regen_irqs()
{ {
bIRQ = true; bIRQ = true;
} }
if (bIRQ) if (bIRQ)
{ {
raise_irq(IRQS_ADB); raise_irq(IRQS_ADB);
@ -4719,6 +4743,7 @@ void apple2gs_state::apple2gs(machine_config &config)
config.set_maximum_quantum(attotime::from_hz(60)); config.set_maximum_quantum(attotime::from_hz(60));
M50741(config, m_adbmicro, A2GS_MASTER_CLOCK/8); M50741(config, m_adbmicro, A2GS_MASTER_CLOCK/8);
m_adbmicro->set_pullups<2>(0x20);
m_adbmicro->read_p<0>().set(FUNC(apple2gs_state::adbmicro_p0_in)); m_adbmicro->read_p<0>().set(FUNC(apple2gs_state::adbmicro_p0_in));
m_adbmicro->write_p<0>().set(FUNC(apple2gs_state::adbmicro_p0_out)); m_adbmicro->write_p<0>().set(FUNC(apple2gs_state::adbmicro_p0_out));
m_adbmicro->read_p<1>().set(FUNC(apple2gs_state::adbmicro_p1_in)); m_adbmicro->read_p<1>().set(FUNC(apple2gs_state::adbmicro_p1_in));
@ -4731,6 +4756,7 @@ void apple2gs_state::apple2gs(machine_config &config)
#if ADB_HLE #if ADB_HLE
MACADB(config, m_macadb, A2GS_MASTER_CLOCK/8); MACADB(config, m_macadb, A2GS_MASTER_CLOCK/8);
m_macadb->set_mcu_mode(true); m_macadb->set_mcu_mode(true);
m_macadb->set_iigs_mode(true);
m_macadb->adb_data_callback().set(FUNC(apple2gs_state::set_adb_line)); m_macadb->adb_data_callback().set(FUNC(apple2gs_state::set_adb_line));
#endif #endif
@ -4854,6 +4880,7 @@ void apple2gs_state::apple2gsr1(machine_config &config)
m_ram->set_default_size("1280K").set_extra_options("256K,512K,768K,1M,2M,3M,4M,5M,6M,7M,8M").set_default_value(0x00); m_ram->set_default_size("1280K").set_extra_options("256K,512K,768K,1M,2M,3M,4M,5M,6M,7M,8M").set_default_value(0x00);
M50740(config.replace(), m_adbmicro, A2GS_MASTER_CLOCK/8); M50740(config.replace(), m_adbmicro, A2GS_MASTER_CLOCK/8);
m_adbmicro->set_pullups<2>(0x20);
m_adbmicro->read_p<0>().set(FUNC(apple2gs_state::adbmicro_p0_in)); m_adbmicro->read_p<0>().set(FUNC(apple2gs_state::adbmicro_p0_in));
m_adbmicro->write_p<0>().set(FUNC(apple2gs_state::adbmicro_p0_out)); m_adbmicro->write_p<0>().set(FUNC(apple2gs_state::adbmicro_p0_out));
m_adbmicro->read_p<1>().set(FUNC(apple2gs_state::adbmicro_p1_in)); m_adbmicro->read_p<1>().set(FUNC(apple2gs_state::adbmicro_p1_in));

24
src/mame/apple/macadb.cpp
View File

@ -152,10 +152,10 @@ static INPUT_PORTS_START( macadb )
PORT_BIT(0x0010, IP_ACTIVE_HIGH, IPT_UNUSED) /* keyboard Enter : */ PORT_BIT(0x0010, IP_ACTIVE_HIGH, IPT_UNUSED) /* keyboard Enter : */
PORT_BIT(0x0020, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("Esc") PORT_CODE(KEYCODE_ESC) PORT_CHAR(27) PORT_BIT(0x0020, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("Esc") PORT_CODE(KEYCODE_ESC) PORT_CHAR(27)
PORT_BIT(0x0040, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("Control") PORT_CODE(KEYCODE_LCONTROL) PORT_BIT(0x0040, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("Control") PORT_CODE(KEYCODE_LCONTROL)
PORT_BIT(0x0080, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("Command / Open Apple") PORT_CODE(KEYCODE_RALT) PORT_BIT(0x0080, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("Command / Open Apple") PORT_CODE(KEYCODE_LALT)
PORT_BIT(0x0100, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("Shift") PORT_CODE(KEYCODE_LSHIFT) PORT_CODE(KEYCODE_RSHIFT) PORT_CHAR(UCHAR_SHIFT_1) PORT_BIT(0x0100, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("Shift") PORT_CODE(KEYCODE_LSHIFT) PORT_CODE(KEYCODE_RSHIFT) PORT_CHAR(UCHAR_SHIFT_1)
PORT_BIT(0x0200, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("Caps Lock") PORT_CODE(KEYCODE_CAPSLOCK) PORT_TOGGLE PORT_BIT(0x0200, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("Caps Lock") PORT_CODE(KEYCODE_CAPSLOCK) PORT_TOGGLE
PORT_BIT(0x0400, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("Option / Solid Apple") PORT_CODE(KEYCODE_LALT) PORT_BIT(0x0400, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("Option / Solid Apple") PORT_CODE(KEYCODE_RALT)
PORT_BIT(0x0800, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("Left Arrow") PORT_CODE(KEYCODE_LEFT) PORT_CHAR(UCHAR_MAMEKEY(LEFT)) PORT_BIT(0x0800, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("Left Arrow") PORT_CODE(KEYCODE_LEFT) PORT_CHAR(UCHAR_MAMEKEY(LEFT))
PORT_BIT(0x1000, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("Right Arrow") PORT_CODE(KEYCODE_RIGHT) PORT_CHAR(UCHAR_MAMEKEY(RIGHT)) PORT_BIT(0x1000, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("Right Arrow") PORT_CODE(KEYCODE_RIGHT) PORT_CHAR(UCHAR_MAMEKEY(RIGHT))
PORT_BIT(0x2000, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("Down Arrow") PORT_CODE(KEYCODE_DOWN) PORT_CHAR(UCHAR_MAMEKEY(DOWN)) PORT_BIT(0x2000, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("Down Arrow") PORT_CODE(KEYCODE_DOWN) PORT_CHAR(UCHAR_MAMEKEY(DOWN))
@ -193,7 +193,8 @@ static INPUT_PORTS_START( macadb )
PORT_BIT(0x0400, IP_ACTIVE_HIGH, IPT_UNUSED) // 0x5a PORT_BIT(0x0400, IP_ACTIVE_HIGH, IPT_UNUSED) // 0x5a
PORT_BIT(0x0800, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_8_PAD) PORT_CHAR(UCHAR_MAMEKEY(8_PAD)) // 0x5b PORT_BIT(0x0800, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_8_PAD) PORT_CHAR(UCHAR_MAMEKEY(8_PAD)) // 0x5b
PORT_BIT(0x1000, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_9_PAD) PORT_CHAR(UCHAR_MAMEKEY(9_PAD)) // 0x5c PORT_BIT(0x1000, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_9_PAD) PORT_CHAR(UCHAR_MAMEKEY(9_PAD)) // 0x5c
PORT_BIT(0xE000, IP_ACTIVE_HIGH, IPT_UNUSED) PORT_BIT(0x2000, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("Reset / Power") PORT_CODE(KEYCODE_F12) // 0x5d (converted to 0x7f7f)
PORT_BIT(0xc000, IP_ACTIVE_HIGH, IPT_UNUSED)
INPUT_PORTS_END INPUT_PORTS_END
macadb_device::macadb_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) macadb_device::macadb_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
@ -396,10 +397,15 @@ int macadb_device::adb_pollkbd(int update)
} }
} }
// if ((codes[0] != 0xff) || (codes[1] != 0xff)) // reset handling
// { if (codes[0] == 0x5d)
// printf("ADB keyboard: update %d keys %02x %02x\n", update, codes[0], codes[1]); {
// } codes[0] = codes[1] = 0x7f;
}
else if (codes[0] == 0xdd)
{
codes[0] = codes[1] = 0xff;
}
// figure out if there was a change // figure out if there was a change
if ((m_adb_currentkeys[0] != codes[0]) || (m_adb_currentkeys[1] != codes[1])) if ((m_adb_currentkeys[0] != codes[0]) || (m_adb_currentkeys[1] != codes[1]))
@ -592,7 +598,7 @@ void macadb_device::adb_talk()
break; break;
} }
if (adb_pollkbd(0)) if ((adb_pollkbd(0)) && (!m_bIsIIGSMode))
{ {
m_adb_srqflag = true; m_adb_srqflag = true;
} }
@ -679,7 +685,7 @@ void macadb_device::adb_talk()
break; break;
} }
if (adb_pollmouse()) if ((adb_pollmouse()) && (!m_bIsIIGSMode))
{ {
m_adb_srqflag = true; m_adb_srqflag = true;
} }

6
src/mame/apple/macadb.h
View File

@ -20,6 +20,10 @@ public:
macadb_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); macadb_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
void set_mcu_mode(bool bMCUMode) { m_bIsMCUMode = bMCUMode; } void set_mcu_mode(bool bMCUMode) { m_bIsMCUMode = bMCUMode; }
// TODO: the IIgs microcontroller programs hate how we generate SRQs, and they already
// do round-robin polling so no data will be missed. This lets us turn off SRQs for that case.
// We should see if we can make them happier, or just work on LLE ADB devices...
void set_iigs_mode(bool bIIGSMode) { m_bIsIIGSMode = bIIGSMode; }
auto via_clock_callback() { return write_via_clock.bind(); } auto via_clock_callback() { return write_via_clock.bind(); }
auto via_data_callback() { return write_via_data.bind(); } auto via_data_callback() { return write_via_data.bind(); }
@ -44,7 +48,7 @@ protected:
virtual void device_reset() override; virtual void device_reset() override;
private: private:
bool m_bIsMCUMode; bool m_bIsMCUMode, m_bIsIIGSMode;
uint64_t m_last_adb_time; uint64_t m_last_adb_time;