diff --git a/hash/bbc_32016_flop.xml b/hash/bbc_flop_32016.xml similarity index 98% rename from hash/bbc_32016_flop.xml rename to hash/bbc_flop_32016.xml index f7c354aab39..bec6703922b 100644 --- a/hash/bbc_32016_flop.xml +++ b/hash/bbc_flop_32016.xml @@ -8,7 +8,7 @@ Hold down the SHIFT key and press and release the BREAK key. --> - + PanOS Version 1.10 System Disks diff --git a/hash/bbc_flop_6502.xml b/hash/bbc_flop_6502.xml new file mode 100644 index 00000000000..51b0c9863fe --- /dev/null +++ b/hash/bbc_flop_6502.xml @@ -0,0 +1,84 @@ + + + + + + + + + + + 6502 Development Package + 1985 + Acornsoft + + + + + + + + + + + Bitstik Graphics System + 1984 + Acorn + + + + + + + + + + + + + + + + + + + + + + + + Bitstik 2 + 1985 + Robo Systems + + + + + + + + + + + + + + + + + Econet Level 2 Fileserver Software + 1985 + Acorn + + + + + + + + + + diff --git a/hash/bbc_65c102_flop.xml b/hash/bbc_flop_65c102.xml similarity index 92% rename from hash/bbc_65c102_flop.xml rename to hash/bbc_flop_65c102.xml index 9770296374c..efc30b3f5e9 100644 --- a/hash/bbc_65c102_flop.xml +++ b/hash/bbc_flop_65c102.xml @@ -8,7 +8,7 @@ Hold down the SHIFT key and press and release the BREAK key. --> - + BBC Master 65C102 Co-Processor Support Disc diff --git a/hash/bbc_68000_flop.xml b/hash/bbc_flop_68000.xml similarity index 95% rename from hash/bbc_68000_flop.xml rename to hash/bbc_flop_68000.xml index c4c720f6c02..3c20855b6ae 100644 --- a/hash/bbc_68000_flop.xml +++ b/hash/bbc_flop_68000.xml @@ -8,7 +8,7 @@ Hold down the SHIFT key and press and release the BREAK key. --> - + Casper Support Discs diff --git a/hash/bbc_80186_flop.xml b/hash/bbc_flop_80186.xml similarity index 98% rename from hash/bbc_80186_flop.xml rename to hash/bbc_flop_80186.xml index 5e3fcae4e83..2805986c240 100644 --- a/hash/bbc_80186_flop.xml +++ b/hash/bbc_flop_80186.xml @@ -8,7 +8,7 @@ Hold down the SHIFT key and press and release the BREAK key. --> - + BBC Master 512 System Discs diff --git a/hash/bbc_arm_flop.xml b/hash/bbc_flop_arm.xml similarity index 97% rename from hash/bbc_arm_flop.xml rename to hash/bbc_flop_arm.xml index 691ed53f12e..a347eb3c19c 100644 --- a/hash/bbc_arm_flop.xml +++ b/hash/bbc_flop_arm.xml @@ -8,7 +8,7 @@ Hold down the SHIFT key and press and release the BREAK key. --> - + ARM Evaluation System Discs diff --git a/hash/bbc_torch_flop.xml b/hash/bbc_flop_torch.xml similarity index 98% rename from hash/bbc_torch_flop.xml rename to hash/bbc_flop_torch.xml index dbb14dcf101..cc0612558fb 100644 --- a/hash/bbc_torch_flop.xml +++ b/hash/bbc_flop_torch.xml @@ -8,7 +8,7 @@ Reset with Z80 co-processor enabled and Acorn CP/M System Disc 1 in drive 0. --> - + Adventure B01 - 550 points @@ -24,7 +24,7 @@ - BBC Basic (Z80) v2.30 + Torch BBC BASIC (Z80) v2.30 1984 Torch diff --git a/hash/bbc_z80_flop.xml b/hash/bbc_flop_z80.xml similarity index 99% rename from hash/bbc_z80_flop.xml rename to hash/bbc_flop_z80.xml index 548ed9bfdd8..f6e9dd91f27 100644 --- a/hash/bbc_z80_flop.xml +++ b/hash/bbc_flop_z80.xml @@ -8,7 +8,7 @@ Reset with Z80 co-processor enabled and Acorn CP/M System Disc 1 in drive 0. --> - + Acorn CP/M System Discs diff --git a/hash/bbcb_de_cass.xml b/hash/bbcb_cass_de.xml similarity index 99% rename from hash/bbcb_de_cass.xml rename to hash/bbcb_cass_de.xml index e790c50f313..9673fc6b484 100644 --- a/hash/bbcb_de_cass.xml +++ b/hash/bbcb_cass_de.xml @@ -12,7 +12,7 @@ To start/stop the tape you must use the MESS menus, so you'll have to turn full keyboard mode off with Scroll Lock, then navigate the menus, turning Scroll Lock back on when you're finished. --> - + diff --git a/hash/bbcb_orig_flop.xml b/hash/bbcb_flop_orig.xml similarity index 99% rename from hash/bbcb_orig_flop.xml rename to hash/bbcb_flop_orig.xml index bc7b4df1165..37eb2c4b212 100644 --- a/hash/bbcb_orig_flop.xml +++ b/hash/bbcb_flop_orig.xml @@ -12,7 +12,7 @@ - + @@ -757,7 +757,7 @@ Fab Four Vol.1 - 1990 + 1989 Audiogenic @@ -1130,7 +1130,7 @@ Impossible Mission - 1985 + 1986 U.S. Gold @@ -1229,7 +1229,7 @@ Strike Force Harrier - 1986 + 1985 Mirrorsoft @@ -1544,8 +1544,8 @@ Disc Debug and Copy All - 198? - <unknown> + 1983 + Basil Bloom @@ -2065,7 +2065,7 @@ Story 1983 - H & H Software + H&H Software @@ -2114,7 +2114,7 @@ - Bismarck Death of a Battleship + Bismarck: Death of a Battleship 1987 BBC Soft @@ -3423,48 +3423,31 @@ - - FarmCash Setup v1.12 + + Farm Management Suite 198? Acornsoft + - - - - FieldFile Setup v1.11 - 198? - Acornsoft - - + + - - - - CapCost Setup v1.11 - 1983 - Acornsoft - - + + - - - - FarmPlanner Setup v1.01 - 1983 - Acornsoft - - + + @@ -3780,7 +3763,7 @@ Longitudinal Waves - 198? + 1983 Five Ways Software diff --git a/hash/bbcb_us_flop.xml b/hash/bbcb_flop_us.xml similarity index 91% rename from hash/bbcb_us_flop.xml rename to hash/bbcb_flop_us.xml index 29c2581d3ce..451d62d5626 100644 --- a/hash/bbcb_us_flop.xml +++ b/hash/bbcb_flop_us.xml @@ -8,7 +8,7 @@ Hold down the SHIFT key and press and release the BREAK key. --> - + Introductory and Utilities Disk diff --git a/src/mame/drivers/bbc.cpp b/src/mame/drivers/bbc.cpp index e5dc2f9c022..1450a44a654 100644 --- a/src/mame/drivers/bbc.cpp +++ b/src/mame/drivers/bbc.cpp @@ -940,12 +940,13 @@ static MACHINE_CONFIG_DERIVED( bbcb, bbca ) MCFG_ECONET_SLOT_ADD("econet254", 254, econet_devices, NULL) /* software lists */ - MCFG_SOFTWARE_LIST_ADD("cass_ls_b", "bbcb_cass") - MCFG_SOFTWARE_LIST_ADD("flop_ls_b", "bbcb_flop") - MCFG_SOFTWARE_LIST_ADD("flop_ls_b_orig", "bbcb_orig_flop") - MCFG_SOFTWARE_LIST_ADD("flop_ls_z80", "bbc_z80_flop") - MCFG_SOFTWARE_LIST_ADD("flop_ls_32016", "bbc_32016_flop") - MCFG_SOFTWARE_LIST_ADD("flop_ls_68000", "bbc_68000_flop") + MCFG_SOFTWARE_LIST_ADD("cass_ls_b", "bbcb_cass") + MCFG_SOFTWARE_LIST_ADD("flop_ls_b", "bbcb_flop") + MCFG_SOFTWARE_LIST_ADD("flop_ls_b_orig", "bbcb_flop_orig") + MCFG_SOFTWARE_LIST_ADD("flop_ls_z80", "bbc_flop_z80") + MCFG_SOFTWARE_LIST_ADD("flop_ls_32016", "bbc_flop_32016") + MCFG_SOFTWARE_LIST_ADD("flop_ls_68000", "bbc_flop_68000") + MCFG_SOFTWARE_LIST_ADD("flop_ls_6502", "bbc_flop_6502") MACHINE_CONFIG_END @@ -970,7 +971,7 @@ MACHINE_CONFIG_END static MACHINE_CONFIG_DERIVED( bbcb_de, bbcb ) /* software lists */ - MCFG_SOFTWARE_LIST_ADD("flop_ls_b_de", "bbcb_de_cass") + MCFG_SOFTWARE_LIST_ADD("flop_ls_b_de", "bbcb_cass_de") MACHINE_CONFIG_END @@ -982,7 +983,7 @@ static MACHINE_CONFIG_DERIVED( bbcb_us, bbcb ) MCFG_SCREEN_REFRESH_RATE(60) /* software lists */ - MCFG_SOFTWARE_LIST_ADD("flop_ls_b_us", "bbcb_us_flop") + MCFG_SOFTWARE_LIST_ADD("flop_ls_b_us", "bbcb_flop_us") MACHINE_CONFIG_END @@ -1033,10 +1034,11 @@ static MACHINE_CONFIG_DERIVED( torchf, bbcb ) /* Add Torch Z80 Communicator co-processor */ /* software lists */ - MCFG_SOFTWARE_LIST_ADD("flop_ls_torch", "bbc_torch_flop") + MCFG_SOFTWARE_LIST_ADD("flop_ls_torch", "bbc_flop_torch") MCFG_SOFTWARE_LIST_REMOVE("flop_ls_z80") MCFG_SOFTWARE_LIST_REMOVE("flop_ls_32016") MCFG_SOFTWARE_LIST_REMOVE("flop_ls_68000") + MCFG_SOFTWARE_LIST_REMOVE("flop_ls_6502") MACHINE_CONFIG_END @@ -1082,6 +1084,7 @@ static MACHINE_CONFIG_DERIVED( abc110, bbcbp ) MCFG_SOFTWARE_LIST_REMOVE("flop_ls_b_orig") MCFG_SOFTWARE_LIST_REMOVE("flop_ls_32016") MCFG_SOFTWARE_LIST_REMOVE("flop_ls_68000") + MCFG_SOFTWARE_LIST_REMOVE("flop_ls_6502") MACHINE_CONFIG_END @@ -1104,6 +1107,7 @@ static MACHINE_CONFIG_DERIVED( acw443, bbcbp ) MCFG_SOFTWARE_LIST_REMOVE("flop_ls_b_orig") MCFG_SOFTWARE_LIST_REMOVE("flop_ls_z80") MCFG_SOFTWARE_LIST_REMOVE("flop_ls_68000") + MCFG_SOFTWARE_LIST_REMOVE("flop_ls_6502") MACHINE_CONFIG_END @@ -1124,6 +1128,7 @@ static MACHINE_CONFIG_DERIVED( abc310, bbcbp ) MCFG_SOFTWARE_LIST_REMOVE("flop_ls_z80") MCFG_SOFTWARE_LIST_REMOVE("flop_ls_32016") MCFG_SOFTWARE_LIST_REMOVE("flop_ls_68000") + MCFG_SOFTWARE_LIST_REMOVE("flop_ls_6502") MACHINE_CONFIG_END @@ -1159,6 +1164,7 @@ static MACHINE_CONFIG_DERIVED( reutapm, bbcbp ) MCFG_SOFTWARE_LIST_REMOVE("flop_ls_z80") MCFG_SOFTWARE_LIST_REMOVE("flop_ls_32016") MCFG_SOFTWARE_LIST_REMOVE("flop_ls_68000") + MCFG_SOFTWARE_LIST_REMOVE("flop_ls_6502") MACHINE_CONFIG_END @@ -1240,13 +1246,13 @@ static MACHINE_CONFIG_START( bbcm, bbc_state ) MCFG_SOFTWARE_LIST_ADD("cass_ls_m", "bbcm_cass") MCFG_SOFTWARE_LIST_ADD("flop_ls_m", "bbcm_flop") MCFG_SOFTWARE_LIST_ADD("cart_ls_m", "bbcm_cart") - MCFG_SOFTWARE_LIST_ADD("flop_ls_z80", "bbc_z80_flop") - MCFG_SOFTWARE_LIST_ADD("flop_ls_32016", "bbc_32016_flop") - MCFG_SOFTWARE_LIST_ADD("flop_ls_68000", "bbc_68000_flop") - MCFG_SOFTWARE_LIST_COMPATIBLE_ADD("cass_ls_a", "bbca_cass") - MCFG_SOFTWARE_LIST_COMPATIBLE_ADD("cass_ls_b", "bbcb_cass") - MCFG_SOFTWARE_LIST_COMPATIBLE_ADD("flop_ls_b", "bbcb_flop") - MCFG_SOFTWARE_LIST_COMPATIBLE_ADD("flop_ls_b_orig", "bbcb_orig_flop") + MCFG_SOFTWARE_LIST_ADD("flop_ls_z80", "bbc_flop_z80") + MCFG_SOFTWARE_LIST_ADD("flop_ls_32016", "bbc_flop_32016") + MCFG_SOFTWARE_LIST_ADD("flop_ls_68000", "bbc_flop_68000") + MCFG_SOFTWARE_LIST_COMPATIBLE_ADD("cass_ls_a", "bbca_cass") + MCFG_SOFTWARE_LIST_COMPATIBLE_ADD("cass_ls_b", "bbcb_cass") + MCFG_SOFTWARE_LIST_COMPATIBLE_ADD("flop_ls_b", "bbcb_flop") + MCFG_SOFTWARE_LIST_COMPATIBLE_ADD("flop_ls_b_orig", "bbcb_flop_orig") /* acia */ MCFG_DEVICE_ADD("acia6850", ACIA6850, 0) @@ -1308,7 +1314,7 @@ static MACHINE_CONFIG_DERIVED( bbcmt, bbcm ) /* Add 65C102 co-processor */ /* software lists */ - MCFG_SOFTWARE_LIST_ADD("flop_ls_65c102", "bbc_65c102_flop") + MCFG_SOFTWARE_LIST_ADD("flop_ls_65c102", "bbc_flop_65c102") MACHINE_CONFIG_END @@ -1360,7 +1366,7 @@ static MACHINE_CONFIG_DERIVED( bbcm512, bbcm ) /* Add Intel 80186 co-processor */ /* software lists */ - MCFG_SOFTWARE_LIST_ADD("flop_ls_80186", "bbc_80186_flop") + MCFG_SOFTWARE_LIST_ADD("flop_ls_80186", "bbc_flop_80186") MACHINE_CONFIG_END @@ -1369,7 +1375,7 @@ static MACHINE_CONFIG_DERIVED( bbcmarm, bbcm ) /* Add ARM co-processor */ /* software lists */ - MCFG_SOFTWARE_LIST_ADD("flop_ls_arm", "bbc_arm_flop") + MCFG_SOFTWARE_LIST_ADD("flop_ls_arm", "bbc_flop_arm") MACHINE_CONFIG_END @@ -1652,10 +1658,12 @@ ROM_START(torchf) ROM_DEFAULT_BIOS("mcp120cbl") ROM_SYSTEM_BIOS( 0, "mcp120cbl", "MCP120CBL" ) ROMX_LOAD("mcp120cbl.rom", 0x38000, 0x4000, CRC(851d0879) SHA1(2e54ef15692ba7dd9fcfd1ef0d660464a772b156), ROM_BIOS(1)) - ROM_SYSTEM_BIOS( 1, "mcp041cbl", "MCP041CBL" ) - ROMX_LOAD("mcp041cbl.rom", 0x38000, 0x4000, CRC(b36f07f4) SHA1(bd53f09bf73357845a6f97df1ee9e5aea5cdca90), ROM_BIOS(2)) - ROM_SYSTEM_BIOS( 2, "cpn071", "CPN71+" ) - ROMX_LOAD("cpn071.rom", 0x38000, 0x2000, CRC(fcb1bdc8) SHA1(756e22f6d76eb26206765f92c78c7152944102b6), ROM_BIOS(3)) + ROM_SYSTEM_BIOS( 1, "mcp101ci", "MCP101CI" ) + ROMX_LOAD("mcp101ci.rom", 0x38000, 0x4000, NO_DUMP, ROM_BIOS(2)) + ROM_SYSTEM_BIOS( 2, "mcp041cbl", "MCP041CBL" ) + ROMX_LOAD("mcp041cbl.rom", 0x38000, 0x4000, CRC(b36f07f4) SHA1(bd53f09bf73357845a6f97df1ee9e5aea5cdca90), ROM_BIOS(3)) + ROM_SYSTEM_BIOS( 3, "cpn071", "CPN71+" ) + ROMX_LOAD("cpn071.rom", 0x38000, 0x2000, CRC(fcb1bdc8) SHA1(756e22f6d76eb26206765f92c78c7152944102b6), ROM_BIOS(4)) ROM_RELOAD( 0x3a000, 0x2000 ) ROM_REGION(0x4000, "os", 0) @@ -2095,8 +2103,8 @@ COMP ( 1983, bbcb_us, bbcb, 0, bbcb_us, bbcb, bbc_state, bbc, " COMP ( 1984, bbcb1770, bbcb, 0, bbcb1770, bbcb, bbc_state, bbc, "Acorn", "BBC Micro Model B w/1770 FDC", MACHINE_IMPERFECT_GRAPHICS) COMP ( 1985, bbcbp, 0, bbcb, bbcbp, bbcbp, bbc_state, bbc, "Acorn", "BBC Micro Model B+ 64K", MACHINE_IMPERFECT_GRAPHICS) COMP ( 1985, bbcbp128, bbcbp, 0, bbcbp128, bbcbp, bbc_state, bbc, "Acorn", "BBC Micro Model B+ 128K", MACHINE_IMPERFECT_GRAPHICS) -COMP ( 1985, acw443, bbcbp, 0, acw443, abc, bbc_state, bbc, "Acorn", "ABC 210/Cambridge Workstation", MACHINE_NOT_WORKING) COMP ( 1985, abc110, bbcbp, 0, abc110, abc, bbc_state, bbc, "Acorn", "ABC 110", MACHINE_NOT_WORKING) +COMP ( 1985, acw443, bbcbp, 0, acw443, abc, bbc_state, bbc, "Acorn", "ABC 210/Cambridge Workstation", MACHINE_NOT_WORKING) COMP ( 1985, abc310, bbcbp, 0, abc310, abc, bbc_state, bbc, "Acorn", "ABC 310", MACHINE_NOT_WORKING) COMP ( 1985, reutapm, bbcbp, 0, reutapm, bbcb, bbc_state, bbc, "Acorn", "Reuters APM", MACHINE_NO_SOUND_HW | MACHINE_NOT_WORKING) COMP ( 1986, bbcm, 0, bbcb, bbcm, bbcm, bbc_state, bbc, "Acorn", "BBC Master 128", MACHINE_IMPERFECT_GRAPHICS)