From f901b00bdf5c55051c4309ae90de94be509d69d8 Mon Sep 17 00:00:00 2001 From: AJR Date: Sun, 9 May 2021 20:37:20 -0400 Subject: trs80.cpp: Change machine config constructor names to be less confusing --- src/mame/drivers/trs80.cpp | 12 ++++++------ src/mame/includes/trs80.h | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/mame/drivers/trs80.cpp b/src/mame/drivers/trs80.cpp index 188056b709e..400281976b7 100644 --- a/src/mame/drivers/trs80.cpp +++ b/src/mame/drivers/trs80.cpp @@ -424,7 +424,7 @@ static void trs80_floppies(device_slot_interface &device) } -void trs80_state::trs80(machine_config &config) // the original model I, level I, with no extras +void trs80_state::level1(machine_config &config) // the original model I, level I, with no extras { /* basic machine hardware */ Z80(config, m_maincpu, 10.6445_MHz_XTAL / 6); @@ -459,9 +459,9 @@ void trs80_state::trs80(machine_config &config) // the original model I, l SOFTWARE_LIST(config, "cass_list").set_original("trs80_cass").set_filter("0"); } -void trs80_state::model1(machine_config &config) // model I, level II +void trs80_state::level2(machine_config &config) // model I, level II { - trs80(config); + level1(config); m_maincpu->set_addrmap(AS_PROGRAM, &trs80_state::m1_mem); m_maincpu->set_addrmap(AS_IO, &trs80_state::m1_io); @@ -511,7 +511,7 @@ void trs80_state::model1(machine_config &config) // model I, level II void trs80_state::sys80(machine_config &config) { - model1(config); + level2(config); m_maincpu->set_addrmap(AS_IO, &trs80_state::sys80_io); m_maincpu->halt_cb().set_nop(); // TODO: asserts HLTA on expansion bus instead @@ -666,8 +666,8 @@ void trs80_state::init_trs80l2() // YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS -COMP( 1977, trs80, 0, 0, trs80, trs80, trs80_state, empty_init, "Tandy Radio Shack", "TRS-80 Model I (Level I Basic)", MACHINE_SUPPORTS_SAVE ) -COMP( 1978, trs80l2, 0, 0, model1, trs80l2, trs80_state, init_trs80l2, "Tandy Radio Shack", "TRS-80 Model I (Level II Basic)", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE ) +COMP( 1977, trs80, 0, 0, level1, trs80, trs80_state, empty_init, "Tandy Radio Shack", "TRS-80 Model I (Level I Basic)", MACHINE_SUPPORTS_SAVE ) +COMP( 1978, trs80l2, 0, 0, level2, trs80l2, trs80_state, init_trs80l2, "Tandy Radio Shack", "TRS-80 Model I (Level II Basic)", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE ) COMP( 1980, eg3003, 0, trs80l2, sys80, sys80, trs80_state, init_trs80l2, "EACA Computers Ltd", "Video Genie EG3003", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE ) COMP( 1980, sys80, eg3003, 0, sys80, sys80, trs80_state, init_trs80l2, "EACA Computers Ltd", "System-80 (60 Hz)", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE ) COMP( 1980, sys80p, eg3003, 0, sys80p, sys80, trs80_state, init_trs80l2, "EACA Computers Ltd", "System-80 (50 Hz)", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE ) diff --git a/src/mame/includes/trs80.h b/src/mame/includes/trs80.h index 6cef75cdbeb..2e76b23e044 100644 --- a/src/mame/includes/trs80.h +++ b/src/mame/includes/trs80.h @@ -51,8 +51,8 @@ public: void sys80(machine_config &config); void sys80p(machine_config &config); - void trs80(machine_config &config); - void model1(machine_config &config); + void level1(machine_config &config); + void level2(machine_config &config); void ht1080z(machine_config &config); void init_trs80l2(); -- cgit v1.2.3