From 518e186f6c7e994f5176192b4323dbc38af206c8 Mon Sep 17 00:00:00 2001 From: arbee Date: Sat, 9 May 2020 22:55:45 -0400 Subject: [PATCH] mac.cpp updates [R. Belmont] - Fixed maciisi booting - Fixed maciivx/maciivi ID bytes, System 7.1 now shows the correct model --- src/mame/drivers/mac.cpp | 4 ++-- src/mame/includes/mac.h | 1 + src/mame/machine/mac.cpp | 5 +++++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/mame/drivers/mac.cpp b/src/mame/drivers/mac.cpp index ddeaea96f50..1af3d9cbbf2 100644 --- a/src/mame/drivers/mac.cpp +++ b/src/mame/drivers/mac.cpp @@ -673,7 +673,7 @@ void mac_state::macii_map(address_map &map) void mac_state::maciici_map(address_map &map) { - map(0x40000000, 0x4007ffff).rom().region("bootrom", 0).mirror(0x0ff80000); + map(0x40000000, 0x4007ffff).r(FUNC(mac_state::rom_switch_r)).mirror(0x0ff80000); map(0x50000000, 0x50001fff).rw(FUNC(mac_state::mac_via_r), FUNC(mac_state::mac_via_w)).mirror(0x00f00000); map(0x50004000, 0x50005fff).rw(FUNC(mac_state::mac_scc_r), FUNC(mac_state::mac_scc_2_w)).mirror(0x00f00000); @@ -2064,6 +2064,6 @@ COMP( 1993, maccclas, 0, 0, maccclas, macadb, mac_state, init_macl COMP( 1992, macpb145b, macpb140, 0, macpb170, macadb, mac_state, init_macpb140, "Apple Computer", "Macintosh PowerBook 145B", MACHINE_NOT_WORKING ) COMP( 1993, maclc3, 0, 0, maclc3, maciici, mac_state, init_maclc3, "Apple Computer", "Macintosh LC III", MACHINE_NOT_WORKING|MACHINE_IMPERFECT_SOUND ) COMP( 1993, maciivx, 0, 0, maciivx, maciici, mac_state, init_maciivx, "Apple Computer", "Macintosh IIvx", MACHINE_NOT_WORKING|MACHINE_IMPERFECT_SOUND ) -COMP( 1993, maciivi, maciivx, 0, maciivi, maciici, mac_state, init_maciivx, "Apple Computer", "Macintosh IIvi", MACHINE_NOT_WORKING|MACHINE_IMPERFECT_SOUND ) +COMP( 1993, maciivi, maciivx, 0, maciivi, maciici, mac_state, init_maciivi, "Apple Computer", "Macintosh IIvi", MACHINE_NOT_WORKING|MACHINE_IMPERFECT_SOUND ) COMP( 1993, maclc520, 0, 0, maclc520, maciici, mac_state, init_maclc520, "Apple Computer", "Macintosh LC 520", MACHINE_NOT_WORKING ) COMP( 1994, pmac6100, 0, 0, pwrmac, macadb, mac_state, init_macpm6100, "Apple Computer", "Power Macintosh 6100/60", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND ) diff --git a/src/mame/includes/mac.h b/src/mame/includes/mac.h index c47f84d3f8c..f653976e98f 100644 --- a/src/mame/includes/mac.h +++ b/src/mame/includes/mac.h @@ -152,6 +152,7 @@ public: void init_macse30(); void init_macprtb(); void init_maciivx(); + void init_maciivi(); void init_macpd210(); void init_macii(); void init_macclassic(); diff --git a/src/mame/machine/mac.cpp b/src/mame/machine/mac.cpp index c66d0f334c1..6b04f1546cd 100644 --- a/src/mame/machine/mac.cpp +++ b/src/mame/machine/mac.cpp @@ -1300,6 +1300,7 @@ READ8_MEMBER(mac_state::mac_via_in_a) case MODEL_MAC_LC: case MODEL_MAC_LC_II: case MODEL_MAC_IIVX: + case MODEL_MAC_IIVI: return 0x81 | PA6 | PA4 | PA2; case MODEL_MAC_IICI: @@ -2141,6 +2142,9 @@ READ32_MEMBER(mac_state::mac_read_id) case MODEL_MAC_QUADRA_840AV: return 0xa55a2830; + case MODEL_MAC_IIVX: + return 0xa55a2015; + default: return 0; } @@ -2223,6 +2227,7 @@ MAC_DRIVER_INIT(macpb100, MODEL_MAC_PB100) MAC_DRIVER_INIT(macpb140, MODEL_MAC_PB140) MAC_DRIVER_INIT(macpb160, MODEL_MAC_PB160) MAC_DRIVER_INIT(maciivx, MODEL_MAC_IIVX) +MAC_DRIVER_INIT(maciivi, MODEL_MAC_IIVI) MAC_DRIVER_INIT(maciifx, MODEL_MAC_IIFX) MAC_DRIVER_INIT(macpd210, MODEL_MAC_PBDUO_210) MAC_DRIVER_INIT(macquadra700, MODEL_MAC_QUADRA_700)