summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/midway
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/midway')
-rw-r--r--src/mame/midway/astrocde.cpp12
-rw-r--r--src/mame/midway/atlantis.cpp14
-rw-r--r--src/mame/midway/balsente.cpp8
-rw-r--r--src/mame/midway/balsente.h2
-rw-r--r--src/mame/midway/csd.cpp6
-rw-r--r--src/mame/midway/csd.h2
-rw-r--r--src/mame/midway/gridlee.cpp2
-rw-r--r--src/mame/midway/gridlee.h4
-rw-r--r--src/mame/midway/gridlee_a.cpp2
-rw-r--r--src/mame/midway/mcr.cpp2
-rw-r--r--src/mame/midway/mcr68.cpp2
-rw-r--r--src/mame/midway/midqslvr.cpp8
-rw-r--r--src/mame/midway/midtunit.cpp4
-rw-r--r--src/mame/midway/midtunit_v.cpp10
-rw-r--r--src/mame/midway/midtunit_v.h16
-rw-r--r--src/mame/midway/midtview.ipp2
-rw-r--r--src/mame/midway/midvunit.cpp10
-rw-r--r--src/mame/midway/midway.cpp14
-rw-r--r--src/mame/midway/midway.h6
-rw-r--r--src/mame/midway/midwayic.cpp14
-rw-r--r--src/mame/midway/midwayic.h14
-rw-r--r--src/mame/midway/midwunit.cpp8
-rw-r--r--src/mame/midway/midxunit.cpp6
-rw-r--r--src/mame/midway/midzeus.cpp18
-rw-r--r--src/mame/midway/omegrace.cpp4
-rw-r--r--src/mame/midway/pinball2k.cpp6
-rw-r--r--src/mame/midway/seattle.cpp60
-rw-r--r--src/mame/midway/sente6vb.cpp12
-rw-r--r--src/mame/midway/sente6vb.h2
-rw-r--r--src/mame/midway/spyhuntertec.cpp4
-rw-r--r--src/mame/midway/sspeedr.cpp2
-rw-r--r--src/mame/midway/tmaster.cpp4
-rw-r--r--src/mame/midway/vegas.cpp62
-rw-r--r--src/mame/midway/williams.cpp42
-rw-r--r--src/mame/midway/wmg.cpp8
-rw-r--r--src/mame/midway/zwackery.cpp8
36 files changed, 200 insertions, 200 deletions
diff --git a/src/mame/midway/astrocde.cpp b/src/mame/midway/astrocde.cpp
index 2aa3ad1f421..98b0f0c6d36 100644
--- a/src/mame/midway/astrocde.cpp
+++ b/src/mame/midway/astrocde.cpp
@@ -1324,7 +1324,7 @@ void astrocde_state::spacezap(machine_config &config)
m_astrocade_sound1->so_cb<0>().set("watchdog", FUNC(watchdog_timer_device::reset_w));
m_astrocade_sound1->so_cb<3>().set("outlatch", FUNC(output_latch_device::write));
- output_latch_device &outlatch(OUTPUT_LATCH(config, "outlatch", 0)); // MC14174B on game board at U16
+ output_latch_device &outlatch(OUTPUT_LATCH(config, "outlatch")); // MC14174B on game board at U16
outlatch.bit_handler<0>().set(FUNC(astrocde_state::coin_counter_w<0>));
outlatch.bit_handler<1>().set(FUNC(astrocde_state::coin_counter_w<1>));
@@ -1365,7 +1365,7 @@ void astrocde_state::wow(machine_config &config)
m_astrocade_sound2->reset_routes();
m_astrocade_sound2->add_route(ALL_OUTPUTS, "lspeaker", 0.35);
- VOTRAX_SC01(config, m_votrax, 756000);
+ VOTRAX_SC01(config, m_votrax, XTAL::u(756000));
m_votrax->add_route(0, "f1", 0.65);
FILTER_RC(config, "f1").set_lowpass(110e3, 560e-12).add_route(0, "f2", 1.00);
@@ -1421,7 +1421,7 @@ void astrocde_state::gorf(machine_config &config)
ASTROCADE_IO(config, m_astrocade_sound2, ASTROCADE_CLOCK/4).add_route(ALL_OUTPUTS, "lower", 0.45);
- VOTRAX_SC01(config, m_votrax, 756000);
+ VOTRAX_SC01(config, m_votrax, XTAL::u(756000));
m_votrax->add_route(ALL_OUTPUTS, "upper", 0.55);
}
@@ -1458,13 +1458,13 @@ void astrocde_state::profpac(machine_config &config)
m_bank4000->set_map(&astrocde_state::profpac_bank4000_map);
m_bank4000->set_addr_width(20);
- output_latch_device &outlatch(OUTPUT_LATCH(config, "outlatch", 0)); // 74LS174 on game board at U6
+ output_latch_device &outlatch(OUTPUT_LATCH(config, "outlatch")); // 74LS174 on game board at U6
outlatch.bit_handler<0>().set(FUNC(astrocde_state::coin_counter_w<0>));
outlatch.bit_handler<1>().set(FUNC(astrocde_state::coin_counter_w<1>));
outlatch.bit_handler<2>().set_output("led0");
outlatch.bit_handler<3>().set_output("led1");
- output_latch_device &lamplatch(OUTPUT_LATCH(config, "lamplatch", 0)); // 74LS174 on game board at U7
+ output_latch_device &lamplatch(OUTPUT_LATCH(config, "lamplatch")); // 74LS174 on game board at U7
lamplatch.bit_handler<0>().set_output("lamp0"); // left lamp A
lamplatch.bit_handler<1>().set_output("lamp1"); // left lamp B
lamplatch.bit_handler<2>().set_output("lamp2"); // left lamp C
@@ -1485,7 +1485,7 @@ void demndrgn_state::demndrgn(machine_config &config)
m_maincpu->set_addrmap(AS_PROGRAM, &demndrgn_state::demndrgn_map);
m_maincpu->set_addrmap(AS_IO, &demndrgn_state::port_map_16col_pattern_demndrgn);
- output_latch_device &outlatch(OUTPUT_LATCH(config, "outlatch", 0));
+ output_latch_device &outlatch(OUTPUT_LATCH(config, "outlatch"));
outlatch.bit_handler<0>().set(FUNC(astrocde_state::coin_counter_w<0>));
outlatch.bit_handler<1>().set(FUNC(astrocde_state::coin_counter_w<1>));
outlatch.bit_handler<2>().set_output("led0");
diff --git a/src/mame/midway/atlantis.cpp b/src/mame/midway/atlantis.cpp
index d6540a46df7..8812927c291 100644
--- a/src/mame/midway/atlantis.cpp
+++ b/src/mame/midway/atlantis.cpp
@@ -814,17 +814,17 @@ DEVICE_INPUT_DEFAULTS_END
void atlantis_state::mwskins(machine_config &config)
{
/* basic machine hardware */
- VR4310LE(config, m_maincpu, 166666666);
+ VR4310LE(config, m_maincpu, XTAL::u(166666666));
m_maincpu->set_icache_size(16384);
m_maincpu->set_dcache_size(16384);
m_maincpu->set_system_clock(66666666);
- PCI_ROOT(config, "pci", 0);
+ PCI_ROOT(config, "pci");
vrc4373_device &vrc4373(VRC4373(config, PCI_ID_NILE, 0, m_maincpu));
vrc4373.set_ram_size(0x00800000);
- pci9050_device &pci9050(PCI9050(config, PCI_ID_9050, 0));
+ pci9050_device &pci9050(PCI9050(config, PCI_ID_9050));
pci9050.set_map(0, address_map_constructor(&atlantis_state::map0, "map0", this), this);
pci9050.set_map(1, address_map_constructor(&atlantis_state::map1, "map1", this), this);
pci9050.set_map(2, address_map_constructor(&atlantis_state::map2, "map2", this), this);
@@ -836,7 +836,7 @@ void atlantis_state::mwskins(machine_config &config)
m_rtc->reset_cb().set(FUNC(atlantis_state::watchdog_reset));
m_rtc->irq_cb().set(FUNC(atlantis_state::watchdog_irq));
- IDE_PCI(config, m_ide, 0, 0x10950646, 0x07, 0x0, PCI_ID_NILE, AS_DATA).irq_handler().set(FUNC(atlantis_state::ide_irq));
+ IDE_PCI(config, m_ide, 0x10950646, 0x07, 0x0, PCI_ID_NILE, AS_DATA).irq_handler().set(FUNC(atlantis_state::ide_irq));
/* video hardware */
ZEUS2(config, m_zeus, ZEUS2_VIDEO_CLOCK);
@@ -850,11 +850,11 @@ void atlantis_state::mwskins(machine_config &config)
m_screen->set_screen_update("zeus2", FUNC(zeus2_device::screen_update));
/* sound hardware */
- DCS2_AUDIO_DENVER_2CH(config, m_dcs, 0);
+ DCS2_AUDIO_DENVER_2CH(config, m_dcs);
m_dcs->set_dram_in_mb(4);
m_dcs->set_polling_offset(0xe33);
- MIDWAY_IOASIC(config, m_ioasic, 0);
+ MIDWAY_IOASIC(config, m_ioasic);
m_ioasic->set_shuffle(MIDWAY_IOASIC_STANDARD);
m_ioasic->set_yearoffs(80);
m_ioasic->set_upper(342); // 325
@@ -862,7 +862,7 @@ void atlantis_state::mwskins(machine_config &config)
m_ioasic->set_auto_ack(1);
if DEBUG_CONSOLE {
m_ioasic->serial_tx_handler().set(m_uart0, FUNC(generic_terminal_device::write));
- GENERIC_TERMINAL(config, m_uart0, 0);
+ GENERIC_TERMINAL(config, m_uart0);
m_uart0->set_keyboard_callback("ioasic", FUNC(midway_ioasic_device::serial_rx_w));
}
diff --git a/src/mame/midway/balsente.cpp b/src/mame/midway/balsente.cpp
index cd64200dc40..2a9e31a6018 100644
--- a/src/mame/midway/balsente.cpp
+++ b/src/mame/midway/balsente.cpp
@@ -1341,7 +1341,7 @@ void balsente_state::balsente(machine_config &config)
m_maincpu->set_addrmap(AS_PROGRAM, &balsente_state::cpu1_map);
m_maincpu->set_vblank_int("screen", FUNC(balsente_state::update_analog_inputs));
- ACIA6850(config, m_acia, 0);
+ ACIA6850(config, m_acia);
m_acia->txd_handler().set("audio6vb", FUNC(sente6vb_device::rec_w));
m_acia->irq_handler().set_inputline(m_maincpu, M6809_FIRQ_LINE);
@@ -1350,7 +1350,7 @@ void balsente_state::balsente(machine_config &config)
WATCHDOG_TIMER(config, "watchdog");
- TIMER(config, m_scanline_timer, 0).configure_generic(FUNC(balsente_state::interrupt_timer));
+ TIMER(config, m_scanline_timer).configure_generic(FUNC(balsente_state::interrupt_timer));
LS259(config, m_outlatch); // U9H
// these outputs are generally used to control the various lamps
@@ -1415,7 +1415,7 @@ void balsente_state::shrike(machine_config &config)
balsente(config);
m_maincpu->set_addrmap(AS_PROGRAM, &balsente_state::cpu1_shrike_map);
- M68000(config, m_68k, 8000000);
+ M68000(config, m_68k, XTAL::u(8000000));
m_68k->set_addrmap(AS_PROGRAM, &balsente_state::shrike68k_map);
config.set_maximum_quantum(attotime::from_hz(6000));
@@ -1474,7 +1474,7 @@ void balsente_state::triviamb(machine_config &config)
AY8910(config, "ay1", 8_MHz_XTAL / 6).add_route(ALL_OUTPUTS, "mono", 0.90);
AY8910(config, "ay2", 8_MHz_XTAL / 6).add_route(ALL_OUTPUTS, "mono", 0.90);
- MSM5205(config, "msm", 384000).add_route(ALL_OUTPUTS, "mono", 0.90);
+ MSM5205(config, "msm", XTAL::u(384000)).add_route(ALL_OUTPUTS, "mono", 0.90);
}
/*************************************
diff --git a/src/mame/midway/balsente.h b/src/mame/midway/balsente.h
index 4831bb0a196..9a11286f30b 100644
--- a/src/mame/midway/balsente.h
+++ b/src/mame/midway/balsente.h
@@ -19,7 +19,7 @@
#include "emupal.h"
#include "screen.h"
-#define BALSENTE_MASTER_CLOCK (20000000)
+#define BALSENTE_MASTER_CLOCK XTAL::u(20000000)
#define BALSENTE_CPU_CLOCK (BALSENTE_MASTER_CLOCK / 16)
#define BALSENTE_PIXEL_CLOCK (BALSENTE_MASTER_CLOCK / 4)
#define BALSENTE_HTOTAL (0x140)
diff --git a/src/mame/midway/csd.cpp b/src/mame/midway/csd.cpp
index 0a606908672..5bda8b63a10 100644
--- a/src/mame/midway/csd.cpp
+++ b/src/mame/midway/csd.cpp
@@ -40,13 +40,13 @@ void midway_cheap_squeak_deluxe_device::device_add_mconfig(machine_config &confi
M68000(config, m_cpu, DERIVED_CLOCK(1, 2));
m_cpu->set_addrmap(AS_PROGRAM, &midway_cheap_squeak_deluxe_device::csdeluxe_map);
- PIA6821(config, m_pia, 0);
+ PIA6821(config, m_pia);
m_pia->writepa_handler().set(FUNC(midway_cheap_squeak_deluxe_device::porta_w));
m_pia->writepb_handler().set(FUNC(midway_cheap_squeak_deluxe_device::portb_w));
m_pia->irqa_handler().set(FUNC(midway_cheap_squeak_deluxe_device::irq_w));
m_pia->irqb_handler().set(FUNC(midway_cheap_squeak_deluxe_device::irq_w));
- AD7533(config, m_dac, 0).add_route(ALL_OUTPUTS, *this, 1.0);
+ AD7533(config, m_dac).add_route(ALL_OUTPUTS, *this, 1.0);
}
//-------------------------------------------------
@@ -67,7 +67,7 @@ const tiny_rom_entry *midway_cheap_squeak_deluxe_device::device_rom_region() con
// midway_cheap_squeak_deluxe_device - constructor
//-------------------------------------------------
-midway_cheap_squeak_deluxe_device::midway_cheap_squeak_deluxe_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+midway_cheap_squeak_deluxe_device::midway_cheap_squeak_deluxe_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
device_t(mconfig, MIDWAY_CHEAP_SQUEAK_DELUXE, tag, owner, clock),
device_mixer_interface(mconfig, *this),
m_cpu(*this, "cpu"),
diff --git a/src/mame/midway/csd.h b/src/mame/midway/csd.h
index 4b5952b5369..22b77de2963 100644
--- a/src/mame/midway/csd.h
+++ b/src/mame/midway/csd.h
@@ -26,7 +26,7 @@ class midway_cheap_squeak_deluxe_device : public device_t, public device_mixer_i
{
public:
// construction/destruction
- midway_cheap_squeak_deluxe_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock = 16'000'000);
+ midway_cheap_squeak_deluxe_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock = 16'000'000);
// helpers
void suspend_cpu();
diff --git a/src/mame/midway/gridlee.cpp b/src/mame/midway/gridlee.cpp
index fd2a9f9ffbe..df1804fd727 100644
--- a/src/mame/midway/gridlee.cpp
+++ b/src/mame/midway/gridlee.cpp
@@ -421,7 +421,7 @@ void gridlee_state::gridlee(machine_config &config)
/* sound hardware */
SPEAKER(config, "mono").front_center();
- GRIDLEE(config, "gridlee", 0).add_route(ALL_OUTPUTS, "mono", 1.0);
+ GRIDLEE(config, "gridlee").add_route(ALL_OUTPUTS, "mono", 1.0);
SAMPLES(config, m_samples);
m_samples->set_channels(8);
diff --git a/src/mame/midway/gridlee.h b/src/mame/midway/gridlee.h
index 7467067d7b6..19f3bc52a6f 100644
--- a/src/mame/midway/gridlee.h
+++ b/src/mame/midway/gridlee.h
@@ -18,7 +18,7 @@
#include "screen.h"
-#define GRIDLEE_MASTER_CLOCK (20000000)
+#define GRIDLEE_MASTER_CLOCK XTAL::u(20000000)
#define GRIDLEE_CPU_CLOCK (GRIDLEE_MASTER_CLOCK / 16)
#define GRIDLEE_PIXEL_CLOCK (GRIDLEE_MASTER_CLOCK / 4)
#define GRIDLEE_HTOTAL (0x140)
@@ -93,7 +93,7 @@ private:
class gridlee_sound_device : public device_t, public device_sound_interface
{
public:
- gridlee_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ gridlee_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
~gridlee_sound_device() { }
protected:
diff --git a/src/mame/midway/gridlee_a.cpp b/src/mame/midway/gridlee_a.cpp
index e9f38afd7d4..efd3b6ee973 100644
--- a/src/mame/midway/gridlee_a.cpp
+++ b/src/mame/midway/gridlee_a.cpp
@@ -22,7 +22,7 @@ DEFINE_DEVICE_TYPE(GRIDLEE, gridlee_sound_device, "gridlee_sound", "Gridlee Cust
// gridlee_sound_device - constructor
//-------------------------------------------------
-gridlee_sound_device::gridlee_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+gridlee_sound_device::gridlee_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: device_t(mconfig, GRIDLEE, tag, owner, clock),
device_sound_interface(mconfig, *this),
m_tone_step(0),
diff --git a/src/mame/midway/mcr.cpp b/src/mame/midway/mcr.cpp
index 90fbd581086..b71b6f4c94d 100644
--- a/src/mame/midway/mcr.cpp
+++ b/src/mame/midway/mcr.cpp
@@ -1870,7 +1870,7 @@ void mcr_state::mcr_91490(machine_config & config)
mcr_90010(config);
/* basic machine hardware */
- m_maincpu->set_clock(5000000);
+ m_maincpu->set_clock(XTAL::u(5000000));
m_maincpu->set_addrmap(AS_PROGRAM, &mcr_state::cpu_91490_map);
m_maincpu->set_addrmap(AS_IO, &mcr_state::cpu_91490_portmap);
diff --git a/src/mame/midway/mcr68.cpp b/src/mame/midway/mcr68.cpp
index 11c615adfd4..21a1248b82d 100644
--- a/src/mame/midway/mcr68.cpp
+++ b/src/mame/midway/mcr68.cpp
@@ -914,7 +914,7 @@ GFXDECODE_END
void mcr68_state::mcr68(machine_config &config)
{
// Basic machine hardware
- M68000(config, m_maincpu, 7723800);
+ M68000(config, m_maincpu, XTAL::u(7723800));
m_maincpu->set_addrmap(AS_PROGRAM, &mcr68_state::mcr68_map);
WATCHDOG_TIMER(config, "watchdog").set_vblank_count("screen", 8);
diff --git a/src/mame/midway/midqslvr.cpp b/src/mame/midway/midqslvr.cpp
index c36ede52222..c347f7a4deb 100644
--- a/src/mame/midway/midqslvr.cpp
+++ b/src/mame/midway/midqslvr.cpp
@@ -649,14 +649,14 @@ void midqslvr_state::machine_reset()
void midqslvr_state::midqslvr(machine_config &config)
{
- PENTIUM2(config, m_maincpu, 333000000); //Verified this Celeron to be Pentium II based.
+ PENTIUM2(config, m_maincpu, XTAL::u(333000000)); //Verified this Celeron to be Pentium II based.
m_maincpu->set_addrmap(AS_PROGRAM, &midqslvr_state::midqslvr_map);
m_maincpu->set_addrmap(AS_IO, &midqslvr_state::midqslvr_io);
m_maincpu->set_irq_acknowledge_callback("pic8259_1", FUNC(pic8259_device::inta_cb));
pcat_common(config);
- pci_bus_legacy_device &pcibus(PCI_BUS_LEGACY(config, "pcibus", 0, 0));
+ pci_bus_legacy_device &pcibus(PCI_BUS_LEGACY(config, "pcibus"));
pcibus.set_device( 0, FUNC(midqslvr_state::intel82439tx_pci_r), FUNC(midqslvr_state::intel82439tx_pci_w));
pcibus.set_device(31, FUNC(midqslvr_state::intel82371ab_pci_r), FUNC(midqslvr_state::intel82371ab_pci_w));
@@ -669,14 +669,14 @@ void midqslvr_state::midqslvr(machine_config &config)
void midqslvr_state::graphite(machine_config &config) //Todo: The entire Pro133A chipset :).
{
- PENTIUM3(config, m_maincpu, 733000000); //Verified
+ PENTIUM3(config, m_maincpu, XTAL::u(733000000)); //Verified
m_maincpu->set_addrmap(AS_PROGRAM, &midqslvr_state::midqslvr_map);
m_maincpu->set_addrmap(AS_IO, &midqslvr_state::midqslvr_io);
m_maincpu->set_irq_acknowledge_callback("pic8259_1", FUNC(pic8259_device::inta_cb));
pcat_common(config);
- pci_bus_legacy_device &pcibus(PCI_BUS_LEGACY(config, "pcibus", 0, 0));
+ pci_bus_legacy_device &pcibus(PCI_BUS_LEGACY(config, "pcibus"));
pcibus.set_device( 0, FUNC(midqslvr_state::intel82439tx_pci_r), FUNC(midqslvr_state::intel82439tx_pci_w));
pcibus.set_device(31, FUNC(midqslvr_state::intel82371ab_pci_r), FUNC(midqslvr_state::intel82371ab_pci_w));
diff --git a/src/mame/midway/midtunit.cpp b/src/mame/midway/midtunit.cpp
index 0240f940271..6bce39a7c86 100644
--- a/src/mame/midway/midtunit.cpp
+++ b/src/mame/midway/midtunit.cpp
@@ -626,7 +626,7 @@ void midtunit_state::tunit_adpcm(machine_config &config)
/* basic machine hardware */
SPEAKER(config, "speaker").front_center();
- WILLIAMS_ADPCM_SOUND(config, m_adpcm_sound, 0).add_route(ALL_OUTPUTS, "speaker", 1.0);
+ WILLIAMS_ADPCM_SOUND(config, m_adpcm_sound).add_route(ALL_OUTPUTS, "speaker", 1.0);
}
@@ -635,7 +635,7 @@ void midtunit_state::tunit_dcs(machine_config &config)
tunit_core(config);
/* basic machine hardware */
- DCS_AUDIO_2K(config, m_dcs, 0);
+ DCS_AUDIO_2K(config, m_dcs);
}
diff --git a/src/mame/midway/midtunit_v.cpp b/src/mame/midway/midtunit_v.cpp
index 8347c6787dc..026cd9bd375 100644
--- a/src/mame/midway/midtunit_v.cpp
+++ b/src/mame/midway/midtunit_v.cpp
@@ -30,7 +30,7 @@ DEFINE_DEVICE_TYPE(MIDXUNIT_VIDEO, midxunit_video_device, "xunitvid", "Midway X-
/* compile-time options */
#define LOG_DMA 0 /* DMAs are logged if the 'L' key is pressed */
-midtunit_video_device::midtunit_video_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock)
+midtunit_video_device::midtunit_video_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock)
: device_t(mconfig, type, tag, owner, clock)
, m_maincpu(*this, finder_base::DUMMY_TAG)
, m_palette(*this, finder_base::DUMMY_TAG)
@@ -41,22 +41,22 @@ midtunit_video_device::midtunit_video_device(const machine_config &mconfig, devi
{
}
-midtunit_video_device::midtunit_video_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+midtunit_video_device::midtunit_video_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: midtunit_video_device(mconfig, MIDTUNIT_VIDEO, tag, owner, clock)
{
}
-midwunit_video_device::midwunit_video_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock)
+midwunit_video_device::midwunit_video_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock)
: midtunit_video_device(mconfig, type, tag, owner, clock)
{
}
-midwunit_video_device::midwunit_video_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+midwunit_video_device::midwunit_video_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: midtunit_video_device(mconfig, MIDWUNIT_VIDEO, tag, owner, clock)
{
}
-midxunit_video_device::midxunit_video_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+midxunit_video_device::midxunit_video_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: midwunit_video_device(mconfig, MIDXUNIT_VIDEO, tag, owner, clock)
{
}
diff --git a/src/mame/midway/midtunit_v.h b/src/mame/midway/midtunit_v.h
index b37cb56253e..258163bd3c0 100644
--- a/src/mame/midway/midtunit_v.h
+++ b/src/mame/midway/midtunit_v.h
@@ -24,14 +24,14 @@ public:
// construction/destruction
template <typename T, typename U, typename V>
midtunit_video_device(const machine_config &mconfig, const char *tag, device_t *owner, T &&cpu_tag, U &&palette_tag, V &&gfxrom_tag)
- : midtunit_video_device(mconfig, tag, owner, (uint32_t)0)
+ : midtunit_video_device(mconfig, tag, owner)
{
m_maincpu.set_tag(std::forward<T>(cpu_tag));
m_palette.set_tag(std::forward<U>(palette_tag));
m_gfxrom.set_tag(std::forward<V>(gfxrom_tag));
}
- midtunit_video_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock = 0);
+ midtunit_video_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock = XTAL());
TMS340X0_TO_SHIFTREG_CB_MEMBER(to_shiftreg);
TMS340X0_FROM_SHIFTREG_CB_MEMBER(from_shiftreg);
@@ -61,7 +61,7 @@ public:
protected:
// construction/destruction
- midtunit_video_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock = 0);
+ midtunit_video_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock = XTAL());
virtual void device_start() override;
@@ -184,13 +184,13 @@ public:
// construction/destruction
template <typename T, typename U, typename V>
midwunit_video_device(const machine_config &mconfig, const char *tag, device_t *owner, T &&cpu_tag, U &&palette_tag, V &&gfxrom_tag)
- : midwunit_video_device(mconfig, tag, owner, (uint32_t)0)
+ : midwunit_video_device(mconfig, tag, owner)
{
m_maincpu.set_tag(std::forward<T>(cpu_tag));
m_palette.set_tag(std::forward<U>(palette_tag));
m_gfxrom.set_tag(std::forward<V>(gfxrom_tag));
}
- midwunit_video_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock = 0);
+ midwunit_video_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock = XTAL());
uint16_t midwunit_gfxrom_r(offs_t offset);
@@ -198,7 +198,7 @@ public:
uint16_t midwunit_control_r();
protected:
- midwunit_video_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock = 0);
+ midwunit_video_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock = XTAL());
virtual void device_start() override;
#if DEBUG_MIDTUNIT_BLITTER
@@ -212,14 +212,14 @@ public:
// construction/destruction
template <typename T, typename U, typename V>
midxunit_video_device(const machine_config &mconfig, const char *tag, device_t *owner, T &&cpu_tag, U &&palette_tag, V &&gfxrom_tag)
- : midwunit_video_device(mconfig, tag, owner, (uint32_t)0)
+ : midwunit_video_device(mconfig, tag, owner)
{
m_maincpu.set_tag(std::forward<T>(cpu_tag));
m_palette.set_tag(std::forward<U>(palette_tag));
m_gfxrom.set_tag(std::forward<V>(gfxrom_tag));
}
- midxunit_video_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock = 0);
+ midxunit_video_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock = XTAL());
void midxunit_paletteram_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
uint16_t midxunit_paletteram_r(offs_t offset);
diff --git a/src/mame/midway/midtview.ipp b/src/mame/midway/midtview.ipp
index f59a101be40..b62601480c2 100644
--- a/src/mame/midway/midtview.ipp
+++ b/src/mame/midway/midtview.ipp
@@ -51,7 +51,7 @@ void midtunit_video_device::device_add_mconfig(machine_config &config)
void midwunit_video_device::device_add_mconfig(machine_config &config)
{
screen_device &debugscreen(SCREEN(config, "debugscreen", SCREEN_TYPE_RASTER));
- debugscreen.set_raw(8000000, 506, 101, 501, 289, 20, 274);
+ debugscreen.set_raw(XTAL::u(8000000), 506, 101, 501, 289, 20, 274);
debugscreen.set_screen_update(FUNC(midwunit_video_device::debug_screen_update));
PALETTE(config, m_debug_palette).set_format(palette_device::xRGB_555, 32768);
diff --git a/src/mame/midway/midvunit.cpp b/src/mame/midway/midvunit.cpp
index 55e3c803213..0453d4b96f4 100644
--- a/src/mame/midway/midvunit.cpp
+++ b/src/mame/midway/midvunit.cpp
@@ -1108,7 +1108,7 @@ void midvunit_state::midvunit(machine_config &config)
m_adc->ch3_callback().set_ioport("BRAKE");
/* sound hardware */
- DCS_AUDIO_2K(config, "dcs", 0);
+ DCS_AUDIO_2K(config, "dcs");
}
@@ -1116,7 +1116,7 @@ void midvunit_state::crusnwld(machine_config &config)
{
midvunit(config);
/* valid values are 450 or 460 */
- MIDWAY_SERIAL_PIC2(config, m_midway_serial_pic2, 0);
+ MIDWAY_SERIAL_PIC2(config, m_midway_serial_pic2);
m_midway_serial_pic2->set_upper(450);
m_midway_serial_pic2->set_yearoffs(94);
}
@@ -1125,7 +1125,7 @@ void midvunit_state::offroadc(machine_config &config)
{
midvunit(config);
/* valid values are 230 or 234 */
- MIDWAY_SERIAL_PIC2(config, m_midway_serial_pic2, 0);
+ MIDWAY_SERIAL_PIC2(config, m_midway_serial_pic2);
m_midway_serial_pic2->set_upper(230);
m_midway_serial_pic2->set_yearoffs(94);
}
@@ -1143,13 +1143,13 @@ void midvunit_state::midvplus(machine_config &config)
ATA_INTERFACE(config, m_ata).options(ata_devices, "hdd", nullptr, true);
- MIDWAY_IOASIC(config, m_midway_ioasic, 0);
+ MIDWAY_IOASIC(config, m_midway_ioasic);
m_midway_ioasic->set_shuffle(0);
m_midway_ioasic->set_upper(452); /* no alternates */
m_midway_ioasic->set_yearoffs(94);
/* sound hardware */
- DCS2_AUDIO_2115(config, m_dcs, 0);
+ DCS2_AUDIO_2115(config, m_dcs);
m_dcs->set_dram_in_mb(2);
m_dcs->set_polling_offset(0x3839);
}
diff --git a/src/mame/midway/midway.cpp b/src/mame/midway/midway.cpp
index 9100860ebeb..517a6aa3465 100644
--- a/src/mame/midway/midway.cpp
+++ b/src/mame/midway/midway.cpp
@@ -43,7 +43,7 @@ DEFINE_DEVICE_TYPE(MIDWAY_TURBO_CHEAP_SQUEAK, midway_turbo_cheap_squeak_device,
// midway_ssio_device - constructor
//-------------------------------------------------
-midway_ssio_device::midway_ssio_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+midway_ssio_device::midway_ssio_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: device_t(mconfig, MIDWAY_SSIO, tag, owner, clock)
, device_mixer_interface(mconfig, *this, 2)
, m_cpu(*this, "cpu")
@@ -479,7 +479,7 @@ TIMER_CALLBACK_MEMBER(midway_ssio_device::synced_write)
// midway_sounds_good_device - constructor
//-------------------------------------------------
-midway_sounds_good_device::midway_sounds_good_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+midway_sounds_good_device::midway_sounds_good_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: device_t(mconfig, MIDWAY_SOUNDS_GOOD, tag, owner, clock)
, device_mixer_interface(mconfig, *this)
, m_cpu(*this, "cpu")
@@ -608,13 +608,13 @@ void midway_sounds_good_device::device_add_mconfig(machine_config &config)
M68000(config, m_cpu, DERIVED_CLOCK(1, 2));
m_cpu->set_addrmap(AS_PROGRAM, &midway_sounds_good_device::soundsgood_map);
- PIA6821(config, m_pia, 0);
+ PIA6821(config, m_pia);
m_pia->writepa_handler().set(FUNC(midway_sounds_good_device::porta_w));
m_pia->writepb_handler().set(FUNC(midway_sounds_good_device::portb_w));
m_pia->irqa_handler().set(FUNC(midway_sounds_good_device::irq_w));
m_pia->irqb_handler().set(FUNC(midway_sounds_good_device::irq_w));
- AD7533(config, m_dac, 0); /// ad7533jn.u10
+ AD7533(config, m_dac); /// ad7533jn.u10
// The DAC filters here are identical to those on the "Turbo Cheap Squeak" and "Cheap Squeak Deluxe" boards.
//LM359 @U2.2, 2nd order MFB low-pass (fc = 5404.717733, Q = 0.625210, gain = -1.000000)
@@ -674,7 +674,7 @@ TIMER_CALLBACK_MEMBER(midway_sounds_good_device::synced_write)
// midway_turbo_cheap_squeak_device - constructor
//-------------------------------------------------
-midway_turbo_cheap_squeak_device::midway_turbo_cheap_squeak_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+midway_turbo_cheap_squeak_device::midway_turbo_cheap_squeak_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: device_t(mconfig, MIDWAY_TURBO_CHEAP_SQUEAK, tag, owner, clock)
, device_mixer_interface(mconfig, *this)
, m_cpu(*this, "cpu")
@@ -775,13 +775,13 @@ void midway_turbo_cheap_squeak_device::device_add_mconfig(machine_config &config
MC6809E(config, m_cpu, DERIVED_CLOCK(1, 4));
m_cpu->set_addrmap(AS_PROGRAM, &midway_turbo_cheap_squeak_device::turbocs_map);
- PIA6821(config, m_pia, 0);
+ PIA6821(config, m_pia);
m_pia->writepa_handler().set(FUNC(midway_turbo_cheap_squeak_device::porta_w));
m_pia->writepb_handler().set(FUNC(midway_turbo_cheap_squeak_device::portb_w));
m_pia->irqa_handler().set(FUNC(midway_turbo_cheap_squeak_device::irq_w));
m_pia->irqb_handler().set(FUNC(midway_turbo_cheap_squeak_device::irq_w));
- AD7533(config, m_dac, 0); /// ad7533jn.u11
+ AD7533(config, m_dac); /// ad7533jn.u11
// The DAC filters here are identical to those on the "Sounds Good" and "Cheap Squeak Deluxe" boards.
//LM359 @U14.2, 2nd order MFB low-pass (fc = 5404.717733, Q = 0.625210, gain = -1.000000)
diff --git a/src/mame/midway/midway.h b/src/mame/midway/midway.h
index 26cb92cde25..87ebccaf19c 100644
--- a/src/mame/midway/midway.h
+++ b/src/mame/midway/midway.h
@@ -46,7 +46,7 @@ class midway_ssio_device : public device_t,
{
public:
// construction/destruction
- midway_ssio_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock = 16'000'000);
+ midway_ssio_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock = 16'000'000);
// helpers
void suspend_cpu();
@@ -131,7 +131,7 @@ class midway_sounds_good_device : public device_t,
{
public:
// construction/destruction
- midway_sounds_good_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock = 16'000'000);
+ midway_sounds_good_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock = 16'000'000);
// read/write
uint8_t read();
@@ -172,7 +172,7 @@ class midway_turbo_cheap_squeak_device : public device_t,
{
public:
// construction/destruction
- midway_turbo_cheap_squeak_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock = 8'000'000);
+ midway_turbo_cheap_squeak_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock = 8'000'000);
// read/write
uint8_t read();
diff --git a/src/mame/midway/midwayic.cpp b/src/mame/midway/midwayic.cpp
index eae2ab7d165..e43067eedd5 100644
--- a/src/mame/midway/midwayic.cpp
+++ b/src/mame/midway/midwayic.cpp
@@ -145,12 +145,12 @@ DEFINE_DEVICE_TYPE(MIDWAY_SERIAL_PIC, midway_serial_pic_device, "midway_serial_p
// midway_serial_pic_device - constructor
//-------------------------------------------------
-midway_serial_pic_device::midway_serial_pic_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+midway_serial_pic_device::midway_serial_pic_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
midway_serial_pic_device(mconfig, MIDWAY_SERIAL_PIC, tag, owner, clock)
{
}
-midway_serial_pic_device::midway_serial_pic_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) :
+midway_serial_pic_device::midway_serial_pic_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock) :
device_t(mconfig, type, tag, owner, clock),
m_io_serial_digit(*this, "SERIAL_DIGIT"),
m_upper(0),
@@ -246,7 +246,7 @@ DEFINE_DEVICE_TYPE(MIDWAY_SERIAL_PIC_EMU, midway_serial_pic_emu_device, "midway_
// midway_serial_pic_emu_device - constructor
//-------------------------------------------------
-midway_serial_pic_emu_device::midway_serial_pic_emu_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+midway_serial_pic_emu_device::midway_serial_pic_emu_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
device_t(mconfig, MIDWAY_SERIAL_PIC_EMU, tag, owner, clock)
, m_pic(*this, "pic")
{
@@ -309,7 +309,7 @@ void midway_serial_pic_emu_device::write_c(u8 data)
void midway_serial_pic_emu_device::device_add_mconfig(machine_config &config)
{
- PIC16C57(config, m_pic, 4000000); /* ? Mhz */
+ PIC16C57(config, m_pic, XTAL::u(4000000)); /* ? Mhz */
m_pic->read_a().set([this]() { return m_command; });
m_pic->write_b().set([this](u8 data) { m_data_out = data; });
m_pic->read_c().set(FUNC(midway_serial_pic_emu_device::read_c));
@@ -338,12 +338,12 @@ DEFINE_DEVICE_TYPE(MIDWAY_SERIAL_PIC2, midway_serial_pic2_device, "midway_serial
// midway_serial_pic2_device - constructor
//-------------------------------------------------
-midway_serial_pic2_device::midway_serial_pic2_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+midway_serial_pic2_device::midway_serial_pic2_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
midway_serial_pic2_device(mconfig, MIDWAY_SERIAL_PIC2, tag, owner, clock)
{
}
-midway_serial_pic2_device::midway_serial_pic2_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) :
+midway_serial_pic2_device::midway_serial_pic2_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock) :
midway_serial_pic_device(mconfig, type, tag, owner, clock),
device_nvram_interface(mconfig, *this),
m_latch(0),
@@ -701,7 +701,7 @@ DEFINE_DEVICE_TYPE(MIDWAY_IOASIC, midway_ioasic_device, "midway_ioasic", "Midway
// midway_serial_pic2_device - constructor
//-------------------------------------------------
-midway_ioasic_device::midway_ioasic_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+midway_ioasic_device::midway_ioasic_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
midway_serial_pic2_device(mconfig, MIDWAY_IOASIC, tag, owner, clock),
m_io_dips(*this, ":DIPS"),
m_io_system(*this, ":SYSTEM"),
diff --git a/src/mame/midway/midwayic.h b/src/mame/midway/midwayic.h
index 499bfa9c72b..26541faf48a 100644
--- a/src/mame/midway/midwayic.h
+++ b/src/mame/midway/midwayic.h
@@ -23,7 +23,7 @@ class midway_serial_pic_device : public device_t
{
public:
// construction/destruction
- midway_serial_pic_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ midway_serial_pic_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
void set_upper(int upper) { m_upper = upper; }
@@ -33,7 +33,7 @@ public:
DECLARE_WRITE_LINE_MEMBER( reset_w );
protected:
- midway_serial_pic_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+ midway_serial_pic_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock);
// device-level overrides
virtual void device_start() override;
@@ -65,7 +65,7 @@ class midway_serial_pic_emu_device : public device_t
{
public:
// construction/destruction
- midway_serial_pic_emu_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ midway_serial_pic_emu_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
u8 read();
void write(u8 data);
@@ -73,7 +73,7 @@ public:
DECLARE_WRITE_LINE_MEMBER(reset_w);
protected:
- midway_serial_pic_emu_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+ midway_serial_pic_emu_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock);
// device-level overrides
virtual void device_add_mconfig(machine_config &config) override;
@@ -105,7 +105,7 @@ class midway_serial_pic2_device : public midway_serial_pic_device, public device
{
public:
// construction/destruction
- midway_serial_pic2_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ midway_serial_pic2_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
void set_yearoffs(int yearoffs) { m_yearoffs = yearoffs; }
@@ -116,7 +116,7 @@ public:
void set_default_nvram(const uint8_t *nvram);
protected:
- midway_serial_pic2_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+ midway_serial_pic2_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock);
// device-level overrides
virtual void device_start() override;
@@ -159,7 +159,7 @@ class midway_ioasic_device : public midway_serial_pic2_device
{
public:
// construction/destruction
- midway_ioasic_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ midway_ioasic_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
void set_shuffle(uint8_t shuffle) { m_shuffle_type = shuffle; }
void set_shuffle_default(uint8_t shuffle) { m_shuffle_default = shuffle; }
diff --git a/src/mame/midway/midwunit.cpp b/src/mame/midway/midwunit.cpp
index 76309e9bd41..ff5817fe0fb 100644
--- a/src/mame/midway/midwunit.cpp
+++ b/src/mame/midway/midwunit.cpp
@@ -627,7 +627,7 @@ void midwunit_state::wunit(machine_config &config)
{
MIDWUNIT_VIDEO(config, m_video, m_maincpu, m_palette, m_gfxrom);
- TMS34010(config, m_maincpu, 50000000);
+ TMS34010(config, m_maincpu, XTAL::u(50000000));
m_maincpu->set_addrmap(AS_PROGRAM, &midwunit_state::main_map);
m_maincpu->set_halt_on_reset(false); /* halt on reset */
m_maincpu->set_pixel_clock(PIXEL_CLOCK); /* pixel clock */
@@ -649,20 +649,20 @@ void midwunit_state::wunit(machine_config &config)
screen.set_palette(m_palette);
/* sound hardware */
- DCS_AUDIO_8K(config, m_dcs, 0);
+ DCS_AUDIO_8K(config, m_dcs);
}
void midwunit_state::wunit_picsim(machine_config &config)
{
wunit(config);
- MIDWAY_SERIAL_PIC(config, m_midway_serial_pic, 0);
+ MIDWAY_SERIAL_PIC(config, m_midway_serial_pic);
m_midway_serial_pic->set_upper(528); // this is actually development PIC code, all games check for in addition to their own game specific code!
}
void midwunit_state::wunit_picemu(machine_config &config)
{
wunit(config);
- MIDWAY_SERIAL_PIC_EMU(config, m_midway_serial_pic_emu, 0);
+ MIDWAY_SERIAL_PIC_EMU(config, m_midway_serial_pic_emu);
}
diff --git a/src/mame/midway/midxunit.cpp b/src/mame/midway/midxunit.cpp
index 6369f266cf8..5e07529110c 100644
--- a/src/mame/midway/midxunit.cpp
+++ b/src/mame/midway/midxunit.cpp
@@ -271,7 +271,7 @@ void midxunit_state::midxunit(machine_config &config)
MIDXUNIT_VIDEO(config, m_video, m_maincpu, m_palette, m_gfxrom);
/* basic machine hardware */
- TMS34020(config, m_maincpu, 40000000);
+ TMS34020(config, m_maincpu, XTAL::u(40000000));
m_maincpu->set_addrmap(AS_PROGRAM, &midxunit_state::main_map);
m_maincpu->set_halt_on_reset(false); /* halt on reset */
m_maincpu->set_pixel_clock(PIXEL_CLOCK); /* pixel clock */
@@ -291,7 +291,7 @@ void midxunit_state::midxunit(machine_config &config)
screen.set_screen_update("maincpu", FUNC(tms34010_device::tms340x0_ind16));
screen.set_palette(m_palette);
- PIC16C57(config, m_pic, 625000); // need to be verified
+ PIC16C57(config, m_pic, XTAL::u(625000)); // need to be verified
m_pic->read_a().set([this]() { return m_pic_command; });
m_pic->write_b().set([this](u8 data) { m_pic_data = data; });
m_pic->read_c().set([this]() { return m_pic_clk ^ 1; });
@@ -308,7 +308,7 @@ void midxunit_state::midxunit(machine_config &config)
adc.ch6_callback().set_ioport("AN5");
/* sound hardware */
- DCS_AUDIO_2K_UART(config, m_dcs, 0);
+ DCS_AUDIO_2K_UART(config, m_dcs);
}
diff --git a/src/mame/midway/midzeus.cpp b/src/mame/midway/midzeus.cpp
index 969e16115b0..07fc33e56ba 100644
--- a/src/mame/midway/midzeus.cpp
+++ b/src/mame/midway/midzeus.cpp
@@ -1278,9 +1278,9 @@ void midzeus_state::midzeus(machine_config &config)
m_screen->set_palette("palette");
/* sound hardware */
- DCS2_AUDIO_2104(config, "dcs", 0);
+ DCS2_AUDIO_2104(config, "dcs");
- MIDWAY_IOASIC(config, m_ioasic, 0);
+ MIDWAY_IOASIC(config, m_ioasic);
m_ioasic->set_shuffle(MIDWAY_IOASIC_STANDARD);
m_ioasic->set_yearoffs(94);
}
@@ -1295,7 +1295,7 @@ void midzeus_state::mk4(machine_config &config)
void midzeus_state::invasn(machine_config &config)
{
midzeus(config);
- PIC16C57(config, "pic", 8000000); /* ? */
+ PIC16C57(config, "pic", XTAL::u(8000000)); /* ? */
m_ioasic->set_upper(468/* or 488 */);
}
@@ -1317,20 +1317,20 @@ void midzeus2_state::midzeus2(machine_config &config)
m_zeus->irq_callback().set(FUNC(midzeus2_state::zeus_irq));
/* sound hardware */
- DCS2_AUDIO_2104(config, "dcs", 0);
+ DCS2_AUDIO_2104(config, "dcs");
- M48T35(config, m_m48t35, 0);
+ M48T35(config, m_m48t35);
/* I/O hardware */
- MIDWAY_IOASIC(config, m_ioasic, 0);
+ MIDWAY_IOASIC(config, m_ioasic);
m_ioasic->set_shuffle(MIDWAY_IOASIC_STANDARD);
m_ioasic->set_yearoffs(99);
m_ioasic->set_upper(474);
- IBM21S851(config, m_fw_phy, 0);
+ IBM21S851(config, m_fw_phy);
m_fw_phy->reset_cb().set(m_fw_link, FUNC(tsb12lv01a_device::phy_reset_w));
- TSB12LV01A(config, m_fw_link, 0);
+ TSB12LV01A(config, m_fw_link);
m_fw_link->int_cb().set(FUNC(midzeus2_state::firewire_irq));
m_fw_link->phy_read().set(m_fw_phy, FUNC(ibm21s851_device::read));
m_fw_link->phy_write().set(m_fw_phy, FUNC(ibm21s851_device::write));
@@ -1345,7 +1345,7 @@ void midzeus2_state::crusnexo(machine_config &config)
void midzeus2_state::thegrid(machine_config &config)
{
midzeus2(config);
- PIC16C57(config, "pic", 8000000).set_disable(); // unverified clock, not hooked up
+ PIC16C57(config, "pic", XTAL::u(8000000)).set_disable(); // unverified clock, not hooked up
m_ioasic->set_upper(474/* or 491 */);
}
diff --git a/src/mame/midway/omegrace.cpp b/src/mame/midway/omegrace.cpp
index 717eabbf8f1..d7e06c9f3d1 100644
--- a/src/mame/midway/omegrace.cpp
+++ b/src/mame/midway/omegrace.cpp
@@ -561,14 +561,14 @@ void omegrace_state::omegrace(machine_config &config)
WATCHDOG_TIMER(config, "watchdog").set_time(attotime::from_hz(12_MHz_XTAL/16/256/256));
/* video hardware */
- VECTOR(config, "vector", 0);
+ VECTOR(config, "vector");
screen_device &screen(SCREEN(config, "screen", SCREEN_TYPE_VECTOR));
screen.set_refresh_hz(40);
screen.set_size(400, 300);
screen.set_visarea(522, 1566, 522, 1566);
screen.set_screen_update("vector", FUNC(vector_device::screen_update));
- DVG(config, m_dvg, 0);
+ DVG(config, m_dvg);
m_dvg->set_vector("vector");
m_dvg->set_memory(m_maincpu, AS_PROGRAM, 0x8000);
diff --git a/src/mame/midway/pinball2k.cpp b/src/mame/midway/pinball2k.cpp
index 8309ae69b1f..a5d3e04059a 100644
--- a/src/mame/midway/pinball2k.cpp
+++ b/src/mame/midway/pinball2k.cpp
@@ -616,20 +616,20 @@ void pinball2k_state::ramdac_map(address_map &map)
void pinball2k_state::mediagx(machine_config &config)
{
/* basic machine hardware */
- MEDIAGX(config, m_maincpu, 166000000);
+ MEDIAGX(config, m_maincpu, XTAL::u(166000000));
m_maincpu->set_addrmap(AS_PROGRAM, &pinball2k_state::mediagx_map);
m_maincpu->set_addrmap(AS_IO, &pinball2k_state::mediagx_io);
m_maincpu->set_irq_acknowledge_callback("pic8259_1", FUNC(pic8259_device::inta_cb));
pcat_common(config);
- pci_bus_legacy_device &pcibus(PCI_BUS_LEGACY(config, "pcibus", 0, 0));
+ pci_bus_legacy_device &pcibus(PCI_BUS_LEGACY(config, "pcibus"));
pcibus.set_device(18, FUNC(pinball2k_state::cx5510_pci_r), FUNC(pinball2k_state::cx5510_pci_w));
ide_controller_device &ide(IDE_CONTROLLER(config, "ide").options(ata_devices, "hdd", nullptr, true));
ide.irq_handler().set("pic8259_2", FUNC(pic8259_device::ir6_w));
- RAMDAC(config, m_ramdac, 0, m_palette);
+ RAMDAC(config, m_ramdac, m_palette);
m_ramdac->set_addrmap(0, &pinball2k_state::ramdac_map);
/* video hardware */
diff --git a/src/mame/midway/seattle.cpp b/src/mame/midway/seattle.cpp
index 381ed7a6060..b3d506b62fe 100644
--- a/src/mame/midway/seattle.cpp
+++ b/src/mame/midway/seattle.cpp
@@ -228,7 +228,7 @@ namespace {
*
*************************************/
-#define SYSTEM_CLOCK 50000000
+#define SYSTEM_CLOCK XTAL::u(50000000)
#define PCI_ID_GALILEO "pci:00.0"
#define PCI_ID_VIDEO "pci:08.0"
@@ -2018,7 +2018,7 @@ void seattle_state::seattle_common(machine_config &config)
m_maincpu->set_system_clock(SYSTEM_CLOCK);
// PCI Bus Devices
- PCI_ROOT(config, "pci", 0);
+ PCI_ROOT(config, "pci");
GT64010(config, m_galileo, SYSTEM_CLOCK, m_maincpu, GALILEO_IRQ_NUM);
m_galileo->set_map(0, address_map_constructor(&seattle_state::seattle_cs0_map, "seattle_cs0_map", this), this);
@@ -2033,7 +2033,7 @@ void seattle_state::seattle_common(machine_config &config)
ide.subdevice<bus_master_ide_controller_device>("ide")->slot(0).set_option_machine_config("hdd", hdd_config);
// video hardware
- VOODOO_1_PCI(config, m_voodoo, 0, m_maincpu, m_screen);
+ VOODOO_1_PCI(config, m_voodoo, m_maincpu, m_screen);
m_voodoo->set_fbmem(2);
m_voodoo->set_tmumem(4, 0);
m_voodoo->set_status_cycles(1000); // optimization to consume extra cycles when polling status
@@ -2087,7 +2087,7 @@ void seattle_state::seattle150_widget(machine_config &config)
m_galileo->set_map(3, address_map_constructor(&seattle_state::widget_cs3_map, "widget_cs3_map", this), this);
- SMC91C94(config, m_ethernet, 0);
+ SMC91C94(config, m_ethernet);
m_ethernet->irq_handler().set(FUNC(seattle_state::ethernet_interrupt));
}
@@ -2105,7 +2105,7 @@ void seattle_state::seattle200_widget(machine_config &config)
m_galileo->set_map(3, address_map_constructor(&seattle_state::widget_cs3_map, "widget_cs3_map", this), this);
- SMC91C94(config, m_ethernet, 0);
+ SMC91C94(config, m_ethernet);
m_ethernet->irq_handler().set(FUNC(seattle_state::ethernet_interrupt));
}
@@ -2115,7 +2115,7 @@ void seattle_state::flagstaff(machine_config &config)
m_galileo->set_map(3, address_map_constructor(&seattle_state::flagstaff_cs3_map, "flagstaff_cs3_map", this), this);
- SMC91C94(config, m_ethernet, 0);
+ SMC91C94(config, m_ethernet);
m_ethernet->irq_handler().set(FUNC(seattle_state::ethernet_interrupt));
m_voodoo->set_fbmem(2);
@@ -2128,11 +2128,11 @@ void seattle_state::flagstaff(machine_config &config)
void seattle_state::wg3dh(machine_config &config)
{
phoenix(config);
- dcs2_audio_2115_device &dcs(DCS2_AUDIO_2115(config, "dcs", 0));
+ dcs2_audio_2115_device &dcs(DCS2_AUDIO_2115(config, "dcs"));
dcs.set_dram_in_mb(2);
dcs.set_polling_offset(0x3839);
- MIDWAY_IOASIC(config, m_ioasic, 0);
+ MIDWAY_IOASIC(config, m_ioasic);
m_ioasic->set_shuffle(MIDWAY_IOASIC_STANDARD);
m_ioasic->set_upper(310); // no alternates
m_ioasic->set_yearoffs(80);
@@ -2142,11 +2142,11 @@ void seattle_state::wg3dh(machine_config &config)
void seattle_state::mace(machine_config &config)
{
seattle150(config);
- dcs2_audio_2115_device &dcs(DCS2_AUDIO_2115(config, "dcs", 0));
+ dcs2_audio_2115_device &dcs(DCS2_AUDIO_2115(config, "dcs"));
dcs.set_dram_in_mb(2);
dcs.set_polling_offset(0x3839);
- MIDWAY_IOASIC(config, m_ioasic, 0);
+ MIDWAY_IOASIC(config, m_ioasic);
m_ioasic->set_shuffle(MIDWAY_IOASIC_MACE);
m_ioasic->set_upper(319); // or 314
m_ioasic->set_yearoffs(80);
@@ -2163,7 +2163,7 @@ void seattle_state::sfrush(machine_config &config)
SPEAKER(config, "rrspeaker").headrest_right();
//SPEAKER(config, "subwoofer").seat(); Not implemented, Quad Amp PCB output;
- atari_cage_seattle_device &cage(ATARI_CAGE_SEATTLE(config, "cage", 0));
+ atari_cage_seattle_device &cage(ATARI_CAGE_SEATTLE(config, "cage"));
cage.set_speedup(0x5236);
cage.irq_handler().set(m_ioasic, FUNC(midway_ioasic_device::cage_irq_handler));
// TODO: copied from atarigt.cpp; Same configurations as T-Mek?
@@ -2172,7 +2172,7 @@ void seattle_state::sfrush(machine_config &config)
cage.add_route(2, "flspeaker", 1.0); // Foward Left
cage.add_route(3, "rrspeaker", 1.0); // Back Right
- MIDWAY_IOASIC(config, m_ioasic, 0);
+ MIDWAY_IOASIC(config, m_ioasic);
m_ioasic->set_shuffle(MIDWAY_IOASIC_STANDARD);
m_ioasic->set_upper(315); // no alternates
m_ioasic->set_yearoffs(100);
@@ -2190,7 +2190,7 @@ void seattle_state::sfrushrk(machine_config &config)
SPEAKER(config, "rrspeaker").headrest_right();
//SPEAKER(config, "subwoofer").seat(); Not implemented, Quad Amp PCB output;
- atari_cage_seattle_device &cage(ATARI_CAGE_SEATTLE(config, "cage", 0));
+ atari_cage_seattle_device &cage(ATARI_CAGE_SEATTLE(config, "cage"));
cage.set_speedup(0x5329);
cage.irq_handler().set(m_ioasic, FUNC(midway_ioasic_device::cage_irq_handler));
// TODO: copied from atarigt.cpp; Same configurations as T-Mek?
@@ -2200,7 +2200,7 @@ void seattle_state::sfrushrk(machine_config &config)
cage.add_route(3, "rrspeaker", 1.0); // Back Right
- MIDWAY_IOASIC(config, m_ioasic, 0);
+ MIDWAY_IOASIC(config, m_ioasic);
m_ioasic->set_shuffle(MIDWAY_IOASIC_SFRUSHRK);
m_ioasic->set_upper(331); // no alternates
m_ioasic->set_yearoffs(100);
@@ -2217,11 +2217,11 @@ void seattle_state::sfrushrkw(machine_config &config)
void seattle_state::calspeed(machine_config &config)
{
seattle150_widget(config);
- dcs2_audio_2115_device &dcs(DCS2_AUDIO_2115(config, "dcs", 0));
+ dcs2_audio_2115_device &dcs(DCS2_AUDIO_2115(config, "dcs"));
dcs.set_dram_in_mb(2);
dcs.set_polling_offset(0x39c0);
- MIDWAY_IOASIC(config, m_ioasic, 0);
+ MIDWAY_IOASIC(config, m_ioasic);
m_ioasic->set_shuffle(MIDWAY_IOASIC_CALSPEED);
m_ioasic->set_upper(328); // 328 = 27"; may or may not have a 31" ID
m_ioasic->set_yearoffs(100);
@@ -2232,11 +2232,11 @@ void seattle_state::calspeed(machine_config &config)
void seattle_state::vaportrx(machine_config &config)
{
seattle200_widget(config);
- dcs2_audio_2115_device &dcs(DCS2_AUDIO_2115(config, "dcs", 0));
+ dcs2_audio_2115_device &dcs(DCS2_AUDIO_2115(config, "dcs"));
dcs.set_dram_in_mb(2);
dcs.set_polling_offset(0x39c2);
- MIDWAY_IOASIC(config, m_ioasic, 0);
+ MIDWAY_IOASIC(config, m_ioasic);
m_ioasic->set_shuffle(MIDWAY_IOASIC_VAPORTRX);
m_ioasic->set_upper(324); // or 334
m_ioasic->set_yearoffs(100);
@@ -2246,11 +2246,11 @@ void seattle_state::vaportrx(machine_config &config)
void seattle_state::biofreak(machine_config &config)
{
seattle150(config);
- dcs2_audio_2115_device &dcs(DCS2_AUDIO_2115(config, "dcs", 0));
+ dcs2_audio_2115_device &dcs(DCS2_AUDIO_2115(config, "dcs"));
dcs.set_dram_in_mb(2);
dcs.set_polling_offset(0x3835);
- MIDWAY_IOASIC(config, m_ioasic, 0);
+ MIDWAY_IOASIC(config, m_ioasic);
m_ioasic->set_shuffle(MIDWAY_IOASIC_STANDARD);
m_ioasic->set_upper(231); // no alternates
m_ioasic->set_yearoffs(80);
@@ -2260,11 +2260,11 @@ void seattle_state::biofreak(machine_config &config)
void seattle_state::blitz(machine_config &config)
{
seattle150(config);
- dcs2_audio_2115_device &dcs(DCS2_AUDIO_2115(config, "dcs", 0));
+ dcs2_audio_2115_device &dcs(DCS2_AUDIO_2115(config, "dcs"));
dcs.set_dram_in_mb(2);
dcs.set_polling_offset(0x39c2);
- MIDWAY_IOASIC(config, m_ioasic, 0);
+ MIDWAY_IOASIC(config, m_ioasic);
m_ioasic->set_shuffle(MIDWAY_IOASIC_BLITZ99);
m_ioasic->set_upper(444); // or 528
m_ioasic->set_yearoffs(80);
@@ -2275,11 +2275,11 @@ void seattle_state::blitz(machine_config &config)
void seattle_state::blitz99(machine_config &config)
{
seattle150(config);
- dcs2_audio_2115_device &dcs(DCS2_AUDIO_2115(config, "dcs", 0));
+ dcs2_audio_2115_device &dcs(DCS2_AUDIO_2115(config, "dcs"));
dcs.set_dram_in_mb(2);
dcs.set_polling_offset(0x0afb);
- MIDWAY_IOASIC(config, m_ioasic, 0);
+ MIDWAY_IOASIC(config, m_ioasic);
m_ioasic->set_shuffle(MIDWAY_IOASIC_BLITZ99);
m_ioasic->set_upper(481); // or 484 or 520
m_ioasic->set_yearoffs(80);
@@ -2290,11 +2290,11 @@ void seattle_state::blitz99(machine_config &config)
void seattle_state::blitz2k(machine_config &config)
{
seattle150(config);
- dcs2_audio_2115_device &dcs(DCS2_AUDIO_2115(config, "dcs", 0));
+ dcs2_audio_2115_device &dcs(DCS2_AUDIO_2115(config, "dcs"));
dcs.set_dram_in_mb(2);
dcs.set_polling_offset(0x0b5d);
- MIDWAY_IOASIC(config, m_ioasic, 0);
+ MIDWAY_IOASIC(config, m_ioasic);
m_ioasic->set_shuffle(MIDWAY_IOASIC_BLITZ99);
m_ioasic->set_upper(494); // or 498
m_ioasic->set_yearoffs(80);
@@ -2307,11 +2307,11 @@ void seattle_state::carnevil(machine_config &config)
seattle150(config);
m_galileo->set_map(3, address_map_constructor(&seattle_state::carnevil_cs3_map, "carnevil_cs3_map", this), this);
- dcs2_audio_2115_device &dcs(DCS2_AUDIO_2115(config, "dcs", 0));
+ dcs2_audio_2115_device &dcs(DCS2_AUDIO_2115(config, "dcs"));
dcs.set_dram_in_mb(2);
dcs.set_polling_offset(0x0af7);
- MIDWAY_IOASIC(config, m_ioasic, 0);
+ MIDWAY_IOASIC(config, m_ioasic);
m_ioasic->set_shuffle(MIDWAY_IOASIC_CARNEVIL);
m_ioasic->set_upper(469); // 469 = 25"; 486 = 39";
m_ioasic->set_yearoffs(80);
@@ -2321,11 +2321,11 @@ void seattle_state::carnevil(machine_config &config)
void seattle_state::hyprdriv(machine_config &config)
{
seattle200_widget(config);
- dcs2_audio_2115_device &dcs(DCS2_AUDIO_2115(config, "dcs", 0));
+ dcs2_audio_2115_device &dcs(DCS2_AUDIO_2115(config, "dcs"));
dcs.set_dram_in_mb(2);
dcs.set_polling_offset(0x0af7);
- MIDWAY_IOASIC(config, m_ioasic, 0);
+ MIDWAY_IOASIC(config, m_ioasic);
m_ioasic->set_shuffle(MIDWAY_IOASIC_HYPRDRIV);
m_ioasic->set_upper(471); // 471 = 25"; 479 = 31"
m_ioasic->set_yearoffs(80);
diff --git a/src/mame/midway/sente6vb.cpp b/src/mame/midway/sente6vb.cpp
index dab50609128..792659ef0eb 100644
--- a/src/mame/midway/sente6vb.cpp
+++ b/src/mame/midway/sente6vb.cpp
@@ -107,7 +107,7 @@ void sente6vb_device::device_add_mconfig(machine_config &config)
m_audiocpu->set_addrmap(AS_PROGRAM, &sente6vb_device::mem_map);
m_audiocpu->set_addrmap(AS_IO, &sente6vb_device::io_map);
- ACIA6850(config, m_uart, 0);
+ ACIA6850(config, m_uart);
m_uart->txd_handler().set([this] (int state) { m_send_cb(state); });
m_uart->irq_handler().set([this] (int state) { m_uint = bool(state); });
@@ -116,9 +116,9 @@ void sente6vb_device::device_add_mconfig(machine_config &config)
uartclock.signal_handler().append(m_uart, FUNC(acia6850_device::write_txc));
uartclock.signal_handler().append(m_uart, FUNC(acia6850_device::write_rxc));
- TIMER(config, m_counter_0_timer, 0).configure_generic(FUNC(sente6vb_device::clock_counter_0_ff));
+ TIMER(config, m_counter_0_timer).configure_generic(FUNC(sente6vb_device::clock_counter_0_ff));
- PIT8253(config, m_pit, 0);
+ PIT8253(config, m_pit);
m_pit->out_handler<0>().set(FUNC(sente6vb_device::counter_0_set_out));
m_pit->out_handler<2>().set_inputline(m_audiocpu, INPUT_LINE_IRQ0);
m_pit->set_clk<1>(8_MHz_XTAL / 4);
@@ -126,13 +126,13 @@ void sente6vb_device::device_add_mconfig(machine_config &config)
SPEAKER(config, "mono").front_center();
- mm5837_stream_device &noise(MM5837_STREAM(config, "noise", 0));
+ mm5837_stream_device &noise(MM5837_STREAM(config, "noise"));
// noise.set_vdd(-6.5); // seems too low -- possible the mapping in mm5837 is wrong
noise.set_vdd(-8.0);
for (auto &cem_device : m_cem_device)
{
- CEM3394(config, cem_device, 0);
+ CEM3394(config, cem_device);
cem_device->set_vco_zero_freq(431.894);
cem_device->set_filter_zero_freq(1300.0);
cem_device->add_route(ALL_OUTPUTS, "mono", 0.90);
@@ -165,7 +165,7 @@ const tiny_rom_entry *sente6vb_device::device_rom_region() const
*
*************************************/
-sente6vb_device::sente6vb_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+sente6vb_device::sente6vb_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
device_t(mconfig, SENTE6VB, tag, owner, clock),
m_pit(*this, "pit"),
m_counter_0_timer(*this, "8253_0_timer"),
diff --git a/src/mame/midway/sente6vb.h b/src/mame/midway/sente6vb.h
index ee199817360..a47a0f1c372 100644
--- a/src/mame/midway/sente6vb.h
+++ b/src/mame/midway/sente6vb.h
@@ -26,7 +26,7 @@ class sente6vb_device : public device_t
static constexpr uint32_t POLY17_ADD = 0x18000;
public:
- sente6vb_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock = 0);
+ sente6vb_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock = XTAL());
auto send_cb() { return m_send_cb.bind(); }
auto clock_out_cb() { return m_clock_out_cb.bind(); }
diff --git a/src/mame/midway/spyhuntertec.cpp b/src/mame/midway/spyhuntertec.cpp
index a8da13b7afc..71880f6182f 100644
--- a/src/mame/midway/spyhuntertec.cpp
+++ b/src/mame/midway/spyhuntertec.cpp
@@ -677,7 +677,7 @@ void spyhuntertec_state::spyhuntertec(machine_config &config)
// 2 XTALs: one 20MHz, other one near maincpu ?MHz
/* basic machine hardware */
- Z80(config, m_maincpu, 4000000); // NEC D780C-2 (rated 6MHz)
+ Z80(config, m_maincpu, XTAL::u(4000000)); // NEC D780C-2 (rated 6MHz)
m_maincpu->set_addrmap(AS_PROGRAM, &spyhuntertec_state::spyhuntertec_map);
m_maincpu->set_addrmap(AS_IO, &spyhuntertec_state::spyhuntertec_portmap);
m_maincpu->set_vblank_int("screen", FUNC(spyhuntertec_state::irq0_line_hold));
@@ -696,7 +696,7 @@ void spyhuntertec_state::spyhuntertec(machine_config &config)
GFXDECODE(config, m_gfxdecode, m_palette, gfx_spyhuntertec);
PALETTE(config, m_palette).set_entries(64+4); // FUNC(spyhuntertec_state::spyhunt)
- Z80(config, m_audiocpu, 4000000); // SGS Z8400B1 (rated 2.5MHz?)
+ Z80(config, m_audiocpu, XTAL::u(4000000)); // SGS Z8400B1 (rated 2.5MHz?)
m_audiocpu->set_addrmap(AS_PROGRAM, &spyhuntertec_state::spyhuntertec_sound_map);
m_audiocpu->set_addrmap(AS_IO, &spyhuntertec_state::spyhuntertec_sound_portmap);
m_audiocpu->set_periodic_int(FUNC(spyhuntertec_state::irq0_line_assert), attotime::from_hz(1000));
diff --git a/src/mame/midway/sspeedr.cpp b/src/mame/midway/sspeedr.cpp
index 219e20b2918..81fbda4769f 100644
--- a/src/mame/midway/sspeedr.cpp
+++ b/src/mame/midway/sspeedr.cpp
@@ -269,7 +269,7 @@ void sspeedr_state::sspeedr(machine_config &config)
/* sound hardware */
SPEAKER(config, "mono").front_center();
- NETLIST_SOUND(config, "sound_nl", 48000)
+ NETLIST_SOUND(config, "sound_nl", XTAL::u(48000))
.set_source(NETLIST_NAME(sspeedr))
.add_route(ALL_OUTPUTS, "mono", 1.0);
diff --git a/src/mame/midway/tmaster.cpp b/src/mame/midway/tmaster.cpp
index 3cadd56147d..6e57f26e521 100644
--- a/src/mame/midway/tmaster.cpp
+++ b/src/mame/midway/tmaster.cpp
@@ -384,7 +384,7 @@ void tmaster_state::tm(machine_config &config)
m_duart->irq_cb().set(FUNC(tmaster_state::duart_irq_handler));
m_duart->a_tx_cb().set(m_microtouch, FUNC(microtouch_device::rx));
- MICROTOUCH(config, m_microtouch, 9600).stx().set(m_duart, FUNC(mc68681_device::rx_a_w));
+ MICROTOUCH(config, m_microtouch, XTAL::u(9600)).stx().set(m_duart, FUNC(mc68681_device::rx_a_w));
NVRAM(config, "nvram", nvram_device::DEFAULT_ALL_0);
@@ -412,7 +412,7 @@ void tmaster_state::tm(machine_config &config)
void tmaster_state::tmds1204(machine_config &config)
{
tm(config);
- DS1204(config, "ds1204", 0);
+ DS1204(config, "ds1204");
}
/***************************************************************************
diff --git a/src/mame/midway/vegas.cpp b/src/mame/midway/vegas.cpp
index 14cfd262fe3..019b527e3d1 100644
--- a/src/mame/midway/vegas.cpp
+++ b/src/mame/midway/vegas.cpp
@@ -1912,7 +1912,7 @@ void vegas_state::vegascore(machine_config &config)
m_maincpu->set_system_clock(vegas_state::SYSTEM_CLOCK);
// PCI Bus Devices
- PCI_ROOT(config, "pci", 0);
+ PCI_ROOT(config, "pci");
VRC5074(config, m_nile, 100000000, m_maincpu);
m_nile->set_sdram_size(0, 0x00800000);
@@ -1923,13 +1923,13 @@ void vegas_state::vegascore(machine_config &config)
m_nile->set_map(6, address_map_constructor(&vegas_state::vegas_cs6_map, "vegas_cs6_map", this), this);
m_nile->set_map(7, address_map_constructor(&vegas_state::vegas_cs7_map, "vegas_cs7_map", this), this);
- ide_pci_device &ide(IDE_PCI(config, PCI_ID_IDE, 0, 0x10950646, 0x05, 0x0));
+ ide_pci_device &ide(IDE_PCI(config, PCI_ID_IDE, 0x10950646, 0x05, 0x0));
ide.irq_handler().set(PCI_ID_NILE, FUNC(vrc5074_device::pci_intr_d));
//ide.set_pif(0x8f);
ide.subdevice<bus_master_ide_controller_device>("ide")->slot(0).set_option_machine_config("hdd", hdd_config);
// video hardware
- voodoo_2_pci_device &voodoo(VOODOO_2_PCI(config, PCI_ID_VIDEO, 0, m_maincpu, "screen"));
+ voodoo_2_pci_device &voodoo(VOODOO_2_PCI(config, PCI_ID_VIDEO, m_maincpu, "screen"));
voodoo.set_fbmem(2);
voodoo.set_tmumem(4, 4);
voodoo.set_status_cycles(1000); // optimization to consume extra cycles when polling status
@@ -1939,7 +1939,7 @@ void vegas_state::vegascore(machine_config &config)
m_timekeeper->reset_cb().set(FUNC(vegas_state::watchdog_reset));
m_timekeeper->irq_cb().set(FUNC(vegas_state::watchdog_irq));
- SMC91C94(config, m_ethernet, 0);
+ SMC91C94(config, m_ethernet);
m_ethernet->irq_handler().set(FUNC(vegas_state::ethernet_interrupt));
// screen
@@ -1985,7 +1985,7 @@ void vegas_state::vegas32m(machine_config &config)
void vegas_state::vegasban(machine_config &config)
{
vegas32m(config);
- voodoo_banshee_pci_device &voodoo(VOODOO_BANSHEE_PCI(config.replace(), PCI_ID_VIDEO, 0, m_maincpu, "screen"));
+ voodoo_banshee_pci_device &voodoo(VOODOO_BANSHEE_PCI(config.replace(), PCI_ID_VIDEO, m_maincpu, "screen"));
voodoo.set_fbmem(16);
voodoo.set_status_cycles(1000); // optimization to consume extra cycles when polling status
subdevice<generic_voodoo_device>(PCI_ID_VIDEO":voodoo")->vblank_callback().set(FUNC(vegas_state::vblank_assert));
@@ -2000,7 +2000,7 @@ void vegas_state::vegasv3(machine_config &config)
m_maincpu->set_dcache_size(16384);
m_maincpu->set_system_clock(vegas_state::SYSTEM_CLOCK);
- voodoo_3_pci_device &voodoo(VOODOO_3_PCI(config.replace(), PCI_ID_VIDEO, 0, m_maincpu, "screen"));
+ voodoo_3_pci_device &voodoo(VOODOO_3_PCI(config.replace(), PCI_ID_VIDEO, m_maincpu, "screen"));
voodoo.set_fbmem(16);
voodoo.set_status_cycles(1000); // optimization to consume extra cycles when polling status
subdevice<generic_voodoo_device>(PCI_ID_VIDEO":voodoo")->vblank_callback().set(FUNC(vegas_state::vblank_assert));
@@ -2018,7 +2018,7 @@ void vegas_state::denver(machine_config &config)
m_nile->set_sdram_size(0, 0x02000000);
m_nile->set_map(8, address_map_constructor(&vegas_state::vegas_cs8_map, "vegas_cs8_map", this), this);
- voodoo_3_pci_device &voodoo(VOODOO_3_PCI(config.replace(), PCI_ID_VIDEO, 0, m_maincpu, "screen"));
+ voodoo_3_pci_device &voodoo(VOODOO_3_PCI(config.replace(), PCI_ID_VIDEO, m_maincpu, "screen"));
voodoo.set_fbmem(16);
voodoo.set_status_cycles(1000); // optimization to consume extra cycles when polling status
subdevice<generic_voodoo_device>(PCI_ID_VIDEO":voodoo")->vblank_callback().set(FUNC(vegas_state::vblank_assert));
@@ -2061,11 +2061,11 @@ void vegas_state::gauntleg(machine_config &config)
// Needs 250MHz MIPS or screen tearing occurs (See MT8064)
// Firmware frequency detection seems to have a bug, console reports 220MHz for a 200MHz cpu and 260MHz for a 250MHz cpu
vegas250(config);
- dcs2_audio_2104_device &dcs(DCS2_AUDIO_2104(config, "dcs", 0));
+ dcs2_audio_2104_device &dcs(DCS2_AUDIO_2104(config, "dcs"));
dcs.set_dram_in_mb(4);
dcs.set_polling_offset(0x0b5d);
- MIDWAY_IOASIC(config, m_ioasic, 0);
+ MIDWAY_IOASIC(config, m_ioasic);
m_ioasic->set_shuffle(MIDWAY_IOASIC_CALSPEED);
m_ioasic->set_upper(340); // 340=39", 322=27" others?
m_ioasic->set_yearoffs(80);
@@ -2077,11 +2077,11 @@ void vegas_state::gauntdl(machine_config &config)
{
// Needs 250MHz MIPS or screen tearing occurs (See MT8064)
vegas250(config);
- dcs2_audio_2104_device &dcs(DCS2_AUDIO_2104(config, "dcs", 0));
+ dcs2_audio_2104_device &dcs(DCS2_AUDIO_2104(config, "dcs"));
dcs.set_dram_in_mb(4);
dcs.set_polling_offset(0x0b5d);
- MIDWAY_IOASIC(config, m_ioasic, 0);
+ MIDWAY_IOASIC(config, m_ioasic);
m_ioasic->set_shuffle(MIDWAY_IOASIC_GAUNTDL);
m_ioasic->set_upper(346); // others?
m_ioasic->set_yearoffs(80);
@@ -2092,11 +2092,11 @@ void vegas_state::gauntdl(machine_config &config)
void vegas_state::warfa(machine_config &config)
{
vegas250(config);
- dcs2_audio_2104_device &dcs(DCS2_AUDIO_2104(config, "dcs", 0));
+ dcs2_audio_2104_device &dcs(DCS2_AUDIO_2104(config, "dcs"));
dcs.set_dram_in_mb(4);
dcs.set_polling_offset(0x0b5d);
- MIDWAY_IOASIC(config, m_ioasic, 0);
+ MIDWAY_IOASIC(config, m_ioasic);
m_ioasic->set_shuffle(MIDWAY_IOASIC_MACE);
m_ioasic->set_upper(337); // others?
m_ioasic->set_yearoffs(80);
@@ -2107,11 +2107,11 @@ void vegas_state::warfa(machine_config &config)
void vegas_state::tenthdeg(machine_config &config)
{
vegas(config);
- dcs2_audio_2115_device &dcs(DCS2_AUDIO_2115(config, "dcs", 0));
+ dcs2_audio_2115_device &dcs(DCS2_AUDIO_2115(config, "dcs"));
dcs.set_dram_in_mb(4);
dcs.set_polling_offset(0x0afb);
- MIDWAY_IOASIC(config, m_ioasic, 0);
+ MIDWAY_IOASIC(config, m_ioasic);
m_ioasic->set_shuffle(MIDWAY_IOASIC_GAUNTDL);
m_ioasic->set_upper(330); // others?
m_ioasic->set_yearoffs(80);
@@ -2122,11 +2122,11 @@ void vegas_state::tenthdeg(machine_config &config)
void vegas_state::roadburn(machine_config &config)
{
vegas32m(config);
- dcs2_audio_dsio_device &dcs(DCS2_AUDIO_DSIO(config, "dcs", 0));
+ dcs2_audio_dsio_device &dcs(DCS2_AUDIO_DSIO(config, "dcs"));
dcs.set_dram_in_mb(4);
dcs.set_polling_offset(0x0ddd);
- MIDWAY_IOASIC(config, m_ioasic, 0);
+ MIDWAY_IOASIC(config, m_ioasic);
m_ioasic->set_shuffle(MIDWAY_IOASIC_STANDARD);
m_ioasic->set_upper(325); // others?
m_ioasic->set_yearoffs(80);
@@ -2137,11 +2137,11 @@ void vegas_state::roadburn(machine_config &config)
void vegas_state::nbashowt(machine_config &config)
{
vegasban(config);
- dcs2_audio_2104_device &dcs(DCS2_AUDIO_2104(config, "dcs", 0));
+ dcs2_audio_2104_device &dcs(DCS2_AUDIO_2104(config, "dcs"));
dcs.set_dram_in_mb(4);
dcs.set_polling_offset(0x0b5d);
- MIDWAY_IOASIC(config, m_ioasic, 0);
+ MIDWAY_IOASIC(config, m_ioasic);
m_ioasic->set_shuffle(MIDWAY_IOASIC_MACE);
// 528 494 478 development pic, 487 NBA
m_ioasic->set_upper(487); // or 478 or 487
@@ -2154,11 +2154,11 @@ void vegas_state::nbashowt(machine_config &config)
void vegas_state::nbanfl(machine_config &config)
{
vegasban(config);
- dcs2_audio_2104_device &dcs(DCS2_AUDIO_2104(config, "dcs", 0));
+ dcs2_audio_2104_device &dcs(DCS2_AUDIO_2104(config, "dcs"));
dcs.set_dram_in_mb(4);
dcs.set_polling_offset(0x0b5d);
- MIDWAY_IOASIC(config, m_ioasic, 0);
+ MIDWAY_IOASIC(config, m_ioasic);
m_ioasic->set_shuffle(MIDWAY_IOASIC_BLITZ99);
m_ioasic->set_upper(498); // or 478 or 487
m_ioasic->set_yearoffs(80);
@@ -2175,11 +2175,11 @@ void vegas_state::nbagold(machine_config &config)
m_maincpu->set_dcache_size(32768);
m_maincpu->set_system_clock(vegas_state::SYSTEM_CLOCK);
m_nile->set_sdram_size(0, 0x00800000);
- dcs2_audio_2104_device &dcs(DCS2_AUDIO_2104(config, "dcs", 0));
+ dcs2_audio_2104_device &dcs(DCS2_AUDIO_2104(config, "dcs"));
dcs.set_dram_in_mb(4);
dcs.set_polling_offset(0x0b5d);
- MIDWAY_IOASIC(config, m_ioasic, 0);
+ MIDWAY_IOASIC(config, m_ioasic);
m_ioasic->set_shuffle(MIDWAY_IOASIC_GAUNTDL);
m_ioasic->set_upper(109); // 494 109 ???
m_ioasic->set_yearoffs(80);
@@ -2191,11 +2191,11 @@ void vegas_state::nbagold(machine_config &config)
void vegas_state::sf2049(machine_config &config)
{
denver(config);
- dcs2_audio_denver_5ch_device &dcs(DCS2_AUDIO_DENVER_5CH(config, "dcs", 0));
+ dcs2_audio_denver_5ch_device &dcs(DCS2_AUDIO_DENVER_5CH(config, "dcs"));
dcs.set_dram_in_mb(8);
dcs.set_polling_offset(0x872);
- MIDWAY_IOASIC(config, m_ioasic, 0);
+ MIDWAY_IOASIC(config, m_ioasic);
m_ioasic->set_shuffle(MIDWAY_IOASIC_STANDARD);
m_ioasic->set_upper(336); // others?
m_ioasic->set_yearoffs(80);
@@ -2207,11 +2207,11 @@ void vegas_state::sf2049(machine_config &config)
void vegas_state::sf2049se(machine_config &config)
{
denver(config);
- dcs2_audio_denver_5ch_device &dcs(DCS2_AUDIO_DENVER_5CH(config, "dcs", 0));
+ dcs2_audio_denver_5ch_device &dcs(DCS2_AUDIO_DENVER_5CH(config, "dcs"));
dcs.set_dram_in_mb(8);
dcs.set_polling_offset(0x872);
- MIDWAY_IOASIC(config, m_ioasic, 0);
+ MIDWAY_IOASIC(config, m_ioasic);
m_ioasic->set_shuffle(MIDWAY_IOASIC_SFRUSHRK);
m_ioasic->set_upper(352); // 352 336 others?
m_ioasic->set_yearoffs(80);
@@ -2223,11 +2223,11 @@ void vegas_state::sf2049se(machine_config &config)
void vegas_state::sf2049te(machine_config &config)
{
denver(config);
- dcs2_audio_denver_5ch_device &dcs(DCS2_AUDIO_DENVER_5CH(config, "dcs", 0));
+ dcs2_audio_denver_5ch_device &dcs(DCS2_AUDIO_DENVER_5CH(config, "dcs"));
dcs.set_dram_in_mb(8);
dcs.set_polling_offset(0x872);
- MIDWAY_IOASIC(config, m_ioasic, 0);
+ MIDWAY_IOASIC(config, m_ioasic);
m_ioasic->set_shuffle(MIDWAY_IOASIC_SFRUSHRK);
m_ioasic->set_upper(348); // others?
m_ioasic->set_yearoffs(80);
@@ -2239,11 +2239,11 @@ void vegas_state::sf2049te(machine_config &config)
void vegas_state::cartfury(machine_config &config)
{
vegasv3(config);
- dcs2_audio_2104_device &dcs(DCS2_AUDIO_2104(config, "dcs", 0));
+ dcs2_audio_2104_device &dcs(DCS2_AUDIO_2104(config, "dcs"));
dcs.set_dram_in_mb(4);
dcs.set_polling_offset(0x0b5d);
- MIDWAY_IOASIC(config, m_ioasic, 0);
+ MIDWAY_IOASIC(config, m_ioasic);
m_ioasic->set_shuffle(MIDWAY_IOASIC_CARNEVIL);
// 433, 495, 490 Development PIC
m_ioasic->set_upper(495/*433, 495 others? */);
diff --git a/src/mame/midway/williams.cpp b/src/mame/midway/williams.cpp
index d1f0aaeb70c..c1b68a558a3 100644
--- a/src/mame/midway/williams.cpp
+++ b/src/mame/midway/williams.cpp
@@ -1565,24 +1565,24 @@ void williams_state::williams_base(machine_config &config)
// sound hardware
SPEAKER(config, "speaker").front_center();
- MC1408(config, "dac", 0).add_route(ALL_OUTPUTS, "speaker", 0.25); // mc1408.ic6
+ MC1408(config, "dac").add_route(ALL_OUTPUTS, "speaker", 0.25); // mc1408.ic6
// pia
INPUT_MERGER_ANY_HIGH(config, "mainirq").output_handler().set_inputline(m_maincpu, M6809_IRQ_LINE);
INPUT_MERGER_ANY_HIGH(config, "soundirq").output_handler().set_inputline(m_soundcpu, M6808_IRQ_LINE);
- PIA6821(config, m_pia[0], 0);
+ PIA6821(config, m_pia[0]);
m_pia[0]->readpa_handler().set_ioport("IN0");
m_pia[0]->readpb_handler().set_ioport("IN1");
- PIA6821(config, m_pia[1], 0);
+ PIA6821(config, m_pia[1]);
m_pia[1]->readpa_handler().set_ioport("IN2");
m_pia[1]->writepb_handler().set(FUNC(williams_state::snd_cmd_w));
m_pia[1]->irqa_handler().set("mainirq", FUNC(input_merger_any_high_device::in_w<0>));
m_pia[1]->irqb_handler().set("mainirq", FUNC(input_merger_any_high_device::in_w<1>));
- PIA6821(config, m_pia[2], 0);
+ PIA6821(config, m_pia[2]);
m_pia[2]->writepa_handler().set("dac", FUNC(dac_byte_interface::data_w));
m_pia[2]->irqa_handler().set("soundirq", FUNC(input_merger_any_high_device::in_w<0>));
m_pia[2]->irqb_handler().set("soundirq", FUNC(input_merger_any_high_device::in_w<1>));
@@ -1637,11 +1637,11 @@ void wms_muxed_state::williams_muxed(machine_config &config)
m_pia[0]->cb2_handler().set("mux_0", FUNC(ls157_device::select_w));
m_pia[0]->cb2_handler().append("mux_1", FUNC(ls157_device::select_w));
- LS157(config, m_mux0, 0); // IC3 on interface board (actually LS257 with OC tied low)
+ LS157(config, m_mux0); // IC3 on interface board (actually LS257 with OC tied low)
m_mux0->a_in_callback().set_ioport("INP2");
m_mux0->b_in_callback().set_ioport("INP1");
- LS157(config, m_mux1, 0); // IC4 on interface board (actually LS257 with OC tied low)
+ LS157(config, m_mux1); // IC4 on interface board (actually LS257 with OC tied low)
m_mux1->a_in_callback().set_ioport("INP2A");
m_mux1->b_in_callback().set_ioport("INP1A");
}
@@ -1664,7 +1664,7 @@ void spdball_state::spdball(machine_config &config)
williams_b1(config);
// pia
- PIA6821(config, m_pia[3], 0);
+ PIA6821(config, m_pia[3]);
m_pia[3]->readpa_handler().set_ioport("IN3");
m_pia[3]->readpb_handler().set_ioport("IN4");
}
@@ -1692,7 +1692,7 @@ void sinistar_state::sinistar(machine_config &config)
m_pia[2]->cb2_handler().set("cvsd", FUNC(hc55516_device::clock_w));
// sound hardware
- HC55516(config, "cvsd", 0).add_route(ALL_OUTPUTS, "speaker", 0.8);
+ HC55516(config, "cvsd").add_route(ALL_OUTPUTS, "speaker", 0.8);
}
void playball_state::playball(machine_config &config)
@@ -1703,7 +1703,7 @@ void playball_state::playball(machine_config &config)
m_screen->set_visarea(6, 298-1, 8, 240-1);
// sound hardware
- HC55516(config, "cvsd", 0).add_route(ALL_OUTPUTS, "speaker", 0.8);
+ HC55516(config, "cvsd").add_route(ALL_OUTPUTS, "speaker", 0.8);
// pia
m_pia[2]->ca2_handler().set("cvsd", FUNC(hc55516_device::digit_w));
@@ -1724,7 +1724,7 @@ void blaster_state::blastkit(machine_config &config)
m_pia[0]->cb2_handler().set("mux_a", FUNC(ls157_x2_device::select_w));
// All multiplexers on Blaster interface board are really LS257 with OC tied to GND (which is equivalent to LS157)
- LS157_X2(config, m_muxa, 0);
+ LS157_X2(config, m_muxa);
m_muxa->a_in_callback().set_ioport("IN3");
m_muxa->b_in_callback().set(FUNC(williams_state::port_0_49way_r));
}
@@ -1747,7 +1747,7 @@ void blaster_state::blaster(machine_config &config)
m_muxa->a_in_callback().set(FUNC(williams_state::port_0_49way_r));
m_muxa->b_in_callback().set_ioport("IN3");
- LS157(config, m_muxb, 0); // IC3
+ LS157(config, m_muxb); // IC3
m_muxb->a_in_callback().set_ioport("INP1");
m_muxb->b_in_callback().set_ioport("INP2");
@@ -1756,7 +1756,7 @@ void blaster_state::blaster(machine_config &config)
m_pia[1]->writepb_handler().set(FUNC(blaster_state::blaster_snd_cmd_w));
m_pia[2]->writepa_handler().set("ldac", FUNC(dac_byte_interface::data_w));
- PIA6821(config, m_pia[3], 0);
+ PIA6821(config, m_pia[3]);
m_pia[3]->writepa_handler().set("rdac", FUNC(dac_byte_interface::data_w));
m_pia[3]->irqa_handler().set("soundirq_b", FUNC(input_merger_any_high_device::in_w<0>));
m_pia[3]->irqb_handler().set("soundirq_b", FUNC(input_merger_any_high_device::in_w<1>));
@@ -1767,8 +1767,8 @@ void blaster_state::blaster(machine_config &config)
SPEAKER(config, "lspeaker").front_left();
SPEAKER(config, "rspeaker").front_right();
- MC1408(config, "ldac", 0).add_route(ALL_OUTPUTS, "lspeaker", 0.25); // unknown DAC
- MC1408(config, "rdac", 0).add_route(ALL_OUTPUTS, "rspeaker", 0.25); // unknown DAC
+ MC1408(config, "ldac").add_route(ALL_OUTPUTS, "lspeaker", 0.25); // unknown DAC
+ MC1408(config, "rdac").add_route(ALL_OUTPUTS, "rspeaker", 0.25); // unknown DAC
}
@@ -1803,24 +1803,24 @@ void williams2_state::williams2_base(machine_config &config)
// sound hardware
SPEAKER(config, "speaker").front_center();
- MC1408(config, "dac", 0).add_route(ALL_OUTPUTS, "speaker", 0.5); // unknown DAC
+ MC1408(config, "dac").add_route(ALL_OUTPUTS, "speaker", 0.5); // unknown DAC
INPUT_MERGER_ANY_HIGH(config, "mainirq").output_handler().set_inputline(m_maincpu, M6809_IRQ_LINE);
INPUT_MERGER_ANY_HIGH(config, "soundirq").output_handler().set_inputline(m_soundcpu, M6808_IRQ_LINE);
// pia
- PIA6821(config, m_pia[0], 0);
+ PIA6821(config, m_pia[0]);
m_pia[0]->readpa_handler().set_ioport("IN0");
m_pia[0]->readpb_handler().set_ioport("IN1");
- PIA6821(config, m_pia[1], 0);
+ PIA6821(config, m_pia[1]);
m_pia[1]->readpa_handler().set_ioport("IN2");
m_pia[1]->writepb_handler().set(FUNC(williams2_state::snd_cmd_w));
m_pia[1]->cb2_handler().set(m_pia[2], FUNC(pia6821_device::ca1_w));
m_pia[1]->irqa_handler().set("mainirq", FUNC(input_merger_any_high_device::in_w<0>));
m_pia[1]->irqb_handler().set("mainirq", FUNC(input_merger_any_high_device::in_w<1>));
- PIA6821(config, m_pia[2], 0);
+ PIA6821(config, m_pia[2]);
m_pia[2]->writepa_handler().set(m_pia[1], FUNC(pia6821_device::portb_w));
m_pia[2]->writepb_handler().set("dac", FUNC(dac_byte_interface::data_w));
m_pia[2]->ca2_handler().set(m_pia[1], FUNC(pia6821_device::cb1_w));
@@ -1843,7 +1843,7 @@ void inferno_state::inferno(machine_config &config)
m_pia[2]->set_port_a_input_overrides_output_mask(0xff);
- LS157_X2(config, m_mux, 0); // IC45 (for PA4-PA7) + IC46 (for PA0-PA3) on CPU board
+ LS157_X2(config, m_mux); // IC45 (for PA4-PA7) + IC46 (for PA0-PA3) on CPU board
m_mux->a_in_callback().set_ioport("INP1");
m_mux->b_in_callback().set_ioport("INP2");
}
@@ -1883,7 +1883,7 @@ void tshoot_state::tshoot(machine_config &config)
m_pia[2]->cb2_handler().set(FUNC(tshoot_state::maxvol_w));
- LS157_X2(config, m_mux, 0); // U2 + U3 on interface board
+ LS157_X2(config, m_mux); // U2 + U3 on interface board
m_mux->a_in_callback().set_ioport("INP1");
m_mux->b_in_callback().set_ioport("INP2");
}
@@ -1915,7 +1915,7 @@ void joust2_state::joust2(machine_config &config)
m_bg->cb2_cb().set(m_pia[2], FUNC(pia6821_device::cb1_w));
m_pia[2]->cb2_handler().set(m_bg, FUNC(s11_obg_device::resetq_w)); // inverted?
- LS157(config, m_mux, 0);
+ LS157(config, m_mux);
m_mux->a_in_callback().set_ioport("INP1");
m_mux->b_in_callback().set_ioport("INP2");
}
diff --git a/src/mame/midway/wmg.cpp b/src/mame/midway/wmg.cpp
index dfe2a74c48b..bdb4419ac3d 100644
--- a/src/mame/midway/wmg.cpp
+++ b/src/mame/midway/wmg.cpp
@@ -530,25 +530,25 @@ void wmg_state::wmg(machine_config &config)
/* sound hardware */
SPEAKER(config, "speaker").front_center();
- MC1408(config, "dac", 0).add_route(ALL_OUTPUTS, "speaker", 0.25); // unknown DAC
+ MC1408(config, "dac").add_route(ALL_OUTPUTS, "speaker", 0.25); // unknown DAC
/* pia */
INPUT_MERGER_ANY_HIGH(config, "mainirq").output_handler().set_inputline(m_maincpu, M6809_IRQ_LINE);
INPUT_MERGER_ANY_HIGH(config, "soundirq").output_handler().set_inputline(m_soundcpu, M6808_IRQ_LINE);
- pia6821_device &pia0(PIA6821(config, "pia_0", 0));
+ pia6821_device &pia0(PIA6821(config, "pia_0"));
pia0.readpa_handler().set_ioport("IN0");
pia0.readpb_handler().set_ioport("IN1");
pia0.cb2_handler().set(FUNC(wmg_state::wmg_port_select_w));
- pia6821_device &pia1(PIA6821(config, "pia_1", 0));
+ pia6821_device &pia1(PIA6821(config, "pia_1"));
pia1.readpa_handler().set_ioport("IN2");
pia1.writepb_handler().set(FUNC(wmg_state::snd_cmd_w));
pia1.irqa_handler().set("mainirq", FUNC(input_merger_any_high_device::in_w<0>));
pia1.irqb_handler().set("mainirq", FUNC(input_merger_any_high_device::in_w<1>));
- pia6821_device &pia2(PIA6821(config, "pia_2", 0));
+ pia6821_device &pia2(PIA6821(config, "pia_2"));
pia2.writepa_handler().set("dac", FUNC(dac_byte_interface::data_w));
pia2.irqa_handler().set("soundirq", FUNC(input_merger_any_high_device::in_w<0>));
pia2.irqb_handler().set("soundirq", FUNC(input_merger_any_high_device::in_w<1>));
diff --git a/src/mame/midway/zwackery.cpp b/src/mame/midway/zwackery.cpp
index ec194c18532..2e3fde9eadd 100644
--- a/src/mame/midway/zwackery.cpp
+++ b/src/mame/midway/zwackery.cpp
@@ -482,7 +482,7 @@ void zwackery_state::machine_start()
void zwackery_state::zwackery(machine_config &config)
{
// basic machine hardware
- M68000(config, m_maincpu, 7652400); // based on counter usage, should be XTAL(16'000'000)/2
+ M68000(config, m_maincpu, XTAL::u(7652400)); // based on counter usage, should be XTAL(16'000'000)/2
m_maincpu->set_addrmap(AS_PROGRAM, &zwackery_state::zwackery_map);
WATCHDOG_TIMER(config, m_watchdog);
@@ -490,19 +490,19 @@ void zwackery_state::zwackery(machine_config &config)
PTM6840(config, m_ptm, 7652400 / 10);
m_ptm->irq_callback().set_inputline("maincpu", 6);
- PIA6821(config, m_pia0, 0);
+ PIA6821(config, m_pia0);
m_pia0->readpb_handler().set_ioport("IN0");
m_pia0->writepa_handler().set(FUNC(zwackery_state::pia0_porta_w));
m_pia0->irqa_handler().set(FUNC(zwackery_state::pia0_irq_w));
m_pia0->irqb_handler().set(FUNC(zwackery_state::pia0_irq_w));
- PIA6821(config, m_pia1, 0);
+ PIA6821(config, m_pia1);
m_pia1->readpa_handler().set_ioport("IN1");
m_pia1->writepa_handler().set(FUNC(zwackery_state::pia1_porta_w));
m_pia1->readpb_handler().set(FUNC(zwackery_state::pia1_portb_r));
m_pia1->ca2_handler().set(m_cheap_squeak_deluxe, FUNC(midway_cheap_squeak_deluxe_device::sirq_w));
- PIA6821(config, m_pia2, 0);
+ PIA6821(config, m_pia2);
m_pia2->readpa_handler().set_ioport("IN3");
m_pia2->readpb_handler().set_ioport("DSW");