diff --git a/src/mess/drivers/at.c b/src/mess/drivers/at.c index 0e259c1b56e..6f92c1d9eda 100644 --- a/src/mess/drivers/at.c +++ b/src/mess/drivers/at.c @@ -428,6 +428,14 @@ static MACHINE_CONFIG_FRAGMENT( at_motherboard ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) MACHINE_CONFIG_END +static MACHINE_CONFIG_FRAGMENT( at_softlists ) + /* software lists */ + MCFG_SOFTWARE_LIST_ADD("pc_disk_list","ibm5150") + MCFG_SOFTWARE_LIST_ADD("xt_disk_list","ibm5160_flop") + MCFG_SOFTWARE_LIST_ADD("at_disk_list","ibm5170") + MCFG_SOFTWARE_LIST_ADD("at_cdrom_list","ibm5170_cdrom") +MACHINE_CONFIG_END + static MACHINE_CONFIG_START( ibm5170, at_state ) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", I80286, XTAL_12MHz/2 /*6000000*/) @@ -447,15 +455,12 @@ static MACHINE_CONFIG_START( ibm5170, at_state ) MCFG_ISA16_SLOT_ADD("isabus","isa4", pc_isa16_cards, "ide", false) MCFG_PC_KBDC_SLOT_ADD("pc_kbdc", "kbd", pc_at_keyboards, STR_KBD_IBM_PC_AT_84) - /* software lists */ - MCFG_SOFTWARE_LIST_ADD("pc_disk_list","ibm5150") - MCFG_SOFTWARE_LIST_ADD("xt_disk_list","ibm5160_flop") - MCFG_SOFTWARE_LIST_ADD("at_disk_list","ibm5170") - /* internal ram */ MCFG_RAM_ADD(RAM_TAG) MCFG_RAM_DEFAULT_SIZE("1664K") MCFG_RAM_EXTRA_OPTIONS("2M,4M,8M,15M") + + MCFG_FRAGMENT_ADD( at_softlists ) MACHINE_CONFIG_END @@ -491,6 +496,8 @@ static MACHINE_CONFIG_START( ibmps1, at_state ) MCFG_RAM_ADD(RAM_TAG) MCFG_RAM_DEFAULT_SIZE("1664K") MCFG_RAM_EXTRA_OPTIONS("2M,4M,8M,15M") + + MCFG_FRAGMENT_ADD( at_softlists ) MACHINE_CONFIG_END static MACHINE_CONFIG_START( ibm5162, at_state ) @@ -516,6 +523,8 @@ static MACHINE_CONFIG_START( ibm5162, at_state ) MCFG_RAM_ADD(RAM_TAG) MCFG_RAM_DEFAULT_SIZE("1664K") MCFG_RAM_EXTRA_OPTIONS("2M,4M,8M,15M") + + MCFG_FRAGMENT_ADD( at_softlists ) MACHINE_CONFIG_END @@ -542,6 +551,8 @@ static MACHINE_CONFIG_START( ps2m30286, at_state ) MCFG_RAM_ADD(RAM_TAG) MCFG_RAM_DEFAULT_SIZE("1664K") MCFG_RAM_EXTRA_OPTIONS("2M,4M,8M,15M") + + MCFG_FRAGMENT_ADD( at_softlists ) MACHINE_CONFIG_END @@ -568,6 +579,8 @@ static MACHINE_CONFIG_START( neat, at_state ) MCFG_RAM_ADD(RAM_TAG) MCFG_RAM_DEFAULT_SIZE("1664K") MCFG_RAM_EXTRA_OPTIONS("2M,4M,8M,15M") + + MCFG_FRAGMENT_ADD( at_softlists ) MACHINE_CONFIG_END static MACHINE_CONFIG_START( atvga, at_state ) @@ -592,6 +605,8 @@ static MACHINE_CONFIG_START( atvga, at_state ) MCFG_RAM_ADD(RAM_TAG) MCFG_RAM_DEFAULT_SIZE("1664K") MCFG_RAM_EXTRA_OPTIONS("2M,4M,8M,15M") + + MCFG_FRAGMENT_ADD( at_softlists ) MACHINE_CONFIG_END static MACHINE_CONFIG_START( xb42639, at_state ) @@ -615,6 +630,8 @@ static MACHINE_CONFIG_START( xb42639, at_state ) MCFG_RAM_ADD(RAM_TAG) MCFG_RAM_DEFAULT_SIZE("1664K") MCFG_RAM_EXTRA_OPTIONS("2M,4M,8M,15M") + + MCFG_FRAGMENT_ADD( at_softlists ) MACHINE_CONFIG_END @@ -645,11 +662,7 @@ static MACHINE_CONFIG_START( at386, at_state ) MCFG_RAM_DEFAULT_SIZE("1664K") MCFG_RAM_EXTRA_OPTIONS("2M,4M,8M,15M,16M,32M,64M,128M,256M") - /* software lists */ - MCFG_SOFTWARE_LIST_ADD("pc_disk_list","ibm5150") - MCFG_SOFTWARE_LIST_ADD("xt_disk_list","ibm5160_flop") - MCFG_SOFTWARE_LIST_ADD("at_disk_list","ibm5170") - MCFG_SOFTWARE_LIST_ADD("at_cdrom_list","ibm5170_cdrom") + MCFG_FRAGMENT_ADD( at_softlists ) MACHINE_CONFIG_END @@ -688,6 +701,8 @@ static MACHINE_CONFIG_START( k286i, at_state ) MCFG_RAM_ADD(RAM_TAG) MCFG_RAM_DEFAULT_SIZE("1M") MCFG_RAM_EXTRA_OPTIONS("2M,4M,8M,16M") + + MCFG_FRAGMENT_ADD( at_softlists ) MACHINE_CONFIG_END @@ -725,6 +740,8 @@ static MACHINE_CONFIG_START( at586, at586_state ) MCFG_ISA16_SLOT_ADD(":pcibus:1:i82371ab:isabus","isa4", pc_isa16_cards, NULL, false) MCFG_ISA16_SLOT_ADD(":pcibus:1:i82371ab:isabus","isa5", pc_isa16_cards, NULL, false) MCFG_PC_KBDC_SLOT_ADD("pc_kbdc", "kbd", pc_at_keyboards, STR_KBD_MICROSOFT_NATURAL) + + MCFG_FRAGMENT_ADD( at_softlists ) MACHINE_CONFIG_END static MACHINE_CONFIG_START( at586x3, at586_state ) @@ -749,6 +766,8 @@ static MACHINE_CONFIG_START( at586x3, at586_state ) MCFG_ISA16_SLOT_ADD(":pcibus:1:i82371sb:isabus","isa4", pc_isa16_cards, NULL, false) MCFG_ISA16_SLOT_ADD(":pcibus:1:i82371sb:isabus","isa5", pc_isa16_cards, NULL, false) MCFG_PC_KBDC_SLOT_ADD("pc_kbdc", "kbd", pc_at_keyboards, STR_KBD_MICROSOFT_NATURAL) + + MCFG_FRAGMENT_ADD( at_softlists ) MACHINE_CONFIG_END static MACHINE_CONFIG_DERIVED( at386sx, atvga ) @@ -839,10 +858,7 @@ static MACHINE_CONFIG_START( megapc, megapc_state ) MCFG_PALETTE_ADD("palette", 256) // todo: really needed? /* software lists */ - MCFG_SOFTWARE_LIST_ADD("pc_disk_list","ibm5150") - MCFG_SOFTWARE_LIST_ADD("xt_disk_list","ibm5160_flop") - MCFG_SOFTWARE_LIST_ADD("at_disk_list","ibm5170") - MCFG_SOFTWARE_LIST_ADD("at_cdrom_list","ibm5170_cdrom") + MCFG_FRAGMENT_ADD( at_softlists ) MCFG_SOFTWARE_LIST_ADD("disk_list","megapc") MACHINE_CONFIG_END @@ -881,10 +897,7 @@ static MACHINE_CONFIG_START( megapcpla, at_state ) MCFG_RAM_EXTRA_OPTIONS("2M,8M,15M,16M,32M,64M,128M,256M") /* software lists */ - MCFG_SOFTWARE_LIST_ADD("pc_disk_list","ibm5150") - MCFG_SOFTWARE_LIST_ADD("xt_disk_list","ibm5160_flop") - MCFG_SOFTWARE_LIST_ADD("at_disk_list","ibm5170") - MCFG_SOFTWARE_LIST_ADD("at_cdrom_list","ibm5170_cdrom") + MCFG_FRAGMENT_ADD( at_softlists ) MCFG_SOFTWARE_LIST_ADD("disk_list","megapc") MACHINE_CONFIG_END diff --git a/src/mess/drivers/ct486.c b/src/mess/drivers/ct486.c index 34be9e6fce8..8b10c34dab5 100644 --- a/src/mess/drivers/ct486.c +++ b/src/mess/drivers/ct486.c @@ -172,6 +172,12 @@ static MACHINE_CONFIG_START( ct486, ct486_state ) // video hardware MCFG_PALETTE_ADD("palette", 256) // todo: really needed? + + /* software lists */ + MCFG_SOFTWARE_LIST_ADD("pc_disk_list","ibm5150") + MCFG_SOFTWARE_LIST_ADD("xt_disk_list","ibm5160_flop") + MCFG_SOFTWARE_LIST_ADD("at_disk_list","ibm5170") + MCFG_SOFTWARE_LIST_ADD("at_cdrom_list","ibm5170_cdrom") MACHINE_CONFIG_END diff --git a/src/mess/drivers/genpc.c b/src/mess/drivers/genpc.c index 9e977e32e58..0f68f703fca 100644 --- a/src/mess/drivers/genpc.c +++ b/src/mess/drivers/genpc.c @@ -90,6 +90,9 @@ static MACHINE_CONFIG_START( pcmda, genpc_state ) /* internal ram */ MCFG_RAM_ADD(RAM_TAG) MCFG_RAM_DEFAULT_SIZE("640K") + + /* software lists */ + MCFG_SOFTWARE_LIST_ADD("disk_list","ibm5150") MACHINE_CONFIG_END @@ -115,6 +118,9 @@ static MACHINE_CONFIG_START( pcherc, genpc_state ) /* internal ram */ MCFG_RAM_ADD(RAM_TAG) MCFG_RAM_DEFAULT_SIZE("640K") + + /* software lists */ + MCFG_SOFTWARE_LIST_ADD("disk_list","ibm5150") MACHINE_CONFIG_END @@ -141,6 +147,9 @@ static MACHINE_CONFIG_START( pccga, genpc_state ) /* internal ram */ MCFG_RAM_ADD(RAM_TAG) MCFG_RAM_DEFAULT_SIZE("640K") + + /* software lists */ + MCFG_SOFTWARE_LIST_ADD("disk_list","ibm5150") MACHINE_CONFIG_END @@ -167,6 +176,9 @@ static MACHINE_CONFIG_START( pcega, genpc_state ) /* internal ram */ MCFG_RAM_ADD(RAM_TAG) MCFG_RAM_DEFAULT_SIZE("640K") + + /* software lists */ + MCFG_SOFTWARE_LIST_ADD("disk_list","ibm5150") MACHINE_CONFIG_END @@ -193,6 +205,9 @@ static MACHINE_CONFIG_START( xtvga, genpc_state ) /* internal ram */ MCFG_RAM_ADD(RAM_TAG) MCFG_RAM_DEFAULT_SIZE("640K") + + /* software lists */ + MCFG_SOFTWARE_LIST_ADD("disk_list","ibm5150") MACHINE_CONFIG_END diff --git a/src/mess/drivers/pc.c b/src/mess/drivers/pc.c index cf5d969604c..b446d083da0 100644 --- a/src/mess/drivers/pc.c +++ b/src/mess/drivers/pc.c @@ -194,6 +194,9 @@ static MACHINE_CONFIG_START( pccga, pc_state ) /* internal ram */ MCFG_RAM_ADD(RAM_TAG) MCFG_RAM_DEFAULT_SIZE("640K") + + /* software lists */ + MCFG_SOFTWARE_LIST_ADD("disk_list","ibm5150") MACHINE_CONFIG_END static DEVICE_INPUT_DEFAULTS_START( iskr3104 ) @@ -258,6 +261,9 @@ static MACHINE_CONFIG_START( zenith, pc_state ) /* internal ram */ MCFG_RAM_ADD(RAM_TAG) MCFG_RAM_DEFAULT_SIZE("640K") + + /* software lists */ + MCFG_SOFTWARE_LIST_ADD("disk_list","ibm5150") MACHINE_CONFIG_END static MACHINE_CONFIG_START( olivetti, pc_state ) @@ -277,6 +283,9 @@ static MACHINE_CONFIG_START( olivetti, pc_state ) /* internal ram */ MCFG_RAM_ADD(RAM_TAG) MCFG_RAM_DEFAULT_SIZE("640K") + + /* software lists */ + MCFG_SOFTWARE_LIST_ADD("disk_list","ibm5150") MACHINE_CONFIG_END static MACHINE_CONFIG_START( ibm5550, pc_state ) diff --git a/src/mess/drivers/tandy1t.c b/src/mess/drivers/tandy1t.c index 367fa00a7ea..62a13168a59 100644 --- a/src/mess/drivers/tandy1t.c +++ b/src/mess/drivers/tandy1t.c @@ -598,6 +598,9 @@ static MACHINE_CONFIG_DERIVED( t1000sx, t1000hx ) MCFG_ISA8_SLOT_ADD("mb:isa", "isa2", pc_isa8_cards, NULL, false) MCFG_ISA8_SLOT_ADD("mb:isa", "isa3", pc_isa8_cards, NULL, false) MCFG_ISA8_SLOT_ADD("mb:isa", "isa4", pc_isa8_cards, NULL, false) + + /* software lists */ + MCFG_SOFTWARE_LIST_ADD("disk_list","ibm5150") MACHINE_CONFIG_END static MACHINE_CONFIG_START( t1000_16, tandy1000_state )