summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/drivers/apple2e.cpp
diff options
context:
space:
mode:
author arbee <rb6502@users.noreply.github.com>2018-09-03 14:49:02 -0400
committer arbee <rb6502@users.noreply.github.com>2018-09-03 14:49:02 -0400
commit21cca10414b4b0b86aad4926fba47f7b9d8e51b6 (patch)
tree521017117a797c250c8fbaa3b11d09c974f6957a /src/mame/drivers/apple2e.cpp
parentc9fcb5d33e15ddb43ecf5c60e0f67528a3ea3795 (diff)
apple2e: more modernization (nw)
Diffstat (limited to 'src/mame/drivers/apple2e.cpp')
-rw-r--r--src/mame/drivers/apple2e.cpp82
1 files changed, 41 insertions, 41 deletions
diff --git a/src/mame/drivers/apple2e.cpp b/src/mame/drivers/apple2e.cpp
index 2eef8fabfe9..77025e39592 100644
--- a/src/mame/drivers/apple2e.cpp
+++ b/src/mame/drivers/apple2e.cpp
@@ -4089,8 +4089,8 @@ void apple2e_state::mprof3(machine_config &config)
MACHINE_CONFIG_START(apple2e_state::apple2ee)
apple2e(config);
- MCFG_DEVICE_REPLACE("maincpu", M65C02, 1021800) /* close to actual CPU frequency of 1.020484 MHz */
- MCFG_DEVICE_PROGRAM_MAP(apple2e_map)
+ M65C02(config.replace(), m_maincpu, 1021800);
+ m_maincpu->set_addrmap(AS_PROGRAM, &apple2e_state::apple2e_map);
MACHINE_CONFIG_END
MACHINE_CONFIG_START(apple2e_state::spectred)
@@ -4104,8 +4104,8 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(apple2e_state::tk3000)
apple2e(config);
- MCFG_DEVICE_REPLACE("maincpu", M65C02, 1021800) /* close to actual CPU frequency of 1.020484 MHz */
- MCFG_DEVICE_PROGRAM_MAP(apple2e_map)
+ M65C02(config.replace(), m_maincpu, 1021800);
+ m_maincpu->set_addrmap(AS_PROGRAM, &apple2e_state::apple2e_map);
// MCFG_DEVICE_ADD("subcpu", Z80, 1021800) // schematics are illegible on where the clock comes from, but it *seems* to be the same as the 65C02 clock
// MCFG_DEVICE_PROGRAM_MAP(tk3000_kbd_map)
@@ -4113,25 +4113,25 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(apple2e_state::apple2ep)
apple2e(config);
- MCFG_DEVICE_REPLACE("maincpu", M65C02, 1021800) /* close to actual CPU frequency of 1.020484 MHz */
- MCFG_DEVICE_PROGRAM_MAP(apple2e_map)
+ M65C02(config.replace(), m_maincpu, 1021800);
+ m_maincpu->set_addrmap(AS_PROGRAM, &apple2e_state::apple2e_map);
MACHINE_CONFIG_END
MACHINE_CONFIG_START(apple2e_state::apple2c)
apple2ee(config);
- MCFG_DEVICE_REPLACE("maincpu", M65C02, 1021800) /* close to actual CPU frequency of 1.020484 MHz */
- MCFG_DEVICE_PROGRAM_MAP(apple2c_map)
+ M65C02(config.replace(), m_maincpu, 1021800);
+ m_maincpu->set_addrmap(AS_PROGRAM, &apple2e_state::apple2c_map);
// IIc and friends have no cassette port
- MCFG_DEVICE_REMOVE(A2_CASSETTE_TAG)
+ config.device_remove(A2_CASSETTE_TAG);
- MCFG_DEVICE_REMOVE("sl1") // IIc has no slots, of course :)
- MCFG_DEVICE_REMOVE("sl2")
- MCFG_DEVICE_REMOVE("sl3")
- MCFG_DEVICE_REMOVE("sl4")
- MCFG_DEVICE_REMOVE("sl5")
- MCFG_DEVICE_REMOVE("sl6")
- MCFG_DEVICE_REMOVE("sl7")
+ config.device_remove("sl1"); // IIc has no slots, of course :)
+ config.device_remove("sl2");
+ config.device_remove("sl3");
+ config.device_remove("sl4");
+ config.device_remove("sl5");
+ config.device_remove("sl6");
+ config.device_remove("sl7");
MOS6551(config, m_acia1, 0);
m_acia1->set_xtal(XTAL(14'318'181) / 8); // ~1.789 MHz
@@ -4158,7 +4158,7 @@ MACHINE_CONFIG_START(apple2e_state::apple2c)
A2BUS_DISKIING(config, "sl6", A2BUS_7M_CLOCK).set_onboard(m_a2bus);
MCFG_A2EAUXSLOT_SLOT_REMOVE("aux")
- MCFG_DEVICE_REMOVE(A2_AUXSLOT_TAG)
+ config.device_remove(A2_AUXSLOT_TAG);
m_ram->set_default_size("128K").set_extra_options("128K");
MACHINE_CONFIG_END
@@ -4267,11 +4267,11 @@ static const floppy_interface floppy_interface =
MACHINE_CONFIG_START(apple2e_state::apple2cp)
apple2c(config);
- MCFG_DEVICE_REPLACE("maincpu", M65C02, 1021800) /* close to actual CPU frequency of 1.020484 MHz */
- MCFG_DEVICE_PROGRAM_MAP(apple2c_memexp_map)
+ M65C02(config.replace(), m_maincpu, 1021800);
+ m_maincpu->set_addrmap(AS_PROGRAM, &apple2e_state::apple2c_memexp_map);
- MCFG_DEVICE_REMOVE("sl4")
- MCFG_DEVICE_REMOVE("sl6")
+ config.device_remove("sl4");
+ config.device_remove("sl6");
MCFG_IWM_ADD(IICP_IWM_TAG, a2cp_interface)
MCFG_LEGACY_FLOPPY_APPLE_2_DRIVES_ADD(floppy_interface,15,16)
MCFG_LEGACY_FLOPPY_SONY_2_DRIVES_ADDITIONAL_ADD(apple2cp_floppy35_floppy_interface)
@@ -4282,16 +4282,16 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(apple2e_state::apple2c_iwm)
apple2c(config);
- MCFG_DEVICE_REMOVE("sl6")
+ config.device_remove("sl6");
A2BUS_IWM_FDC(config, "sl6", A2BUS_7M_CLOCK).set_onboard(m_a2bus);
MACHINE_CONFIG_END
MACHINE_CONFIG_START(apple2e_state::apple2c_mem)
apple2c(config);
- MCFG_DEVICE_REPLACE("maincpu", M65C02, 1021800) /* close to actual CPU frequency of 1.020484 MHz */
- MCFG_DEVICE_PROGRAM_MAP(apple2c_memexp_map)
+ M65C02(config.replace(), m_maincpu, 1021800);
+ m_maincpu->set_addrmap(AS_PROGRAM, &apple2e_state::apple2c_memexp_map);
- MCFG_DEVICE_REMOVE("sl6")
+ config.device_remove("sl6");
A2BUS_IWM_FDC(config, "sl6", A2BUS_7M_CLOCK).set_onboard(m_a2bus);
m_ram->set_default_size("128K").set_extra_options("128K, 384K, 640K, 896K, 1152K");
@@ -4309,14 +4309,14 @@ const applefdc_interface fdc_interface =
MACHINE_CONFIG_START(apple2e_state::laser128)
apple2c(config);
- MCFG_DEVICE_REPLACE("maincpu", M65C02, 1021800) /* close to actual CPU frequency of 1.020484 MHz */
- MCFG_DEVICE_PROGRAM_MAP(laser128_map)
+ M65C02(config.replace(), m_maincpu, 1021800);
+ m_maincpu->set_addrmap(AS_PROGRAM, &apple2e_state::laser128_map);
MCFG_APPLEFDC_ADD(LASER128_UDC_TAG, fdc_interface)
MCFG_LEGACY_FLOPPY_APPLE_2_DRIVES_ADD(floppy_interface,15,16)
- MCFG_DEVICE_REMOVE("sl4")
- MCFG_DEVICE_REMOVE("sl6")
+ config.device_remove("sl4");
+ config.device_remove("sl6");
A2BUS_LASER128(config, "sl1", A2BUS_7M_CLOCK).set_onboard(m_a2bus);
A2BUS_LASER128(config, "sl2", A2BUS_7M_CLOCK).set_onboard(m_a2bus);
@@ -4331,14 +4331,14 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(apple2e_state::laser128ex2)
apple2c(config);
- MCFG_DEVICE_REPLACE("maincpu", M65C02, 1021800) /* close to actual CPU frequency of 1.020484 MHz */
- MCFG_DEVICE_PROGRAM_MAP(laser128_map)
+ M65C02(config.replace(), m_maincpu, 1021800);
+ m_maincpu->set_addrmap(AS_PROGRAM, &apple2e_state::laser128_map);
MCFG_APPLEFDC_ADD(LASER128_UDC_TAG, fdc_interface)
MCFG_LEGACY_FLOPPY_APPLE_2_DRIVES_ADD(floppy_interface,15,16)
- MCFG_DEVICE_REMOVE("sl4")
- MCFG_DEVICE_REMOVE("sl6")
+ config.device_remove("sl4");
+ config.device_remove("sl6");
A2BUS_LASER128(config, "sl1", A2BUS_7M_CLOCK).set_onboard(m_a2bus);
A2BUS_LASER128(config, "sl2", A2BUS_7M_CLOCK).set_onboard(m_a2bus);
@@ -4353,19 +4353,19 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(apple2e_state::ceci)
apple2e(config);
- MCFG_DEVICE_REMOVE("sl1")
- MCFG_DEVICE_REMOVE("sl2")
- MCFG_DEVICE_REMOVE("sl3")
- MCFG_DEVICE_REMOVE("sl4")
- MCFG_DEVICE_REMOVE("sl5")
- MCFG_DEVICE_REMOVE("sl6")
- MCFG_DEVICE_REMOVE("sl7")
+ config.device_remove("sl1");
+ config.device_remove("sl2");
+ config.device_remove("sl3");
+ config.device_remove("sl4");
+ config.device_remove("sl5");
+ config.device_remove("sl6");
+ config.device_remove("sl7");
A2BUS_DISKIING(config, "sl6", A2BUS_7M_CLOCK).set_onboard(m_a2bus);
// there is no aux slot, the "aux" side of the //e is used for additional ROM
MCFG_A2EAUXSLOT_SLOT_REMOVE("aux")
- MCFG_DEVICE_REMOVE(A2_AUXSLOT_TAG)
+ config.device_remove(A2_AUXSLOT_TAG);
m_ram->set_default_size("64K");
MACHINE_CONFIG_END