summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame
diff options
context:
space:
mode:
authorGravatarGravatar Vas Crabb <vas@vastheman.com>2019-12-08 04:00:49 +1100
committerGravatarGravatar Vas Crabb <vas@vastheman.com>2019-12-08 04:00:49 +1100
commitd8ef34be9a20cd28a11aef627c533554f49346b8 (patch)
treea528ea40e19161c36875af7baef7090ca86eb5dd /src/mame
parentd4b3128e0d410c02dd2f82b52b3d626e86ef816e (diff)
softlist_dev.cpp: get some stuff out of the global namespace (nw)
Diffstat (limited to 'src/mame')
-rw-r--r--src/mame/drivers/interpro.cpp2
-rw-r--r--src/mame/drivers/lisa.cpp2
-rw-r--r--src/mame/drivers/mac.cpp16
-rw-r--r--src/mame/drivers/mac128.cpp4
-rw-r--r--src/mame/drivers/macpci.cpp2
-rw-r--r--src/mame/drivers/neogeo.cpp14
-rw-r--r--src/mame/drivers/neogeocd.cpp2
-rw-r--r--src/mame/drivers/partner.cpp4
-rw-r--r--src/mame/drivers/rmnimbus.cpp2
-rw-r--r--src/mame/drivers/ti99_4x.cpp2
-rw-r--r--src/mame/drivers/ti99_8.cpp2
-rw-r--r--src/mame/drivers/tutor.cpp2
-rw-r--r--src/mame/drivers/vectrex.cpp2
-rw-r--r--src/mame/drivers/vic20.cpp6
-rw-r--r--src/mame/drivers/victor9k.cpp2
-rw-r--r--src/mame/drivers/wicat.cpp2
16 files changed, 33 insertions, 33 deletions
diff --git a/src/mame/drivers/interpro.cpp b/src/mame/drivers/interpro.cpp
index 0901c0acc8f..b0448f44562 100644
--- a/src/mame/drivers/interpro.cpp
+++ b/src/mame/drivers/interpro.cpp
@@ -842,7 +842,7 @@ void interpro_state::interpro(machine_config &config)
config.set_default_layout(layout_interpro);
// software lists
- SOFTWARE_LIST(config, m_softlist).set_type("interpro", SOFTWARE_LIST_ORIGINAL_SYSTEM);
+ SOFTWARE_LIST(config, m_softlist).set_original("interpro");
}
void emerald_state::emerald(machine_config &config)
diff --git a/src/mame/drivers/lisa.cpp b/src/mame/drivers/lisa.cpp
index ab12a6d5a98..f2158394ae1 100644
--- a/src/mame/drivers/lisa.cpp
+++ b/src/mame/drivers/lisa.cpp
@@ -151,7 +151,7 @@ void lisa_state::lisa(machine_config &config)
sonydriv_floppy_image_device::legacy_2_drives_add(config, &lisa_floppy_interface);
/* software lists */
- SOFTWARE_LIST(config, "disk_list").set_type("lisa", SOFTWARE_LIST_ORIGINAL_SYSTEM);
+ SOFTWARE_LIST(config, "disk_list").set_original("lisa");
/* via */
VIA6522(config, m_via0, 20.37504_MHz_XTAL / 40); // CPU E clock (nominally 500 kHz)
diff --git a/src/mame/drivers/mac.cpp b/src/mame/drivers/mac.cpp
index 4576c4b34aa..a5d6a74d0a7 100644
--- a/src/mame/drivers/mac.cpp
+++ b/src/mame/drivers/mac.cpp
@@ -950,7 +950,7 @@ void mac_state::add_scsi(machine_config &config, bool cdrom)
m_ncr5380->set_scsi_port("scsi");
m_ncr5380->irq_callback().set(FUNC(mac_state::mac_scsi_irq));
- SOFTWARE_LIST(config, "hdd_list").set_type("mac_hdd", SOFTWARE_LIST_ORIGINAL_SYSTEM);
+ SOFTWARE_LIST(config, "hdd_list").set_original("mac_hdd");
}
void mac_state::add_via1_adb(machine_config &config, bool macii)
@@ -1089,7 +1089,7 @@ void mac_state::add_macplus_additions(machine_config &config)
m_ram->set_extra_options("1M,2M,2560K,4M");
// software list
- SOFTWARE_LIST(config, "flop35_list").set_type("mac_flop", SOFTWARE_LIST_ORIGINAL_SYSTEM);
+ SOFTWARE_LIST(config, "flop35_list").set_original("mac_flop");
}
void mac_state::add_nubus(machine_config &config, bool bank1, bool bank2)
@@ -1225,7 +1225,7 @@ void mac_state::macii(machine_config &config, bool cpu, asc_device::asc_type asc
m_ram->set_default_size("2M");
m_ram->set_extra_options("8M,32M,64M,96M,128M");
- SOFTWARE_LIST(config, "flop35_list").set_type("mac_flop", SOFTWARE_LIST_ORIGINAL_SYSTEM);
+ SOFTWARE_LIST(config, "flop35_list").set_original("mac_flop");
}
void mac_state::maciihmu(machine_config &config)
@@ -1260,7 +1260,7 @@ void mac_state::maciifx(machine_config &config)
m_ram->set_default_size("4M");
m_ram->set_extra_options("8M,16M,32M,64M,96M,128M");
- SOFTWARE_LIST(config, "flop35_list").set_type("mac_flop", SOFTWARE_LIST_ORIGINAL_SYSTEM);
+ SOFTWARE_LIST(config, "flop35_list").set_original("mac_flop");
add_nubus(config);
}
@@ -1421,7 +1421,7 @@ void mac_state::macse30(machine_config &config)
m_ram->set_default_size("2M");
m_ram->set_extra_options("8M,16M,32M,48M,64M,96M,128M");
- SOFTWARE_LIST(config, "flop35_list").set_type("mac_flop", SOFTWARE_LIST_ORIGINAL_SYSTEM);
+ SOFTWARE_LIST(config, "flop35_list").set_original("mac_flop");
}
void mac_state::macpb140(machine_config &config)
@@ -1446,7 +1446,7 @@ void mac_state::macpb140(machine_config &config)
m_ram->set_default_size("2M");
m_ram->set_extra_options("4M,6M,8M");
- SOFTWARE_LIST(config, "flop35_list").set_type("mac_flop", SOFTWARE_LIST_ORIGINAL_SYSTEM);
+ SOFTWARE_LIST(config, "flop35_list").set_original("mac_flop");
}
// PowerBook 145 = 140 @ 25 MHz (still 2MB RAM - the 145B upped that to 4MB)
@@ -1491,7 +1491,7 @@ void mac_state::macpb160(machine_config &config)
m_ram->set_default_size("4M");
m_ram->set_extra_options("8M,12M,16M");
- SOFTWARE_LIST(config, "flop35_list").set_type("mac_flop", SOFTWARE_LIST_ORIGINAL_SYSTEM);
+ SOFTWARE_LIST(config, "flop35_list").set_original("mac_flop");
}
void mac_state::macpb180(machine_config &config)
@@ -1678,7 +1678,7 @@ void mac_state::macqd700(machine_config &config)
m_ram->set_default_size("4M");
m_ram->set_extra_options("8M,16M,32M,64M,68M,72M,80M,96M,128M");
- SOFTWARE_LIST(config, "flop35_list").set_type("mac_flop", SOFTWARE_LIST_ORIGINAL_SYSTEM);
+ SOFTWARE_LIST(config, "flop35_list").set_original("mac_flop");
}
static INPUT_PORTS_START( macadb )
diff --git a/src/mame/drivers/mac128.cpp b/src/mame/drivers/mac128.cpp
index e1558b518d3..d5c5b8dc957 100644
--- a/src/mame/drivers/mac128.cpp
+++ b/src/mame/drivers/mac128.cpp
@@ -1401,8 +1401,8 @@ void mac128_state::mac512ke(machine_config &config)
MACPDS_SLOT(config, "pds", "macpds", mac_pds_cards, nullptr);
// software list
- SOFTWARE_LIST(config, "flop35_list").set_type("mac_flop", SOFTWARE_LIST_ORIGINAL_SYSTEM);
- SOFTWARE_LIST(config, "hdd_list").set_type("mac_hdd", SOFTWARE_LIST_ORIGINAL_SYSTEM);
+ SOFTWARE_LIST(config, "flop35_list").set_original("mac_flop");
+ SOFTWARE_LIST(config, "hdd_list").set_original("mac_hdd");
}
void mac128_state::mac128k(machine_config &config)
diff --git a/src/mame/drivers/macpci.cpp b/src/mame/drivers/macpci.cpp
index bf347dcfa06..834d710d338 100644
--- a/src/mame/drivers/macpci.cpp
+++ b/src/mame/drivers/macpci.cpp
@@ -118,7 +118,7 @@ void macpci_state::pippin(machine_config &config)
cdrom_image_device &cdrom(CDROM(config, "cdrom", 0));
cdrom.set_interface("pippin_cdrom");
- SOFTWARE_LIST(config, "cd_list").set_type("pippin", SOFTWARE_LIST_ORIGINAL_SYSTEM);
+ SOFTWARE_LIST(config, "cd_list").set_original("pippin");
RAM(config, m_ram);
m_ram->set_default_size("32M");
diff --git a/src/mame/drivers/neogeo.cpp b/src/mame/drivers/neogeo.cpp
index 554e7a53412..d83cea15476 100644
--- a/src/mame/drivers/neogeo.cpp
+++ b/src/mame/drivers/neogeo.cpp
@@ -2009,7 +2009,7 @@ void mvs_led_state::mv1(machine_config &config)
cartslot_config(config, 1);
- SOFTWARE_LIST(config, "cart_list").set_type("neogeo", SOFTWARE_LIST_ORIGINAL_SYSTEM);
+ SOFTWARE_LIST(config, "cart_list").set_original("neogeo");
}
void mvs_led_state::mv1f(machine_config &config)
@@ -2024,7 +2024,7 @@ void mvs_led_state::mv1f(machine_config &config)
cartslot_config(config, 1);
- SOFTWARE_LIST(config, "cart_list").set_type("neogeo", SOFTWARE_LIST_ORIGINAL_SYSTEM);
+ SOFTWARE_LIST(config, "cart_list").set_original("neogeo");
}
void mvs_state::mv1fz(machine_config &config)
@@ -2036,7 +2036,7 @@ void mvs_state::mv1fz(machine_config &config)
cartslot_config(config, 1);
- SOFTWARE_LIST(config, "cart_list").set_type("neogeo", SOFTWARE_LIST_ORIGINAL_SYSTEM);
+ SOFTWARE_LIST(config, "cart_list").set_original("neogeo");
}
void mvs_led_el_state::mv2f(machine_config &config)
@@ -2053,7 +2053,7 @@ void mvs_led_el_state::mv2f(machine_config &config)
cartslot_config(config, 2);
- SOFTWARE_LIST(config, "cart_list").set_type("neogeo", SOFTWARE_LIST_ORIGINAL_SYSTEM);
+ SOFTWARE_LIST(config, "cart_list").set_original("neogeo");
}
void mvs_led_el_state::mv4f(machine_config &config)
@@ -2070,7 +2070,7 @@ void mvs_led_el_state::mv4f(machine_config &config)
cartslot_config(config, 4);
- SOFTWARE_LIST(config, "cart_list").set_type("neogeo", SOFTWARE_LIST_ORIGINAL_SYSTEM);
+ SOFTWARE_LIST(config, "cart_list").set_original("neogeo");
}
void mvs_led_el_state::mv6f(machine_config &config)
@@ -2087,7 +2087,7 @@ void mvs_led_el_state::mv6f(machine_config &config)
cartslot_config(config, 6);
- SOFTWARE_LIST(config, "cart_list").set_type("neogeo", SOFTWARE_LIST_ORIGINAL_SYSTEM);
+ SOFTWARE_LIST(config, "cart_list").set_original("neogeo");
}
void mvs_led_state::mv1_fixed(machine_config &config)
@@ -2146,7 +2146,7 @@ void aes_state::aes(machine_config &config)
NEOGEO_CONTROL_PORT(config, m_ctrl1, neogeo_controls, "joy", false);
NEOGEO_CONTROL_PORT(config, m_ctrl2, neogeo_controls, "joy", false);
- SOFTWARE_LIST(config, "cart_list").set_type("neogeo", SOFTWARE_LIST_ORIGINAL_SYSTEM).set_filter("AES");
+ SOFTWARE_LIST(config, "cart_list").set_original("neogeo").set_filter("AES");
}
diff --git a/src/mame/drivers/neogeocd.cpp b/src/mame/drivers/neogeocd.cpp
index d04b91975da..c06fce52d75 100644
--- a/src/mame/drivers/neogeocd.cpp
+++ b/src/mame/drivers/neogeocd.cpp
@@ -1065,7 +1065,7 @@ void ngcd_state::neocd(machine_config &config)
NEOGEO_CONTROL_PORT(config, m_ctrl2, neogeo_controls, "joy", false);
CDROM(config, "cdrom").set_interface("neocd_cdrom");
- SOFTWARE_LIST(config, "cd_list").set_type("neocd", SOFTWARE_LIST_ORIGINAL_SYSTEM);
+ SOFTWARE_LIST(config, "cd_list").set_original("neocd");
m_ym->set_addrmap(0, &ngcd_state::neocd_ym_map);
}
diff --git a/src/mame/drivers/partner.cpp b/src/mame/drivers/partner.cpp
index 48daf21ca15..2d361699bb0 100644
--- a/src/mame/drivers/partner.cpp
+++ b/src/mame/drivers/partner.cpp
@@ -207,14 +207,14 @@ void partner_state::partner(machine_config &config)
cassette.add_route(ALL_OUTPUTS, "mono", 0.05);
cassette.set_interface("partner_cass");
- SOFTWARE_LIST(config, "cass_list").set_type("partner_cass", SOFTWARE_LIST_ORIGINAL_SYSTEM);
+ SOFTWARE_LIST(config, "cass_list").set_original("partner_cass");
FD1793(config, "wd1793", 16_MHz_XTAL / 16);
FLOPPY_CONNECTOR(config, "fd0", "525qd", FLOPPY_525_QD, true, floppy_formats);
FLOPPY_CONNECTOR(config, "fd1", "525qd", FLOPPY_525_QD, true, floppy_formats);
- SOFTWARE_LIST(config, "flop_list").set_type("partner_flop", SOFTWARE_LIST_ORIGINAL_SYSTEM);
+ SOFTWARE_LIST(config, "flop_list").set_original("partner_flop");
/* internal ram */
RAM(config, m_ram);
diff --git a/src/mame/drivers/rmnimbus.cpp b/src/mame/drivers/rmnimbus.cpp
index e7eea4b5780..a9ce8c7e1cc 100644
--- a/src/mame/drivers/rmnimbus.cpp
+++ b/src/mame/drivers/rmnimbus.cpp
@@ -209,7 +209,7 @@ void rmnimbus_state::nimbus(machine_config &config)
msm5205.set_prescaler_selector(msm5205_device::S48_4B); /* 8 kHz */
msm5205.add_route(ALL_OUTPUTS, MONO_TAG, 0.75);
- SOFTWARE_LIST(config, "disk_list").set_type("nimbus", SOFTWARE_LIST_ORIGINAL_SYSTEM);
+ SOFTWARE_LIST(config, "disk_list").set_original("nimbus");
}
diff --git a/src/mame/drivers/ti99_4x.cpp b/src/mame/drivers/ti99_4x.cpp
index 8091947f556..4b1c17dc4ea 100644
--- a/src/mame/drivers/ti99_4x.cpp
+++ b/src/mame/drivers/ti99_4x.cpp
@@ -973,7 +973,7 @@ void ti99_4x_state::ti99_4_common(machine_config& config)
RAM(config, TI99_EXPRAM_TAG).set_default_size("32K").set_default_value(0);
// Software list
- SOFTWARE_LIST(config, "cart_list_ti99").set_type("ti99_cart", SOFTWARE_LIST_ORIGINAL_SYSTEM);
+ SOFTWARE_LIST(config, "cart_list_ti99").set_original("ti99_cart");
// Cassette drives. Second drive is record-only.
SPEAKER(config, "cass_out").front_center();
diff --git a/src/mame/drivers/ti99_8.cpp b/src/mame/drivers/ti99_8.cpp
index 083e5c924b2..99aa0804886 100644
--- a/src/mame/drivers/ti99_8.cpp
+++ b/src/mame/drivers/ti99_8.cpp
@@ -723,7 +723,7 @@ void ti99_8_state::ti99_8(machine_config& config)
RAM(config, TI998_DRAM_TAG).set_default_size("64K").set_default_value(0);
// Software list
- SOFTWARE_LIST(config, "cart_list_ti99").set_type("ti99_cart", SOFTWARE_LIST_ORIGINAL_SYSTEM);
+ SOFTWARE_LIST(config, "cart_list_ti99").set_original("ti99_cart");
// I/O port
TI99_IOPORT(config, m_ioport, 0, ti99_ioport_options_plain, nullptr);
diff --git a/src/mame/drivers/tutor.cpp b/src/mame/drivers/tutor.cpp
index 9fed2d71e4c..8226690a247 100644
--- a/src/mame/drivers/tutor.cpp
+++ b/src/mame/drivers/tutor.cpp
@@ -775,7 +775,7 @@ void tutor_state::tutor(machine_config &config)
GENERIC_CARTSLOT(config, "cartslot", generic_linear_slot, "tutor_cart", "bin");
// software lists
- SOFTWARE_LIST(config, "cart_list").set_type("tutor", SOFTWARE_LIST_ORIGINAL_SYSTEM);
+ SOFTWARE_LIST(config, "cart_list").set_original("tutor");
}
diff --git a/src/mame/drivers/vectrex.cpp b/src/mame/drivers/vectrex.cpp
index 79bb72a91f0..3b5aaaa1e4d 100644
--- a/src/mame/drivers/vectrex.cpp
+++ b/src/mame/drivers/vectrex.cpp
@@ -142,7 +142,7 @@ void vectrex_state::vectrex(machine_config &config)
vectrex_cart(slot);
/* software lists */
- SOFTWARE_LIST(config, "cart_list").set_type("vectrex", SOFTWARE_LIST_ORIGINAL_SYSTEM);
+ SOFTWARE_LIST(config, "cart_list").set_original("vectrex");
}
ROM_START(vectrex)
diff --git a/src/mame/drivers/vic20.cpp b/src/mame/drivers/vic20.cpp
index 6c7d41113ad..72eae20ecfa 100644
--- a/src/mame/drivers/vic20.cpp
+++ b/src/mame/drivers/vic20.cpp
@@ -846,9 +846,9 @@ void vic20_state::vic20(machine_config &config, const char* softlist_filter)
QUICKLOAD(config, "quickload", "p00,prg", CBM_QUICKLOAD_DELAY).set_load_callback(FUNC(vic20_state::quickload_vc20));
- SOFTWARE_LIST(config, "cart_list").set_type("vic1001_cart", SOFTWARE_LIST_ORIGINAL_SYSTEM).set_filter(softlist_filter);
- SOFTWARE_LIST(config, "cass_list").set_type("vic1001_cass", SOFTWARE_LIST_ORIGINAL_SYSTEM).set_filter(softlist_filter);
- SOFTWARE_LIST(config, "flop_list").set_type("vic1001_flop", SOFTWARE_LIST_ORIGINAL_SYSTEM).set_filter(softlist_filter);
+ SOFTWARE_LIST(config, "cart_list").set_original("vic1001_cart").set_filter(softlist_filter);
+ SOFTWARE_LIST(config, "cass_list").set_original("vic1001_cass").set_filter(softlist_filter);
+ SOFTWARE_LIST(config, "flop_list").set_original("vic1001_flop").set_filter(softlist_filter);
RAM(config, m_ram);
m_ram->set_default_size("5K");
diff --git a/src/mame/drivers/victor9k.cpp b/src/mame/drivers/victor9k.cpp
index 7f3a543afe1..07089516f7f 100644
--- a/src/mame/drivers/victor9k.cpp
+++ b/src/mame/drivers/victor9k.cpp
@@ -793,7 +793,7 @@ void victor9k_state::victor9k(machine_config &config)
RAM(config, m_ram).set_default_size("128K");
- SOFTWARE_LIST(config, "flop_list").set_type("victor9k_flop", SOFTWARE_LIST_ORIGINAL_SYSTEM);
+ SOFTWARE_LIST(config, "flop_list").set_original("victor9k_flop");
}
diff --git a/src/mame/drivers/wicat.cpp b/src/mame/drivers/wicat.cpp
index 76697e7dd00..e624caf454d 100644
--- a/src/mame/drivers/wicat.cpp
+++ b/src/mame/drivers/wicat.cpp
@@ -850,7 +850,7 @@ void wicat_state::wicat(machine_config &config)
FLOPPY_CONNECTOR(config, "fdc:2", wicat_floppies, nullptr, floppy_image_device::default_floppy_formats).enable_sound(true);
FLOPPY_CONNECTOR(config, "fdc:3", wicat_floppies, nullptr, floppy_image_device::default_floppy_formats).enable_sound(true);
- SOFTWARE_LIST(config, "flop_list").set_type("wicat", SOFTWARE_LIST_ORIGINAL_SYSTEM);
+ SOFTWARE_LIST(config, "flop_list").set_original("wicat");
}
/* ROM definition */