Merge pull request #477 from Pernod70/master

bbc: attached 68000 softlist (nw)
This commit is contained in:
R. Belmont 2015-11-26 22:00:40 -05:00
commit 0a1b3c9cb2

View File

@ -885,6 +885,7 @@ static MACHINE_CONFIG_DERIVED( bbcb, bbca )
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")
MACHINE_CONFIG_END
@ -980,6 +981,7 @@ static MACHINE_CONFIG_DERIVED( abc110, bbcbp )
MCFG_SOFTWARE_LIST_REMOVE("flop_ls_b")
MCFG_SOFTWARE_LIST_REMOVE("flop_ls_b_orig")
MCFG_SOFTWARE_LIST_REMOVE("flop_ls_32016")
MCFG_SOFTWARE_LIST_REMOVE("flop_ls_68000")
MACHINE_CONFIG_END
@ -1001,6 +1003,7 @@ static MACHINE_CONFIG_DERIVED( acw443, bbcbp )
MCFG_SOFTWARE_LIST_REMOVE("flop_ls_b")
MCFG_SOFTWARE_LIST_REMOVE("flop_ls_b_orig")
MCFG_SOFTWARE_LIST_REMOVE("flop_ls_z80")
MCFG_SOFTWARE_LIST_REMOVE("flop_ls_68000")
MACHINE_CONFIG_END
@ -1020,6 +1023,7 @@ static MACHINE_CONFIG_DERIVED( abc310, bbcbp )
MCFG_SOFTWARE_LIST_REMOVE("flop_ls_b")
MCFG_SOFTWARE_LIST_REMOVE("flop_ls_z80")
MCFG_SOFTWARE_LIST_REMOVE("flop_ls_32016")
MCFG_SOFTWARE_LIST_REMOVE("flop_ls_68000")
MACHINE_CONFIG_END
@ -1054,6 +1058,7 @@ static MACHINE_CONFIG_DERIVED( reutapm, bbcbp )
MCFG_SOFTWARE_LIST_REMOVE("flop_ls_b_orig")
MCFG_SOFTWARE_LIST_REMOVE("flop_ls_z80")
MCFG_SOFTWARE_LIST_REMOVE("flop_ls_32016")
MCFG_SOFTWARE_LIST_REMOVE("flop_ls_68000")
MACHINE_CONFIG_END
@ -1137,6 +1142,7 @@ static MACHINE_CONFIG_START( bbcm, bbc_state )
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")
@ -1233,6 +1239,7 @@ static MACHINE_CONFIG_DERIVED( bbcmet, bbcm )
MCFG_SOFTWARE_LIST_REMOVE("flop_ls_b_orig")
MCFG_SOFTWARE_LIST_REMOVE("flop_ls_z80")
MCFG_SOFTWARE_LIST_REMOVE("flop_ls_32016")
MCFG_SOFTWARE_LIST_REMOVE("flop_ls_68000")
/* acia */
MCFG_DEVICE_REMOVE("acia6850")
@ -1304,6 +1311,7 @@ static MACHINE_CONFIG_DERIVED( bbcmc, bbcm )
MCFG_SOFTWARE_LIST_REMOVE("flop_ls_b_orig")
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("cart_ls_m")
MCFG_SOFTWARE_LIST_ADD("flop_ls_mc", "bbcmc_flop")
MCFG_SOFTWARE_LIST_COMPATIBLE_ADD("flop_ls_pro128s", "pro128s_flop")