From ce045e819b6a64e2f161c883d2ee574e96482185 Mon Sep 17 00:00:00 2001 From: Robbbert Date: Sun, 11 Oct 2020 03:23:40 +1100 Subject: [PATCH] kaypro: merged software lists, using compatibility flag instead. New working software ------------------ Kaypro284 boot disk Kaypro IV boot disk Kaypro 10 boot disk Kaypro 10 Games --- hash/{kayproii.xml => kaypro.xml} | 99 ++++++++++++++++++++++++++++++- hash/kaypro484.xml | 32 ---------- src/mame/drivers/kaypro.cpp | 36 +++++++---- src/mame/includes/kaypro.h | 2 + 4 files changed, 124 insertions(+), 45 deletions(-) rename hash/{kayproii.xml => kaypro.xml} (60%) delete mode 100644 hash/kaypro484.xml diff --git a/hash/kayproii.xml b/hash/kaypro.xml similarity index 60% rename from hash/kayproii.xml rename to hash/kaypro.xml index d19c601bb12..8e5ee9f6a03 100644 --- a/hash/kayproii.xml +++ b/hash/kaypro.xml @@ -3,7 +3,9 @@ - + + + @@ -11,6 +13,7 @@ license:CC0 CP/M 2.2 Boot Disk (Ger) 19?? Digital Research + @@ -22,6 +25,7 @@ license:CC0 CP/M 2.2 19?? Digital Research + @@ -35,6 +39,7 @@ license:CC0 Perfect Calc v1.00 1982 Perfect Software + @@ -46,6 +51,7 @@ license:CC0 Perfect Speller 1982 Perfect Software + @@ -57,6 +63,7 @@ license:CC0 Perfect Writer 1982 Perfect Software + @@ -68,6 +75,7 @@ license:CC0 Perfect Writer - Docs and Utilities 198? <unknown> + @@ -79,6 +87,7 @@ license:CC0 Perfect Writer - Lessons 198? Perfect Software + @@ -90,6 +99,7 @@ license:CC0 Profit Plan 1982 Chang Laboratories + @@ -101,6 +111,7 @@ license:CC0 Select - Teach 1981 Select Information Systems + @@ -112,6 +123,7 @@ license:CC0 Select - Work Processor 1981 Select Information Systems + @@ -123,6 +135,7 @@ license:CC0 WordStar v3.3 1983 MicroPro + @@ -134,6 +147,7 @@ license:CC0 Synergy Host Control System 10/11/85 1985 Digital Keyboards + @@ -141,4 +155,87 @@ license:CC0 + + + + CP/M 2.2G + 19?? + Digital Research + + + + + + + + + + + + CP/M 2.2F (81-292) + 19?? + Digital Research + + + + + + + + + + CP/M 2.2G (81-292-A) + 19?? + Digital Research + + + + + + + + + + + + CP/M 2.2 for Kaypro IV + 19?? + Digital Research + + + + + + + + + + + + CP/M 2.2F + 19?? + Digital Research + + + + + + + + + + Kaypro 10 Games + 19?? + <unknown> + + + + + + + + + + + diff --git a/hash/kaypro484.xml b/hash/kaypro484.xml deleted file mode 100644 index 2450ec1cc55..00000000000 --- a/hash/kaypro484.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - - CP/M 2.2F (81-292) - 19?? - Digital Research - - - - - - - - - CP/M 2.2G (81-292-A) - 19?? - Digital Research - - - - - - - - diff --git a/src/mame/drivers/kaypro.cpp b/src/mame/drivers/kaypro.cpp index bb65f6959a1..73c01b2ebb3 100644 --- a/src/mame/drivers/kaypro.cpp +++ b/src/mame/drivers/kaypro.cpp @@ -267,7 +267,7 @@ void kaypro_state::kayproii(machine_config &config) m_fdc->set_force_ready(true); FLOPPY_CONNECTOR(config, "fdc:0", kaypro_floppies, "525ssdd", floppy_image_device::default_floppy_formats).enable_sound(true); FLOPPY_CONNECTOR(config, "fdc:1", kaypro_floppies, "525ssdd", floppy_image_device::default_floppy_formats).enable_sound(true); - SOFTWARE_LIST(config, "flop_list").set_original("kayproii"); + SOFTWARE_LIST(config, "flop_list").set_original("kaypro").set_filter("A"); } void kaypro_state::kayproiv(machine_config &config) @@ -278,7 +278,7 @@ void kaypro_state::kayproiv(machine_config &config) config.device_remove("fdc:1"); FLOPPY_CONNECTOR(config, "fdc:0", kaypro_floppies, "525dd", floppy_image_device::default_floppy_formats).enable_sound(true); FLOPPY_CONNECTOR(config, "fdc:1", kaypro_floppies, "525dd", floppy_image_device::default_floppy_formats).enable_sound(true); - SOFTWARE_LIST(config.replace(), "flop_list").set_original("kaypro483"); + SOFTWARE_LIST(config.replace(), "flop_list").set_original("kaypro").set_filter("D"); } void kaypro_state::omni2(machine_config &config) @@ -367,7 +367,19 @@ void kaypro_state::kaypro484(machine_config &config) m_fdc->set_force_ready(true); FLOPPY_CONNECTOR(config, "fdc:0", kaypro_floppies, "525dd", floppy_image_device::default_floppy_formats).enable_sound(true); FLOPPY_CONNECTOR(config, "fdc:1", kaypro_floppies, "525dd", floppy_image_device::default_floppy_formats).enable_sound(true); - SOFTWARE_LIST(config, "flop_list").set_original("kaypro484"); + SOFTWARE_LIST(config, "flop_list").set_original("kaypro").set_filter("C"); +} + +void kaypro_state::kaypro4x(machine_config &config) +{ + kaypro484(config); + SOFTWARE_LIST(config.replace(), "flop_list").set_original("kaypro").set_filter("F"); +} + +void kaypro_state::kaypro1(machine_config &config) +{ + kaypro484(config); + SOFTWARE_LIST(config.replace(), "flop_list").set_original("kaypro").set_filter("G"); } void kaypro_state::kaypro10(machine_config &config) @@ -375,14 +387,14 @@ void kaypro_state::kaypro10(machine_config &config) kaypro484(config); config.device_remove("fdc:1"); // only has 1 floppy drive // need to add hard drive & controller - SOFTWARE_LIST(config.replace(), "flop_list").set_original("kaypro10"); + SOFTWARE_LIST(config.replace(), "flop_list").set_original("kaypro").set_filter("E"); } void kaypro_state::kaypronew2(machine_config &config) { kaypro484(config); config.device_remove("fdc:1"); // only has 1 floppy drive - SOFTWARE_LIST(config.replace(), "flop_list").set_original("kaypronew2"); + SOFTWARE_LIST(config.replace(), "flop_list").set_original("kaypro").set_filter("G"); } void kaypro_state::kaypro284(machine_config &config) @@ -392,7 +404,7 @@ void kaypro_state::kaypro284(machine_config &config) config.device_remove("fdc:1"); FLOPPY_CONNECTOR(config, "fdc:0", kaypro_floppies, "525ssdd", floppy_image_device::default_floppy_formats).enable_sound(true); FLOPPY_CONNECTOR(config, "fdc:1", kaypro_floppies, "525ssdd", floppy_image_device::default_floppy_formats).enable_sound(true); - SOFTWARE_LIST(config.replace(), "flop_list").set_original("kaypro284"); + SOFTWARE_LIST(config.replace(), "flop_list").set_original("kaypro").set_filter("B"); } void kaypro_state::init_kaypro() @@ -663,10 +675,10 @@ COMP( 1984, kaypro484, 0, 0, kaypro484, kaypro, kaypro_state, i COMP( 1984, kaypro284, kaypro484, 0, kaypro284, kaypro, kaypro_state, init_kaypro, "Non Linear Systems", "Kaypro 2/84", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE ) // model 81-015 COMP( 1984, kaypro484p88, kaypro484, 0, kaypro484, kaypro, kaypro_state, init_kaypro, "Non Linear Systems", "Kaypro 4/84 plus88", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE ) // model 81-015 with an added 8088 daughterboard and rom COMP( 1984, kaypro1084, kaypro10, 0, kaypro10, kaypro, kaypro_state, init_kaypro, "Non Linear Systems", "Kaypro 10", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE ) // model 81-005 -COMP( 1984, robie, 0, 0, kaypro484, kaypro, kaypro_state, init_kaypro, "Non Linear Systems", "Kaypro Robie", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE ) -COMP( 1985, kaypro2x, kaypro484, 0, kaypro484, kaypro, kaypro_state, init_kaypro, "Non Linear Systems", "Kaypro 2x", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE ) // model 81-025 +COMP( 1984, robie, 0, 0, kaypro4x, kaypro, kaypro_state, init_kaypro, "Non Linear Systems", "Kaypro Robie", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE ) +COMP( 1985, kaypro2x, kaypro484, 0, kaypro484, kaypro, kaypro_state, init_kaypro, "Non Linear Systems", "Kaypro 2x", MACHINE_SUPPORTS_SAVE ) // model 81-025 COMP( 1985, kaypronew2, 0, 0, kaypronew2, kaypro, kaypro_state, init_kaypro, "Non Linear Systems", "Kaypro New 2", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE ) -COMP( 1985, kaypro4x, robie, 0, kaypro484, kaypro, kaypro_state, init_kaypro, "Non Linear Systems", "Kaypro 4x", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE ) -COMP( 1986, kaypro1, kaypro484, 0, kaypro484, kaypro, kaypro_state, init_kaypro, "Non Linear Systems", "Kaypro 1", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE ) -COMP( 198?, omni2, kayproii, 0, omni2, kaypro, kaypro_state, init_kaypro, "Non Linear Systems", "Omni II Logic Analyzer", MACHINE_SUPPORTS_SAVE ) -COMP( 198?, omni4, kaypro484, 0, kaypro484, kaypro, kaypro_state, init_kaypro, "Omni Logic Inc.", "Omni 4 Logic Analyzer", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE ) +COMP( 1985, kaypro4x, robie, 0, kaypro4x, kaypro, kaypro_state, init_kaypro, "Non Linear Systems", "Kaypro 4x", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE ) +COMP( 1986, kaypro1, kaypro484, 0, kaypro1, kaypro, kaypro_state, init_kaypro, "Non Linear Systems", "Kaypro 1", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE ) +COMP( 198?, omni2, kayproii, 0, omni2, kaypro, kaypro_state, init_kaypro, "Non Linear Systems", "Omni II Logic Analyzer", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE ) +COMP( 198?, omni4, kaypro484, 0, kaypro1, kaypro, kaypro_state, init_kaypro, "Omni Logic Inc.", "Omni 4 Logic Analyzer", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE ) diff --git a/src/mame/includes/kaypro.h b/src/mame/includes/kaypro.h index 370ea1d75d1..97de596cfe4 100644 --- a/src/mame/includes/kaypro.h +++ b/src/mame/includes/kaypro.h @@ -48,6 +48,8 @@ public: void kaypro484(machine_config &config); void kaypro10(machine_config &config); void kaypro284(machine_config &config); + void kaypro4x(machine_config &config); + void kaypro1(machine_config &config); void init_kaypro();