summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/skeleton
diff options
context:
space:
mode:
author Olivier Galibert <galibert@pobox.com>2022-06-16 12:47:52 +0200
committer Olivier Galibert <galibert@pobox.com>2025-04-29 23:06:41 +0200
commit45d4cd52a8194f2ef9e0383cfb2e2a35634af6ff (patch)
tree4e8d8fcb7382a5e9e0bce5ec59939bcfbe67155a /src/mame/skeleton
parent5c14bcdfcb4aefb71b5b62387c4ad05dbeb3814e (diff)
full xtal conversionxtal
Diffstat (limited to 'src/mame/skeleton')
-rw-r--r--src/mame/skeleton/airbase99.cpp6
-rw-r--r--src/mame/skeleton/alfaskop41xx.cpp12
-rw-r--r--src/mame/skeleton/alfaskop_s41_kb.h2
-rw-r--r--src/mame/skeleton/alphasma.cpp4
-rw-r--r--src/mame/skeleton/alphasma3k.cpp6
-rw-r--r--src/mame/skeleton/ampex.cpp2
-rw-r--r--src/mame/skeleton/ampex210_kbd.cpp2
-rw-r--r--src/mame/skeleton/ampex210_kbd.h2
-rw-r--r--src/mame/skeleton/anzterm.cpp10
-rw-r--r--src/mame/skeleton/attache.cpp2
-rw-r--r--src/mame/skeleton/ax20.cpp2
-rw-r--r--src/mame/skeleton/basf7100.cpp12
-rw-r--r--src/mame/skeleton/basf7100_kbd.cpp2
-rw-r--r--src/mame/skeleton/basf7100_kbd.h2
-rw-r--r--src/mame/skeleton/bitgraph.cpp16
-rw-r--r--src/mame/skeleton/blit.cpp6
-rw-r--r--src/mame/skeleton/br8641.cpp2
-rw-r--r--src/mame/skeleton/busicom.cpp2
-rw-r--r--src/mame/skeleton/c2color.cpp2
-rw-r--r--src/mame/skeleton/candela.cpp20
-rw-r--r--src/mame/skeleton/cd100.cpp2
-rw-r--r--src/mame/skeleton/cd2650.cpp4
-rw-r--r--src/mame/skeleton/ckz80.cpp2
-rw-r--r--src/mame/skeleton/consola_emt.cpp2
-rw-r--r--src/mame/skeleton/cortex.cpp4
-rw-r--r--src/mame/skeleton/cosmicos.cpp2
-rw-r--r--src/mame/skeleton/cp1.cpp4
-rw-r--r--src/mame/skeleton/ct909e_segadvd.cpp2
-rw-r--r--src/mame/skeleton/cxhumax.cpp6
-rw-r--r--src/mame/skeleton/daruma.cpp2
-rw-r--r--src/mame/skeleton/datacast.cpp10
-rw-r--r--src/mame/skeleton/design.cpp2
-rw-r--r--src/mame/skeleton/didact.cpp26
-rw-r--r--src/mame/skeleton/digel804.cpp4
-rw-r--r--src/mame/skeleton/digilog320.cpp4
-rw-r--r--src/mame/skeleton/digilog_kbd.cpp2
-rw-r--r--src/mame/skeleton/digilog_kbd.h2
-rw-r--r--src/mame/skeleton/dim68k.cpp4
-rw-r--r--src/mame/skeleton/dm7000.cpp2
-rw-r--r--src/mame/skeleton/dmv.cpp6
-rw-r--r--src/mame/skeleton/dmv_keyb.cpp2
-rw-r--r--src/mame/skeleton/dmv_keyb.h2
-rw-r--r--src/mame/skeleton/dps1.cpp6
-rw-r--r--src/mame/skeleton/e100.cpp6
-rw-r--r--src/mame/skeleton/easy_karaoke.cpp2
-rw-r--r--src/mame/skeleton/elzet80.cpp10
-rw-r--r--src/mame/skeleton/epic14e.cpp2
-rw-r--r--src/mame/skeleton/eurit.cpp6
-rw-r--r--src/mame/skeleton/eurocom2.cpp12
-rw-r--r--src/mame/skeleton/fanucspmg.cpp18
-rw-r--r--src/mame/skeleton/fc100.cpp2
-rw-r--r--src/mame/skeleton/fk1.cpp4
-rw-r--r--src/mame/skeleton/ft68m.cpp2
-rw-r--r--src/mame/skeleton/gimix.cpp16
-rw-r--r--src/mame/skeleton/gm1000.cpp4
-rw-r--r--src/mame/skeleton/goupil.cpp2
-rw-r--r--src/mame/skeleton/grfd2301.cpp2
-rw-r--r--src/mame/skeleton/hazeltin.cpp8
-rw-r--r--src/mame/skeleton/hazl1420.cpp4
-rw-r--r--src/mame/skeleton/hohnadam.cpp6
-rw-r--r--src/mame/skeleton/hprot1.cpp2
-rw-r--r--src/mame/skeleton/ht68k.cpp2
-rw-r--r--src/mame/skeleton/i7000.cpp4
-rw-r--r--src/mame/skeleton/icatel.cpp2
-rw-r--r--src/mame/skeleton/icebox.cpp4
-rw-r--r--src/mame/skeleton/iez80.cpp12
-rw-r--r--src/mame/skeleton/if800.cpp4
-rw-r--r--src/mame/skeleton/imsai.cpp6
-rw-r--r--src/mame/skeleton/indiana.cpp8
-rw-r--r--src/mame/skeleton/itt1700_kbd.cpp2
-rw-r--r--src/mame/skeleton/itt1700_kbd.h2
-rw-r--r--src/mame/skeleton/itt3030.cpp2
-rw-r--r--src/mame/skeleton/itt9216.cpp4
-rw-r--r--src/mame/skeleton/jonos.cpp2
-rw-r--r--src/mame/skeleton/juku.cpp18
-rw-r--r--src/mame/skeleton/junior80.cpp14
-rw-r--r--src/mame/skeleton/lee1214.cpp2
-rw-r--r--src/mame/skeleton/lee1220.cpp8
-rw-r--r--src/mame/skeleton/lms46.cpp4
-rw-r--r--src/mame/skeleton/mccpm.cpp2
-rw-r--r--src/mame/skeleton/mes.cpp8
-rw-r--r--src/mame/skeleton/mfabfz.cpp2
-rw-r--r--src/mame/skeleton/mice.cpp2
-rw-r--r--src/mame/skeleton/micral.cpp4
-rw-r--r--src/mame/skeleton/micromon.cpp2
-rw-r--r--src/mame/skeleton/micronic.cpp2
-rw-r--r--src/mame/skeleton/milwaukee.cpp12
-rw-r--r--src/mame/skeleton/mindset.cpp22
-rw-r--r--src/mame/skeleton/mini2440.cpp10
-rw-r--r--src/mame/skeleton/miniframe.cpp8
-rw-r--r--src/mame/skeleton/ml20.cpp2
-rw-r--r--src/mame/skeleton/mmd1.cpp2
-rw-r--r--src/mame/skeleton/mmd2.cpp2
-rw-r--r--src/mame/skeleton/mod8.cpp4
-rw-r--r--src/mame/skeleton/modellot.cpp2
-rw-r--r--src/mame/skeleton/ms9540.cpp4
-rw-r--r--src/mame/skeleton/mtd1256.cpp2
-rw-r--r--src/mame/skeleton/mx2178.cpp4
-rw-r--r--src/mame/skeleton/mycom.cpp2
-rw-r--r--src/mame/skeleton/ngen.cpp32
-rw-r--r--src/mame/skeleton/ngen_kb.cpp6
-rw-r--r--src/mame/skeleton/ngen_kb.h2
-rw-r--r--src/mame/skeleton/onyx.cpp6
-rw-r--r--src/mame/skeleton/p8k.cpp24
-rw-r--r--src/mame/skeleton/palestra.cpp4
-rw-r--r--src/mame/skeleton/pdt3100.cpp2
-rw-r--r--src/mame/skeleton/pes.cpp4
-rw-r--r--src/mame/skeleton/philipsbo.cpp4
-rw-r--r--src/mame/skeleton/picno.cpp2
-rw-r--r--src/mame/skeleton/plan80.cpp2
-rw-r--r--src/mame/skeleton/pm68k.cpp6
-rw-r--r--src/mame/skeleton/pockchal.cpp2
-rw-r--r--src/mame/skeleton/proteus3.cpp8
-rw-r--r--src/mame/skeleton/pt68k4.cpp38
-rw-r--r--src/mame/skeleton/ptcsol.cpp6
-rw-r--r--src/mame/skeleton/pv9234.cpp2
-rw-r--r--src/mame/skeleton/qtsbc.cpp2
-rw-r--r--src/mame/skeleton/rvoice.cpp4
-rw-r--r--src/mame/skeleton/sacstate.cpp4
-rw-r--r--src/mame/skeleton/sansa_fuze.cpp2
-rw-r--r--src/mame/skeleton/sartorius.cpp2
-rw-r--r--src/mame/skeleton/sbrain.cpp4
-rw-r--r--src/mame/skeleton/scopus.cpp6
-rw-r--r--src/mame/skeleton/sh4robot.cpp2
-rw-r--r--src/mame/skeleton/shine.cpp8
-rw-r--r--src/mame/skeleton/slsstars.cpp2
-rw-r--r--src/mame/skeleton/softbox.cpp4
-rw-r--r--src/mame/skeleton/squale.cpp6
-rw-r--r--src/mame/skeleton/swyft.cpp2
-rw-r--r--src/mame/skeleton/sys2900.cpp8
-rw-r--r--src/mame/skeleton/sys9002.cpp6
-rw-r--r--src/mame/skeleton/systec.cpp2
-rw-r--r--src/mame/skeleton/tavernie.cpp14
-rw-r--r--src/mame/skeleton/telex274.cpp10
-rw-r--r--src/mame/skeleton/terak.cpp2
-rw-r--r--src/mame/skeleton/terco.cpp6
-rw-r--r--src/mame/skeleton/terminal.cpp2
-rw-r--r--src/mame/skeleton/testpat.cpp6
-rw-r--r--src/mame/skeleton/ti630.cpp2
-rw-r--r--src/mame/skeleton/tk635.cpp2
-rw-r--r--src/mame/skeleton/tr175.cpp4
-rw-r--r--src/mame/skeleton/tsispch.cpp8
-rw-r--r--src/mame/skeleton/tulip1.cpp12
-rw-r--r--src/mame/skeleton/v6809.cpp16
-rw-r--r--src/mame/skeleton/vanguardmk1.cpp2
-rw-r--r--src/mame/skeleton/vd56sp.cpp2
-rw-r--r--src/mame/skeleton/vector4.cpp14
-rw-r--r--src/mame/skeleton/vectrix.cpp2
-rw-r--r--src/mame/skeleton/vp415.cpp4
-rw-r--r--src/mame/skeleton/vsmilepro.cpp2
-rw-r--r--src/mame/skeleton/wicat.cpp4
-rw-r--r--src/mame/skeleton/zeebo_qualcomm_adreno130.cpp2
-rw-r--r--src/mame/skeleton/zms8085.cpp2
-rw-r--r--src/mame/skeleton/zorba.cpp8
-rw-r--r--src/mame/skeleton/zorbakbd.h2
-rw-r--r--src/mame/skeleton/zt8802.cpp4
156 files changed, 434 insertions, 434 deletions
diff --git a/src/mame/skeleton/airbase99.cpp b/src/mame/skeleton/airbase99.cpp
index f6250981fd4..104ff908b48 100644
--- a/src/mame/skeleton/airbase99.cpp
+++ b/src/mame/skeleton/airbase99.cpp
@@ -55,11 +55,11 @@ INPUT_PORTS_END
void airbase99_state::airbase99(machine_config &config)
{
- PIC17C43(config, m_maincpu, 16'000'000); // PIC17C43-16/P (XTAL unreadable)
+ PIC17C43(config, m_maincpu, XTAL::u(16'000'000)); // PIC17C43-16/P (XTAL unreadable)
m_maincpu->set_mode(pic17c43_device::mode::MICROPROCESSOR);
m_maincpu->set_addrmap(AS_PROGRAM, &airbase99_state::mem_map);
- PIC17C43(config, m_slavecpu, 16'000'000); // PIC17C43-33/P (XTAL unreadable)
+ PIC17C43(config, m_slavecpu, XTAL::u(16'000'000)); // PIC17C43-33/P (XTAL unreadable)
m_slavecpu->set_mode(pic17c43_device::mode::MICROCONTROLLER);
m_slavecpu->set_disable();
@@ -73,7 +73,7 @@ void airbase99_state::airbase99(machine_config &config)
PALETTE(config, "palette", palette_device::MONOCHROME_INVERTED);
- hd44780_device &lcdc(HD44780(config, "lcdc", 0));
+ hd44780_device &lcdc(HD44780(config, "lcdc"));
lcdc.set_lcd_size(2, 20);
lcdc.set_pixel_update_cb(FUNC(airbase99_state::pixel_update));
}
diff --git a/src/mame/skeleton/alfaskop41xx.cpp b/src/mame/skeleton/alfaskop41xx.cpp
index b65a28fe6a8..700b1950a50 100644
--- a/src/mame/skeleton/alfaskop41xx.cpp
+++ b/src/mame/skeleton/alfaskop41xx.cpp
@@ -370,7 +370,7 @@ void alfaskop4110_state::alfaskop4110(machine_config &config)
m_screen->set_raw(19'170'000, 80 * 8, 0, 80 * 8, 400, 0, 400);
m_screen->set_screen_update("crtc", FUNC(mc6845_device::screen_update));
- PIA6821(config, m_mic_pia, 0); // Main board PIA
+ PIA6821(config, m_mic_pia); // Main board PIA
m_mic_pia->cb1_w(0);
m_mic_pia->cb2_handler().set([this](offs_t offset, uint8_t data) { LOGMIC("->MIC PIA: CB2 write %d\n", data); });
@@ -432,7 +432,7 @@ void alfaskop4110_state::alfaskop4110(machine_config &config)
m_mic_pia->ca1_w(0);
m_mic_pia->ca2_w(0);
- PIA6821(config, m_dia_pia, 0); // Display PIA, controls how the CRTC accesses memory etc
+ PIA6821(config, m_dia_pia); // Display PIA, controls how the CRTC accesses memory etc
m_dia_pia->cb1_w(0);
m_dia_pia->cb2_handler().set([this](offs_t offset, uint8_t data) { LOGDIA("DIA PIA: CB2_w %d\n", data); });
m_dia_pia->writepa_handler().set([this](offs_t offset, uint8_t data) { LOGDIA("DIA PIA: PA_w %02x\n", data); });
@@ -442,7 +442,7 @@ void alfaskop4110_state::alfaskop4110(machine_config &config)
m_dia_pia->ca1_w(0);
m_dia_pia->ca2_w(0);
- ACIA6850(config, m_kbd_acia, 0);
+ ACIA6850(config, m_kbd_acia);
//CLOCK(config, "acia_clock", ACIA_CLOCK).signal_handler().set(FUNC(alfaskop4110_state::write_acia_clock));
m_kbd_acia->irq_handler().set("irq3", FUNC(input_merger_device::in_w<3>));
@@ -531,8 +531,8 @@ void alfaskop4120_state::alfaskop4120(machine_config &config)
M6800(config, m_maincpu, XTAL(19'170'000) / 18); // Verified from service manual
m_maincpu->set_addrmap(AS_PROGRAM, &alfaskop4120_state::mem_map);
- PIA6821(config, m_mic_pia, 0); // Main Board PIA
- PIA6821(config, m_fdapia, 0); // Floppy Disk PIA
+ PIA6821(config, m_mic_pia); // Main Board PIA
+ PIA6821(config, m_fdapia); // Floppy Disk PIA
}
void alfaskop4101_state::alfaskop4101(machine_config &config)
@@ -541,7 +541,7 @@ void alfaskop4101_state::alfaskop4101(machine_config &config)
M6800(config, m_maincpu, XTAL(19'170'000) / 18); // Verified from service manual
m_maincpu->set_addrmap(AS_PROGRAM, &alfaskop4101_state::mem_map);
- PIA6821(config, m_mic_pia, 0); // Main board PIA
+ PIA6821(config, m_mic_pia); // Main board PIA
}
/* ROM definitions */
diff --git a/src/mame/skeleton/alfaskop_s41_kb.h b/src/mame/skeleton/alfaskop_s41_kb.h
index de604fd37b4..d5c1f1e4ebd 100644
--- a/src/mame/skeleton/alfaskop_s41_kb.h
+++ b/src/mame/skeleton/alfaskop_s41_kb.h
@@ -16,7 +16,7 @@ public:
auto txd_cb() { return m_txd_cb.bind(); }
auto leds_cb() { return m_leds_cb.bind(); }
- alfaskop_s41_keyboard_device(machine_config const &mconfig, char const *tag, device_t *owner, uint32_t clock = 0);
+ alfaskop_s41_keyboard_device(machine_config const &mconfig, char const *tag, device_t *owner, const XTAL &clock = XTAL());
DECLARE_INPUT_CHANGED_MEMBER(key);
DECLARE_WRITE_LINE_MEMBER(rxd_w);
diff --git a/src/mame/skeleton/alphasma.cpp b/src/mame/skeleton/alphasma.cpp
index e747eebb4c2..ee6e36b890d 100644
--- a/src/mame/skeleton/alphasma.cpp
+++ b/src/mame/skeleton/alphasma.cpp
@@ -567,9 +567,9 @@ void alphasmart_state::alphasmart(machine_config &config)
m_maincpu->in_pd_callback().set(FUNC(alphasmart_state::port_d_r));
m_maincpu->out_pd_callback().set(FUNC(alphasmart_state::port_d_w));
- KS0066_F05(config, m_lcdc[0], 0);
+ KS0066_F05(config, m_lcdc[0]);
m_lcdc[0]->set_lcd_size(2, 40);
- KS0066_F05(config, m_lcdc[1], 0);
+ KS0066_F05(config, m_lcdc[1]);
m_lcdc[1]->set_lcd_size(2, 40);
/* video hardware */
diff --git a/src/mame/skeleton/alphasma3k.cpp b/src/mame/skeleton/alphasma3k.cpp
index f0ecc6ba050..21a64fb2ecd 100644
--- a/src/mame/skeleton/alphasma3k.cpp
+++ b/src/mame/skeleton/alphasma3k.cpp
@@ -72,13 +72,13 @@ INPUT_PORTS_END
void alphasmart3k_state::alphasmart3k(machine_config &config)
{
// Basic machine hardware
- MC68328(config, m_maincpu, 16'000'000); // MC68EZ328PU16V, clock unverified
+ MC68328(config, m_maincpu, XTAL::u(16'000'000)); // MC68EZ328PU16V, clock unverified
// Values from AlphaSmart 2000, not confirmed for AlphaSmart 3000
// AlphaSmart 3000 uses a Data Image CM4040 LCD display
- KS0066_F05(config, m_lcdc0, 0);
+ KS0066_F05(config, m_lcdc0);
m_lcdc0->set_lcd_size(2, 40);
- KS0066_F05(config, m_lcdc1, 0);
+ KS0066_F05(config, m_lcdc1);
m_lcdc1->set_lcd_size(2, 40);
RAM(config, RAM_TAG).set_default_size("256K");
diff --git a/src/mame/skeleton/ampex.cpp b/src/mame/skeleton/ampex.cpp
index cb6f049668e..013c264cc0f 100644
--- a/src/mame/skeleton/ampex.cpp
+++ b/src/mame/skeleton/ampex.cpp
@@ -372,7 +372,7 @@ void ampex_state::ampex(machine_config &config)
m_vtac->vsyn_callback().set(FUNC(ampex_state::vsyn_w));
m_vtac->set_screen("screen");
- AY31015(config, m_uart, 0); // COM8017, actually
+ AY31015(config, m_uart); // COM8017, actually
m_uart->write_so_callback().set(FUNC(ampex_state::so_w));
m_uart->write_dav_callback().set(FUNC(ampex_state::dav_w));
m_uart->set_auto_rdav(true);
diff --git a/src/mame/skeleton/ampex210_kbd.cpp b/src/mame/skeleton/ampex210_kbd.cpp
index 65acbccba88..344c0eef519 100644
--- a/src/mame/skeleton/ampex210_kbd.cpp
+++ b/src/mame/skeleton/ampex210_kbd.cpp
@@ -15,7 +15,7 @@
DEFINE_DEVICE_TYPE(AMPEX230_KEYBOARD, ampex230_keyboard_device, "ampex230_kbd", "Ampex 230 Keyboard")
-ampex230_keyboard_device::ampex230_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock)
+ampex230_keyboard_device::ampex230_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: device_t(mconfig, AMPEX230_KEYBOARD, tag, owner, clock)
, m_data_out_callback(*this)
, m_clock_out_callback(*this)
diff --git a/src/mame/skeleton/ampex210_kbd.h b/src/mame/skeleton/ampex210_kbd.h
index 7775ca3a9ad..a08a4227a1e 100644
--- a/src/mame/skeleton/ampex210_kbd.h
+++ b/src/mame/skeleton/ampex210_kbd.h
@@ -10,7 +10,7 @@ class ampex230_keyboard_device : public device_t
{
public:
// construction/destruction
- ampex230_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock = 0);
+ ampex230_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock = XTAL());
// callback configuration
auto data_out_callback() { return m_data_out_callback.bind(); }
diff --git a/src/mame/skeleton/anzterm.cpp b/src/mame/skeleton/anzterm.cpp
index 5938606f34f..eb360563fcd 100644
--- a/src/mame/skeleton/anzterm.cpp
+++ b/src/mame/skeleton/anzterm.cpp
@@ -419,11 +419,11 @@ void anzterm_state::anzterm(machine_config &config)
m6809_device &maincpu(M6809(config, "maincpu", 15974400/4));
maincpu.set_addrmap(AS_PROGRAM, &anzterm_state::anzterm_mem);
- I8214(config, "pic.ic39", 0);
- MC6854(config, "adlc.ic16", 0);
- MC6854(config, "adlc.1c19", 0);
- ACIA6850(config, "acia.ic17", 0);
- ACIA6850(config, "acia.ic18", 0);
+ I8214(config, "pic.ic39");
+ MC6854(config, "adlc.ic16");
+ MC6854(config, "adlc.1c19");
+ ACIA6850(config, "acia.ic17");
+ ACIA6850(config, "acia.ic18");
screen_device &screen(SCREEN(config, "screen", SCREEN_TYPE_RASTER, rgb_t::green()));
screen.set_screen_update(FUNC(anzterm_state::screen_update));
diff --git a/src/mame/skeleton/attache.cpp b/src/mame/skeleton/attache.cpp
index 5c3404ce2e9..c1d40f77c2c 100644
--- a/src/mame/skeleton/attache.cpp
+++ b/src/mame/skeleton/attache.cpp
@@ -1250,7 +1250,7 @@ void attache816_state::attache816(machine_config &config)
m_ctc->zc_callback<1>().set(m_sio, FUNC(z80sio_device::rxtxcb_w));
m_ctc->intr_callback().set_inputline(m_maincpu, INPUT_LINE_IRQ0);
- I8255A(config, m_ppi, 0);
+ I8255A(config, m_ppi);
m_ppi->out_pa_callback().set(FUNC(attache816_state::x86_comms_w));
m_ppi->in_pa_callback().set(FUNC(attache816_state::x86_comms_r));
m_ppi->out_pb_callback().set(FUNC(attache816_state::x86_irq_enable));
diff --git a/src/mame/skeleton/ax20.cpp b/src/mame/skeleton/ax20.cpp
index b27f055e5dc..31db944aebc 100644
--- a/src/mame/skeleton/ax20.cpp
+++ b/src/mame/skeleton/ax20.cpp
@@ -150,7 +150,7 @@ void ax20_state::ax20(machine_config &config)
GFXDECODE(config, m_gfxdecode, m_palette, gfx_ax20);
PALETTE(config, m_palette, palette_device::MONOCHROME);
- I8272A(config, m_fdc, 8'000'000, true);
+ I8272A(config, m_fdc, XTAL::u(8'000'000), true);
/* Devices */
FLOPPY_CONNECTOR(config, "fdc:0", ax20_floppies, "525dd", isa8_fdc_device::floppy_formats);
diff --git a/src/mame/skeleton/basf7100.cpp b/src/mame/skeleton/basf7100.cpp
index 62859323228..33798d972a5 100644
--- a/src/mame/skeleton/basf7100.cpp
+++ b/src/mame/skeleton/basf7100.cpp
@@ -599,20 +599,20 @@ void basf7100_state::machine_reset()
void basf7100_state::basf7100(machine_config &config)
{
- Z80(config, m_maincpu, 4000000);
+ Z80(config, m_maincpu, XTAL::u(4000000));
m_maincpu->set_addrmap(AS_PROGRAM, &basf7100_state::mem_map);
m_maincpu->set_addrmap(AS_IO, &basf7100_state::io_map);
m_maincpu->set_irq_acknowledge_callback(FUNC(basf7100_state::maincpu_irq_callback));
- Z80(config, m_fdccpu, 4000000);
+ Z80(config, m_fdccpu, XTAL::u(4000000));
m_fdccpu->set_addrmap(AS_PROGRAM, &basf7100_state::fdc_mem_map);
m_fdccpu->set_addrmap(AS_IO, &basf7100_state::fdc_io_map);
m_fdccpu->set_irq_acknowledge_callback(FUNC(basf7100_state::fdccpu_irq_callback));
- PIC8259(config, m_pic, 0);
+ PIC8259(config, m_pic);
m_pic->out_int_callback().set_inputline(m_maincpu, INPUT_LINE_IRQ0);
- I8251(config, m_usart[0], 0); // unknown clock
+ I8251(config, m_usart[0]); // unknown clock
m_usart[0]->txd_handler().set("rs232", FUNC(rs232_port_device::write_txd));
m_usart[0]->rts_handler().set("rs232", FUNC(rs232_port_device::write_rts));
m_usart[0]->dtr_handler().set("rs232", FUNC(rs232_port_device::write_dtr));
@@ -626,7 +626,7 @@ void basf7100_state::basf7100(machine_config &config)
rs232.cts_handler().set(m_usart[0], FUNC(i8251_device::write_cts));
rs232.dsr_handler().set(m_usart[0], FUNC(i8251_device::write_dsr));
- I8251(config, m_usart[1], 0); // unknown clock
+ I8251(config, m_usart[1]); // unknown clock
m_usart[1]->txd_handler().set("auxrs232", FUNC(rs232_port_device::write_txd));
m_usart[1]->rts_handler().set("auxrs232", FUNC(rs232_port_device::write_rts));
m_usart[1]->dtr_handler().set("auxrs232", FUNC(rs232_port_device::write_dtr));
@@ -688,7 +688,7 @@ void basf7100_state::basf7100(machine_config &config)
m_centronics->busy_handler().set(FUNC(basf7100_state::centronics_busy_w));
// floppy
- FD1791(config, m_fdc, 1000000);
+ FD1791(config, m_fdc, XTAL::u(1000000));
m_fdc->intrq_wr_callback().set_inputline(m_fdccpu, INPUT_LINE_IRQ0);
m_fdc->drq_wr_callback().set(FUNC(basf7100_state::fdc_drq_w));
FLOPPY_CONNECTOR(config, "fdc:0", basf7100_floppies, "basf6106", floppy_image_device::default_mfm_floppy_formats);
diff --git a/src/mame/skeleton/basf7100_kbd.cpp b/src/mame/skeleton/basf7100_kbd.cpp
index 147d208c913..dd571703ba7 100644
--- a/src/mame/skeleton/basf7100_kbd.cpp
+++ b/src/mame/skeleton/basf7100_kbd.cpp
@@ -194,7 +194,7 @@ ioport_constructor basf7100_kbd_device::device_input_ports() const
// basf7100_kbd_device - constructor
//-------------------------------------------------
-basf7100_kbd_device::basf7100_kbd_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+basf7100_kbd_device::basf7100_kbd_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
device_t(mconfig, BASF7100_KBD, tag, owner, clock),
device_matrix_keyboard_interface(mconfig, *this, "row_0", "row_1", "row_2", "row_3", "row_4", "row_5", "row_6", "row_7", "row_8"),
m_translation(*this, "translation"),
diff --git a/src/mame/skeleton/basf7100_kbd.h b/src/mame/skeleton/basf7100_kbd.h
index f49168d681c..6240a9cba40 100644
--- a/src/mame/skeleton/basf7100_kbd.h
+++ b/src/mame/skeleton/basf7100_kbd.h
@@ -24,7 +24,7 @@ class basf7100_kbd_device : public device_t, protected device_matrix_keyboard_i
{
public:
// construction/destruction
- basf7100_kbd_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock = 0);
+ basf7100_kbd_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock = XTAL());
// callbacks
auto int_handler() { return m_int_handler.bind(); }
diff --git a/src/mame/skeleton/bitgraph.cpp b/src/mame/skeleton/bitgraph.cpp
index ccf61b7f0ec..f58440ceb57 100644
--- a/src/mame/skeleton/bitgraph.cpp
+++ b/src/mame/skeleton/bitgraph.cpp
@@ -496,7 +496,7 @@ void bitgraph_state::bg_motherboard(machine_config &config)
PALETTE(config, "palette", palette_device::MONOCHROME);
- ACIA6850(config, m_acia0, 0);
+ ACIA6850(config, m_acia0);
m_acia0->txd_handler().set(RS232_H_TAG, FUNC(rs232_port_device::write_txd));
m_acia0->rts_handler().set(RS232_H_TAG, FUNC(rs232_port_device::write_rts));
m_acia0->irq_handler().set_inputline(m_maincpu, M68K_IRQ_1);
@@ -506,7 +506,7 @@ void bitgraph_state::bg_motherboard(machine_config &config)
rs232h.dcd_handler().set(m_acia0, FUNC(acia6850_device::write_dcd));
rs232h.cts_handler().set(m_acia0, FUNC(acia6850_device::write_cts));
- ACIA6850(config, m_acia1, 0);
+ ACIA6850(config, m_acia1);
m_acia1->txd_handler().set(RS232_K_TAG, FUNC(rs232_port_device::write_txd));
m_acia1->rts_handler().set(RS232_K_TAG, FUNC(rs232_port_device::write_rts));
m_acia1->irq_handler().set_inputline(m_maincpu, M68K_IRQ_1);
@@ -517,7 +517,7 @@ void bitgraph_state::bg_motherboard(machine_config &config)
rs232k.cts_handler().set(m_acia1, FUNC(acia6850_device::write_cts));
rs232k.set_option_device_input_defaults("keyboard", DEVICE_INPUT_DEFAULTS_NAME(kbd_rs232_defaults));
- ACIA6850(config, m_acia2, 0);
+ ACIA6850(config, m_acia2);
m_acia2->txd_handler().set(RS232_D_TAG, FUNC(rs232_port_device::write_txd));
m_acia2->rts_handler().set(RS232_D_TAG, FUNC(rs232_port_device::write_rts));
m_acia2->irq_handler().set_inputline(m_maincpu, M68K_IRQ_1);
@@ -535,7 +535,7 @@ void bitgraph_state::bg_motherboard(machine_config &config)
m_dbrgb->fr_handler().set(FUNC(bitgraph_state::com8116_b_fr_w));
m_dbrgb->ft_handler().set(FUNC(bitgraph_state::com8116_b_ft_w));
- PIA6821(config, m_pia, 0);
+ PIA6821(config, m_pia);
m_pia->readca1_handler().set(FUNC(bitgraph_state::pia_ca1_r));
m_pia->cb2_handler().set(FUNC(bitgraph_state::pia_cb2_w));
m_pia->readpa_handler().set(FUNC(bitgraph_state::pia_pa_r));
@@ -543,7 +543,7 @@ void bitgraph_state::bg_motherboard(machine_config &config)
m_pia->readpb_handler().set(FUNC(bitgraph_state::pia_pb_r));
m_pia->writepb_handler().set(FUNC(bitgraph_state::pia_pb_w));
- ER2055(config, m_earom, 0);
+ ER2055(config, m_earom);
SPEAKER(config, "mono").front_center();
AY8912(config, m_psg, XTAL(1'294'400));
@@ -587,9 +587,9 @@ void bitgraph_state::bitgrpha(machine_config &config)
bg_motherboard(config);
- CLOCK(config, "system_clock", 40).signal_handler().set(FUNC(bitgraph_state::system_clock_write));
+ CLOCK(config, "system_clock", XTAL::u(40)).signal_handler().set(FUNC(bitgraph_state::system_clock_write));
- ACIA6850(config, m_acia3, 0);
+ ACIA6850(config, m_acia3);
m_acia3->txd_handler().set(RS232_M_TAG, FUNC(rs232_port_device::write_txd));
m_acia3->rts_handler().set(RS232_M_TAG, FUNC(rs232_port_device::write_rts));
m_acia3->irq_handler().set_inputline(M68K_TAG, M68K_IRQ_1);
@@ -610,7 +610,7 @@ void bitgraph_state::bitgrphb(machine_config &config)
bg_motherboard(config);
// bg_ppu(config);
- CLOCK(config, "system_clock", 1040).signal_handler().set(FUNC(bitgraph_state::system_clock_write));
+ CLOCK(config, "system_clock", XTAL::u(1040)).signal_handler().set(FUNC(bitgraph_state::system_clock_write));
RAM(config, RAM_TAG).set_default_size("512K");
}
diff --git a/src/mame/skeleton/blit.cpp b/src/mame/skeleton/blit.cpp
index c1aef0bceb8..0a1c8a7c6cd 100644
--- a/src/mame/skeleton/blit.cpp
+++ b/src/mame/skeleton/blit.cpp
@@ -248,9 +248,9 @@ void blit_state::blit(machine_config &config)
PALETTE(config, "palette", palette_device::MONOCHROME);
- CLOCK(config, "system_clock", 19200 * 16).signal_handler().set(FUNC(blit_state::system_clock_write));
+ CLOCK(config, "system_clock", XTAL::u(19200 * 16)).signal_handler().set(FUNC(blit_state::system_clock_write));
- ACIA6850(config, m_acia0, 0);
+ ACIA6850(config, m_acia0);
m_acia0->txd_handler().set(RS232_H_TAG, FUNC(rs232_port_device::write_txd));
m_acia0->rts_handler().set(RS232_H_TAG, FUNC(rs232_port_device::write_rts));
m_acia0->irq_handler().set_inputline(M68K_TAG, M68K_IRQ_5);
@@ -261,7 +261,7 @@ void blit_state::blit(machine_config &config)
rs232h.cts_handler().set(m_acia0, FUNC(acia6850_device::write_cts));
rs232h.set_option_device_input_defaults("null_modem", DEVICE_INPUT_DEFAULTS_NAME(host_rs232_defaults));
- ACIA6850(config, m_acia1, 0);
+ ACIA6850(config, m_acia1);
m_acia1->txd_handler().set(RS232_K_TAG, FUNC(rs232_port_device::write_txd));
m_acia1->rts_handler().set(RS232_K_TAG, FUNC(rs232_port_device::write_rts));
m_acia1->irq_handler().set_inputline(M68K_TAG, M68K_IRQ_2);
diff --git a/src/mame/skeleton/br8641.cpp b/src/mame/skeleton/br8641.cpp
index 6cc378c3fb4..775365a19b1 100644
--- a/src/mame/skeleton/br8641.cpp
+++ b/src/mame/skeleton/br8641.cpp
@@ -179,7 +179,7 @@ void brandt8641_state::brandt8641(machine_config &config)
/* sound hardware */
SPEAKER(config, "mono").front_center();
- BEEP(config, m_beep, 2000).add_route(ALL_OUTPUTS, "mono", 0.50);
+ BEEP(config, m_beep, XTAL::u(2000)).add_route(ALL_OUTPUTS, "mono", 0.50);
// Z80APIO U9
// Z80APIO U14
diff --git a/src/mame/skeleton/busicom.cpp b/src/mame/skeleton/busicom.cpp
index 57fb6cd9dca..9a8db062b23 100644
--- a/src/mame/skeleton/busicom.cpp
+++ b/src/mame/skeleton/busicom.cpp
@@ -234,7 +234,7 @@ void busicom_state::machine_reset()
void busicom_state::busicom(machine_config &config)
{
/* basic machine hardware */
- I4004(config, m_maincpu, 750000);
+ I4004(config, m_maincpu, XTAL::u(750000));
m_maincpu->set_rom_map(&busicom_state::busicom_rom);
m_maincpu->set_ram_memory_map(&busicom_state::busicom_mem);
m_maincpu->set_rom_ports_map(&busicom_state::busicom_rp);
diff --git a/src/mame/skeleton/c2color.cpp b/src/mame/skeleton/c2color.cpp
index 3efa00c721d..7d24e52ff86 100644
--- a/src/mame/skeleton/c2color.cpp
+++ b/src/mame/skeleton/c2color.cpp
@@ -126,7 +126,7 @@ INPUT_PORTS_END
void c2_color_state::c2_color(machine_config &config)
{
- I8032(config, m_maincpu, 12'000'000); // exact type and clock unknown
+ I8032(config, m_maincpu, XTAL::u(12'000'000)); // exact type and clock unknown
m_maincpu->set_addrmap(AS_PROGRAM, &c2_color_state::prog_map);
m_maincpu->set_addrmap(AS_IO, &c2_color_state::ext_map);
diff --git a/src/mame/skeleton/candela.cpp b/src/mame/skeleton/candela.cpp
index 213ad4d2555..ea42f138293 100644
--- a/src/mame/skeleton/candela.cpp
+++ b/src/mame/skeleton/candela.cpp
@@ -680,7 +680,7 @@ void can09t_state::can09t(machine_config &config)
m_maincpu->set_addrmap(AS_PROGRAM, &can09t_state::can09t_map);
/* --PIA inits----------------------- */
- PIA6821(config, m_syspia, 0); // CPU board
+ PIA6821(config, m_syspia); // CPU board
m_syspia->readpa_handler().set(FUNC(can09t_state::syspia_A_r));
m_syspia->readpb_handler().set(FUNC(can09t_state::syspia_B_r));
m_syspia->writepb_handler().set(FUNC(can09t_state::syspia_B_w));
@@ -693,7 +693,7 @@ void can09t_state::can09t(machine_config &config)
/* 0xE20A 0xB113 (SYSPIA Control B) = 0x34 - CB2 is low and lock DDRB */
/* 0xE20E 0xB111 (SYSPIA port B) = 0x10 - Data to port B */
- PIA6821(config, m_usrpia, 0); // CPU board
+ PIA6821(config, m_usrpia); // CPU board
m_usrpia->cb2_handler().set(FUNC(can09t_state::usrpia_cb2_w));
/* 0xE212 0xB122 (USRPIA Control A) = 0x00 - Channel A IRQ disabled */
/* 0xE212 0xB123 (USRPIA Control B) = 0x00 - Channel B IRQ disabled */
@@ -701,13 +701,13 @@ void can09t_state::can09t(machine_config &config)
/* 0xE215 0xB121 (USRPIA DDR B) = 0xFF - Port B all outputs */
/* 0xE21A 0xB122 (USRPIA Control A) = 0x34 - CA2 is low and lock DDRB */
/* 0xE21A 0xB123 (USRPIA Control B) = 0x34 - CB2 is low and lock DDRB */
- PIA6821(config, m_pia3, 0); // ROM board
- PIA6821(config, m_pia4, 0); // ROM board
+ PIA6821(config, m_pia3); // ROM board
+ PIA6821(config, m_pia4); // ROM board
- PTM6840(config, "ptm", 0);
+ PTM6840(config, "ptm");
/* RS232 usage: mame can09t -window -debug -rs232 terminal */
- ACIA6850(config, m_acia, 0);
+ ACIA6850(config, m_acia);
m_acia->txd_handler().set("rs232", FUNC(rs232_port_device::write_txd));
m_acia->rts_handler().set("rs232", FUNC(rs232_port_device::write_rts));
rs232_port_device &rs232(RS232_PORT(config, "rs232", default_rs232_devices, "terminal"));
@@ -778,7 +778,7 @@ void can09_state::can09(machine_config &config)
#endif
/* --PIA inits----------------------- */
- PIA6821(config, m_pia1, 0); // CPU board
+ PIA6821(config, m_pia1); // CPU board
m_pia1->readpa_handler().set(FUNC(can09_state::pia1_A_r));
m_pia1->writepa_handler().set(FUNC(can09_state::pia1_A_w));
m_pia1->readpb_handler().set(FUNC(can09_state::pia1_B_r));
@@ -793,9 +793,9 @@ void can09_state::can09(machine_config &config)
/* 0xFF93 0xE034 (PIA1 Port B) = 0x18 - Write Data on Port B */
#if 1
- PIA6821(config, PIA2_TAG, 0); // CPU board
- ACIA6850(config, "acia1", 0); // CPU board
- ACIA6850(config, "acia2", 0); // CPU board
+ PIA6821(config, PIA2_TAG); // CPU board
+ ACIA6850(config, "acia1"); // CPU board
+ ACIA6850(config, "acia2"); // CPU board
#endif
}
diff --git a/src/mame/skeleton/cd100.cpp b/src/mame/skeleton/cd100.cpp
index 145d4be1bbc..c2d5b08ca4d 100644
--- a/src/mame/skeleton/cd100.cpp
+++ b/src/mame/skeleton/cd100.cpp
@@ -237,7 +237,7 @@ void cd100_state::cd100b(machine_config &config)
NVRAM(config, "nvram", nvram_device::DEFAULT_ALL_0); // 6264/62256 + same battery as RTC
- RTC72421(config, "rtc", 32768).out_int_handler().set_inputline(m_maincpu, Z180_INPUT_LINE_IRQ2);
+ RTC72421(config, "rtc", XTAL::u(32768)).out_int_handler().set_inputline(m_maincpu, Z180_INPUT_LINE_IRQ2);
M6803(config, m_mechcpu, 4.9152_MHz_XTAL);
m_mechcpu->set_addrmap(AS_PROGRAM, &cd100_state::mc6803_map);
diff --git a/src/mame/skeleton/cd2650.cpp b/src/mame/skeleton/cd2650.cpp
index c075994a306..ec83a67adc4 100644
--- a/src/mame/skeleton/cd2650.cpp
+++ b/src/mame/skeleton/cd2650.cpp
@@ -352,10 +352,10 @@ void cd2650_state::cd2650(machine_config &config)
/* Sound */
SPEAKER(config, "mono").front_center();
- BEEP(config, "beeper", 950).add_route(ALL_OUTPUTS, "mono", 0.50); // guess
+ BEEP(config, "beeper", XTAL::u(950)).add_route(ALL_OUTPUTS, "mono", 0.50); // guess
/* Devices */
- generic_keyboard_device &keyboard(GENERIC_KEYBOARD(config, "keyboard", 0));
+ generic_keyboard_device &keyboard(GENERIC_KEYBOARD(config, "keyboard"));
keyboard.set_keyboard_callback(FUNC(cd2650_state::kbd_put));
CASSETTE(config, m_cass);
m_cass->set_default_state(CASSETTE_STOPPED | CASSETTE_MOTOR_ENABLED | CASSETTE_SPEAKER_ENABLED);
diff --git a/src/mame/skeleton/ckz80.cpp b/src/mame/skeleton/ckz80.cpp
index b1667cf4fc2..9f793f99164 100644
--- a/src/mame/skeleton/ckz80.cpp
+++ b/src/mame/skeleton/ckz80.cpp
@@ -204,7 +204,7 @@ void ckz80_state::ckz80(machine_config &config)
m_maincpu->set_addrmap(AS_IO, &ckz80_state::io_map);
m_maincpu->set_daisy_config(daisy_chain);
- GENERIC_TERMINAL(config, m_terminal, 0);
+ GENERIC_TERMINAL(config, m_terminal);
m_terminal->set_keyboard_callback(FUNC(ckz80_state::kbd_put));
UPD765A(config, m_fdc, 8_MHz_XTAL, true, true);
FLOPPY_CONNECTOR(config, "fdc:0", ckz80_floppies, "525dd", floppy_image_device::default_mfm_floppy_formats);
diff --git a/src/mame/skeleton/consola_emt.cpp b/src/mame/skeleton/consola_emt.cpp
index 74bff79497f..5bc870081a5 100644
--- a/src/mame/skeleton/consola_emt.cpp
+++ b/src/mame/skeleton/consola_emt.cpp
@@ -277,7 +277,7 @@ void consoemt_state::consoemt(machine_config &config)
PALETTE(config, "palette", FUNC(consoemt_state::consoemt_palette), 3);
- KS0066_F05(config, m_lcdc, 0);
+ KS0066_F05(config, m_lcdc);
m_lcdc->set_lcd_size(2, 20);
m_lcdc->set_pixel_update_cb(FUNC(consoemt_state::lcd_pixel_update));
}
diff --git a/src/mame/skeleton/cortex.cpp b/src/mame/skeleton/cortex.cpp
index 2308cdddce1..53bc1c24662 100644
--- a/src/mame/skeleton/cortex.cpp
+++ b/src/mame/skeleton/cortex.cpp
@@ -223,7 +223,7 @@ void cortex_state::cortex(machine_config &config)
crtc.set_vram_size(0x4000);
SCREEN(config, "screen", SCREEN_TYPE_RASTER);
- generic_keyboard_device &keyboard(GENERIC_KEYBOARD(config, "keyboard", 0));
+ generic_keyboard_device &keyboard(GENERIC_KEYBOARD(config, "keyboard"));
keyboard.set_keyboard_callback(FUNC(cortex_state::kbd_put));
//TMS9902(config, "uart1", XTAL(12'000'000) / 4);
@@ -231,7 +231,7 @@ void cortex_state::cortex(machine_config &config)
/* Sound */
SPEAKER(config, "mono").front_center();
- BEEP(config, m_beep, 950); // guess
+ BEEP(config, m_beep, XTAL::u(950)); // guess
m_beep->add_route(ALL_OUTPUTS, "mono", 0.05);
}
diff --git a/src/mame/skeleton/cosmicos.cpp b/src/mame/skeleton/cosmicos.cpp
index 395e1b666ae..dd3452fb5cb 100644
--- a/src/mame/skeleton/cosmicos.cpp
+++ b/src/mame/skeleton/cosmicos.cpp
@@ -526,7 +526,7 @@ void cosmicos_state::cosmicos(machine_config &config)
/* video hardware */
config.set_default_layout(layout_cosmicos);
- DM9368(config, m_led, 0);
+ DM9368(config, m_led);
TIMER(config, "digit").configure_periodic(FUNC(cosmicos_state::digit_tick), attotime::from_hz(100));
TIMER(config, "interrupt").configure_periodic(FUNC(cosmicos_state::int_tick), attotime::from_hz(1000));
diff --git a/src/mame/skeleton/cp1.cpp b/src/mame/skeleton/cp1.cpp
index b1efa22d6f9..68edf5cf422 100644
--- a/src/mame/skeleton/cp1.cpp
+++ b/src/mame/skeleton/cp1.cpp
@@ -280,13 +280,13 @@ void cp1_state::cp1(machine_config &config)
maincpu.t0_in_cb().set_log("t0_r");
maincpu.t1_in_cb().set_log("t1_r");
- i8155_device &i8155(I8155(config, "i8155", 0));
+ i8155_device &i8155(I8155(config, "i8155"));
i8155.out_pa_callback().set(FUNC(cp1_state::i8155_porta_w));
i8155.in_pb_callback().set(FUNC(cp1_state::i8155_portb_r));
i8155.out_pb_callback().set(FUNC(cp1_state::i8155_portb_w));
i8155.out_pc_callback().set(FUNC(cp1_state::i8155_portc_w));
- I8155(config, "i8155_cp3", 0);
+ I8155(config, "i8155_cp3");
PWM_DISPLAY(config, m_display).set_size(6, 7);
m_display->set_segmask(0x3f, 0x7f);
diff --git a/src/mame/skeleton/ct909e_segadvd.cpp b/src/mame/skeleton/ct909e_segadvd.cpp
index 6ae67c1d3a1..8bb69dff4fa 100644
--- a/src/mame/skeleton/ct909e_segadvd.cpp
+++ b/src/mame/skeleton/ct909e_segadvd.cpp
@@ -70,7 +70,7 @@ INPUT_PORTS_END
void ct909e_megatrix_state::megatrix(machine_config &config)
{
- SPARCV8(config, m_maincpu, 100'000'000); // unknown frequency
+ SPARCV8(config, m_maincpu, XTAL::u(100'000'000)); // unknown frequency
m_maincpu->set_addrmap(0, &ct909e_megatrix_state::mem_map);
m_maincpu->set_addrmap(0x19, &ct909e_megatrix_state::mem_map);
diff --git a/src/mame/skeleton/cxhumax.cpp b/src/mame/skeleton/cxhumax.cpp
index ccfb44dfe4e..aa12e717a42 100644
--- a/src/mame/skeleton/cxhumax.cpp
+++ b/src/mame/skeleton/cxhumax.cpp
@@ -1044,12 +1044,12 @@ void cxhumax_state::machine_reset()
void cxhumax_state::cxhumax(machine_config &config)
{
- ARM920T(config, m_maincpu, 180000000); // CX24175 (RevC up?)
+ ARM920T(config, m_maincpu, XTAL::u(180000000)); // CX24175 (RevC up?)
m_maincpu->set_addrmap(AS_PROGRAM, &cxhumax_state::cxhumax_map);
INTEL_28F320J3D(config, "flash");
- I2C_24C64(config, "eeprom", 0); // 24LC64
+ I2C_24C64(config, "eeprom"); // 24LC64
/* video hardware */
screen_device &screen(SCREEN(config, "screen", SCREEN_TYPE_RASTER));
@@ -1061,7 +1061,7 @@ void cxhumax_state::cxhumax(machine_config &config)
PALETTE(config, "palette", palette_device::MONOCHROME);
- GENERIC_TERMINAL(config, m_terminal, 0);
+ GENERIC_TERMINAL(config, m_terminal);
}
ROM_START( hxhdci2k )
diff --git a/src/mame/skeleton/daruma.cpp b/src/mame/skeleton/daruma.cpp
index f76048451c4..7f6679a19d2 100644
--- a/src/mame/skeleton/daruma.cpp
+++ b/src/mame/skeleton/daruma.cpp
@@ -121,7 +121,7 @@ INPUT_PORTS_END
void daruma_state::daruma(machine_config &config)
{
/* basic machine hardware */
- I80C32(config, m_maincpu, 11059200); //verified on pcb
+ I80C32(config, m_maincpu, XTAL::u(11059200)); //verified on pcb
m_maincpu->set_addrmap(AS_PROGRAM, &daruma_state::mem_prg);
m_maincpu->set_addrmap(AS_IO, &daruma_state::mem_io);
// TODO: ports
diff --git a/src/mame/skeleton/datacast.cpp b/src/mame/skeleton/datacast.cpp
index 46a2d991dc6..76bce62832e 100644
--- a/src/mame/skeleton/datacast.cpp
+++ b/src/mame/skeleton/datacast.cpp
@@ -192,7 +192,7 @@ void datacast_state::datacast(machine_config &config)
m_screen->set_raw(6_MHz_XTAL, 768, 0, 480, 312, 0, 250);
m_screen->set_screen_update("saa5240", FUNC(saa5240a_device::screen_update));
- MM74C923(config, m_kb, 0);
+ MM74C923(config, m_kb);
m_kb->x1_rd_callback().set_ioport("X1");
m_kb->x2_rd_callback().set_ioport("X2");
m_kb->x3_rd_callback().set_ioport("X3");
@@ -203,7 +203,7 @@ void datacast_state::datacast(machine_config &config)
SAA5240A(config, m_cct, 6_MHz_XTAL);
m_cct->set_addrmap(0, &datacast_state::saa5240_map);
- //SAA5250(config, m_saa5250, 0);
+ //SAA5250(config, m_saa5250);
//m_saa5250->set_addrmap(0, &datacast_state::saa5250_map); // 2K RAM
I2C_PCF8582(config, m_i2cmem).set_e0(1);
@@ -217,7 +217,7 @@ void datacast_state::datacast(machine_config &config)
input_merger_device &usartint(INPUT_MERGER_ANY_HIGH(config, "usartint"));
usartint.output_handler().set(m_maincpu, FUNC(i80186_cpu_device::int0_w));
- I8251(config, m_usart[0], 0);
+ I8251(config, m_usart[0]);
m_usart[0]->txd_handler().set("modem", FUNC(rs232_port_device::write_txd));
m_usart[0]->dtr_handler().set("modem", FUNC(rs232_port_device::write_dtr));
m_usart[0]->rts_handler().set("modem", FUNC(rs232_port_device::write_rts));
@@ -228,7 +228,7 @@ void datacast_state::datacast(machine_config &config)
modem.rxd_handler().set(m_usart[0], FUNC(i8251_device::write_rxd));
modem.dsr_handler().set(m_usart[0], FUNC(i8251_device::write_dsr));
- I8251(config, m_usart[1], 0);
+ I8251(config, m_usart[1]);
m_usart[1]->txd_handler().set("printer", FUNC(rs232_port_device::write_txd));
m_usart[1]->dtr_handler().set("printer", FUNC(rs232_port_device::write_dtr));
m_usart[1]->rts_handler().set("printer", FUNC(rs232_port_device::write_rts));
@@ -241,7 +241,7 @@ void datacast_state::datacast(machine_config &config)
// Teletext data is extracted from video signal by SAA5231.
// Use bitbanger to read a T42 teletext stream.
- BITBANGER(config, m_ttd, 0);
+ BITBANGER(config, m_ttd);
}
diff --git a/src/mame/skeleton/design.cpp b/src/mame/skeleton/design.cpp
index 65ab3d8372b..92afb07177c 100644
--- a/src/mame/skeleton/design.cpp
+++ b/src/mame/skeleton/design.cpp
@@ -265,7 +265,7 @@ void design6_state::design6(machine_config &config)
m_maincpu->set_addrmap(AS_IO, &design6_state::io_map);
m_maincpu->port_out_cb<1>().set(FUNC(design6_state::port1_w));
- ADDRESS_MAP_BANK(config, m_iobank, 0);
+ ADDRESS_MAP_BANK(config, m_iobank);
m_iobank->set_map(&design6_state::iobanked_map);
m_iobank->set_addr_width(17);
m_iobank->set_data_width(8);
diff --git a/src/mame/skeleton/didact.cpp b/src/mame/skeleton/didact.cpp
index 8873be65f47..ee080a99ca3 100644
--- a/src/mame/skeleton/didact.cpp
+++ b/src/mame/skeleton/didact.cpp
@@ -786,7 +786,7 @@ void modulab_state::modulab(machine_config &config)
config.set_default_layout(layout_modulab);
/* Devices */
- MM74C923(config, m_kb, 0);
+ MM74C923(config, m_kb);
m_kb->set_cap_osc(CAP_U(0.10));
m_kb->set_cap_debounce(CAP_U(1));
m_kb->da_wr_callback().set(FUNC(modulab_state::da_w));
@@ -811,12 +811,12 @@ void md6802_state::md6802(machine_config &config)
config.set_default_layout(layout_md6802);
/* Devices */
- TTL74145(config, m_tb16_74145, 0);
+ TTL74145(config, m_tb16_74145);
/* PIA #1 0xA000-0xA003 - used differently by laborations and loaded software */
- PIA6821(config, m_pia1, 0);
+ PIA6821(config, m_pia1);
/* PIA #2 Keyboard & Display 0xC000-0xC003 */
- PIA6821(config, m_pia2, 0);
+ PIA6821(config, m_pia2);
/* --PIA init----------------------- */
/* 0xE007 0xC002 (DDR B) = 0xFF - Port B all outputs and set to 0 (zero) */
/* 0xE00B 0xC000 (DDR A) = 0x70 - Port A three outputs and set to 0 (zero) */
@@ -841,16 +841,16 @@ void mp68a_state::mp68a(machine_config &config)
{
// Clock source is based on a N9602N Dual Retriggerable Resettable Monostable Multivibrator oscillator at aprox 505KHz.
// Trimpot seems broken/stuck at 5K Ohm thu. ROM code 1Ms delay loops suggest 1MHz+
- M6800(config, m_maincpu, 505000);
+ M6800(config, m_maincpu, XTAL::u(505000));
m_maincpu->set_addrmap(AS_PROGRAM, &mp68a_state::mp68a_map);
config.set_default_layout(layout_mp68a);
/* Devices */
/* PIA #1 0x500-0x503 - used differently by laborations and loaded software */
- PIA6820(config, m_pia1, 0);
+ PIA6820(config, m_pia1);
/* PIA #2 Keyboard & Display 0x600-0x603 */
- PIA6820(config, m_pia2, 0);
+ PIA6820(config, m_pia2);
/* --PIA inits----------------------- */
/* 0x0BAF 0x601 (Control A) = 0x30 - CA2 is low and enable DDRA */
/* 0x0BB1 0x603 (Control B) = 0x30 - CB2 is low and enable DDRB */
@@ -883,12 +883,12 @@ void mp68a_state::mp68a(machine_config &config)
/* 0x086B 0x600 (Port A) = 0x70 */
/* 0x086B 0x600 (Port A) = 0x50 */
/* 0x086B 0x600 (Port A) = 0x70 */
- DM9368(config, m_digits[0], 0).update_cb().set(FUNC(mp68a_state::digit_w<0>));
- DM9368(config, m_digits[1], 0).update_cb().set(FUNC(mp68a_state::digit_w<1>));
- DM9368(config, m_digits[2], 0).update_cb().set(FUNC(mp68a_state::digit_w<2>));
- DM9368(config, m_digits[3], 0).update_cb().set(FUNC(mp68a_state::digit_w<3>));
- DM9368(config, m_digits[4], 0).update_cb().set(FUNC(mp68a_state::digit_w<4>));
- DM9368(config, m_digits[5], 0).update_cb().set(FUNC(mp68a_state::digit_w<5>));
+ DM9368(config, m_digits[0]).update_cb().set(FUNC(mp68a_state::digit_w<0>));
+ DM9368(config, m_digits[1]).update_cb().set(FUNC(mp68a_state::digit_w<1>));
+ DM9368(config, m_digits[2]).update_cb().set(FUNC(mp68a_state::digit_w<2>));
+ DM9368(config, m_digits[3]).update_cb().set(FUNC(mp68a_state::digit_w<3>));
+ DM9368(config, m_digits[4]).update_cb().set(FUNC(mp68a_state::digit_w<4>));
+ DM9368(config, m_digits[5]).update_cb().set(FUNC(mp68a_state::digit_w<5>));
/* Cassette */
SPEAKER(config, "mono").front_center();
diff --git a/src/mame/skeleton/digel804.cpp b/src/mame/skeleton/digel804.cpp
index d8f5fc2d3df..f675e15ab01 100644
--- a/src/mame/skeleton/digel804.cpp
+++ b/src/mame/skeleton/digel804.cpp
@@ -652,7 +652,7 @@ void digel804_state::digel804(machine_config &config)
/* video hardware */
config.set_default_layout(layout_digel804);
- MM74C923(config, m_kb, 0);
+ MM74C923(config, m_kb);
m_kb->da_wr_callback().set(FUNC(digel804_state::da_w));
m_kb->x1_rd_callback().set_ioport("LINE0");
m_kb->x2_rd_callback().set_ioport("LINE1");
@@ -660,7 +660,7 @@ void digel804_state::digel804(machine_config &config)
m_kb->x4_rd_callback().set_ioport("LINE3");
/* acia */
- MOS6551(config, m_acia, 0);
+ MOS6551(config, m_acia);
m_acia->set_xtal(3.6864_MHz_XTAL/2);
m_acia->irq_handler().set(FUNC(digel804_state::acia_irq_w));
m_acia->txd_handler().set("rs232", FUNC(rs232_port_device::write_txd));
diff --git a/src/mame/skeleton/digilog320.cpp b/src/mame/skeleton/digilog320.cpp
index 7d7f26e0d5c..8913e9784bd 100644
--- a/src/mame/skeleton/digilog320.cpp
+++ b/src/mame/skeleton/digilog320.cpp
@@ -364,7 +364,7 @@ void digilog320_state::digilog320(machine_config &config)
NVRAM(config, "nvram", nvram_device::DEFAULT_ALL_0);
- AM9519(config, m_uic, 0);
+ AM9519(config, m_uic);
m_uic->out_int_callback().set_inputline(m_subcpu, INPUT_LINE_IRQ0);
screen_device &screen(SCREEN(config, "screen", SCREEN_TYPE_RASTER));
@@ -385,7 +385,7 @@ void digilog320_state::digilog320(machine_config &config)
m_duart->outport_cb().set("usart", FUNC(i8251_device::write_txc)).bit(3);
m_duart->outport_cb().append("usart", FUNC(i8251_device::write_rxc)).bit(3);
- I8251(config, "usart", 0);
+ I8251(config, "usart");
SCC8530N(config, m_scc[0], 3.6864_MHz_XTAL);
diff --git a/src/mame/skeleton/digilog_kbd.cpp b/src/mame/skeleton/digilog_kbd.cpp
index c324a6f03eb..c905265dd94 100644
--- a/src/mame/skeleton/digilog_kbd.cpp
+++ b/src/mame/skeleton/digilog_kbd.cpp
@@ -206,7 +206,7 @@ ioport_constructor digilog_kbd_device::device_input_ports() const
// digilog_kbd_device - constructor
//-------------------------------------------------
-digilog_kbd_device::digilog_kbd_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+digilog_kbd_device::digilog_kbd_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
device_t(mconfig, DIGILOG_KBD, tag, owner, clock),
m_mcu(*this, "mcu"),
m_keys(*this, "row_%x", 0U),
diff --git a/src/mame/skeleton/digilog_kbd.h b/src/mame/skeleton/digilog_kbd.h
index 143925c2fbc..dee850f25b2 100644
--- a/src/mame/skeleton/digilog_kbd.h
+++ b/src/mame/skeleton/digilog_kbd.h
@@ -24,7 +24,7 @@ class digilog_kbd_device : public device_t
{
public:
// construction/destruction
- digilog_kbd_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock = 0);
+ digilog_kbd_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock = XTAL());
// callbacks
auto tx_handler() { return m_tx_handler.bind(); }
diff --git a/src/mame/skeleton/dim68k.cpp b/src/mame/skeleton/dim68k.cpp
index 113bf2c3f04..72e96f1ebde 100644
--- a/src/mame/skeleton/dim68k.cpp
+++ b/src/mame/skeleton/dim68k.cpp
@@ -435,12 +435,12 @@ void dim68k_state::dim68k(machine_config &config)
SPEAKER_SOUND(config, m_speaker).add_route(ALL_OUTPUTS, "mono", 0.50);
/* Devices */
- UPD765A(config, m_fdc, 4'000'000, true, true); // these options unknown
+ UPD765A(config, m_fdc, XTAL::u(4'000'000), true, true); // these options unknown
FLOPPY_CONNECTOR(config, m_floppy[0], dim68k_floppies, "525qd", floppy_image_device::default_mfm_floppy_formats);
FLOPPY_CONNECTOR(config, m_floppy[1], dim68k_floppies, "525qd", floppy_image_device::default_mfm_floppy_formats);
m_fdc->intrq_wr_callback().set(FUNC(dim68k_state::fdc_irq_w));
- MC6845(config, m_crtc, 1790000);
+ MC6845(config, m_crtc, XTAL::u(1790000));
m_crtc->set_screen("screen");
m_crtc->set_show_border_area(false);
m_crtc->set_char_width(8);
diff --git a/src/mame/skeleton/dm7000.cpp b/src/mame/skeleton/dm7000.cpp
index 62571f39265..42533541d5b 100644
--- a/src/mame/skeleton/dm7000.cpp
+++ b/src/mame/skeleton/dm7000.cpp
@@ -319,7 +319,7 @@ void dm7000_state::dm7000(machine_config &config)
screen.set_visarea(0, 640-1, 0, 480-1);
screen.set_screen_update(FUNC(dm7000_state::screen_update_dm7000));
- GENERIC_TERMINAL(config, m_terminal, 0);
+ GENERIC_TERMINAL(config, m_terminal);
m_terminal->set_keyboard_callback(FUNC(dm7000_state::kbd_put));
}
diff --git a/src/mame/skeleton/dmv.cpp b/src/mame/skeleton/dmv.cpp
index cd8b94c62be..55b8c712547 100644
--- a/src/mame/skeleton/dmv.cpp
+++ b/src/mame/skeleton/dmv.cpp
@@ -810,7 +810,7 @@ void dmv_state::dmv(machine_config &config)
config.set_perfect_quantum(m_maincpu);
- DMV_KEYBOARD(config, m_keyboard, 0);
+ DMV_KEYBOARD(config, m_keyboard);
/* video hardware */
SCREEN(config, m_screen, SCREEN_TYPE_RASTER);
@@ -844,13 +844,13 @@ void dmv_state::dmv(machine_config &config)
m_dmac->out_iow_callback<3>().set(m_fdc, FUNC(i8272a_device::dma_w));
m_dmac->out_dack_callback<3>().set(FUNC(dmv_state::dmac_dack3));
- I8272A(config, m_fdc, 8'000'000, true);
+ I8272A(config, m_fdc, XTAL::u(8'000'000), true);
m_fdc->intrq_wr_callback().set(FUNC(dmv_state::fdc_irq));
m_fdc->drq_wr_callback().set(m_dmac, FUNC(am9517a_device::dreq3_w));
FLOPPY_CONNECTOR(config, "i8272:0", dmv_floppies, "525dd", dmv_state::floppy_formats);
FLOPPY_CONNECTOR(config, "i8272:1", dmv_floppies, "525dd", dmv_state::floppy_formats);
- PIT8253(config, m_pit, 0);
+ PIT8253(config, m_pit);
m_pit->set_clk<0>(50);
m_pit->out_handler<0>().set(FUNC(dmv_state::pit_out0));
m_pit->set_clk<2>(XTAL(24'000'000) / 3 / 16);
diff --git a/src/mame/skeleton/dmv_keyb.cpp b/src/mame/skeleton/dmv_keyb.cpp
index a2a88666925..27b6176bc0f 100644
--- a/src/mame/skeleton/dmv_keyb.cpp
+++ b/src/mame/skeleton/dmv_keyb.cpp
@@ -196,7 +196,7 @@ ioport_constructor dmv_keyboard_device::device_input_ports() const
// dmv_keyboard_device - constructor
//-------------------------------------------------
-dmv_keyboard_device::dmv_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+dmv_keyboard_device::dmv_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: device_t(mconfig, DMV_KEYBOARD, tag, owner, clock)
, m_maincpu(*this, "mcu")
, m_keyboard(*this, "COL.%u", 0)
diff --git a/src/mame/skeleton/dmv_keyb.h b/src/mame/skeleton/dmv_keyb.h
index 75b6c46a19d..7d63da51ca2 100644
--- a/src/mame/skeleton/dmv_keyb.h
+++ b/src/mame/skeleton/dmv_keyb.h
@@ -25,7 +25,7 @@ class dmv_keyboard_device : public device_t
{
public:
// construction/destruction
- dmv_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ dmv_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
DECLARE_WRITE_LINE_MEMBER(sd_poll_w);
DECLARE_READ_LINE_MEMBER(sd_poll_r);
diff --git a/src/mame/skeleton/dps1.cpp b/src/mame/skeleton/dps1.cpp
index ed93f730a86..e427734f0f1 100644
--- a/src/mame/skeleton/dps1.cpp
+++ b/src/mame/skeleton/dps1.cpp
@@ -191,7 +191,7 @@ void dps1_state::machine_reset()
{
m_bank1->set_entry(1);
// set fdc for 8 inch floppies
- m_fdc->set_rate(500000);
+ m_fdc->set_rate(XTAL::u(500000));
// turn on the motor
floppy_image_device *floppy = m_floppy0->get_device();
m_fdc->set_floppy(floppy);
@@ -224,8 +224,8 @@ void dps1_state::dps1(machine_config &config)
rs232.dsr_handler().set(uart, FUNC(scn2651_device::dsr_w));
rs232.cts_handler().set(uart, FUNC(scn2651_device::cts_w));
- AM9519(config, "am9519a", 0);
- AM9519(config, "am9519b", 0);
+ AM9519(config, "am9519a");
+ AM9519(config, "am9519b");
// floppy
UPD765A(config, m_fdc, 16_MHz_XTAL / 2, false, true);
diff --git a/src/mame/skeleton/e100.cpp b/src/mame/skeleton/e100.cpp
index 4615775cd09..5faef15255a 100644
--- a/src/mame/skeleton/e100.cpp
+++ b/src/mame/skeleton/e100.cpp
@@ -528,7 +528,7 @@ void e100_state::e100(machine_config &config)
m_maincpu->set_addrmap(AS_PROGRAM, &e100_state::e100_map);
/* Devices */
- TTL74145(config, m_kbd_74145, 0);
+ TTL74145(config, m_kbd_74145);
/* --PIA inits----------------------- */
/* 0xF883 0xC818 (PIA1 DDR A) = 0x00 - Port A all inputs */
@@ -545,7 +545,7 @@ void e100_state::e100(machine_config &config)
/* 0xF894 0xC818 (PIA2 Control A) = 0x34 - CA2 is low and lock DDRA */
/* 0xF896 0xC818 (PIA1 Control B) = 0x34 - CB2 is low and lock DDRB */
/* 0xF896 0xC818 (PIA2 Control B) = 0x34 - CB2 is low and lock DDRB */
- PIA6821(config, m_pia1, 0);
+ PIA6821(config, m_pia1);
m_pia1->writepa_handler().set(FUNC(e100_state::pia1_kbA_w));
m_pia1->readpa_handler().set(FUNC(e100_state::pia1_kbA_r));
m_pia1->writepb_handler().set(FUNC(e100_state::pia1_kbB_w));
@@ -555,7 +555,7 @@ void e100_state::e100(machine_config &config)
m_pia1->cb2_handler().set(FUNC(e100_state::pia1_cb2_w));
/* The optional second PIA enables the expansion port on CA1 and a software RTC with 50Hz resolution */
- PIA6821(config, m_pia2, 0);
+ PIA6821(config, m_pia2);
m_pia2->irqa_handler().set_inputline("maincpu", M6800_IRQ_LINE);
/* Serial port support */
diff --git a/src/mame/skeleton/easy_karaoke.cpp b/src/mame/skeleton/easy_karaoke.cpp
index 0ddece8a557..5d3e1f0e60d 100644
--- a/src/mame/skeleton/easy_karaoke.cpp
+++ b/src/mame/skeleton/easy_karaoke.cpp
@@ -146,7 +146,7 @@ void easy_karaoke_state::arm_map(address_map &map)
void easy_karaoke_state::easy_karaoke_base(machine_config &config)
{
- ARM9(config, m_maincpu, 72000000); // ARM 720 core
+ ARM9(config, m_maincpu, XTAL::u(72000000)); // ARM 720 core
m_maincpu->set_addrmap(AS_PROGRAM, &easy_karaoke_state::arm_map);
SCREEN(config, m_screen, SCREEN_TYPE_RASTER);
diff --git a/src/mame/skeleton/elzet80.cpp b/src/mame/skeleton/elzet80.cpp
index 3501adf4478..94ce4207f2d 100644
--- a/src/mame/skeleton/elzet80.cpp
+++ b/src/mame/skeleton/elzet80.cpp
@@ -130,14 +130,14 @@ void elzet80_state::elzet80(machine_config &config)
m_maincpu->set_addrmap(AS_IO, &elzet80_state::io_map);
// devices
- FD1793(config, m_fdc, 1000000); // unknown where this is derived
+ FD1793(config, m_fdc, XTAL::u(1000000)); // unknown where this is derived
FLOPPY_CONNECTOR(config, "fdc:0", elzet80_floppies, "fdd", floppy_image_device::default_mfm_floppy_formats).enable_sound(true);
FLOPPY_CONNECTOR(config, "fdc:1", elzet80_floppies, "fdd", floppy_image_device::default_mfm_floppy_formats).enable_sound(true);
- Z80PIO(config, m_pio, 0);
- Z80SIO(config, m_uart, 0);
- Z80CTC(config, m_ctc, 0);
- Z80DMA(config, m_dma, 0);
+ Z80PIO(config, m_pio);
+ Z80SIO(config, m_uart);
+ Z80CTC(config, m_ctc);
+ Z80DMA(config, m_dma);
}
diff --git a/src/mame/skeleton/epic14e.cpp b/src/mame/skeleton/epic14e.cpp
index 6f3eb99bf10..f061a6f70cf 100644
--- a/src/mame/skeleton/epic14e.cpp
+++ b/src/mame/skeleton/epic14e.cpp
@@ -209,7 +209,7 @@ void epic14e_state::epic14e(machine_config &config)
MOS6522(config, m_via, 17.01_MHz_XTAL / 9); // SY6522A
m_via->irq_handler().set("mainirq", FUNC(input_merger_device::in_w<0>));
- I8748(config, "keybmcu", 4608000).set_disable();
+ I8748(config, "keybmcu", XTAL::u(4608000)).set_disable();
screen_device &screen(SCREEN(config, "screen", SCREEN_TYPE_RASTER));
screen.set_color(rgb_t::green());
diff --git a/src/mame/skeleton/eurit.cpp b/src/mame/skeleton/eurit.cpp
index 8fe65e434d8..44cc39594d0 100644
--- a/src/mame/skeleton/eurit.cpp
+++ b/src/mame/skeleton/eurit.cpp
@@ -146,7 +146,7 @@ void eurit_state::palette_init(palette_device &palette)
void eurit_state::eurit30(machine_config &config)
{
- M37730S2(config, m_maincpu, 4'096'000);
+ M37730S2(config, m_maincpu, XTAL::u(4'096'000));
m_maincpu->set_addrmap(AS_PROGRAM, &eurit_state::mem_map);
m_maincpu->p4_in_cb().set("lcdc", FUNC(hd44780_device::db_r)); // not actually used for input?
m_maincpu->p4_out_cb().set("lcdc", FUNC(hd44780_device::db_w));
@@ -156,7 +156,7 @@ void eurit_state::eurit30(machine_config &config)
m_maincpu->p6_out_cb().append("lcdc", FUNC(hd44780_device::rw_w)).bit(5); // not actually used for read mode?
m_maincpu->p6_out_cb().append("lcdc", FUNC(hd44780_device::rs_w)).bit(4);
- am79c30a_device &dsc(AM79C30A(config, "dsc", 12'288'000));
+ am79c30a_device &dsc(AM79C30A(config, "dsc", XTAL::u(12'288'000)));
dsc.int_callback().set_inputline(m_maincpu, M37710_LINE_IRQ0);
screen_device &screen(SCREEN(config, "screen", SCREEN_TYPE_LCD));
@@ -169,7 +169,7 @@ void eurit_state::eurit30(machine_config &config)
PALETTE(config, "palette", FUNC(eurit_state::palette_init), 2);
- hd44780_device &lcdc(SED1278_0B(config, "lcdc", 0));
+ hd44780_device &lcdc(SED1278_0B(config, "lcdc"));
lcdc.set_lcd_size(2, 20);
lcdc.set_pixel_update_cb(FUNC(eurit_state::lcd_pixel_update));
}
diff --git a/src/mame/skeleton/eurocom2.cpp b/src/mame/skeleton/eurocom2.cpp
index 01432c5d09d..23e68298c40 100644
--- a/src/mame/skeleton/eurocom2.cpp
+++ b/src/mame/skeleton/eurocom2.cpp
@@ -424,10 +424,10 @@ void eurocom2_state::eurocom2(machine_config &config)
PALETTE(config, "palette", palette_device::MONOCHROME);
- generic_keyboard_device &keyboard(GENERIC_KEYBOARD(config, "keyboard", 0));
+ generic_keyboard_device &keyboard(GENERIC_KEYBOARD(config, "keyboard"));
keyboard.set_keyboard_callback(FUNC(eurocom2_state::kbd_put));
- PIA6821(config, m_pia1, 0);
+ PIA6821(config, m_pia1);
m_pia1->ca2_w(m_sst_state); // SST output Q14
m_pia1->cb1_w(m_sst_state); // SST output Q6
m_pia1->cb2_handler().set(FUNC(eurocom2_state::pia1_cb2_w)); // SST reset input
@@ -436,11 +436,11 @@ void eurocom2_state::eurocom2(machine_config &config)
// m_pia1->irqa_handler().set_inputline("maincpu", M6809_IRQ_LINE);
// m_pia1->irqb_handler().set_inputline("maincpu", M6809_IRQ_LINE);
- PIA6821(config, m_pia2, 0);
+ PIA6821(config, m_pia2);
// m_pia2->irqa_handler().set_inputline("maincpu", M6809_FIRQ_LINE);
// m_pia2->irqb_handler().set_inputline("maincpu", M6809_FIRQ_LINE);
- ACIA6850(config, m_acia, 0);
+ ACIA6850(config, m_acia);
m_acia->txd_handler().set("rs232", FUNC(rs232_port_device::write_txd));
m_acia->rts_handler().set("rs232", FUNC(rs232_port_device::write_rts));
rs232_port_device &rs232(RS232_PORT(config, "rs232", default_rs232_devices, nullptr));
@@ -464,14 +464,14 @@ void waveterm_state::waveterm(machine_config &config)
// ports A(in/out), B(out), CA1(in), CA2(in), and CB2(out) = interface to PPG bus via DIL socket on WTI board
// CB1 -- front panel "End" button
- PIA6821(config, m_pia3, 0);
+ PIA6821(config, m_pia3);
// m_pia3->readpa_handler().set(FUNC(waveterm_state::pia3_pa_r));
// m_pia3->writepa_handler().set(FUNC(waveterm_state::pia3_pa_w));
m_pia3->writepb_handler().set(FUNC(waveterm_state::pia3_pb_w));
m_pia3->readcb1_handler().set_ioport("FP");
// m_pia3->cb2_handler().set(FUNC(waveterm_state::pia3_cb2_w));
- PTM6840(config, m_ptm, 0);
+ PTM6840(config, m_ptm);
SOFTWARE_LIST(config, "disk_list").set_original("waveterm");
}
diff --git a/src/mame/skeleton/fanucspmg.cpp b/src/mame/skeleton/fanucspmg.cpp
index 8259c6d2b75..03286dacea4 100644
--- a/src/mame/skeleton/fanucspmg.cpp
+++ b/src/mame/skeleton/fanucspmg.cpp
@@ -963,17 +963,17 @@ void fanucspmg_state::fanucspmg(machine_config &config)
I8085A(config, m_subcpu, XTAL(16'000'000)/2/2);
m_subcpu->set_addrmap(AS_PROGRAM, &fanucspmg_state::subcpu_mem);
- I8251(config, m_usart[0], 0);
- I8251(config, m_usart[1], 0);
- I8251(config, m_usart[2], 0);
- I8251(config, m_usart[3], 0);
+ I8251(config, m_usart[0]);
+ I8251(config, m_usart[1]);
+ I8251(config, m_usart[2]);
+ I8251(config, m_usart[3]);
- PIT8253(config, m_pit[0], 0);
+ PIT8253(config, m_pit[0]);
m_pit[0]->set_clk<0>(XTAL(15'000'000)/12);
m_pit[0]->set_clk<1>(XTAL(15'000'000)/12);
m_pit[0]->set_clk<2>(XTAL(15'000'000)/12);
- PIT8253(config, m_pit[1], 0);
+ PIT8253(config, m_pit[1]);
m_pit[1]->set_clk<0>(XTAL(15'000'000)/12);
m_pit[1]->set_clk<1>(XTAL(15'000'000)/12);
m_pit[1]->set_clk<2>(XTAL(15'000'000)/12);
@@ -986,16 +986,16 @@ void fanucspmg_state::fanucspmg(machine_config &config)
m_dmac->in_ior_cb<0>().set(FUNC(fanucspmg_state::fdcdma_r));
m_dmac->out_iow_cb<0>().set(FUNC(fanucspmg_state::fdcdma_w));
- PIC8259(config, m_pic[0], 0);
+ PIC8259(config, m_pic[0]);
m_pic[0]->out_int_callback().set_inputline(m_maincpu, 0);
m_pic[0]->in_sp_callback().set_constant(1);
m_pic[0]->read_slave_ack_callback().set(FUNC(fanucspmg_state::get_slave_ack));
- PIC8259(config, m_pic[1], 0);
+ PIC8259(config, m_pic[1]);
m_pic[1]->out_int_callback().set(m_pic[0], FUNC(pic8259_device::ir7_w));
m_pic[1]->in_sp_callback().set_constant(0);
- UPD765A(config, m_fdc, 8'000'000, true, true);
+ UPD765A(config, m_fdc, XTAL::u(8'000'000), true, true);
m_fdc->intrq_wr_callback().set(m_pic[0], FUNC(pic8259_device::ir3_w));
m_fdc->drq_wr_callback().set(m_dmac, FUNC(i8257_device::dreq0_w));
FLOPPY_CONNECTOR(config, FDC_TAG":0", fanuc_floppies, "525dd", fanucspmg_state::floppy_formats);
diff --git a/src/mame/skeleton/fc100.cpp b/src/mame/skeleton/fc100.cpp
index 59447471ed8..74ee2a7cd0f 100644
--- a/src/mame/skeleton/fc100.cpp
+++ b/src/mame/skeleton/fc100.cpp
@@ -548,7 +548,7 @@ void fc100_state::fc100(machine_config &config)
m_cass->set_default_state(CASSETTE_PLAY | CASSETTE_MOTOR_DISABLED | CASSETTE_SPEAKER_ENABLED);
m_cass->add_route(ALL_OUTPUTS, "mono", 0.05);
- I8251(config, m_uart, 0);
+ I8251(config, m_uart);
m_uart->txd_handler().set([this] (bool state) { m_cassbit = state; });
clock_device &uart_clock(CLOCK(config, "uart_clock", XTAL(4'915'200)/16/16)); // gives 19200
uart_clock.signal_handler().set(m_uart, FUNC(i8251_device::write_txc));
diff --git a/src/mame/skeleton/fk1.cpp b/src/mame/skeleton/fk1.cpp
index e0d11652fee..e3b2faf3ca8 100644
--- a/src/mame/skeleton/fk1.cpp
+++ b/src/mame/skeleton/fk1.cpp
@@ -437,7 +437,7 @@ void fk1_state::fk1(machine_config &config)
PALETTE(config, "palette", palette_device::MONOCHROME);
- pit8253_device &pit8253(PIT8253(config, "pit", 0));
+ pit8253_device &pit8253(PIT8253(config, "pit"));
pit8253.set_clk<0>(50);
pit8253.out_handler<0>().set(FUNC(fk1_state::pit_out0));
pit8253.set_clk<1>(1000000);
@@ -468,7 +468,7 @@ void fk1_state::fk1(machine_config &config)
ppi3.out_pc_callback().set(FUNC(fk1_state::ppi3_c_w));
/* uart */
- I8251(config, "uart", 0);
+ I8251(config, "uart");
/* internal ram */
RAM(config, RAM_TAG).set_default_size("48K"); // 32 for banks1,2 + 16 for vram
diff --git a/src/mame/skeleton/ft68m.cpp b/src/mame/skeleton/ft68m.cpp
index fe04a2c7c0e..de183faf7a9 100644
--- a/src/mame/skeleton/ft68m.cpp
+++ b/src/mame/skeleton/ft68m.cpp
@@ -88,7 +88,7 @@ void ft68m_state::ft68m(machine_config &config)
M68000(config, m_maincpu, XTAL(19'660'800) / 2);
m_maincpu->set_addrmap(AS_PROGRAM, &ft68m_state::mem_map);
- upd7201_device& mpsc(UPD7201(config, "mpsc", 0));
+ upd7201_device& mpsc(UPD7201(config, "mpsc"));
mpsc.out_txda_callback().set("rs232a", FUNC(rs232_port_device::write_txd));
mpsc.out_dtra_callback().set("rs232a", FUNC(rs232_port_device::write_dtr));
mpsc.out_rtsa_callback().set("rs232a", FUNC(rs232_port_device::write_rts));
diff --git a/src/mame/skeleton/gimix.cpp b/src/mame/skeleton/gimix.cpp
index f6f298de4ee..34d93a82cd3 100644
--- a/src/mame/skeleton/gimix.cpp
+++ b/src/mame/skeleton/gimix.cpp
@@ -751,7 +751,7 @@ void gimix_state::gimix(machine_config &config)
rtc.irq().set(m_irqs, FUNC(input_merger_device::in_w<0>));
/* timer */
- ptm6840_device &ptm(PTM6840(config, "timer", 2'000'000)); // clock is a guess
+ ptm6840_device &ptm(PTM6840(config, "timer", XTAL::u(2'000'000))); // clock is a guess
// PCB pictures show both the RTC and timer set to generate IRQs (are jumper configurable)
ptm.irq_callback().set(m_irqs, FUNC(input_merger_device::in_w<1>));
@@ -766,31 +766,31 @@ void gimix_state::gimix(machine_config &config)
FLOPPY_CONNECTOR(config, "fdc:3", gimix_floppies, "525hd", gimix_state::floppy_formats).enable_sound(true);
/* parallel ports */
- pia6821_device &pia1(PIA6821(config, "pia1", 2'000'000));
+ pia6821_device &pia1(PIA6821(config, "pia1", XTAL::u(2'000'000)));
pia1.writepa_handler().set(FUNC(gimix_state::pia_pa_w));
pia1.writepb_handler().set(FUNC(gimix_state::pia_pb_w));
pia1.readpa_handler().set(FUNC(gimix_state::pia_pa_r));
pia1.readpb_handler().set(FUNC(gimix_state::pia_pb_r));
- PIA6821(config, "pia2", 2'000'000);
+ PIA6821(config, "pia2", XTAL::u(2'000'000));
/* serial ports */
- ACIA6850(config, m_acia1, 2'000'000);
+ ACIA6850(config, m_acia1, XTAL::u(2'000'000));
m_acia1->txd_handler().set("serial1", FUNC(rs232_port_device::write_txd));
m_acia1->rts_handler().set("serial1", FUNC(rs232_port_device::write_rts));
m_acia1->irq_handler().set(m_irqs, FUNC(input_merger_device::in_w<2>));
- ACIA6850(config, m_acia2, 2'000'000);
+ ACIA6850(config, m_acia2, XTAL::u(2'000'000));
m_acia2->txd_handler().set("serial2", FUNC(rs232_port_device::write_txd));
m_acia2->rts_handler().set("serial2", FUNC(rs232_port_device::write_rts));
m_acia2->irq_handler().set(m_irqs, FUNC(input_merger_device::in_w<3>));
- ACIA6850(config, m_acia3, 2'000'000);
+ ACIA6850(config, m_acia3, XTAL::u(2'000'000));
m_acia3->txd_handler().set("serial3", FUNC(rs232_port_device::write_txd));
m_acia3->rts_handler().set("serial3", FUNC(rs232_port_device::write_rts));
m_acia3->irq_handler().set(m_irqs, FUNC(input_merger_device::in_w<4>));
- ACIA6850(config, m_acia4, 2'000'000);
+ ACIA6850(config, m_acia4, XTAL::u(2'000'000));
m_acia4->txd_handler().set("serial4", FUNC(rs232_port_device::write_txd));
m_acia4->rts_handler().set("serial4", FUNC(rs232_port_device::write_rts));
m_acia4->irq_handler().set(m_irqs, FUNC(input_merger_device::in_w<5>));
@@ -811,7 +811,7 @@ void gimix_state::gimix(machine_config &config)
serial4.rxd_handler().set(m_acia4, FUNC(acia6850_device::write_rxd));
serial4.cts_handler().set(m_acia4, FUNC(acia6850_device::write_cts));
- clock_device &acia_clock(CLOCK(config, "acia_clock", 9600 * 16));
+ clock_device &acia_clock(CLOCK(config, "acia_clock", XTAL::u(9600 * 16)));
acia_clock.signal_handler().set(m_acia1, FUNC(acia6850_device::write_txc));
acia_clock.signal_handler().append(m_acia1, FUNC(acia6850_device::write_rxc));
acia_clock.signal_handler().append(m_acia2, FUNC(acia6850_device::write_txc));
diff --git a/src/mame/skeleton/gm1000.cpp b/src/mame/skeleton/gm1000.cpp
index 76e2c75b6a0..f8c8b8f8803 100644
--- a/src/mame/skeleton/gm1000.cpp
+++ b/src/mame/skeleton/gm1000.cpp
@@ -81,7 +81,7 @@ INPUT_PORTS_END
void gm1000_state::gm1000(machine_config &config)
{
- M37702S1(config, m_maincpu, 4'000'000); // unknown clock; type guessed
+ M37702S1(config, m_maincpu, XTAL::u(4'000'000)); // unknown clock; type guessed
m_maincpu->set_addrmap(AS_PROGRAM, &gm1000_state::mem_map);
m_maincpu->p4_in_cb().set_ioport("P4");
m_maincpu->p6_in_cb().set_ioport("P6");
@@ -101,7 +101,7 @@ void gm1000_state::gm1000(machine_config &config)
PALETTE(config, "palette", palette_device::MONOCHROME_INVERTED);
- hd44780_device &lcdc(HD44780(config, "lcdc", 0));
+ hd44780_device &lcdc(HD44780(config, "lcdc"));
lcdc.set_lcd_size(2, 24);
lcdc.set_pixel_update_cb(FUNC(gm1000_state::lcd_pixel_update));
lcdc.set_function_set_at_any_time(true);
diff --git a/src/mame/skeleton/goupil.cpp b/src/mame/skeleton/goupil.cpp
index c2272e3e88b..deb6e91e68a 100644
--- a/src/mame/skeleton/goupil.cpp
+++ b/src/mame/skeleton/goupil.cpp
@@ -522,7 +522,7 @@ void goupil_base_state::base(machine_config &config)
// TODO: sound hardware
- ACIA6850(config, m_acia, 0);
+ ACIA6850(config, m_acia);
// TODO: Is this specific to the G1?
MOS6522(config, m_via_video, CPU_CLOCK / 4);
diff --git a/src/mame/skeleton/grfd2301.cpp b/src/mame/skeleton/grfd2301.cpp
index a17b1616455..cd068d1dcbf 100644
--- a/src/mame/skeleton/grfd2301.cpp
+++ b/src/mame/skeleton/grfd2301.cpp
@@ -118,7 +118,7 @@ uint32_t grfd2301_state::screen_update(screen_device &screen, bitmap_ind16 &bitm
void grfd2301_state::grfd2301(machine_config &config)
{
// basic machine hardware
- Z80(config, m_maincpu, 4000000);
+ Z80(config, m_maincpu, XTAL::u(4000000));
m_maincpu->set_addrmap(AS_PROGRAM, &grfd2301_state::mem_map);
m_maincpu->set_addrmap(AS_IO, &grfd2301_state::io_map);
diff --git a/src/mame/skeleton/hazeltin.cpp b/src/mame/skeleton/hazeltin.cpp
index 89ab346bf79..6e76c684dab 100644
--- a/src/mame/skeleton/hazeltin.cpp
+++ b/src/mame/skeleton/hazeltin.cpp
@@ -750,12 +750,12 @@ void hazl1500_state::hazl1500(machine_config &config)
NETLIST_LOGIC_INPUT(config, NETLIST_TAG ":cpu_db6", "cpu_db6.IN", 0);
NETLIST_LOGIC_INPUT(config, NETLIST_TAG ":cpu_db7", "cpu_db7.IN", 0);
- NETLIST_ANALOG_OUTPUT(config, NETLIST_TAG ":video_out", 0).set_params("video_out", FUNC(hazl1500_state::video_out_cb));
- NETLIST_ANALOG_OUTPUT(config, NETLIST_TAG ":vblank", 0).set_params("vblank", FUNC(hazl1500_state::vblank_cb));
- NETLIST_ANALOG_OUTPUT(config, NETLIST_TAG ":tvinterq", 0).set_params("tvinterq", FUNC(hazl1500_state::tvinterq_cb));
+ NETLIST_ANALOG_OUTPUT(config, NETLIST_TAG ":video_out").set_params("video_out", FUNC(hazl1500_state::video_out_cb));
+ NETLIST_ANALOG_OUTPUT(config, NETLIST_TAG ":vblank").set_params("vblank", FUNC(hazl1500_state::vblank_cb));
+ NETLIST_ANALOG_OUTPUT(config, NETLIST_TAG ":tvinterq").set_params("tvinterq", FUNC(hazl1500_state::tvinterq_cb));
/* keyboard controller */
- AY3600(config, m_kbdc, 0);
+ AY3600(config, m_kbdc);
m_kbdc->x0().set_ioport("X0");
m_kbdc->x1().set_ioport("X1");
m_kbdc->x2().set_ioport("X2");
diff --git a/src/mame/skeleton/hazl1420.cpp b/src/mame/skeleton/hazl1420.cpp
index 85400ec2347..82b57448772 100644
--- a/src/mame/skeleton/hazl1420.cpp
+++ b/src/mame/skeleton/hazl1420.cpp
@@ -360,7 +360,7 @@ void hazl1420_state::hazl1420(machine_config &config)
m_ioexp[1]->p6_in_cb().set_ioport("INP6");
m_ioexp[1]->p7_in_cb().set_ioport("INP7");
- ins8250_device &ace(INS8250(config, "ace", 2'764'800));
+ ins8250_device &ace(INS8250(config, "ace", XTAL::u(2'764'800)));
ace.out_int_callback().set(m_mainint, FUNC(input_merger_device::in_w<1>));
ace.out_tx_callback().set("eia", FUNC(rs232_port_device::write_txd));
ace.out_rts_callback().set("eia", FUNC(rs232_port_device::write_rts));
@@ -375,7 +375,7 @@ void hazl1420_state::hazl1420(machine_config &config)
screen.set_screen_update(FUNC(hazl1420_state::screen_update));
SPEAKER(config, "mono").front_center();
- BEEP(config, m_beeper, 1000).add_route(ALL_OUTPUTS, "mono", 1.00);
+ BEEP(config, m_beeper, XTAL::u(1000)).add_route(ALL_OUTPUTS, "mono", 1.00);
rs232_port_device &eia(RS232_PORT(config, "eia", default_rs232_devices, nullptr));
eia.rxd_handler().set("ace", FUNC(ins8250_device::rx_w));
diff --git a/src/mame/skeleton/hohnadam.cpp b/src/mame/skeleton/hohnadam.cpp
index cac17f5af01..8ca1fc7f07b 100644
--- a/src/mame/skeleton/hohnadam.cpp
+++ b/src/mame/skeleton/hohnadam.cpp
@@ -86,16 +86,16 @@ INPUT_PORTS_END
void hohnadam_state::hohnadam(machine_config &config)
{
- M68000(config, m_maincpu, 12000000); // MC68000FN12, unknown clock
+ M68000(config, m_maincpu, XTAL::u(12000000)); // MC68000FN12, unknown clock
m_maincpu->set_addrmap(AS_PROGRAM, &hohnadam_state::main_map);
- I8032(config, m_panelcpu, 12000000); // unknown type and clock
+ I8032(config, m_panelcpu, XTAL::u(12000000)); // unknown type and clock
m_panelcpu->set_addrmap(AS_PROGRAM, &hohnadam_state::panel_map);
m_panelcpu->set_addrmap(AS_IO, &hohnadam_state::panel_ext_map);
NVRAM(config, "nvram", nvram_device::DEFAULT_ALL_0); // 2x HY62256ALJ-70 + CR2032 battery
- //F82C721(config, "io", 24000000);
+ //F82C721(config, "io", XTAL::u(24000000));
// TODO: LCD, everything else
}
diff --git a/src/mame/skeleton/hprot1.cpp b/src/mame/skeleton/hprot1.cpp
index feaff0856f5..287728c84f5 100644
--- a/src/mame/skeleton/hprot1.cpp
+++ b/src/mame/skeleton/hprot1.cpp
@@ -267,7 +267,7 @@ void hprot1_state::hprot1(machine_config &config)
PALETTE(config, "palette", FUNC(hprot1_state::hprot1_palette), 2);
GFXDECODE(config, "gfxdecode", "palette", gfx_hprot1);
- HD44780(config, m_lcdc, 0);
+ HD44780(config, m_lcdc);
m_lcdc->set_lcd_size(2, 16);
m_lcdc->set_pixel_update_cb(FUNC(hprot1_state::hprot1_pixel_update));
diff --git a/src/mame/skeleton/ht68k.cpp b/src/mame/skeleton/ht68k.cpp
index c226e223ed2..d11f1b9e72b 100644
--- a/src/mame/skeleton/ht68k.cpp
+++ b/src/mame/skeleton/ht68k.cpp
@@ -129,7 +129,7 @@ void ht68k_state::ht68k(machine_config &config)
/* video hardware */
MC68681(config, m_duart, 8_MHz_XTAL / 2);
- m_duart->set_clocks(500000, 500000, 1000000, 1000000);
+ m_duart->set_clocks(XTAL::u(500000), XTAL::u(500000), XTAL::u(1000000), XTAL::u(1000000));
m_duart->irq_cb().set_inputline(m_maincpu, M68K_IRQ_3);
m_duart->a_tx_cb().set("rs232", FUNC(rs232_port_device::write_txd));
m_duart->b_tx_cb().set(FUNC(ht68k_state::duart_txb));
diff --git a/src/mame/skeleton/i7000.cpp b/src/mame/skeleton/i7000.cpp
index dbefadee7e9..1d4526cc9c6 100644
--- a/src/mame/skeleton/i7000.cpp
+++ b/src/mame/skeleton/i7000.cpp
@@ -362,7 +362,7 @@ void i7000_state::i7000(machine_config &config)
SPEAKER_SOUND(config, "speaker").add_route(ALL_OUTPUTS, "mono", 0.50);
/* Programmable timer */
- pit8253_device &pit8253(PIT8253(config, "pit8253", 0));
+ pit8253_device &pit8253(PIT8253(config, "pit8253"));
// pit8253.set_clk<0>(XTAL(4'000'000) / 2); /* TODO: verify on PCB */
// pit8253.out_handler<0>().set(FUNC(i7000_state::i7000_pit_out0));
// pit8253.set_clk<1>(XTAL(4'000'000) / 2); /* TODO: verify on PCB */
@@ -371,7 +371,7 @@ void i7000_state::i7000(machine_config &config)
pit8253.out_handler<2>().set("speaker", FUNC(speaker_sound_device::level_w));
/* Keyboard interface */
- i8279_device &kbdc(I8279(config, "i8279", 4000000)); /* guessed value. TODO: verify on PCB */
+ i8279_device &kbdc(I8279(config, "i8279", XTAL::u(4000000))); /* guessed value. TODO: verify on PCB */
kbdc.out_sl_callback().set(FUNC(i7000_state::scanlines_w)); // scan SL lines
kbdc.in_rl_callback().set(FUNC(i7000_state::kbd_r)); // kbd RL lines
kbdc.in_shift_callback().set_constant(1); // TODO: Shift key
diff --git a/src/mame/skeleton/icatel.cpp b/src/mame/skeleton/icatel.cpp
index 151fd97ed80..19e6fe16e22 100644
--- a/src/mame/skeleton/icatel.cpp
+++ b/src/mame/skeleton/icatel.cpp
@@ -261,7 +261,7 @@ void icatel_state::icatel(machine_config &config)
PALETTE(config, "palette", FUNC(icatel_state::icatel_palette), 2);
GFXDECODE(config, "gfxdecode", "palette", gfx_icatel);
- HD44780(config, m_lcdc, 0);
+ HD44780(config, m_lcdc);
m_lcdc->set_lcd_size(2, 16);
m_lcdc->set_pixel_update_cb(FUNC(icatel_state::icatel_pixel_update));
}
diff --git a/src/mame/skeleton/icebox.cpp b/src/mame/skeleton/icebox.cpp
index 27c10c0a0e6..6d25f421b96 100644
--- a/src/mame/skeleton/icebox.cpp
+++ b/src/mame/skeleton/icebox.cpp
@@ -324,7 +324,7 @@ void icebox_state::icebox(machine_config &config)
m_maincpu->set_addrmap(AS_PROGRAM, &icebox_state::mem_map);
m_maincpu->set_addrmap(AS_IO, &icebox_state::io_map);
- I8251(config, m_uart0, 0);
+ I8251(config, m_uart0);
m_uart0->txd_handler().set("rs232a", FUNC(rs232_port_device::write_txd));
m_uart0->dtr_handler().set("rs232a", FUNC(rs232_port_device::write_dtr));
m_uart0->rts_handler().set("rs232a", FUNC(rs232_port_device::write_rts));
@@ -335,7 +335,7 @@ void icebox_state::icebox(machine_config &config)
rs232a.cts_handler().set(m_uart0, FUNC(i8251_device::write_cts));
rs232a.set_option_device_input_defaults("terminal", DEVICE_INPUT_DEFAULTS_NAME(terminal)); // must be exactly here
- I8251(config, m_uart1, 0);
+ I8251(config, m_uart1);
m_uart1->txd_handler().set("rs232b", FUNC(rs232_port_device::write_txd));
m_uart1->dtr_handler().set("rs232b", FUNC(rs232_port_device::write_dtr));
m_uart1->rts_handler().set("rs232b", FUNC(rs232_port_device::write_rts));
diff --git a/src/mame/skeleton/iez80.cpp b/src/mame/skeleton/iez80.cpp
index 091910c4509..cd55eecc3b2 100644
--- a/src/mame/skeleton/iez80.cpp
+++ b/src/mame/skeleton/iez80.cpp
@@ -177,21 +177,21 @@ static const z80_daisy_config daisy_chain[] =
void iez80_state::iez80(machine_config &config)
{
- Z80(config, m_maincpu, 2'500'000); // unknown clock
+ Z80(config, m_maincpu, XTAL::u(2'500'000)); // unknown clock
m_maincpu->set_addrmap(AS_PROGRAM, &iez80_state::mem_map);
m_maincpu->set_addrmap(AS_IO, &iez80_state::io_map);
m_maincpu->set_daisy_config(daisy_chain);
- Z80DMA(config, "dma", 4'000'000); // unknown clock
+ Z80DMA(config, "dma", XTAL::u(4'000'000)); // unknown clock
- z80ctc_device& ctc(Z80CTC(config, "ctc", 4'000'000)); // unknown clock
+ z80ctc_device& ctc(Z80CTC(config, "ctc", XTAL::u(4'000'000))); // unknown clock
ctc.intr_callback().set_inputline(m_maincpu, INPUT_LINE_IRQ0);
- Z80PIO(config, "pio", 4'000'000); // unknown clock
+ Z80PIO(config, "pio", XTAL::u(4'000'000)); // unknown clock
- Z80DART(config, "dart1", 4'000'000); // unknown clock (5.0688_MHz_XTAL near)
+ Z80DART(config, "dart1", XTAL::u(4'000'000)); // unknown clock (5.0688_MHz_XTAL near)
- Z80DART(config, "dart2", 4'000'000); // unknown clock (5.0688_MHz_XTAL near)
+ Z80DART(config, "dart2", XTAL::u(4'000'000)); // unknown clock (5.0688_MHz_XTAL near)
// video hardware
screen_device &screen(SCREEN(config, "screen", SCREEN_TYPE_RASTER));
diff --git a/src/mame/skeleton/if800.cpp b/src/mame/skeleton/if800.cpp
index 64f979fc854..688ac201157 100644
--- a/src/mame/skeleton/if800.cpp
+++ b/src/mame/skeleton/if800.cpp
@@ -90,12 +90,12 @@ void if800_state::upd7220_map(address_map &map)
void if800_state::if800(machine_config &config)
{
/* basic machine hardware */
- I8086(config, m_maincpu, 8000000);
+ I8086(config, m_maincpu, XTAL::u(8000000));
m_maincpu->set_addrmap(AS_PROGRAM, &if800_state::if800_map);
m_maincpu->set_addrmap(AS_IO, &if800_state::if800_io);
-// PIC8259(config, "pic8259", 0);
+// PIC8259(config, "pic8259");
UPD7220(config, m_hgdc, 8000000/4);
m_hgdc->set_addrmap(0, &if800_state::upd7220_map);
m_hgdc->set_display_pixels(FUNC(if800_state::hgdc_display_pixels));
diff --git a/src/mame/skeleton/imsai.cpp b/src/mame/skeleton/imsai.cpp
index c1674aa4c3e..09ff887fb6b 100644
--- a/src/mame/skeleton/imsai.cpp
+++ b/src/mame/skeleton/imsai.cpp
@@ -143,13 +143,13 @@ void imsai_state::imsai(machine_config &config)
m_maincpu->set_addrmap(AS_IO, &imsai_state::io_map);
/* video hardware */
- GENERIC_TERMINAL(config, m_terminal, 0);
+ GENERIC_TERMINAL(config, m_terminal);
m_terminal->set_keyboard_callback(FUNC(imsai_state::kbd_put));
/* Devices */
- I8251(config, "uart", 0);
+ I8251(config, "uart");
- PIT8253(config, m_pit, 0);
+ PIT8253(config, m_pit);
m_pit->set_clk<0>(6_MHz_XTAL / 3); // Timer 0: baud rate gen for 8251
m_pit->out_handler<0>().set("uart", FUNC(i8251_device::write_txc));
m_pit->out_handler<0>().append("uart", FUNC(i8251_device::write_rxc));
diff --git a/src/mame/skeleton/indiana.cpp b/src/mame/skeleton/indiana.cpp
index 733f58f8635..fae940f7279 100644
--- a/src/mame/skeleton/indiana.cpp
+++ b/src/mame/skeleton/indiana.cpp
@@ -111,10 +111,10 @@ void indiana_state::indiana(machine_config &config)
isa.irq14_callback().set("mfp", FUNC(mc68901_device::i3_w));
isa.irq15_callback().set("mfp", FUNC(mc68901_device::i2_w));
- ISA16_SLOT(config, "isa1", 0, ISABUS_TAG, indiana_isa_cards, "vga", false);
- ISA16_SLOT(config, "isa2", 0, ISABUS_TAG, indiana_isa_cards, "fdc_at", false);
- ISA16_SLOT(config, "isa3", 0, ISABUS_TAG, indiana_isa_cards, "comat", false);
- ISA16_SLOT(config, "isa4", 0, ISABUS_TAG, indiana_isa_cards, "ide", false);
+ ISA16_SLOT(config, "isa1", ISABUS_TAG, indiana_isa_cards, "vga", false);
+ ISA16_SLOT(config, "isa2", ISABUS_TAG, indiana_isa_cards, "fdc_at", false);
+ ISA16_SLOT(config, "isa3", ISABUS_TAG, indiana_isa_cards, "comat", false);
+ ISA16_SLOT(config, "isa4", ISABUS_TAG, indiana_isa_cards, "ide", false);
pc_kbdc_device &kbd(PC_KBDC(config, "kbd", pc_at_keyboards, STR_KBD_IBM_PC_AT_84));
kbd.out_data_cb().set("mfp", FUNC(mc68901_device::i0_w));
diff --git a/src/mame/skeleton/itt1700_kbd.cpp b/src/mame/skeleton/itt1700_kbd.cpp
index e24cb0c2a64..4673b6cc9e9 100644
--- a/src/mame/skeleton/itt1700_kbd.cpp
+++ b/src/mame/skeleton/itt1700_kbd.cpp
@@ -23,7 +23,7 @@ DEFINE_DEVICE_TYPE(ITT1700_KEYBOARD, itt1700_keyboard_device, "itt1700_kbd", "IT
// itt1700_keyboard_device - constructor
//-------------------------------------------------
-itt1700_keyboard_device::itt1700_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock)
+itt1700_keyboard_device::itt1700_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: device_t(mconfig, ITT1700_KEYBOARD, tag, owner, clock)
, m_clock_state(true)
, m_line1_state(true)
diff --git a/src/mame/skeleton/itt1700_kbd.h b/src/mame/skeleton/itt1700_kbd.h
index b8ee3cfd3ee..914d6ffb5f4 100644
--- a/src/mame/skeleton/itt1700_kbd.h
+++ b/src/mame/skeleton/itt1700_kbd.h
@@ -17,7 +17,7 @@ class itt1700_keyboard_device : public device_t
{
public:
// device constructor
- itt1700_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock = 0);
+ itt1700_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock = XTAL());
// host interface
DECLARE_WRITE_LINE_MEMBER(line1_w);
diff --git a/src/mame/skeleton/itt3030.cpp b/src/mame/skeleton/itt3030.cpp
index d0d53336263..243d8174301 100644
--- a/src/mame/skeleton/itt3030.cpp
+++ b/src/mame/skeleton/itt3030.cpp
@@ -753,7 +753,7 @@ void itt3030_state::itt3030(machine_config &config)
/* sound hardware */
SPEAKER(config, "mono").front_center();
- BEEP(config, m_beep, 3250).add_route(ALL_OUTPUTS, "mono", 1.00);
+ BEEP(config, m_beep, XTAL::u(3250)).add_route(ALL_OUTPUTS, "mono", 1.00);
SOFTWARE_LIST(config, "flop_list").set_original("itt3030");
}
diff --git a/src/mame/skeleton/itt9216.cpp b/src/mame/skeleton/itt9216.cpp
index 6f31da10327..e9c18d4c79f 100644
--- a/src/mame/skeleton/itt9216.cpp
+++ b/src/mame/skeleton/itt9216.cpp
@@ -82,10 +82,10 @@ INPUT_PORTS_END
void itt9216_state::itt9216(machine_config &config)
{
- M68008(config, m_maincpu, 8000000); // clock unknown
+ M68008(config, m_maincpu, XTAL::u(8000000)); // clock unknown
m_maincpu->set_addrmap(AS_PROGRAM, &itt9216_state::mem_map);
- I8741A(config, "upi", 6000000).set_disable(); // clock unknown
+ I8741A(config, "upi", XTAL::u(6000000)).set_disable(); // clock unknown
}
// XTALs: 38.080 MHz (U7), 11.250(?) MHz (U1)
diff --git a/src/mame/skeleton/jonos.cpp b/src/mame/skeleton/jonos.cpp
index 1381fbe909a..5344fc4b405 100644
--- a/src/mame/skeleton/jonos.cpp
+++ b/src/mame/skeleton/jonos.cpp
@@ -207,7 +207,7 @@ void jonos_state::jonos(machine_config &config)
GFXDECODE(config, "gfxdecode", "palette", gfx_jonos);
PALETTE(config, "palette", palette_device::MONOCHROME);
- generic_keyboard_device &keyboard(GENERIC_KEYBOARD(config, "keyboard", 0));
+ generic_keyboard_device &keyboard(GENERIC_KEYBOARD(config, "keyboard"));
keyboard.set_keyboard_callback(FUNC(jonos_state::kbd_put));
}
diff --git a/src/mame/skeleton/juku.cpp b/src/mame/skeleton/juku.cpp
index 7dcdc95a153..0fd67782031 100644
--- a/src/mame/skeleton/juku.cpp
+++ b/src/mame/skeleton/juku.cpp
@@ -458,7 +458,7 @@ void juku_state::machine_reset()
void juku_state::juku(machine_config &config)
{
// КР580ВМ80A @ 2 MHz
- I8080A(config, m_maincpu, 2000000);
+ I8080A(config, m_maincpu, XTAL::u(2000000));
m_maincpu->set_addrmap(AS_PROGRAM, &juku_state::mem_map);
m_maincpu->set_addrmap(AS_IO, &juku_state::io_map);
m_maincpu->in_inta_func().set("pic", FUNC(pic8259_device::acknowledge));
@@ -470,11 +470,11 @@ void juku_state::juku(machine_config &config)
m_bank->set_stride(0x10000);
// КР580ВН59
- PIC8259(config, m_pic, 0);
+ PIC8259(config, m_pic);
m_pic->out_int_callback().set_inputline(m_maincpu, 0);
// КР580ВИ53
- PIT8253(config, m_pit[0], 0);
+ PIT8253(config, m_pit[0]);
m_pit[0]->set_clk<0>(16_MHz_XTAL/16);
m_pit[0]->out_handler<0>().set(m_pit[1], FUNC(pit8253_device::write_clk0));
m_pit[0]->out_handler<0>().append(m_pit[0], FUNC(pit8253_device::write_gate1));
@@ -485,13 +485,13 @@ void juku_state::juku(machine_config &config)
m_pit[0]->out_handler<2>().append(m_pit[1], FUNC(pit8253_device::write_clk2));
// КР580ВИ53
- PIT8253(config, m_pit[1], 0);
+ PIT8253(config, m_pit[1]);
m_pit[1]->out_handler<0>().set(m_pit[1], FUNC(pit8253_device::write_gate1));
m_pit[1]->out_handler<0>().append(m_pit[1], FUNC(pit8253_device::write_gate2));
m_pit[1]->out_handler<1>().set(m_pic, FUNC(pic8259_device::ir5_w));
// КР580ВИ53
- PIT8253(config, m_pit[2], 0);
+ PIT8253(config, m_pit[2]);
// КР580ВВ55A
I8255A(config, m_pio[0]);
@@ -503,12 +503,12 @@ void juku_state::juku(machine_config &config)
I8255A(config, m_pio[1]);
// КР580ВВ51A
- I8251(config, m_sio[0], 0);
+ I8251(config, m_sio[0]);
m_sio[0]->rxrdy_handler().set("pic", FUNC(pic8259_device::ir2_w));
m_sio[0]->txrdy_handler().set("pic", FUNC(pic8259_device::ir3_w));
// КР580ВВ51A (instead of FDC?)
- I8251(config, m_sio[1], 0);
+ I8251(config, m_sio[1]);
m_sio[1]->rxrdy_handler().set("pic", FUNC(pic8259_device::ir0_w));
m_sio[1]->txrdy_handler().set("pic", FUNC(pic8259_device::ir1_w));
@@ -519,9 +519,9 @@ void juku_state::juku(machine_config &config)
screen.set_visarea(0, 319, 0, 239);
screen.set_screen_update(FUNC(juku_state::screen_update));
- TTL74148(config, m_key_encoder, 0);
+ TTL74148(config, m_key_encoder);
- KR1818VG93(config, m_fdc, 1000000);
+ KR1818VG93(config, m_fdc, XTAL::u(1000000));
// m_fdc->intrq_wr_callback().set(FUNC(juku_state::fdc_intrq_w));
m_fdc->drq_wr_callback().set(FUNC(juku_state::fdc_drq_w));
FLOPPY_CONNECTOR(config, "fdc:0", juku_floppies, "525qd", juku_state::floppy_formats);
diff --git a/src/mame/skeleton/junior80.cpp b/src/mame/skeleton/junior80.cpp
index 913e7b1633c..100842180d5 100644
--- a/src/mame/skeleton/junior80.cpp
+++ b/src/mame/skeleton/junior80.cpp
@@ -260,7 +260,7 @@ static void junior80_floppies(device_slot_interface &device)
void junior80_state::junior80(machine_config &config)
{
/* basic machine hardware */
- Z80(config, m_maincpu, 2'500'000); // 2.5 or 4MHz selectable by jumpers
+ Z80(config, m_maincpu, XTAL::u(2'500'000)); // 2.5 or 4MHz selectable by jumpers
m_maincpu->set_addrmap(AS_PROGRAM, &junior80_state::mem_map);
m_maincpu->set_addrmap(AS_IO, &junior80_state::io_map);
@@ -269,13 +269,13 @@ void junior80_state::junior80(machine_config &config)
FLOPPY_CONNECTOR(config, "fdc:0", junior80_floppies, "fdd", floppy_image_device::default_mfm_floppy_formats).enable_sound(true);
FLOPPY_CONNECTOR(config, "fdc:1", junior80_floppies, "fdd", floppy_image_device::default_mfm_floppy_formats).enable_sound(true);
- Z80PIO(config, m_pio, 0);
- Z80SIO(config, m_uart, 0);
- Z80CTC(config, m_ctc, 0);
- PIT8253(config, m_pit, 0);
- I8255(config, m_ppi, 0);
+ Z80PIO(config, m_pio);
+ Z80SIO(config, m_uart);
+ Z80CTC(config, m_ctc);
+ PIT8253(config, m_pit);
+ I8255(config, m_ppi);
- I8257(config, m_dma, 0);
+ I8257(config, m_dma);
//m_dma->out_hrq_cb().set(FUNC(junior80_state::hrq_w));
//m_dma->in_memr_cb().set(FUNC(junior80_state::memory_r));
//m_dma->out_memw_cb().set(FUNC(junior80_state::memory_w));
diff --git a/src/mame/skeleton/lee1214.cpp b/src/mame/skeleton/lee1214.cpp
index d8e7be6ab04..5d39a4dde12 100644
--- a/src/mame/skeleton/lee1214.cpp
+++ b/src/mame/skeleton/lee1214.cpp
@@ -69,7 +69,7 @@ void lee1214_state::lee1214(machine_config &config)
m_maincpu->set_addrmap(AS_PROGRAM, &lee1214_state::mem_map);
m_maincpu->set_addrmap(AS_IO, &lee1214_state::io_map);
- i8274_device &mpsc(I8274(config, "mpsc", 4'000'000));
+ i8274_device &mpsc(I8274(config, "mpsc", XTAL::u(4'000'000)));
mpsc.out_int_callback().set("maincpu", FUNC(i80188_cpu_device::int0_w));
EEPROM_2816(config, "eeprom");
diff --git a/src/mame/skeleton/lee1220.cpp b/src/mame/skeleton/lee1220.cpp
index ed82b0ce522..242b2d7c318 100644
--- a/src/mame/skeleton/lee1220.cpp
+++ b/src/mame/skeleton/lee1220.cpp
@@ -103,17 +103,17 @@ INPUT_PORTS_END
void lee1220_state::lee1220(machine_config &config)
{
- I8085A(config, m_maincpu, 10'000'000); // Intel P8085AH-2
+ I8085A(config, m_maincpu, XTAL::u(10'000'000)); // Intel P8085AH-2
m_maincpu->set_addrmap(AS_PROGRAM, &lee1220_state::mem_map);
m_maincpu->set_addrmap(AS_IO, &lee1220_state::io_map);
- AM9517A(config, "dmac", 5'000'000); // Intel P8237A-5
+ AM9517A(config, "dmac", XTAL::u(5'000'000)); // Intel P8237A-5
I8748(config, "kbdmcu", 5.9904_MHz_XTAL);
//WD1933(config, m_sdlc); // WDC WD1933PL-11
- i8251_device &usart(I8251(config, "usart", 0)); // NEC D8251AC
+ i8251_device &usart(I8251(config, "usart")); // NEC D8251AC
usart.rxrdy_handler().set_inputline(m_maincpu, I8085_RST55_LINE);
PIT8253(config, "pit"); // Intel D8253-5
@@ -123,7 +123,7 @@ void lee1220_state::lee1220(machine_config &config)
screen.set_raw(28'944'000, 1152, 0, 960, 420, 0, 400);
screen.set_screen_update(m_crtc, FUNC(hd6845s_device::screen_update));
- HD6845S(config, m_crtc, 2'412'000); // Hitachi HD46505SP/HD6845SP
+ HD6845S(config, m_crtc, XTAL::u(2'412'000)); // Hitachi HD46505SP/HD6845SP
m_crtc->set_screen("screen");
m_crtc->set_show_border_area(false);
m_crtc->set_char_width(12);
diff --git a/src/mame/skeleton/lms46.cpp b/src/mame/skeleton/lms46.cpp
index 718f5d2e28d..a1ae5f17042 100644
--- a/src/mame/skeleton/lms46.cpp
+++ b/src/mame/skeleton/lms46.cpp
@@ -92,11 +92,11 @@ INPUT_PORTS_END
void lms46_state::lms46(machine_config &config)
{
- Z80(config, m_maincpu, 4000000);
+ Z80(config, m_maincpu, XTAL::u(4000000));
m_maincpu->set_addrmap(AS_PROGRAM, &lms46_state::mem_map);
m_maincpu->set_addrmap(AS_IO, &lms46_state::io_map);
- MSM5832(config, m_rtc, 32768);
+ MSM5832(config, m_rtc, XTAL::u(32768));
}
diff --git a/src/mame/skeleton/mccpm.cpp b/src/mame/skeleton/mccpm.cpp
index 6e498d34398..97cff3f940b 100644
--- a/src/mame/skeleton/mccpm.cpp
+++ b/src/mame/skeleton/mccpm.cpp
@@ -204,7 +204,7 @@ void mccpm_state::mccpm(machine_config &config)
m_maincpu->set_addrmap(AS_PROGRAM, &mccpm_state::mem_map);
m_maincpu->set_addrmap(AS_IO, &mccpm_state::io_map);
- ADDRESS_MAP_BANK(config, m_bank, 0);
+ ADDRESS_MAP_BANK(config, m_bank);
m_bank->set_addrmap(0, &mccpm_state::bankdev_map);
m_bank->set_data_width(8);
m_bank->set_addr_width(16);
diff --git a/src/mame/skeleton/mes.cpp b/src/mame/skeleton/mes.cpp
index 631c99e22a4..0367af71991 100644
--- a/src/mame/skeleton/mes.cpp
+++ b/src/mame/skeleton/mes.cpp
@@ -161,11 +161,11 @@ void mes_state::mes(machine_config &config)
PALETTE(config, "palette", palette_device::MONOCHROME);
- Z80CTC(config, "ctc", 0);
- Z80PIO(config, "pio", 0);
- Z80SIO(config, "sio", 0);
+ Z80CTC(config, "ctc");
+ Z80PIO(config, "pio");
+ Z80SIO(config, "sio");
- generic_keyboard_device &keybd(GENERIC_KEYBOARD(config, "keybd", 0));
+ generic_keyboard_device &keybd(GENERIC_KEYBOARD(config, "keybd"));
keybd.set_keyboard_callback(FUNC(mes_state::kbd_put));
}
diff --git a/src/mame/skeleton/mfabfz.cpp b/src/mame/skeleton/mfabfz.cpp
index 8089f4fac77..7d86b5141dd 100644
--- a/src/mame/skeleton/mfabfz.cpp
+++ b/src/mame/skeleton/mfabfz.cpp
@@ -213,7 +213,7 @@ void mfabfz_state::mfabfz(machine_config &config)
uart1_clock.signal_handler().set("uart1", FUNC(i8251_device::write_txc));
uart1_clock.signal_handler().append("uart1", FUNC(i8251_device::write_rxc));
- i8251_device &uart1(I8251(config, "uart1", 0));
+ i8251_device &uart1(I8251(config, "uart1"));
uart1.txd_handler().set("rs232", FUNC(rs232_port_device::write_txd));
uart1.dtr_handler().set("rs232", FUNC(rs232_port_device::write_dtr));
uart1.rts_handler().set("rs232", FUNC(rs232_port_device::write_rts));
diff --git a/src/mame/skeleton/mice.cpp b/src/mame/skeleton/mice.cpp
index e6de8d4ec76..0f9144a380c 100644
--- a/src/mame/skeleton/mice.cpp
+++ b/src/mame/skeleton/mice.cpp
@@ -199,7 +199,7 @@ void mice_state::mice2(machine_config &config)
I8255(config, "rttppi3");
I8255(config, "rttppi4");
I8255(config, "rttppi5");
- I8155(config, "rtt8155", 0);
+ I8155(config, "rtt8155");
}
/* ROM definitions */
diff --git a/src/mame/skeleton/micral.cpp b/src/mame/skeleton/micral.cpp
index 915ab57fb98..301e1f28eb9 100644
--- a/src/mame/skeleton/micral.cpp
+++ b/src/mame/skeleton/micral.cpp
@@ -432,13 +432,13 @@ void micral_state::micral(machine_config &config)
/* sound hardware */
//SPEAKER(config, "mono").front_center();
- //BEEP(config, m_beep, 2000).add_route(ALL_OUTPUTS, "mono", 0.50);
+ //BEEP(config, m_beep, XTAL::u(2000)).add_route(ALL_OUTPUTS, "mono", 0.50);
AY31015(config, m_uart); // CDP6402
m_uart->read_si_callback().set("rs232", FUNC(rs232_port_device::rxd_r));
m_uart->write_so_callback().set("rs232", FUNC(rs232_port_device::write_txd));
- clock_device &uart_clock(CLOCK(config, "uart_clock", 153600));
+ clock_device &uart_clock(CLOCK(config, "uart_clock", XTAL::u(153600)));
uart_clock.signal_handler().set(m_uart, FUNC(ay31015_device::write_tcp));
uart_clock.signal_handler().append(m_uart, FUNC(ay31015_device::write_rcp));
diff --git a/src/mame/skeleton/micromon.cpp b/src/mame/skeleton/micromon.cpp
index 7c8e3c497f2..b47c56dcb7e 100644
--- a/src/mame/skeleton/micromon.cpp
+++ b/src/mame/skeleton/micromon.cpp
@@ -76,7 +76,7 @@ void micromon_state::machine_reset()
void micromon_state::micromon(machine_config &config)
{
// basic machine hardware
- CDP1802(config, m_maincpu, 2457600);
+ CDP1802(config, m_maincpu, XTAL::u(2457600));
m_maincpu->set_addrmap(AS_PROGRAM, &micromon_state::mem_map);
m_maincpu->set_addrmap(AS_IO, &micromon_state::io_map);
m_maincpu->wait_cb().set_constant(1);
diff --git a/src/mame/skeleton/micronic.cpp b/src/mame/skeleton/micronic.cpp
index ee630def976..f03f1020ab6 100644
--- a/src/mame/skeleton/micronic.cpp
+++ b/src/mame/skeleton/micronic.cpp
@@ -375,7 +375,7 @@ void micronic_state::micronic(machine_config &config)
/* sound hardware */
SPEAKER(config, "mono").front_center();
- BEEP(config, m_beep, 0).add_route(ALL_OUTPUTS, "mono", 1.00);
+ BEEP(config, m_beep).add_route(ALL_OUTPUTS, "mono", 1.00);
/* ram banks */
RAM(config, RAM_TAG).set_default_size("224K");
diff --git a/src/mame/skeleton/milwaukee.cpp b/src/mame/skeleton/milwaukee.cpp
index 44e6c587ace..485c9e4202a 100644
--- a/src/mame/skeleton/milwaukee.cpp
+++ b/src/mame/skeleton/milwaukee.cpp
@@ -62,22 +62,22 @@ void milwaukee_state::milwaukee(machine_config &config)
M6502(config, m_maincpu, 16_MHz_XTAL / 16);
m_maincpu->set_addrmap(AS_PROGRAM, &milwaukee_state::mem_map);
- pit8253_device &pit(PIT8253(config, "pit", 0));
+ pit8253_device &pit(PIT8253(config, "pit"));
pit.set_clk<0>(16_MHz_XTAL / 16 / 4); // 250 kHz
pit.out_handler<0>().set("pit", FUNC(pit8253_device::write_gate0)).invert();
pit.set_clk<1>(16_MHz_XTAL / 2 / 13 / 2048 / 5); // 60.09 Hz?
pit.out_handler<1>().set("pit", FUNC(pit8253_device::write_clk2)).invert();
- PIA6821(config, "pia1", 0);
- PIA6821(config, "pia2", 0);
- ACIA6850(config, "acia2", 0);
- MC6852(config, "ssda", 0);
+ PIA6821(config, "pia1");
+ PIA6821(config, "pia2");
+ ACIA6850(config, "acia2");
+ MC6852(config, "ssda");
clock_device &acia_clock(CLOCK(config, "acia_clock", 16_MHz_XTAL / 2 / 13 / 4));
acia_clock.signal_handler().set("acia1", FUNC(acia6850_device::write_txc));
acia_clock.signal_handler().append("acia1", FUNC(acia6850_device::write_rxc));
- acia6850_device &acia1(ACIA6850(config, "acia1", 0));
+ acia6850_device &acia1(ACIA6850(config, "acia1"));
acia1.txd_handler().set("rs232", FUNC(rs232_port_device::write_txd));
acia1.rts_handler().set("rs232", FUNC(rs232_port_device::write_rts));
diff --git a/src/mame/skeleton/mindset.cpp b/src/mame/skeleton/mindset.cpp
index b0c2d8e2c9a..69013e710f8 100644
--- a/src/mame/skeleton/mindset.cpp
+++ b/src/mame/skeleton/mindset.cpp
@@ -73,7 +73,7 @@ protected:
void irq_w(int state);
- mindset_module_interface(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+ mindset_module_interface(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock);
virtual void device_start() override;
virtual void device_reset() override;
@@ -93,7 +93,7 @@ void mindset_module_interface::device_reset()
m_irq_cb(m_irq_state);
}
-mindset_module_interface::mindset_module_interface(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) :
+mindset_module_interface::mindset_module_interface(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock) :
device_t(mconfig, type, tag, owner, clock),
m_irq_cb(*this)
{
@@ -111,14 +111,14 @@ class mindset_module: public device_t,
public:
template <typename T>
mindset_module(const machine_config &mconfig, const char *tag, device_t *owner, T &&opts, const char *dflt, bool fixed = false)
- : mindset_module(mconfig, tag, owner, 0)
+ : mindset_module(mconfig, tag, owner)
{
option_reset();
opts(*this);
set_default_option(dflt);
set_fixed(fixed);
}
- mindset_module(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock = 0);
+ mindset_module(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock = XTAL());
virtual ~mindset_module() = default;
void map(address_space &space, offs_t base, bool id);
@@ -130,7 +130,7 @@ protected:
DEFINE_DEVICE_TYPE(MINDSET_MODULE, mindset_module, "mindset_module", "MINDSET module")
-mindset_module::mindset_module(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+mindset_module::mindset_module(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
device_t(mconfig, MINDSET_MODULE, tag, owner, clock),
device_slot_interface(mconfig, *this)
{
@@ -157,7 +157,7 @@ void mindset_module::map(address_space &space, offs_t base, bool id)
class mindset_sound_module: public mindset_module_interface {
public:
- mindset_sound_module(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock = 0);
+ mindset_sound_module(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock = XTAL());
virtual ~mindset_sound_module() = default;
virtual void map(address_map &map) override;
@@ -182,7 +182,7 @@ private:
DEFINE_DEVICE_TYPE(MINDSET_SOUND_MODULE, mindset_sound_module, "mindset_sound_module", "MINDSET stereo sound module")
-mindset_sound_module::mindset_sound_module(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+mindset_sound_module::mindset_sound_module(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
mindset_module_interface(mconfig, MINDSET_SOUND_MODULE, tag, owner, clock),
m_soundcpu(*this, "soundcpu"),
m_dac(*this, "dac")
@@ -249,13 +249,13 @@ void mindset_sound_module::device_add_mconfig(machine_config &config)
m_soundcpu->p2_out_cb().set(FUNC(mindset_sound_module::p2_w));
SPEAKER(config, "rspeaker").front_right();
- DAC_8BIT_R2R(config, m_dac, 0).add_route(ALL_OUTPUTS, "rspeaker", 0.5);
+ DAC_8BIT_R2R(config, m_dac).add_route(ALL_OUTPUTS, "rspeaker", 0.5);
}
class mindset_rs232_module: public mindset_module_interface {
public:
- mindset_rs232_module(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock = 0);
+ mindset_rs232_module(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock = XTAL());
virtual ~mindset_rs232_module() = default;
virtual void map(address_map &map) override;
@@ -271,7 +271,7 @@ private:
DEFINE_DEVICE_TYPE(MINDSET_RS232_MODULE, mindset_rs232_module, "mindset_rs232_module", "MINDSET RS232 module")
-mindset_rs232_module::mindset_rs232_module(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+mindset_rs232_module::mindset_rs232_module(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
mindset_module_interface(mconfig, MINDSET_RS232_MODULE, tag, owner, clock),
m_ins8250(*this, "ins8250"),
m_rs232(*this, "rs232")
@@ -1349,7 +1349,7 @@ void mindset_state::mindset(machine_config &config)
FLOPPY_CONNECTOR(config, m_fdco[1], pc_dd_floppies, "525dd", floppy_image_device::default_pc_floppy_formats);
SPEAKER(config, "lspeaker").front_left();
- DAC_8BIT_R2R(config, m_dac, 0).add_route(ALL_OUTPUTS, "lspeaker", 0.5);
+ DAC_8BIT_R2R(config, m_dac).add_route(ALL_OUTPUTS, "lspeaker", 0.5);
MINDSET_MODULE(config, "m0", mindset_modules, "stereo", false);
MINDSET_MODULE(config, "m1", mindset_modules, "rs232", false);
diff --git a/src/mame/skeleton/mini2440.cpp b/src/mame/skeleton/mini2440.cpp
index b25a80dc2bd..8ade7a8b77b 100644
--- a/src/mame/skeleton/mini2440.cpp
+++ b/src/mame/skeleton/mini2440.cpp
@@ -228,7 +228,7 @@ void mini2440_state::init_mini2440()
void mini2440_state::mini2440(machine_config &config)
{
- ARM920T(config, m_maincpu, 400000000);
+ ARM920T(config, m_maincpu, XTAL::u(400000000));
m_maincpu->set_addrmap(AS_PROGRAM, &mini2440_state::mini2440_map);
PALETTE(config, "palette").set_entries(32768);
@@ -242,10 +242,10 @@ void mini2440_state::mini2440(machine_config &config)
SPEAKER(config, "lspeaker").front_left();
SPEAKER(config, "rspeaker").front_right();
- UDA1341TS(config, m_ldac, 0).add_route(ALL_OUTPUTS, "lspeaker", 1.0); // uda1341ts.u12
- UDA1341TS(config, m_rdac, 0).add_route(ALL_OUTPUTS, "rspeaker", 1.0); // uda1341ts.u12
+ UDA1341TS(config, m_ldac).add_route(ALL_OUTPUTS, "lspeaker", 1.0); // uda1341ts.u12
+ UDA1341TS(config, m_rdac).add_route(ALL_OUTPUTS, "rspeaker", 1.0); // uda1341ts.u12
- S3C2440(config, m_s3c2440, 12000000);
+ S3C2440(config, m_s3c2440, XTAL::u(12000000));
m_s3c2440->set_palette_tag("palette");
m_s3c2440->set_screen_tag("screen");
m_s3c2440->core_pin_r_callback().set(FUNC(mini2440_state::s3c2440_core_pin_r));
@@ -258,7 +258,7 @@ void mini2440_state::mini2440(machine_config &config)
m_s3c2440->nand_data_r_callback().set(FUNC(mini2440_state::s3c2440_nand_data_r));
m_s3c2440->nand_data_w_callback().set(FUNC(mini2440_state::s3c2440_nand_data_w));
- NAND(config, m_nand, 0);
+ NAND(config, m_nand);
m_nand->set_nand_type(nand_device::chip::K9F1G08U0B);
m_nand->rnb_wr_callback().set(m_s3c2440, FUNC(s3c2440_device::frnb_w));
}
diff --git a/src/mame/skeleton/miniframe.cpp b/src/mame/skeleton/miniframe.cpp
index 57c2ec7f907..101ec3e0461 100644
--- a/src/mame/skeleton/miniframe.cpp
+++ b/src/mame/skeleton/miniframe.cpp
@@ -235,13 +235,13 @@ void miniframe_state::miniframe(machine_config &config)
ADDRESS_MAP_BANK(config, "ramrombank").set_map(&miniframe_state::ramrombank_map).set_options(ENDIANNESS_BIG, 16, 32, 0x400000);
// floppy
- WD2797(config, m_wd2797, 1000000);
+ WD2797(config, m_wd2797, XTAL::u(1000000));
// m_wd2797->intrq_wr_callback().set(FUNC(miniframe_state::wd2797_intrq_w));
// m_wd2797->drq_wr_callback().set(FUNC(miniframe_state::wd2797_drq_w));
FLOPPY_CONNECTOR(config, "wd2797:0", miniframe_floppies, "525dd", floppy_image_device::default_mfm_floppy_formats);
// 8263s
- pit8253_device &pit8253(PIT8253(config, "pit8253", 0));
+ pit8253_device &pit8253(PIT8253(config, "pit8253"));
pit8253.set_clk<0>(76800);
pit8253.set_clk<1>(76800);
pit8253.out_handler<0>().set("pic8259", FUNC(pic8259_device::ir4_w)); // FIXME: fighting for IR4 - error, or needs input merger?
@@ -250,13 +250,13 @@ void miniframe_state::miniframe(machine_config &config)
// and ir4 on the PIC
pit8253.out_handler<1>().append("pic8259", FUNC(pic8259_device::ir4_w));
- pit8253_device &baudgen(PIT8253(config, "baudgen", 0));
+ pit8253_device &baudgen(PIT8253(config, "baudgen"));
baudgen.set_clk<0>(1228800);
baudgen.set_clk<1>(1228800);
baudgen.set_clk<2>(1228800);
// PIC8259s
- pic8259_device &pic8259(PIC8259(config, "pic8259", 0));
+ pic8259_device &pic8259(PIC8259(config, "pic8259"));
pic8259.out_int_callback().set_inputline(m_maincpu, M68K_IRQ_4);
pic8259.in_sp_callback().set_constant(1);
}
diff --git a/src/mame/skeleton/ml20.cpp b/src/mame/skeleton/ml20.cpp
index d31a697b5a0..3f1618b9d09 100644
--- a/src/mame/skeleton/ml20.cpp
+++ b/src/mame/skeleton/ml20.cpp
@@ -271,7 +271,7 @@ void ml20_state::ml20(machine_config &config)
PALETTE(config, "palette", FUNC(ml20_state::lcd_palette), 3);
- HD44780(config, m_lcdc, 0);
+ HD44780(config, m_lcdc);
m_lcdc->set_lcd_size(2, 16);
m_lcdc->set_pixel_update_cb(FUNC(ml20_state::lcd_pixel_update));
diff --git a/src/mame/skeleton/mmd1.cpp b/src/mame/skeleton/mmd1.cpp
index c0d76f13271..3192d06fc58 100644
--- a/src/mame/skeleton/mmd1.cpp
+++ b/src/mame/skeleton/mmd1.cpp
@@ -326,7 +326,7 @@ void mmd1_state::mmd1(machine_config &config)
m_uart->write_so_callback().set(FUNC(mmd1_state::so));
m_uart->set_auto_rdav(true);
- clock_device &uart_clock(CLOCK(config, "uart_clock", 4800));
+ clock_device &uart_clock(CLOCK(config, "uart_clock", XTAL::u(4800)));
uart_clock.signal_handler().set(FUNC(mmd1_state::kansas_w));
TIMER(config, "kansas_r").configure_periodic(FUNC(mmd1_state::kansas_r), attotime::from_hz(40000));
diff --git a/src/mame/skeleton/mmd2.cpp b/src/mame/skeleton/mmd2.cpp
index f8f0d65eea8..d05e106f464 100644
--- a/src/mame/skeleton/mmd2.cpp
+++ b/src/mame/skeleton/mmd2.cpp
@@ -373,7 +373,7 @@ void mmd2_state::mmd2(machine_config &config)
config.set_default_layout(layout_mmd2);
/* Devices */
- i8279_device &kbdc(I8279(config, "i8279", 400000)); // based on divider
+ i8279_device &kbdc(I8279(config, "i8279", XTAL::u(400000))); // based on divider
kbdc.out_sl_callback().set(FUNC(mmd2_state::scanlines_w)); // scan SL lines
kbdc.out_disp_callback().set(FUNC(mmd2_state::digit_w)); // display A&B
kbdc.in_rl_callback().set(FUNC(mmd2_state::keyboard_r)); // kbd RL lines
diff --git a/src/mame/skeleton/mod8.cpp b/src/mame/skeleton/mod8.cpp
index 004033feb57..348abd9b346 100644
--- a/src/mame/skeleton/mod8.cpp
+++ b/src/mame/skeleton/mod8.cpp
@@ -157,13 +157,13 @@ void mod8_state::kbd_put(u8 data)
void mod8_state::mod8(machine_config &config)
{
/* basic machine hardware */
- I8008(config, m_maincpu, 800000);
+ I8008(config, m_maincpu, XTAL::u(800000));
m_maincpu->set_addrmap(AS_PROGRAM, &mod8_state::mem_map);
m_maincpu->set_addrmap(AS_IO, &mod8_state::io_map);
m_maincpu->set_irq_acknowledge_callback(FUNC(mod8_state::mod8_irq_callback));
/* video hardware */
- TELEPRINTER(config, m_teleprinter, 0);
+ TELEPRINTER(config, m_teleprinter);
m_teleprinter->set_keyboard_callback(FUNC(mod8_state::kbd_put));
}
diff --git a/src/mame/skeleton/modellot.cpp b/src/mame/skeleton/modellot.cpp
index 6f6c84b871f..7112a63ba62 100644
--- a/src/mame/skeleton/modellot.cpp
+++ b/src/mame/skeleton/modellot.cpp
@@ -234,7 +234,7 @@ void modellot_state::modellot(machine_config &config)
PALETTE(config, "palette", palette_device::MONOCHROME);
/* Devices */
- generic_keyboard_device &keyboard(GENERIC_KEYBOARD(config, "keyboard", 0));
+ generic_keyboard_device &keyboard(GENERIC_KEYBOARD(config, "keyboard"));
keyboard.set_keyboard_callback(FUNC(modellot_state::kbd_put));
}
diff --git a/src/mame/skeleton/ms9540.cpp b/src/mame/skeleton/ms9540.cpp
index 5bc9c1bdfaa..4bd9fc4c44e 100644
--- a/src/mame/skeleton/ms9540.cpp
+++ b/src/mame/skeleton/ms9540.cpp
@@ -117,11 +117,11 @@ void ms9540_state::kbd_put(u8 data)
void ms9540_state::ms9540(machine_config &config)
{
/* basic machine hardware */
- M68000(config, m_maincpu, 8000000); // unknown clock
+ M68000(config, m_maincpu, XTAL::u(8000000)); // unknown clock
m_maincpu->set_addrmap(AS_PROGRAM, &ms9540_state::mem_map);
/* video hardware */
- GENERIC_TERMINAL(config, m_terminal, 0);
+ GENERIC_TERMINAL(config, m_terminal);
m_terminal->set_keyboard_callback(FUNC(ms9540_state::kbd_put));
}
diff --git a/src/mame/skeleton/mtd1256.cpp b/src/mame/skeleton/mtd1256.cpp
index 0c05033a071..d2c8c9baa8f 100644
--- a/src/mame/skeleton/mtd1256.cpp
+++ b/src/mame/skeleton/mtd1256.cpp
@@ -126,7 +126,7 @@ void mtd1256_state::mtd1256(machine_config &config)
MM58274C(config, "rtc", 32.768_kHz_XTAL); // TODO: 1 second interrupt output configured
- MM74C923(config, m_encoder, 0); // timing parameters unknown
+ MM74C923(config, m_encoder); // timing parameters unknown
screen_device &screen(SCREEN(config, "screen", SCREEN_TYPE_LCD));
screen.set_refresh_hz(50);
diff --git a/src/mame/skeleton/mx2178.cpp b/src/mame/skeleton/mx2178.cpp
index 59963598088..71a4cb25d5e 100644
--- a/src/mame/skeleton/mx2178.cpp
+++ b/src/mame/skeleton/mx2178.cpp
@@ -161,7 +161,7 @@ void mx2178_state::mx2178(machine_config &config)
acia_clock.signal_handler().append("acia2", FUNC(acia6850_device::write_txc));
acia_clock.signal_handler().append("acia2", FUNC(acia6850_device::write_rxc));
- acia6850_device &acia1(ACIA6850(config, "acia1", 0));
+ acia6850_device &acia1(ACIA6850(config, "acia1"));
acia1.txd_handler().set("rs232a", FUNC(rs232_port_device::write_txd));
acia1.rts_handler().set("rs232a", FUNC(rs232_port_device::write_rts));
acia1.irq_handler().set_inputline(m_maincpu, INPUT_LINE_IRQ0);
@@ -170,7 +170,7 @@ void mx2178_state::mx2178(machine_config &config)
rs232a.rxd_handler().set("acia1", FUNC(acia6850_device::write_rxd));
rs232a.cts_handler().set("acia1", FUNC(acia6850_device::write_cts));
- acia6850_device &acia2(ACIA6850(config, "acia2", 0));
+ acia6850_device &acia2(ACIA6850(config, "acia2"));
acia2.txd_handler().set("rs232b", FUNC(rs232_port_device::write_txd));
acia2.rts_handler().set("rs232b", FUNC(rs232_port_device::write_rts));
acia2.irq_handler().set_inputline(m_maincpu, INPUT_LINE_IRQ0);
diff --git a/src/mame/skeleton/mycom.cpp b/src/mame/skeleton/mycom.cpp
index a5876aa64fd..1705951d88b 100644
--- a/src/mame/skeleton/mycom.cpp
+++ b/src/mame/skeleton/mycom.cpp
@@ -544,7 +544,7 @@ void mycom_state::mycom(machine_config &config)
/* Manual states clock is 1.008mhz for 40 cols, and 2.016 mhz for 80 cols.
The manual states the CRTC is a HD46505S (apparently same as HD6845S). The start registers need to be readable. */
- HD6845S(config, m_crtc, 1008000);
+ HD6845S(config, m_crtc, XTAL::u(1008000));
m_crtc->set_screen("screen");
m_crtc->set_show_border_area(false);
m_crtc->set_char_width(8);
diff --git a/src/mame/skeleton/ngen.cpp b/src/mame/skeleton/ngen.cpp
index 81af26b9a6f..4e8d0d675c1 100644
--- a/src/mame/skeleton/ngen.cpp
+++ b/src/mame/skeleton/ngen.cpp
@@ -936,10 +936,10 @@ void ngen_state::ngen(machine_config &config)
m_maincpu->tmrout0_handler().set(FUNC(ngen_state::cpu_timer_w));
m_maincpu->read_slave_ack_callback().set(FUNC(ngen_state::irq_cb));
- PIC8259(config, m_pic, 0);
+ PIC8259(config, m_pic);
m_pic->out_int_callback().set(m_maincpu, FUNC(i80186_cpu_device::int0_w));
- PIT8254(config, m_pit, 0);
+ PIT8254(config, m_pit);
m_pit->set_clk<0>(78120/4); // 19.53kHz, /4 of the CPU timer output?
m_pit->out_handler<0>().set(FUNC(ngen_state::pit_out0_w)); // RS232 channel B baud rate
m_pit->set_clk<1>(14.7456_MHz_XTAL / 12); // correct? - based on patent
@@ -966,7 +966,7 @@ void ngen_state::ngen(machine_config &config)
m_dmac->out_iow_callback<3>().set(FUNC(ngen_state::dma_3_dack_w));
// I/O board
- UPD7201(config, m_iouart, 0); // clocked by PIT channel 2?
+ UPD7201(config, m_iouart); // clocked by PIT channel 2?
m_iouart->out_txda_callback().set("rs232_a", FUNC(rs232_port_device::write_txd));
m_iouart->out_txdb_callback().set("rs232_b", FUNC(rs232_port_device::write_txd));
m_iouart->out_dtra_callback().set("rs232_a", FUNC(rs232_port_device::write_dtr));
@@ -1002,13 +1002,13 @@ void ngen_state::ngen(machine_config &config)
m_crtc->set_update_row_callback(FUNC(ngen_state::crtc_update_row));
// keyboard UART (patent says i8251 is used for keyboard communications, it is located on the video board)
- I8251(config, m_viduart, 0); // main clock unknown, Rx/Tx clocks are 19.53kHz
+ I8251(config, m_viduart); // main clock unknown, Rx/Tx clocks are 19.53kHz
// m_viduart->txempty_handler().set(m_pic, FUNC(pic8259_device::ir4_w));
m_viduart->txd_handler().set("keyboard", FUNC(rs232_port_device::write_txd));
rs232_port_device &kbd(RS232_PORT(config, "keyboard", keyboard, "ngen"));
kbd.rxd_handler().set(m_viduart, FUNC(i8251_device::write_rxd));
- CLOCK(config, "refresh_clock", 19200*16).signal_handler().set(FUNC(ngen_state::timer_clk_out)); // should be 19530Hz
+ CLOCK(config, "refresh_clock", XTAL::u(19200*16)).signal_handler().set(FUNC(ngen_state::timer_clk_out)); // should be 19530Hz
// floppy disk / hard disk module (WD2797 FDC, WD1010 HDC, plus an 8253 timer for each)
WD2797(config, m_fdc, 20_MHz_XTAL / 20);
@@ -1016,7 +1016,7 @@ void ngen_state::ngen(machine_config &config)
m_fdc->drq_wr_callback().set(m_maincpu, FUNC(i80186_cpu_device::drq1_w));
m_fdc->set_force_ready(true);
- PIT8253(config, m_fdc_timer, 0);
+ PIT8253(config, m_fdc_timer);
m_fdc_timer->set_clk<0>(0);
m_fdc_timer->out_handler<0>().set(m_pic, FUNC(pic8259_device::ir5_w)); // clocked on FDC data register access
m_fdc_timer->set_clk<1>(20_MHz_XTAL / 20);
@@ -1035,11 +1035,11 @@ void ngen_state::ngen(machine_config &config)
m_hdc->in_tk000_callback().set_constant(1);
m_hdc->in_sc_callback().set_constant(1);
- PIT8253(config, m_hdc_timer, 0);
+ PIT8253(config, m_hdc_timer);
m_hdc_timer->set_clk<2>(20_MHz_XTAL / 10); // 2MHz
FLOPPY_CONNECTOR(config, "fdc:0", ngen_floppies, "525qd", floppy_image_device::default_mfm_floppy_formats);
- HARDDISK(config, "hard0", 0);
+ HARDDISK(config, "hard0");
}
void ngen386_state::ngen386(machine_config &config)
@@ -1049,10 +1049,10 @@ void ngen386_state::ngen386(machine_config &config)
m_i386cpu->set_addrmap(AS_IO, &ngen386_state::ngen386_io);
m_i386cpu->set_irq_acknowledge_callback("pic", FUNC(pic8259_device::inta_cb));
- PIC8259(config, m_pic, 0);
+ PIC8259(config, m_pic);
m_pic->out_int_callback().set_inputline(m_i386cpu, 0);
- PIT8254(config, m_pit, 0);
+ PIT8254(config, m_pit);
m_pit->set_clk<0>(78120/4); // 19.53kHz, /4 of the CPU timer output?
m_pit->out_handler<0>().set(FUNC(ngen386_state::pit_out0_w)); // RS232 channel B baud rate
m_pit->set_clk<1>(14.7456_MHz_XTAL / 12); // correct? - based on patent
@@ -1079,7 +1079,7 @@ void ngen386_state::ngen386(machine_config &config)
m_dmac->out_iow_callback<3>().set(FUNC(ngen386_state::dma_3_dack_w));
// I/O board
- UPD7201(config, m_iouart, 0); // clocked by PIT channel 2?
+ UPD7201(config, m_iouart); // clocked by PIT channel 2?
m_iouart->out_txda_callback().set("rs232_a", FUNC(rs232_port_device::write_txd));
m_iouart->out_txdb_callback().set("rs232_b", FUNC(rs232_port_device::write_txd));
m_iouart->out_dtra_callback().set("rs232_a", FUNC(rs232_port_device::write_dtr));
@@ -1115,13 +1115,13 @@ void ngen386_state::ngen386(machine_config &config)
m_crtc->set_update_row_callback(FUNC(ngen386_state::crtc_update_row));
// keyboard UART (patent says i8251 is used for keyboard communications, it is located on the video board)
- I8251(config, m_viduart, 0); // main clock unknown, Rx/Tx clocks are 19.53kHz
+ I8251(config, m_viduart); // main clock unknown, Rx/Tx clocks are 19.53kHz
// m_viduart->txempty_handler().set("pic", FUNC(pic8259_device::ir4_w));
m_viduart->txd_handler().set("keyboard", FUNC(rs232_port_device::write_txd));
rs232_port_device &kbd(RS232_PORT(config, "keyboard", keyboard, "ngen"));
kbd.rxd_handler().set(m_viduart, FUNC(i8251_device::write_rxd));
- CLOCK(config, "refresh_clock", 19200*16).signal_handler().set(FUNC(ngen386_state::timer_clk_out)); // should be 19530Hz
+ CLOCK(config, "refresh_clock", XTAL::u(19200*16)).signal_handler().set(FUNC(ngen386_state::timer_clk_out)); // should be 19530Hz
// floppy disk / hard disk module (WD2797 FDC, WD1010 HDC, plus an 8253 timer for each)
WD2797(config, m_fdc, 20_MHz_XTAL / 20);
@@ -1129,7 +1129,7 @@ void ngen386_state::ngen386(machine_config &config)
//m_fdc->drq_wr_callback().set(m_i386cpu, FUNC(i80186_cpu_device_device::drq1_w));
m_fdc->set_force_ready(true);
- PIT8253(config, m_fdc_timer, 0);
+ PIT8253(config, m_fdc_timer);
m_fdc_timer->set_clk<0>(0);
m_fdc_timer->out_handler<0>().set(m_pic, FUNC(pic8259_device::ir5_w)); // clocked on FDC data register access
m_fdc_timer->set_clk<1>(20_MHz_XTAL / 20);
@@ -1148,11 +1148,11 @@ void ngen386_state::ngen386(machine_config &config)
m_hdc->in_tk000_callback().set_constant(1);
m_hdc->in_sc_callback().set_constant(1);
- PIT8253(config, m_hdc_timer, 0);
+ PIT8253(config, m_hdc_timer);
m_hdc_timer->set_clk<2>(20_MHz_XTAL / 10); // 2MHz
FLOPPY_CONNECTOR(config, "fdc:0", ngen_floppies, "525qd", floppy_image_device::default_mfm_floppy_formats);
- HARDDISK(config, "hard0", 0);
+ HARDDISK(config, "hard0");
}
void ngen386_state::_386i(machine_config &config)
diff --git a/src/mame/skeleton/ngen_kb.cpp b/src/mame/skeleton/ngen_kb.cpp
index 3f363de2533..abaafd6da95 100644
--- a/src/mame/skeleton/ngen_kb.cpp
+++ b/src/mame/skeleton/ngen_kb.cpp
@@ -11,8 +11,8 @@
#include "emu.h"
#include "ngen_kb.h"
-ngen_keyboard_device::ngen_keyboard_device(const machine_config& mconfig, const char* tag, device_t* owner, uint32_t clock)
- : serial_keyboard_device(mconfig, NGEN_KEYBOARD, tag, owner, 0)
+ngen_keyboard_device::ngen_keyboard_device(const machine_config& mconfig, const char* tag, device_t* owner, const XTAL &clock)
+ : serial_keyboard_device(mconfig, NGEN_KEYBOARD, tag, owner)
, m_keys_down(0U)
, m_last_reset(0U)
{
@@ -68,7 +68,7 @@ void ngen_keyboard_device::device_start()
save_item(NAME(m_keys_down));
save_item(NAME(m_last_reset));
- set_rcv_rate(19200);
+ set_rcv_rate(XTAL::u(19200));
}
void ngen_keyboard_device::device_reset()
diff --git a/src/mame/skeleton/ngen_kb.h b/src/mame/skeleton/ngen_kb.h
index 37589926303..46ba4733b71 100644
--- a/src/mame/skeleton/ngen_kb.h
+++ b/src/mame/skeleton/ngen_kb.h
@@ -12,7 +12,7 @@
class ngen_keyboard_device : public serial_keyboard_device
{
public:
- ngen_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ ngen_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
virtual ioport_constructor device_input_ports() const override;
protected:
diff --git a/src/mame/skeleton/onyx.cpp b/src/mame/skeleton/onyx.cpp
index 4b9acf3ebf0..5bfcb5f0c8e 100644
--- a/src/mame/skeleton/onyx.cpp
+++ b/src/mame/skeleton/onyx.cpp
@@ -146,7 +146,7 @@ void onyx_state::c8002(machine_config &config)
subcpu.set_addrmap(AS_PROGRAM, &onyx_state::submem);
subcpu.set_addrmap(AS_IO, &onyx_state::subio);
- clock_device &sio1_clock(CLOCK(config, "sio1_clock", 307200));
+ clock_device &sio1_clock(CLOCK(config, "sio1_clock", XTAL::u(307200)));
sio1_clock.signal_handler().set(m_sio[0], FUNC(z80sio_device::rxca_w));
sio1_clock.signal_handler().append(m_sio[0], FUNC(z80sio_device::txca_w));
@@ -176,7 +176,7 @@ void onyx_state::c8002(machine_config &config)
//z80pio_device& pio1s(Z80PIO(config, "pio1s", XTAL(16'000'000)/4));
//pio1s->out_int_callback().set_inputline("subcpu", INPUT_LINE_IRQ0);
- clock_device &sio1s_clock(CLOCK(config, "sio1s_clock", 614400));
+ clock_device &sio1s_clock(CLOCK(config, "sio1s_clock", XTAL::u(614400)));
sio1s_clock.signal_handler().set("sio1s", FUNC(z80sio_device::rxtxcb_w));
//sio1s_clock.signal_handler().append("sio1s", FUNC(z80sio_device::txca_w));
@@ -253,7 +253,7 @@ void onyx_state::c5000(machine_config &config)
maincpu.set_addrmap(AS_PROGRAM, &onyx_state::c5000_mem);
maincpu.set_addrmap(AS_IO, &onyx_state::c5000_io);
- clock_device &sio1_clock(CLOCK(config, "sio1_clock", 614400));
+ clock_device &sio1_clock(CLOCK(config, "sio1_clock", XTAL::u(614400)));
sio1_clock.signal_handler().set(m_sio[0], FUNC(z80sio_device::rxtxcb_w));
//sio1_clock.signal_handler().append(m_sio[0], FUNC(z80sio_device::txca_w));
diff --git a/src/mame/skeleton/p8k.cpp b/src/mame/skeleton/p8k.cpp
index 4363afd65dd..cfecd089baf 100644
--- a/src/mame/skeleton/p8k.cpp
+++ b/src/mame/skeleton/p8k.cpp
@@ -63,7 +63,7 @@
class p8k_16_daisy_device : public device_t, public z80_daisy_chain_interface
{
public:
- p8k_16_daisy_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ p8k_16_daisy_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
uint16_t viack_r() {
device_z80daisy_interface *intf = daisy_get_irq_device();
return intf ? intf->z80daisy_irq_ack() : 0;
@@ -75,7 +75,7 @@ protected:
DEFINE_DEVICE_TYPE(P8K_16_DAISY, p8k_16_daisy_device, "p8k_16_daisy", "P8000 16-bit daisy chain device")
-p8k_16_daisy_device::p8k_16_daisy_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+p8k_16_daisy_device::p8k_16_daisy_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: device_t(mconfig, P8K_16_DAISY, tag, owner, clock)
, z80_daisy_chain_interface(mconfig, *this) {}
@@ -434,17 +434,17 @@ void p8k_state::p8k(machine_config &config)
dma.in_iorq_callback().set(FUNC(p8k_state::io_read_byte));
dma.out_iorq_callback().set(FUNC(p8k_state::io_write_byte));
- clock_device &uart_clock(CLOCK(config, "uart_clock", 307200));
+ clock_device &uart_clock(CLOCK(config, "uart_clock", XTAL::u(307200)));
uart_clock.signal_handler().set("sio", FUNC(z80sio_device::txcb_w));
uart_clock.signal_handler().append("sio", FUNC(z80sio_device::rxcb_w));
- z80ctc_device& ctc0(Z80CTC(config, "ctc0", 1229000)); /* 1.22MHz clock */
+ z80ctc_device& ctc0(Z80CTC(config, "ctc0", XTAL::u(1229000))); /* 1.22MHz clock */
// to implement: callbacks!
// manual states the callbacks should go to
// Baud Gen 3, FDC, System-Kanal
ctc0.intr_callback().set_inputline(m_maincpu, INPUT_LINE_IRQ0);
- z80ctc_device& ctc1(Z80CTC(config, "ctc1", 1229000)); /* 1.22MHz clock */
+ z80ctc_device& ctc1(Z80CTC(config, "ctc1", XTAL::u(1229000))); /* 1.22MHz clock */
// to implement: callbacks!
// manual states the callbacks should go to
// Baud Gen 0, Baud Gen 1, Baud Gen 2,
@@ -463,13 +463,13 @@ void p8k_state::p8k(machine_config &config)
z80sio_device& sio1(Z80SIO(config, "sio1", 16_MHz_XTAL / 4));
sio1.out_int_callback().set_inputline(m_maincpu, INPUT_LINE_IRQ0);
- z80pio_device& pio0(Z80PIO(config, "pio0", 1229000));
+ z80pio_device& pio0(Z80PIO(config, "pio0", XTAL::u(1229000)));
pio0.out_int_callback().set_inputline(m_maincpu, INPUT_LINE_IRQ0);
- z80pio_device& pio1(Z80PIO(config, "pio1", 1229000));
+ z80pio_device& pio1(Z80PIO(config, "pio1", XTAL::u(1229000)));
pio1.out_int_callback().set_inputline(m_maincpu, INPUT_LINE_IRQ0);
- Z80PIO(config, m_pio2, 1229000);
+ Z80PIO(config, m_pio2, XTAL::u(1229000));
m_pio2->out_int_callback().set_inputline(m_maincpu, INPUT_LINE_IRQ0);
m_pio2->in_pa_callback().set_ioport("DSW");
@@ -481,7 +481,7 @@ void p8k_state::p8k(machine_config &config)
/* sound hardware */
SPEAKER(config, "mono").front_center();
- BEEP(config, "beeper", 3250).add_route(ALL_OUTPUTS, "mono", 0.5);
+ BEEP(config, "beeper", XTAL::u(3250)).add_route(ALL_OUTPUTS, "mono", 0.5);
}
void p8k_state::p8k_16(machine_config &config)
@@ -493,10 +493,10 @@ void p8k_state::p8k_16(machine_config &config)
maincpu.set_addrmap(AS_IO, &p8k_state::p8k_16_iomap);
maincpu.viack().set("p8k_16_daisy", FUNC(p8k_16_daisy_device::viack_r));
- P8K_16_DAISY(config, m_daisy, 0);
+ P8K_16_DAISY(config, m_daisy);
m_daisy->set_daisy_config(p8k_16_daisy_chain);
- clock_device &uart_clock(CLOCK(config, "uart_clock", 307200));
+ clock_device &uart_clock(CLOCK(config, "uart_clock", XTAL::u(307200)));
uart_clock.signal_handler().set("sio", FUNC(z80sio_device::txcb_w));
uart_clock.signal_handler().append("sio", FUNC(z80sio_device::rxcb_w));
@@ -531,7 +531,7 @@ void p8k_state::p8k_16(machine_config &config)
/* sound hardware */
SPEAKER(config, "mono").front_center();
- BEEP(config, "beeper", 3250).add_route(ALL_OUTPUTS, "mono", 0.5);
+ BEEP(config, "beeper", XTAL::u(3250)).add_route(ALL_OUTPUTS, "mono", 0.5);
}
/* ROM definition */
diff --git a/src/mame/skeleton/palestra.cpp b/src/mame/skeleton/palestra.cpp
index cd66fb7f242..c397167ac57 100644
--- a/src/mame/skeleton/palestra.cpp
+++ b/src/mame/skeleton/palestra.cpp
@@ -34,7 +34,7 @@
#include <cmath>
-#define MASTER_CLOCK (4000000)
+#define MASTER_CLOCK XTAL::u(4000000)
#define V_TOTAL_PONG 315
#define H_TOTAL_PONG 256 // tbc
@@ -68,7 +68,7 @@ INPUT_PORTS_END
void palestra_state::palestra(machine_config &config)
{
- NETLIST_CPU(config, m_maincpu, netlist::config::DEFAULT_CLOCK())
+ NETLIST_CPU(config, m_maincpu)
.set_source(netlist_palestra);
NETLIST_ANALOG_OUTPUT(config, "maincpu:vid0").set_params("videomix", m_video, FUNC(fixedfreq_device::update_composite_monochrome));
diff --git a/src/mame/skeleton/pdt3100.cpp b/src/mame/skeleton/pdt3100.cpp
index 1a78bb98095..8c664741506 100644
--- a/src/mame/skeleton/pdt3100.cpp
+++ b/src/mame/skeleton/pdt3100.cpp
@@ -57,7 +57,7 @@ INPUT_PORTS_END
void pdt3100_state::pdt3100(machine_config &config)
{
- V25(config, m_maincpu, 8'000'000);
+ V25(config, m_maincpu, XTAL::u(8'000'000));
m_maincpu->set_addrmap(AS_PROGRAM, &pdt3100_state::mem_map);
m_maincpu->set_addrmap(AS_IO, &pdt3100_state::io_map);
}
diff --git a/src/mame/skeleton/pes.cpp b/src/mame/skeleton/pes.cpp
index 545c23397c6..43f087c46fe 100644
--- a/src/mame/skeleton/pes.cpp
+++ b/src/mame/skeleton/pes.cpp
@@ -184,10 +184,10 @@ void pes_state::pes(machine_config &config)
/* sound hardware */
SPEAKER(config, "mono").front_center();
- TMS5220C(config, m_speech, 720000); /* 720Khz clock, 9khz sample-rate, adjustable with 10-turn trimpot */
+ TMS5220C(config, m_speech, XTAL::u(720000)); /* 720Khz clock, 9khz sample-rate, adjustable with 10-turn trimpot */
m_speech->add_route(ALL_OUTPUTS, "mono", 1.0);
- GENERIC_TERMINAL(config, m_terminal, 0);
+ GENERIC_TERMINAL(config, m_terminal);
m_terminal->set_keyboard_callback(FUNC(pes_state::kbd_put));
}
diff --git a/src/mame/skeleton/philipsbo.cpp b/src/mame/skeleton/philipsbo.cpp
index d31600d6da1..72acc1c302e 100644
--- a/src/mame/skeleton/philipsbo.cpp
+++ b/src/mame/skeleton/philipsbo.cpp
@@ -197,7 +197,7 @@ void pbo_state::pbo(machine_config &config)
m_maincpu->set_addrmap(AS_PROGRAM, &pbo_state::main_map);
SCC85C30(config, m_scc, 10_MHz_XTAL); // Unknown PCLK
- m_scc->configure_channels(4'915'200, 4'915'200, 4'915'200, 4'915'200);
+ m_scc->configure_channels(XTAL::u(4'915'200), XTAL::u(4'915'200), XTAL::u(4'915'200), XTAL::u(4'915'200));
m_scc->out_txda_callback().set(m_rs232[0], FUNC(rs232_port_device::write_txd));
m_scc->out_dtra_callback().set(m_rs232[0], FUNC(rs232_port_device::write_dtr));
m_scc->out_rtsa_callback().set(m_rs232[0], FUNC(rs232_port_device::write_rts));
@@ -253,7 +253,7 @@ void pbo_state::pbo(machine_config &config)
AM7990(config, m_lance);
m_lance->intr_out().set(FUNC(pbo_state::net_irq_w));
- MC68681(config, "duart", 3'686'400);
+ MC68681(config, "duart", XTAL::u(3'686'400));
}
ROM_START( pbo )
diff --git a/src/mame/skeleton/picno.cpp b/src/mame/skeleton/picno.cpp
index c8446775a86..e367ba52c0d 100644
--- a/src/mame/skeleton/picno.cpp
+++ b/src/mame/skeleton/picno.cpp
@@ -64,7 +64,7 @@ INPUT_PORTS_END
void picno_state::picno(machine_config &config)
{
/* basic machine hardware */
- HD6435328(config, m_maincpu, 20'000'000); // TODO: clock is a guess, divided by 2 in the cpu
+ HD6435328(config, m_maincpu, XTAL::u(20'000'000)); // TODO: clock is a guess, divided by 2 in the cpu
m_maincpu->set_addrmap(AS_PROGRAM, &picno_state::mem_map);
//SPEAKER(config, "lspeaker").front_left(); // no speaker in the unit, but there's a couple of sockets on the back
diff --git a/src/mame/skeleton/plan80.cpp b/src/mame/skeleton/plan80.cpp
index a99aec6cefb..70e845b982d 100644
--- a/src/mame/skeleton/plan80.cpp
+++ b/src/mame/skeleton/plan80.cpp
@@ -250,7 +250,7 @@ GFXDECODE_END
void plan80_state::plan80(machine_config &config)
{
/* basic machine hardware */
- I8080(config, m_maincpu, 2048000);
+ I8080(config, m_maincpu, XTAL::u(2048000));
m_maincpu->set_addrmap(AS_PROGRAM, &plan80_state::mem_map);
m_maincpu->set_addrmap(AS_IO, &plan80_state::io_map);
diff --git a/src/mame/skeleton/pm68k.cpp b/src/mame/skeleton/pm68k.cpp
index 9a331e7a1fa..f1331c72f5e 100644
--- a/src/mame/skeleton/pm68k.cpp
+++ b/src/mame/skeleton/pm68k.cpp
@@ -60,10 +60,10 @@ void pm68k_state::machine_reset()
void pm68k_state::pm68k(machine_config &config)
{
/* basic machine hardware */
- M68000(config, m_maincpu, 8000000);
+ M68000(config, m_maincpu, XTAL::u(8000000));
m_maincpu->set_addrmap(AS_PROGRAM, &pm68k_state::mem_map);
- i8274_device& mpsc(I8274(config, "mpsc", 0));
+ i8274_device& mpsc(I8274(config, "mpsc"));
mpsc.out_txda_callback().set("rs232a", FUNC(rs232_port_device::write_txd));
mpsc.out_dtra_callback().set("rs232a", FUNC(rs232_port_device::write_dtr));
mpsc.out_rtsa_callback().set("rs232a", FUNC(rs232_port_device::write_rts));
@@ -71,7 +71,7 @@ void pm68k_state::pm68k(machine_config &config)
mpsc.out_dtrb_callback().set("rs232b", FUNC(rs232_port_device::write_dtr));
mpsc.out_rtsb_callback().set("rs232b", FUNC(rs232_port_device::write_rts));
- am9513_device &stc(AM9513(config, "stc", 4000000));
+ am9513_device &stc(AM9513(config, "stc", XTAL::u(4000000)));
stc.out4_cb().set("mpsc", FUNC(i8274_device::rxca_w));
stc.out4_cb().append("mpsc", FUNC(i8274_device::txca_w));
stc.out5_cb().set("mpsc", FUNC(i8274_device::rxcb_w));
diff --git a/src/mame/skeleton/pockchal.cpp b/src/mame/skeleton/pockchal.cpp
index a8062d81a36..993f0e11453 100644
--- a/src/mame/skeleton/pockchal.cpp
+++ b/src/mame/skeleton/pockchal.cpp
@@ -105,7 +105,7 @@ void pockchalv1_state::machine_reset()
void pockchalv1_state::pockchalv1(machine_config &config)
{
/* basic machine hardware */
- TMP90845(config, m_maincpu, 8000000); /* ? MHz */
+ TMP90845(config, m_maincpu, XTAL::u(8000000)); /* ? MHz */
m_maincpu->set_addrmap(AS_PROGRAM, &pockchalv1_state::pockchalv1_map);
// m_maincpu->->set_vblank_int("screen", FUNC(pockchalv1_state::irq0_line_hold));
diff --git a/src/mame/skeleton/proteus3.cpp b/src/mame/skeleton/proteus3.cpp
index 3da71c4bf2d..9d658e41202 100644
--- a/src/mame/skeleton/proteus3.cpp
+++ b/src/mame/skeleton/proteus3.cpp
@@ -415,16 +415,16 @@ void proteus3_state::proteus3(machine_config &config)
PALETTE(config, "palette", palette_device::MONOCHROME);
/* Devices */
- PIA6821(config, m_pia, 0);
+ PIA6821(config, m_pia);
m_pia->writepa_handler().set(FUNC(proteus3_state::video_w));
m_pia->ca2_handler().set(FUNC(proteus3_state::ca2_w));
m_pia->irqb_handler().set_inputline("maincpu", M6800_IRQ_LINE);
- generic_keyboard_device &keyboard(GENERIC_KEYBOARD(config, "keyboard", 0));
+ generic_keyboard_device &keyboard(GENERIC_KEYBOARD(config, "keyboard"));
keyboard.set_keyboard_callback(FUNC(proteus3_state::kbd_put));
/* cassette */
- ACIA6850(config, m_acia1, 0);
+ ACIA6850(config, m_acia1);
m_acia1->txd_handler().set([this] (bool state) { m_cassbit = state; });
SPEAKER(config, "mono").front_center();
@@ -435,7 +435,7 @@ void proteus3_state::proteus3(machine_config &config)
TIMER(config, "kansas_r").configure_periodic(FUNC(proteus3_state::kansas_r), attotime::from_hz(40000));
// optional tty keyboard
- ACIA6850(config, m_acia2, 0);
+ ACIA6850(config, m_acia2);
m_acia2->txd_handler().set("rs232", FUNC(rs232_port_device::write_txd));
m_acia2->rts_handler().set("rs232", FUNC(rs232_port_device::write_rts));
diff --git a/src/mame/skeleton/pt68k4.cpp b/src/mame/skeleton/pt68k4.cpp
index 37627775faa..d94c7087945 100644
--- a/src/mame/skeleton/pt68k4.cpp
+++ b/src/mame/skeleton/pt68k4.cpp
@@ -427,22 +427,22 @@ void pt68k4_state::pt68k2(machine_config &config)
pc_kbdc.out_clock_cb().set(FUNC(pt68k4_state::keyboard_clock_w));
pc_kbdc.out_data_cb().set(FUNC(pt68k4_state::keyboard_data_w));
- M48T02(config, TIMEKEEPER_TAG, 0);
+ M48T02(config, TIMEKEEPER_TAG);
WD1772(config, m_wdfdc, 16_MHz_XTAL / 2);
FLOPPY_CONNECTOR(config, m_floppy_connector[0], pt68k_floppies, "525dd", pt68k4_state::floppy_formats);
FLOPPY_CONNECTOR(config, m_floppy_connector[1], pt68k_floppies, "525dd", pt68k4_state::floppy_formats);
- ISA8(config, m_isa, 0);
+ ISA8(config, m_isa);
m_isa->set_custom_spaces();
m_isa->irq5_callback().set(FUNC(pt68k4_state::irq5_w));
- ISA8_SLOT(config, "isa1", 0, m_isa, pt68k4_isa8_cards, "cga", false); // FIXME: determine ISA bus clock
- ISA8_SLOT(config, "isa2", 0, m_isa, pt68k4_isa8_cards, nullptr, false);
- ISA8_SLOT(config, "isa3", 0, m_isa, pt68k4_isa8_cards, nullptr, false);
- ISA8_SLOT(config, "isa4", 0, m_isa, pt68k4_isa8_cards, nullptr, false);
- ISA8_SLOT(config, "isa5", 0, m_isa, pt68k4_isa8_cards, nullptr, false);
- ISA8_SLOT(config, "isa6", 0, m_isa, pt68k4_isa8_cards, nullptr, false),
+ ISA8_SLOT(config, "isa1", m_isa, pt68k4_isa8_cards, "cga", false); // FIXME: determine ISA bus clock
+ ISA8_SLOT(config, "isa2", m_isa, pt68k4_isa8_cards, nullptr, false);
+ ISA8_SLOT(config, "isa3", m_isa, pt68k4_isa8_cards, nullptr, false);
+ ISA8_SLOT(config, "isa4", m_isa, pt68k4_isa8_cards, nullptr, false);
+ ISA8_SLOT(config, "isa5", m_isa, pt68k4_isa8_cards, nullptr, false);
+ ISA8_SLOT(config, "isa6", m_isa, pt68k4_isa8_cards, nullptr, false),
SPEAKER(config, "mono").front_center();
SPEAKER_SOUND(config, m_speaker).add_route(ALL_OUTPUTS, "mono", 1.00);
@@ -467,18 +467,18 @@ void pt68k4_state::pt68k4(machine_config &config)
pc_kbdc.out_clock_cb().set(FUNC(pt68k4_state::keyboard_clock_w));
pc_kbdc.out_data_cb().set(FUNC(pt68k4_state::keyboard_data_w));
- M48T02(config, TIMEKEEPER_TAG, 0);
+ M48T02(config, TIMEKEEPER_TAG);
- ISA8(config, m_isa, 0);
+ ISA8(config, m_isa);
m_isa->set_custom_spaces();
- ISA8_SLOT(config, "isa1", 0, m_isa, pt68k4_isa8_cards, "fdc_at", false); // FIXME: determine ISA bus clock
- ISA8_SLOT(config, "isa2", 0, m_isa, pt68k4_isa8_cards, "cga", false);
- ISA8_SLOT(config, "isa3", 0, m_isa, pt68k4_isa8_cards, nullptr, false);
- ISA8_SLOT(config, "isa4", 0, m_isa, pt68k4_isa8_cards, nullptr, false);
- ISA8_SLOT(config, "isa5", 0, m_isa, pt68k4_isa8_cards, nullptr, false);
- ISA8_SLOT(config, "isa6", 0, m_isa, pt68k4_isa8_cards, nullptr, false),
- ISA8_SLOT(config, "isa7", 0, m_isa, pt68k4_isa8_cards, nullptr, false),
+ ISA8_SLOT(config, "isa1", m_isa, pt68k4_isa8_cards, "fdc_at", false); // FIXME: determine ISA bus clock
+ ISA8_SLOT(config, "isa2", m_isa, pt68k4_isa8_cards, "cga", false);
+ ISA8_SLOT(config, "isa3", m_isa, pt68k4_isa8_cards, nullptr, false);
+ ISA8_SLOT(config, "isa4", m_isa, pt68k4_isa8_cards, nullptr, false);
+ ISA8_SLOT(config, "isa5", m_isa, pt68k4_isa8_cards, nullptr, false);
+ ISA8_SLOT(config, "isa6", m_isa, pt68k4_isa8_cards, nullptr, false),
+ ISA8_SLOT(config, "isa7", m_isa, pt68k4_isa8_cards, nullptr, false),
SPEAKER(config, "mono").front_center();
SPEAKER_SOUND(config, m_speaker).add_route(ALL_OUTPUTS, "mono", 1.00);
@@ -520,5 +520,5 @@ ROM_END
/* Driver */
// YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS
-COMP( 1988, pt68k2, 0, 0, pt68k2, pt68k4, pt68k4_state, empty_init, "Peripheral Technology", "PT68K2", MACHINE_SUPPORTS_SAVE )
-COMP( 1990, pt68k4, 0, 0, pt68k4, pt68k4, pt68k4_state, empty_init, "Peripheral Technology", "PT68K4", MACHINE_SUPPORTS_SAVE )
+COMP( 1988, pt68k2, 0, 0, pt68k2, pt68k4, pt68k4_state, empty_init, "Peripheral Technology", "PT68K2", MACHINE_SUPPORTS_SAVE )
+COMP( 1990, pt68k4, 0, 0, pt68k4, pt68k4, pt68k4_state, empty_init, "Peripheral Technology", "PT68K4", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/skeleton/ptcsol.cpp b/src/mame/skeleton/ptcsol.cpp
index 3b427e2dc95..acb221dff92 100644
--- a/src/mame/skeleton/ptcsol.cpp
+++ b/src/mame/skeleton/ptcsol.cpp
@@ -764,7 +764,7 @@ void sol20_state::sol20(machine_config &config)
AY51013(config, m_uart); // TMS6011NC
m_uart->set_auto_rdav(true); // ROD (pin 4) tied to RDD (pin 18)
- CLOCK(config, m_uart_clock, 4800);
+ CLOCK(config, m_uart_clock, XTAL::u(4800));
m_uart_clock->signal_handler().set(m_uart, FUNC(ay51013_device::write_rcp));
m_uart_clock->signal_handler().append(m_uart, FUNC(ay51013_device::write_tcp));
@@ -775,11 +775,11 @@ void sol20_state::sol20(machine_config &config)
m_uart_s->write_so_callback().set(m_rs232, FUNC(rs232_port_device::write_txd));
m_uart_s->set_auto_rdav(true); // ROD (pin 4) tied to RDD (pin 18)
- CLOCK(config, m_uart_s_clock, 4800);
+ CLOCK(config, m_uart_s_clock, XTAL::u(4800));
m_uart_s_clock->signal_handler().set(m_uart_s, FUNC(ay51013_device::write_rcp));
m_uart_s_clock->signal_handler().append(m_uart_s, FUNC(ay51013_device::write_tcp));
- generic_keyboard_device &keyboard(GENERIC_KEYBOARD(config, "keyboard", 0));
+ generic_keyboard_device &keyboard(GENERIC_KEYBOARD(config, "keyboard"));
keyboard.set_keyboard_callback(FUNC(sol20_state::kbd_put));
SOFTWARE_LIST(config, "cass_list").set_original("sol20_cass");
diff --git a/src/mame/skeleton/pv9234.cpp b/src/mame/skeleton/pv9234.cpp
index 52d8ed427c6..366315be0f6 100644
--- a/src/mame/skeleton/pv9234.cpp
+++ b/src/mame/skeleton/pv9234.cpp
@@ -152,7 +152,7 @@ uint32_t pv9234_state::screen_update_pv9234(screen_device &screen, bitmap_ind16
void pv9234_state::pv9234(machine_config &config)
{
/* basic machine hardware */
- ARM7(config, m_maincpu, 4915000); //probably a more powerful clone.
+ ARM7(config, m_maincpu, XTAL::u(4915000)); //probably a more powerful clone.
m_maincpu->set_addrmap(AS_PROGRAM, &pv9234_state::pv9234_map);
/* video hardware */
diff --git a/src/mame/skeleton/qtsbc.cpp b/src/mame/skeleton/qtsbc.cpp
index 75bb34c7e3c..fb6004343b3 100644
--- a/src/mame/skeleton/qtsbc.cpp
+++ b/src/mame/skeleton/qtsbc.cpp
@@ -532,7 +532,7 @@ void qtsbc_state::qtsbc(machine_config &config)
m_pit->set_clk<1>(4_MHz_XTAL / 2);
m_pit->out_handler<1>().set(m_pit, FUNC(pit8253_device::write_clk2));
- I8251(config, m_usart, 0); // U8
+ I8251(config, m_usart); // U8
m_usart->txd_handler().set(m_rs232, FUNC(rs232_port_device::write_txd));
RS232_PORT(config, m_rs232, default_rs232_devices, "terminal");
diff --git a/src/mame/skeleton/rvoice.cpp b/src/mame/skeleton/rvoice.cpp
index 01762f8462b..41424c01725 100644
--- a/src/mame/skeleton/rvoice.cpp
+++ b/src/mame/skeleton/rvoice.cpp
@@ -90,13 +90,13 @@ void rvoice_state::rvoicepc(machine_config &config)
//playercpu.set_addrmap(AS_PROGRAM, &rvoice_state::hd63701_slave_io);
config.set_maximum_quantum(attotime::from_hz(60));
- mos6551_device &acia(MOS6551(config, "acia65c51", 0));
+ mos6551_device &acia(MOS6551(config, "acia65c51"));
acia.set_xtal(1.8432_MHz_XTAL);
/* video hardware */
/* sound hardware */
- GENERIC_TERMINAL(config, m_terminal, 0);
+ GENERIC_TERMINAL(config, m_terminal);
m_terminal->set_keyboard_callback(FUNC(rvoice_state::null_kbd_put));
}
diff --git a/src/mame/skeleton/sacstate.cpp b/src/mame/skeleton/sacstate.cpp
index d4b3461bcfc..9820219b041 100644
--- a/src/mame/skeleton/sacstate.cpp
+++ b/src/mame/skeleton/sacstate.cpp
@@ -144,12 +144,12 @@ void sacstate_state::machine_start()
void sacstate_state::sacstate(machine_config &config)
{
/* basic machine hardware */
- I8008(config, m_maincpu, 800000);
+ I8008(config, m_maincpu, XTAL::u(800000));
m_maincpu->set_addrmap(AS_PROGRAM, &sacstate_state::sacstate_mem);
m_maincpu->set_addrmap(AS_IO, &sacstate_state::sacstate_io);
/* video hardware */
- GENERIC_TERMINAL(config, m_terminal, 0);
+ GENERIC_TERMINAL(config, m_terminal);
m_terminal->set_keyboard_callback(FUNC(sacstate_state::kbd_put));
}
diff --git a/src/mame/skeleton/sansa_fuze.cpp b/src/mame/skeleton/sansa_fuze.cpp
index f452f0a14da..fda6c0848fb 100644
--- a/src/mame/skeleton/sansa_fuze.cpp
+++ b/src/mame/skeleton/sansa_fuze.cpp
@@ -46,7 +46,7 @@ INPUT_PORTS_END
void sansa_fuze_state::sansa_fuze(machine_config &config)
{
/* basic machine hardware */
- ARM7(config, m_maincpu, 50000000); // arm based, speed unknown
+ ARM7(config, m_maincpu, XTAL::u(50000000)); // arm based, speed unknown
m_maincpu->set_addrmap(AS_PROGRAM, &sansa_fuze_state::sansa_fuze_map);
}
diff --git a/src/mame/skeleton/sartorius.cpp b/src/mame/skeleton/sartorius.cpp
index 17df80470e4..5ff0c551d1c 100644
--- a/src/mame/skeleton/sartorius.cpp
+++ b/src/mame/skeleton/sartorius.cpp
@@ -89,7 +89,7 @@ private:
void sart3733_state::sart3733(machine_config &config)
{
- i4040_cpu_device &cpu(I4040(config, "maincpu", 750'000)); // clock speed is a complete guess - can't see crystal or multi-phase clock generator
+ i4040_cpu_device &cpu(I4040(config, "maincpu", XTAL::u(750'000))); // clock speed is a complete guess - can't see crystal or multi-phase clock generator
cpu.set_rom_map(&sart3733_state::sart3733_rom);
cpu.set_ram_memory_map(&sart3733_state::sart3733_memory);
cpu.set_ram_status_map(&sart3733_state::sart3733_status);
diff --git a/src/mame/skeleton/sbrain.cpp b/src/mame/skeleton/sbrain.cpp
index 841b7a7469c..7c011003f8d 100644
--- a/src/mame/skeleton/sbrain.cpp
+++ b/src/mame/skeleton/sbrain.cpp
@@ -706,7 +706,7 @@ void sbrain_state::sbrain(machine_config &config)
/* sound hardware */
SPEAKER(config, "mono").front_center();
- BEEP(config, m_beep, 800).add_route(ALL_OUTPUTS, "mono", 1.00);
+ BEEP(config, m_beep, XTAL::u(800)).add_route(ALL_OUTPUTS, "mono", 1.00);
/* Devices */
I8255(config, m_ppi);
@@ -749,7 +749,7 @@ void sbrain_state::sbrain(machine_config &config)
FLOPPY_CONNECTOR(config, "fdc:2", sbrain_floppies, nullptr, floppy_image_device::default_mfm_floppy_formats).enable_sound(true);
FLOPPY_CONNECTOR(config, "fdc:3", sbrain_floppies, nullptr, floppy_image_device::default_mfm_floppy_formats).enable_sound(true);
- TIMER(config, "timer_a", 0).configure_periodic(FUNC(sbrain_state::kbd_scan), attotime::from_hz(15));
+ TIMER(config, "timer_a").configure_periodic(FUNC(sbrain_state::kbd_scan), attotime::from_hz(15));
SOFTWARE_LIST(config, "flop_list").set_original("sbrain");
}
diff --git a/src/mame/skeleton/scopus.cpp b/src/mame/skeleton/scopus.cpp
index 44002f3d7dd..db59a6bfa5c 100644
--- a/src/mame/skeleton/scopus.cpp
+++ b/src/mame/skeleton/scopus.cpp
@@ -185,7 +185,7 @@ void sagitta180_state::sagitta180(machine_config &config)
m_dma8257->out_hrq_cb().set(FUNC(sagitta180_state::hrq_w));
m_dma8257->in_memr_cb().set(FUNC(sagitta180_state::memory_read_byte));
- i8251_device &uart(I8251(config, "uart", 0));
+ i8251_device &uart(I8251(config, "uart"));
uart.txd_handler().set("rs232", FUNC(rs232_port_device::write_txd));
uart.dtr_handler().set("rs232", FUNC(rs232_port_device::write_dtr));
uart.rts_handler().set("rs232", FUNC(rs232_port_device::write_rts));
@@ -195,11 +195,11 @@ void sagitta180_state::sagitta180(machine_config &config)
rs232.cts_handler().set("uart", FUNC(i8251_device::write_cts));
rs232.dsr_handler().set("uart", FUNC(i8251_device::write_dsr));
- clock_device &uart_clock(CLOCK(config, "uart_clock", 153600));
+ clock_device &uart_clock(CLOCK(config, "uart_clock", XTAL::u(153600)));
uart_clock.signal_handler().set("uart", FUNC(i8251_device::write_txc));
uart_clock.signal_handler().append("uart", FUNC(i8251_device::write_rxc));
-// i8212_device &intlatch(I8212(config, "intlatch", 0));
+// i8212_device &intlatch(I8212(config, "intlatch"));
// intlatch.md_rd_callback().set_constant(GND); // guessed !
// intlatch.di_rd_callback().set("picu", FUNC(i8214_device::vector_r));
// intlatch.int_wr_callback().set_inputline("maincpu", I8085_INTR_LINE); // guessed !
diff --git a/src/mame/skeleton/sh4robot.cpp b/src/mame/skeleton/sh4robot.cpp
index e373b9885ce..ab7f49fa0d4 100644
--- a/src/mame/skeleton/sh4robot.cpp
+++ b/src/mame/skeleton/sh4robot.cpp
@@ -71,7 +71,7 @@ INPUT_PORTS_END
void sh4robot_state::sh4robot(machine_config &config)
{
/* basic machine hardware */
- SH4LE(config, m_maincpu, 200000000); // SH7750
+ SH4LE(config, m_maincpu, XTAL::u(200000000)); // SH7750
m_maincpu->set_md(0, 1);
m_maincpu->set_md(1, 0);
m_maincpu->set_md(2, 1);
diff --git a/src/mame/skeleton/shine.cpp b/src/mame/skeleton/shine.cpp
index 6218cac3b0d..08a6047df72 100644
--- a/src/mame/skeleton/shine.cpp
+++ b/src/mame/skeleton/shine.cpp
@@ -246,7 +246,7 @@ void shine_state::machine_start()
void shine_state::shine(machine_config &config)
{
/* basic machine hardware */
- M6502(config, m_maincpu, 2000000); // 2MHz ??
+ M6502(config, m_maincpu, XTAL::u(2000000)); // 2MHz ??
m_maincpu->set_addrmap(AS_PROGRAM, &shine_state::shine_mem);
INPUT_MERGER_ANY_HIGH(config, "irqs").output_handler().set_inputline("maincpu", M6502_IRQ_LINE);
@@ -267,18 +267,18 @@ void shine_state::shine(machine_config &config)
m_ram->set_default_size("32K");
m_ram->set_extra_options("16K");
- MOS6522(config, m_via[0], 1000000);
+ MOS6522(config, m_via[0], XTAL::u(1000000));
m_via[0]->readpa_handler().set(FUNC(shine_state::via0_pa_r));
m_via[0]->writepb_handler().set(FUNC(shine_state::via0_pb_w));
m_via[0]->irq_handler().set(m_irqs, FUNC(input_merger_device::in_w<0>));
m_via[0]->cb2_handler().set(m_speaker, FUNC(speaker_sound_device::level_w));
- MOS6522(config, m_via[1], 1000000);
+ MOS6522(config, m_via[1], XTAL::u(1000000));
m_via[1]->irq_handler().set(m_irqs, FUNC(input_merger_device::in_w<1>));
CENTRONICS(config, m_centronics, centronics_devices, "printer");
- FD1771(config, m_fdc, 1000000);
+ FD1771(config, m_fdc, XTAL::u(1000000));
FLOPPY_CONNECTOR(config, m_floppy[0], "525qd", FLOPPY_525_QD, true, floppy_image_device::default_mfm_floppy_formats).enable_sound(true);
FLOPPY_CONNECTOR(config, m_floppy[1], "525qd", FLOPPY_525_QD, false, floppy_image_device::default_mfm_floppy_formats).enable_sound(true);
diff --git a/src/mame/skeleton/slsstars.cpp b/src/mame/skeleton/slsstars.cpp
index cd5b14064bd..e4f4e4c1bd8 100644
--- a/src/mame/skeleton/slsstars.cpp
+++ b/src/mame/skeleton/slsstars.cpp
@@ -44,7 +44,7 @@ INPUT_PORTS_END
void slsstars_state::slsstars(machine_config &config)
{
- MC68HC11F1(config, m_maincpu, 8'000'000); // unknown clock
+ MC68HC11F1(config, m_maincpu, XTAL::u(8'000'000)); // unknown clock
m_maincpu->set_addrmap(AS_PROGRAM, &slsstars_state::mem_map);
m_maincpu->set_default_config(0x3f);
diff --git a/src/mame/skeleton/softbox.cpp b/src/mame/skeleton/softbox.cpp
index c892b276c07..46b6e627ec0 100644
--- a/src/mame/skeleton/softbox.cpp
+++ b/src/mame/skeleton/softbox.cpp
@@ -362,7 +362,7 @@ void softbox_state::softbox(machine_config &config)
m_maincpu->set_addrmap(AS_IO, &softbox_state::softbox_io);
// devices
- i8251_device &i8251(I8251(config, I8251_TAG, 0));
+ i8251_device &i8251(I8251(config, I8251_TAG));
i8251.txd_handler().set(RS232_TAG, FUNC(rs232_port_device::write_txd));
i8251.dtr_handler().set(RS232_TAG, FUNC(rs232_port_device::write_dtr));
i8251.rts_handler().set(RS232_TAG, FUNC(rs232_port_device::write_rts));
@@ -390,7 +390,7 @@ void softbox_state::softbox(machine_config &config)
ieee488_device::add_cbm_devices(config, "c8050");
- CORVUS_HDC(config, m_hdc, 0);
+ CORVUS_HDC(config, m_hdc);
HARDDISK(config, "harddisk1", "corvus_hdd");
HARDDISK(config, "harddisk2", "corvus_hdd");
HARDDISK(config, "harddisk3", "corvus_hdd");
diff --git a/src/mame/skeleton/squale.cpp b/src/mame/skeleton/squale.cpp
index 19695481447..802e633e96c 100644
--- a/src/mame/skeleton/squale.cpp
+++ b/src/mame/skeleton/squale.cpp
@@ -814,7 +814,7 @@ void squale_state::squale(machine_config &config)
m_maincpu->set_addrmap(AS_PROGRAM, &squale_state::squale_mem);
/* Cartridge pia */
- PIA6821(config, m_pia_u72, 0);
+ PIA6821(config, m_pia_u72);
m_pia_u72->readpa_handler().set(FUNC(squale_state::pia_u72_porta_r));
m_pia_u72->readpb_handler().set(FUNC(squale_state::pia_u72_portb_r));
m_pia_u72->writepa_handler().set(FUNC(squale_state::pia_u72_porta_w));
@@ -823,7 +823,7 @@ void squale_state::squale(machine_config &config)
m_pia_u72->cb2_handler().set(FUNC(squale_state::pia_u72_cb2_w));
/* Keyboard pia */
- PIA6821(config, m_pia_u75, 0);
+ PIA6821(config, m_pia_u75);
m_pia_u75->readpa_handler().set(FUNC(squale_state::pia_u75_porta_r));
m_pia_u75->readpb_handler().set(FUNC(squale_state::pia_u75_portb_r));
m_pia_u75->writepa_handler().set(FUNC(squale_state::pia_u75_porta_w));
@@ -840,7 +840,7 @@ void squale_state::squale(machine_config &config)
m_ay8910->port_b_write_callback().set(FUNC(squale_state::ay_portb_w));
m_ay8910->add_route(ALL_OUTPUTS, "mono", 0.50);
- ACIA6850(config, m_acia, 0);
+ ACIA6850(config, m_acia);
/* screen */
screen_device &screen(SCREEN(config, "screen", SCREEN_TYPE_RASTER));
diff --git a/src/mame/skeleton/swyft.cpp b/src/mame/skeleton/swyft.cpp
index faac891b732..06e9ff2b3eb 100644
--- a/src/mame/skeleton/swyft.cpp
+++ b/src/mame/skeleton/swyft.cpp
@@ -761,7 +761,7 @@ void swyft_state::swyft(machine_config &config)
PALETTE(config, "palette", palette_device::MONOCHROME);
- ACIA6850(config, m_acia6850, 0);
+ ACIA6850(config, m_acia6850);
// acia rx and tx clocks come from one of the VIA pins and are tied together, fix this below? acia e clock comes from 68008
clock_device &acia_clock(CLOCK(config, "acia_clock", (XTAL(15'897'600)/2)/5)); // out e clock from 68008, ~ 10in clocks per out clock
acia_clock.signal_handler().set(FUNC(swyft_state::write_acia_clock));
diff --git a/src/mame/skeleton/sys2900.cpp b/src/mame/skeleton/sys2900.cpp
index de993bd64f7..4ded7ff6a2d 100644
--- a/src/mame/skeleton/sys2900.cpp
+++ b/src/mame/skeleton/sys2900.cpp
@@ -154,10 +154,10 @@ void sys2900_state::sys2900(machine_config &config)
PALETTE(config, "palette", palette_device::MONOCHROME);
- Z80CTC(config, "ctc", 0);
- Z80PIO(config, "pio", 0);
- Z80SIO(config, "sio1", 0);
- Z80SIO(config, "sio2", 0);
+ Z80CTC(config, "ctc");
+ Z80PIO(config, "pio");
+ Z80SIO(config, "sio1");
+ Z80SIO(config, "sio2");
}
/* ROM definition */
diff --git a/src/mame/skeleton/sys9002.cpp b/src/mame/skeleton/sys9002.cpp
index 3e113c90f59..ee77f7d9667 100644
--- a/src/mame/skeleton/sys9002.cpp
+++ b/src/mame/skeleton/sys9002.cpp
@@ -139,13 +139,13 @@ void sys9002_state::sys9002(machine_config &config)
crtc.set_char_width(8);
crtc.set_update_row_callback(FUNC(sys9002_state::crtc_update_row));
- clock_device &uart_clock(CLOCK(config, "uart_clock", 9600));
+ clock_device &uart_clock(CLOCK(config, "uart_clock", XTAL::u(9600)));
uart_clock.signal_handler().set("uart1", FUNC(i8251_device::write_txc));
uart_clock.signal_handler().append("uart1", FUNC(i8251_device::write_rxc));
uart_clock.signal_handler().append("uart2", FUNC(i8251_device::write_txc));
uart_clock.signal_handler().append("uart2", FUNC(i8251_device::write_rxc));
- i8251_device &uart1(I8251(config, "uart1", 0)); // sync
+ i8251_device &uart1(I8251(config, "uart1")); // sync
uart1.txd_handler().set("rs232a", FUNC(rs232_port_device::write_txd));
uart1.dtr_handler().set("rs232a", FUNC(rs232_port_device::write_dtr));
uart1.rts_handler().set("rs232a", FUNC(rs232_port_device::write_rts));
@@ -155,7 +155,7 @@ void sys9002_state::sys9002(machine_config &config)
rs232a.dsr_handler().set("uart1", FUNC(i8251_device::write_dsr));
rs232a.cts_handler().set("uart1", FUNC(i8251_device::write_cts));
- i8251_device &uart2(I8251(config, "uart2", 0)); // sync
+ i8251_device &uart2(I8251(config, "uart2")); // sync
uart2.txd_handler().set("rs232b", FUNC(rs232_port_device::write_txd));
uart2.dtr_handler().set("rs232b", FUNC(rs232_port_device::write_dtr));
uart2.rts_handler().set("rs232b", FUNC(rs232_port_device::write_rts));
diff --git a/src/mame/skeleton/systec.cpp b/src/mame/skeleton/systec.cpp
index 37107a0039b..536933dac9d 100644
--- a/src/mame/skeleton/systec.cpp
+++ b/src/mame/skeleton/systec.cpp
@@ -92,7 +92,7 @@ void systec_state::systec(machine_config &config)
m_maincpu->set_addrmap(AS_PROGRAM, &systec_state::mem_map);
m_maincpu->set_addrmap(AS_IO, &systec_state::io_map);
- clock_device &uart_clock(CLOCK(config, "uart_clock", 153600));
+ clock_device &uart_clock(CLOCK(config, "uart_clock", XTAL::u(153600)));
uart_clock.signal_handler().set("sio", FUNC(z80sio_device::txca_w));
uart_clock.signal_handler().append("sio", FUNC(z80sio_device::rxca_w));
diff --git a/src/mame/skeleton/tavernie.cpp b/src/mame/skeleton/tavernie.cpp
index da9c729c307..9fcd642e157 100644
--- a/src/mame/skeleton/tavernie.cpp
+++ b/src/mame/skeleton/tavernie.cpp
@@ -404,7 +404,7 @@ void cpu09_state::cpu09(machine_config &config)
m_cass->add_route(ALL_OUTPUTS, "mono", 0.05);
TIMER(config, "kansas_r").configure_periodic(FUNC(cpu09_state::kansas_r), attotime::from_hz(19200));
- PIA6821(config, m_pia0, 0);
+ PIA6821(config, m_pia0);
m_pia0->readpa_handler().set(FUNC(cpu09_state::pa_r));
m_pia0->ca1_w(0);
m_pia0->writepa_handler().set(FUNC(cpu09_state::pa_w));
@@ -412,13 +412,13 @@ void cpu09_state::cpu09(machine_config &config)
PTM6840(config, m_ptm, 4_MHz_XTAL / 4);
// all i/o lines connect to the 40-pin expansion connector
- m_ptm->set_external_clocks(0, 0, 0);
+ m_ptm->set_external_clocks(XTAL(), XTAL(), XTAL());
m_ptm->o1_callback().set("acia", FUNC(acia6850_device::write_txc));
m_ptm->o1_callback().append("acia", FUNC(acia6850_device::write_rxc));
m_ptm->o2_callback().set_inputline("maincpu", INPUT_LINE_NMI);
m_ptm->irq_callback().set_inputline("maincpu", M6809_IRQ_LINE);
- ACIA6850(config, m_acia, 0);
+ ACIA6850(config, m_acia);
m_acia->txd_handler().set("rs232", FUNC(rs232_port_device::write_txd));
m_acia->rts_handler().set("rs232", FUNC(rs232_port_device::write_rts));
@@ -445,21 +445,21 @@ void ivg09_state::ivg09(machine_config &config)
PALETTE(config, m_palette, FUNC(ivg09_state::ivg09_palette), 3);
/* sound hardware */
- BEEP(config, m_beep, 950).add_route(ALL_OUTPUTS, "mono", 0.50); // guess
+ BEEP(config, m_beep, XTAL::u(950)).add_route(ALL_OUTPUTS, "mono", 0.50); // guess
/* Devices */
subdevice<rs232_port_device>("rs232")->set_default_option(nullptr);
- generic_keyboard_device &keyboard(GENERIC_KEYBOARD(config, "keyboard", 0));
+ generic_keyboard_device &keyboard(GENERIC_KEYBOARD(config, "keyboard"));
keyboard.set_keyboard_callback(FUNC(ivg09_state::kbd_put));
- MC6845(config, m_crtc, 1008000); // unknown clock
+ MC6845(config, m_crtc, XTAL::u(1008000)); // unknown clock
m_crtc->set_screen("screen");
m_crtc->set_show_border_area(false);
m_crtc->set_char_width(8);
m_crtc->set_update_row_callback(FUNC(ivg09_state::crtc_update_row));
- PIA6821(config, m_pia1, 0);
+ PIA6821(config, m_pia1);
m_pia1->readpb_handler().set(FUNC(ivg09_state::pb_ivg_r));
m_pia1->writepa_handler().set(FUNC(ivg09_state::pa_ivg_w));
m_pia1->cb2_handler().set(m_beep, FUNC(beep_device::set_state));
diff --git a/src/mame/skeleton/telex274.cpp b/src/mame/skeleton/telex274.cpp
index aaa6f7bdce9..5cbe8f6670f 100644
--- a/src/mame/skeleton/telex274.cpp
+++ b/src/mame/skeleton/telex274.cpp
@@ -154,19 +154,19 @@ void telex274_state::telex274(machine_config &config)
maintimer.out4_cb().append("mpsc", FUNC(i8274_device::txca_w)); // ?
maintimer.out5_cb().set("mpsc", FUNC(i8274_device::rxtxcb_w)); // ?
- I8274(config, "mpsc", 4'000'000);
+ I8274(config, "mpsc", XTAL::u(4'000'000));
- M68000(config, m_coaxcpu, 10'000'000);
+ M68000(config, m_coaxcpu, XTAL::u(10'000'000));
m_coaxcpu->set_addrmap(AS_PROGRAM, &telex274_state::coax_mem);
m_coaxcpu->set_disable();
- M68000(config, m_examcpu, 10'000'000);
+ M68000(config, m_examcpu, XTAL::u(10'000'000));
m_examcpu->set_addrmap(AS_PROGRAM, &telex274_state::exam_mem);
m_examcpu->set_disable();
- //AM9513A(config, "examtimer", 4'000'000);
+ //AM9513A(config, "examtimer", XTAL::u(4'000'000));
- //WD2797(config, "fdc", 1'000'000);
+ //WD2797(config, "fdc", XTAL::u(1'000'000));
}
diff --git a/src/mame/skeleton/terak.cpp b/src/mame/skeleton/terak.cpp
index 75c352a26bc..1846b7fb2c4 100644
--- a/src/mame/skeleton/terak.cpp
+++ b/src/mame/skeleton/terak.cpp
@@ -106,7 +106,7 @@ uint32_t terak_state::screen_update_terak(screen_device &screen, bitmap_ind16 &b
void terak_state::terak(machine_config &config)
{
/* basic machine hardware */
- T11(config, m_maincpu, 4'000'000); // FIXME: actually LSI-11
+ T11(config, m_maincpu, XTAL::u(4'000'000)); // FIXME: actually LSI-11
m_maincpu->set_initial_mode(6 << 13);
m_maincpu->set_addrmap(AS_PROGRAM, &terak_state::mem_map);
diff --git a/src/mame/skeleton/terco.cpp b/src/mame/skeleton/terco.cpp
index c4257a95d8f..7cba93d99a8 100644
--- a/src/mame/skeleton/terco.cpp
+++ b/src/mame/skeleton/terco.cpp
@@ -301,9 +301,9 @@ void t4490_state::t4490(machine_config &config)
m_maincpu->set_addrmap(AS_PROGRAM, &t4490_state::t4490_map);
/* devices */
- PIA6821(config, m_pia1, 0);
- PIA6821(config, m_pia2, 0);
- ACIA6850(config, "acia", 0);
+ PIA6821(config, m_pia1);
+ PIA6821(config, m_pia2);
+ ACIA6850(config, "acia");
}
ROM_START( t4490 )
diff --git a/src/mame/skeleton/terminal.cpp b/src/mame/skeleton/terminal.cpp
index 618e97de484..267a82baf56 100644
--- a/src/mame/skeleton/terminal.cpp
+++ b/src/mame/skeleton/terminal.cpp
@@ -47,7 +47,7 @@ INPUT_PORTS_END
void terminal_state::terminal(machine_config &config)
{
- I8031(config, m_maincpu, 12'000'000);
+ I8031(config, m_maincpu, XTAL::u(12'000'000));
m_maincpu->set_addrmap(AS_PROGRAM, &terminal_state::mem_map);
}
diff --git a/src/mame/skeleton/testpat.cpp b/src/mame/skeleton/testpat.cpp
index 48f4eb1b484..fd0ef957bb7 100644
--- a/src/mame/skeleton/testpat.cpp
+++ b/src/mame/skeleton/testpat.cpp
@@ -29,7 +29,7 @@ Radio, 1985, N6
namespace {
-#define MASTER_CLOCK (4000000)
+#define MASTER_CLOCK XTAL::u(4000000)
#define V_TOTAL_PONG 315
#define H_TOTAL_PONG 256 // tbc
@@ -97,7 +97,7 @@ INPUT_PORTS_END
void tp1983_state::tp1983(machine_config &config)
{
- NETLIST_CPU(config, m_maincpu, netlist::config::DEFAULT_CLOCK()).set_source(netlist_tp1983);
+ NETLIST_CPU(config, m_maincpu).set_source(netlist_tp1983);
NETLIST_ANALOG_OUTPUT(config, "maincpu:vid0").set_params("videomix", m_video, FUNC(fixedfreq_device::update_composite_monochrome));
@@ -113,7 +113,7 @@ void tp1983_state::tp1983(machine_config &config)
void tp1985_state::tp1985(machine_config &config)
{
- NETLIST_CPU(config, m_maincpu, netlist::config::DEFAULT_CLOCK()).set_source(netlist_tp1985);
+ NETLIST_CPU(config, m_maincpu).set_source(netlist_tp1985);
NETLIST_ANALOG_OUTPUT(config, "maincpu:vid0").set_params("videomix", FUNC(tp1985_state::video_out_cb));
diff --git a/src/mame/skeleton/ti630.cpp b/src/mame/skeleton/ti630.cpp
index 16831f4a346..c14e98c1c37 100644
--- a/src/mame/skeleton/ti630.cpp
+++ b/src/mame/skeleton/ti630.cpp
@@ -161,7 +161,7 @@ void ti630_state::ti630(machine_config &config)
PALETTE(config, "palette", FUNC(ti630_state::ti630_palette), 2);
GFXDECODE(config, "gfxdecode", "palette", gfx_ti630);
- HD44780(config, m_lcdc, 0);
+ HD44780(config, m_lcdc);
m_lcdc->set_lcd_size(2, 16);
}
diff --git a/src/mame/skeleton/tk635.cpp b/src/mame/skeleton/tk635.cpp
index 3b27c8907c5..39811b61f39 100644
--- a/src/mame/skeleton/tk635.cpp
+++ b/src/mame/skeleton/tk635.cpp
@@ -187,7 +187,7 @@ void tk635_state::machine_reset()
void tk635_state::tk635(machine_config &config)
{
- I80188(config, m_maincpu, 25000000);
+ I80188(config, m_maincpu, XTAL::u(25000000));
m_maincpu->set_addrmap(AS_PROGRAM, &tk635_state::mem_map);
m_maincpu->set_addrmap(AS_IO, &tk635_state::io_map);
diff --git a/src/mame/skeleton/tr175.cpp b/src/mame/skeleton/tr175.cpp
index ad5865652c1..ac1f7a3ef51 100644
--- a/src/mame/skeleton/tr175.cpp
+++ b/src/mame/skeleton/tr175.cpp
@@ -88,7 +88,7 @@ INPUT_PORTS_END
void tr175_state::tr175(machine_config &config)
{
- M68000(config, m_maincpu, 12'000'000);
+ M68000(config, m_maincpu, XTAL::u(12'000'000));
m_maincpu->set_addrmap(AS_PROGRAM, &tr175_state::mem_map);
screen_device &screen(SCREEN(config, "screen", SCREEN_TYPE_RASTER));
@@ -106,7 +106,7 @@ void tr175_state::tr175(machine_config &config)
duart.irq_cb().set_inputline("maincpu", M68K_IRQ_1);
PALETTE(config, "palette").set_entries(0x100);
- ramdac_device &ramdac(RAMDAC(config, "ramdac", 0, "palette"));
+ ramdac_device &ramdac(RAMDAC(config, "ramdac", "palette"));
ramdac.set_addrmap(0, &tr175_state::ramdac_map);
}
diff --git a/src/mame/skeleton/tsispch.cpp b/src/mame/skeleton/tsispch.cpp
index 6974970c400..bfdc4e38b0a 100644
--- a/src/mame/skeleton/tsispch.cpp
+++ b/src/mame/skeleton/tsispch.cpp
@@ -411,11 +411,11 @@ void tsispch_state::prose2k(machine_config &config)
m_dsp->p1().set(FUNC(tsispch_state::dsp_to_8086_p1_w));
/* PIC 8259 */
- PIC8259(config, m_pic, 0);
+ PIC8259(config, m_pic);
m_pic->out_int_callback().set_inputline(m_maincpu, 0);
/* uarts */
- I8251(config, m_uart, 0);
+ I8251(config, m_uart);
m_uart->txd_handler().set("rs232", FUNC(rs232_port_device::write_txd));
m_uart->dtr_handler().set("rs232", FUNC(rs232_port_device::write_dtr));
m_uart->rts_handler().set("rs232", FUNC(rs232_port_device::write_rts));
@@ -423,13 +423,13 @@ void tsispch_state::prose2k(machine_config &config)
m_uart->txrdy_handler().set(m_pic, FUNC(pic8259_device::ir3_w));
m_uart->txempty_handler().set(m_pic, FUNC(pic8259_device::ir2_w));
- clock_device &clock(CLOCK(config, "baudclock", 153600)); // this comes from a resonator? or a divider? not sure.
+ clock_device &clock(CLOCK(config, "baudclock", XTAL::u(153600))); // this comes from a resonator? or a divider? not sure.
clock.signal_handler().set(m_uart, FUNC(i8251_device::write_txc));
clock.signal_handler().append(m_uart, FUNC(i8251_device::write_rxc));
/* sound hardware */
SPEAKER(config, "speaker").front_center();
- DAC_12BIT_R2R(config, "dac", 0).add_route(ALL_OUTPUTS, "speaker", 1.0); // unknown DAC (TODO: correctly figure out how the DAC works; apparently it is connected to the serial output of the upd7720, which will be "fun" to connect up)
+ DAC_12BIT_R2R(config, "dac").add_route(ALL_OUTPUTS, "speaker", 1.0); // unknown DAC (TODO: correctly figure out how the DAC works; apparently it is connected to the serial output of the upd7720, which will be "fun" to connect up)
rs232_port_device &rs232(RS232_PORT(config, "rs232", default_rs232_devices, "terminal"));
rs232.rxd_handler().set("i8251a_u15", FUNC(i8251_device::write_rxd));
diff --git a/src/mame/skeleton/tulip1.cpp b/src/mame/skeleton/tulip1.cpp
index 45d9db49066..0a4bc074557 100644
--- a/src/mame/skeleton/tulip1.cpp
+++ b/src/mame/skeleton/tulip1.cpp
@@ -143,37 +143,37 @@ void tulip1_state::machine_start()
void tulip1_state::tulip1(machine_config &config)
{
// main cpu
- I8086(config, m_cpu, 8000000);
+ I8086(config, m_cpu, XTAL::u(8000000));
m_cpu->set_addrmap(AS_PROGRAM, &tulip1_state::mem_map);
m_cpu->set_addrmap(AS_IO, &tulip1_state::io_map);
// video hardware
screen_device &screen(SCREEN(config, "screen", SCREEN_TYPE_RASTER));
- screen.set_raw(16000000, 912, 0, 640, 312, 0, 275); // unknown clock
+ screen.set_raw(XTAL::u(16000000), 912, 0, 640, 312, 0, 275); // unknown clock
screen.set_screen_update(m_crtc, FUNC(mc6845_device::screen_update));
PALETTE(config, m_palette, palette_device::MONOCHROME);
GFXDECODE(config, m_gfxdecode, m_palette, chars);
- HD6845S(config, m_crtc, 2000000); // unknown clock
+ HD6845S(config, m_crtc, XTAL::u(2000000)); // unknown clock
m_crtc->set_screen("screen");
m_crtc->set_show_border_area(false);
m_crtc->set_char_width(8);
m_crtc->set_update_row_callback(FUNC(tulip1_state::crtc_update_row));
- ACIA6850(config, m_acia, 0);
+ ACIA6850(config, m_acia);
m_acia->txd_handler().set("kbd", FUNC(rs232_port_device::write_txd));
rs232_port_device &rs232(RS232_PORT(config, "kbd", default_rs232_devices, "keyboard"));
rs232.rxd_handler().set(m_acia, FUNC(acia6850_device::write_rxd));
- clock_device &uart_clock(CLOCK(config, "uart_clock", 153600));
+ clock_device &uart_clock(CLOCK(config, "uart_clock", XTAL::u(153600)));
uart_clock.signal_handler().set(m_acia, FUNC(acia6850_device::write_txc));
uart_clock.signal_handler().append(m_acia, FUNC(acia6850_device::write_rxc));
// floppy disk controller
- WD2793(config, m_fdc, 1000000); // unknown clock
+ WD2793(config, m_fdc, XTAL::u(1000000)); // unknown clock
// floppy drives
FLOPPY_CONNECTOR(config, "fdc:0", tulip1_floppies, "525qd", floppy_image_device::default_mfm_floppy_formats);
diff --git a/src/mame/skeleton/v6809.cpp b/src/mame/skeleton/v6809.cpp
index 599ab551399..5d96c425830 100644
--- a/src/mame/skeleton/v6809.cpp
+++ b/src/mame/skeleton/v6809.cpp
@@ -320,38 +320,38 @@ void v6809_state::v6809(machine_config &config)
m_crtc->set_update_row_callback(FUNC(v6809_state::crtc_update_row));
m_crtc->set_on_update_addr_change_callback(FUNC(v6809_state::crtc_update_addr));
- generic_keyboard_device &keyboard(GENERIC_KEYBOARD(config, "keyboard", 0));
+ generic_keyboard_device &keyboard(GENERIC_KEYBOARD(config, "keyboard"));
keyboard.set_keyboard_callback(FUNC(v6809_state::kbd_put));
// port A = drive select and 2 control lines ; port B = keyboard
- PIA6821(config, m_pia0, 0);
+ PIA6821(config, m_pia0);
m_pia0->readpb_handler().set(FUNC(v6809_state::pb_r));
m_pia0->writepa_handler().set(FUNC(v6809_state::pa_w));
m_pia0->irqa_handler().set_inputline("maincpu", M6809_IRQ_LINE);
m_pia0->irqb_handler().set_inputline("maincpu", M6809_IRQ_LINE);
// no idea what this does
- pia6821_device &pia1(PIA6821(config, "pia1", 0));
+ pia6821_device &pia1(PIA6821(config, "pia1"));
pia1.irqa_handler().set_inputline("maincpu", M6809_IRQ_LINE);
pia1.irqb_handler().set_inputline("maincpu", M6809_IRQ_LINE);
ptm6840_device &ptm(PTM6840(config, "ptm", 16_MHz_XTAL / 4));
- ptm.set_external_clocks(4000000.0/14.0, 4000000.0/14.0, (4000000.0/14.0)/8.0);
+ ptm.set_external_clocks(XTAL::u(4000000)/14, XTAL::u(4000000)/14, XTAL::u(4000000)/14/8);
ptm.o1_callback().set(FUNC(v6809_state::speaker_en_w));
ptm.o2_callback().set(FUNC(v6809_state::speaker_w));
ptm.irq_callback().set_inputline("maincpu", M6809_IRQ_LINE);
- ACIA6850(config, "acia0", 0);
+ ACIA6850(config, "acia0");
- ACIA6850(config, "acia1", 0);
+ ACIA6850(config, "acia1");
- clock_device &acia_clock(CLOCK(config, "acia_clock", 153600));
+ clock_device &acia_clock(CLOCK(config, "acia_clock", XTAL::u(153600)));
acia_clock.signal_handler().set("acia0", FUNC(acia6850_device::write_txc));
acia_clock.signal_handler().append("acia0", FUNC(acia6850_device::write_rxc));
acia_clock.signal_handler().append("acia1", FUNC(acia6850_device::write_txc));
acia_clock.signal_handler().append("acia1", FUNC(acia6850_device::write_rxc));
- MM58174(config, "rtc", 0);
+ MM58174(config, "rtc");
//rtc.irq_handler().set(m_pia0, FUNC(pia6821_device::cb2_w)); // unsupported by RTC emulation
MB8876(config, m_fdc, 16_MHz_XTAL / 16);
diff --git a/src/mame/skeleton/vanguardmk1.cpp b/src/mame/skeleton/vanguardmk1.cpp
index b55429283b0..92421ce28cb 100644
--- a/src/mame/skeleton/vanguardmk1.cpp
+++ b/src/mame/skeleton/vanguardmk1.cpp
@@ -31,7 +31,7 @@ INPUT_PORTS_END
void vanguardmk1_state::vanguardmk1(machine_config &config)
{
- mc68hc811e2_device &mcu(MC68HC811E2(config, "mcu", 8000000)); // unknown clock
+ mc68hc811e2_device &mcu(MC68HC811E2(config, "mcu", XTAL::u(8000000))); // unknown clock
mcu.set_addrmap(AS_PROGRAM, &vanguardmk1_state::mcu_map);
mcu.set_default_config(0xff);
}
diff --git a/src/mame/skeleton/vd56sp.cpp b/src/mame/skeleton/vd56sp.cpp
index 7e8962e5a27..9721a16786e 100644
--- a/src/mame/skeleton/vd56sp.cpp
+++ b/src/mame/skeleton/vd56sp.cpp
@@ -41,7 +41,7 @@ INPUT_PORTS_END
void vd56sp_state::vd56sp(machine_config &config)
{
- L2800(config, m_maincpu, 8'000'000); // L28L2800-38 (XTAL not readable)
+ L2800(config, m_maincpu, XTAL::u(8'000'000)); // L28L2800-38 (XTAL not readable)
m_maincpu->set_addrmap(AS_DATA, &vd56sp_state::exp_map);
// Modem IC: Conexant R6764-61
diff --git a/src/mame/skeleton/vector4.cpp b/src/mame/skeleton/vector4.cpp
index b26d4f13679..4e43bf840ac 100644
--- a/src/mame/skeleton/vector4.cpp
+++ b/src/mame/skeleton/vector4.cpp
@@ -137,12 +137,12 @@ void vector4_state::machine_reset()
void vector4_state::vector4(machine_config &config)
{
/* basic machine hardware */
- Z80(config, m_maincpu, 5'100'000); // manual says 5.1MHz (8088 uses this frequency too)
+ Z80(config, m_maincpu, XTAL::u(5'100'000)); // manual says 5.1MHz (8088 uses this frequency too)
m_maincpu->set_addrmap(AS_PROGRAM, &vector4_state::vector4_mem);
m_maincpu->set_addrmap(AS_IO, &vector4_state::vector4_io);
/* video hardware */
- clock_device &uart_clock(CLOCK(config, "uart_clock", 153600));
+ clock_device &uart_clock(CLOCK(config, "uart_clock", XTAL::u(153600)));
uart_clock.signal_handler().set("uart1", FUNC(i8251_device::write_txc));
uart_clock.signal_handler().append("uart0", FUNC(i8251_device::write_txc));
uart_clock.signal_handler().append("uart0", FUNC(i8251_device::write_rxc));
@@ -152,9 +152,9 @@ void vector4_state::vector4(machine_config &config)
uart_clock.signal_handler().append("uart3", FUNC(i8251_device::write_txc));
uart_clock.signal_handler().append("uart3", FUNC(i8251_device::write_rxc));
- I8251(config, "uart0", 0);
+ I8251(config, "uart0");
- i8251_device &uart1(I8251(config, "uart1", 0));
+ i8251_device &uart1(I8251(config, "uart1"));
uart1.txd_handler().set("rs232a", FUNC(rs232_port_device::write_txd));
uart1.dtr_handler().set("rs232a", FUNC(rs232_port_device::write_dtr));
uart1.rts_handler().set("rs232a", FUNC(rs232_port_device::write_rts));
@@ -164,7 +164,7 @@ void vector4_state::vector4(machine_config &config)
rs232a.dsr_handler().set("uart1", FUNC(i8251_device::write_dsr));
rs232a.cts_handler().set("uart1", FUNC(i8251_device::write_cts));
- i8251_device &uart2(I8251(config, "uart2", 0));
+ i8251_device &uart2(I8251(config, "uart2"));
uart2.txd_handler().set("rs232b", FUNC(rs232_port_device::write_txd));
uart2.dtr_handler().set("rs232b", FUNC(rs232_port_device::write_dtr));
uart2.rts_handler().set("rs232b", FUNC(rs232_port_device::write_rts));
@@ -174,7 +174,7 @@ void vector4_state::vector4(machine_config &config)
rs232b.dsr_handler().set("uart2", FUNC(i8251_device::write_dsr));
rs232b.cts_handler().set("uart2", FUNC(i8251_device::write_cts));
- i8251_device &uart3(I8251(config, "uart3", 0));
+ i8251_device &uart3(I8251(config, "uart3"));
uart3.txd_handler().set("rs232c", FUNC(rs232_port_device::write_txd));
uart3.dtr_handler().set("rs232c", FUNC(rs232_port_device::write_dtr));
uart3.rts_handler().set("rs232c", FUNC(rs232_port_device::write_rts));
@@ -185,7 +185,7 @@ void vector4_state::vector4(machine_config &config)
rs232c.cts_handler().set("uart3", FUNC(i8251_device::write_cts));
I8255A(config, "ppi");
- PIT8253(config, "pit", 0);
+ PIT8253(config, "pit");
}
/* ROM definition */
diff --git a/src/mame/skeleton/vectrix.cpp b/src/mame/skeleton/vectrix.cpp
index d114ba42119..2f1ac148027 100644
--- a/src/mame/skeleton/vectrix.cpp
+++ b/src/mame/skeleton/vectrix.cpp
@@ -56,7 +56,7 @@ void vectrix_state::vectrix(machine_config &config)
maincpu.set_addrmap(AS_PROGRAM, &vectrix_state::mem_map);
maincpu.set_addrmap(AS_IO, &vectrix_state::io_map);
- I8251(config, "uart1", 0);
+ I8251(config, "uart1");
}
ROM_START( vectrix )
diff --git a/src/mame/skeleton/vp415.cpp b/src/mame/skeleton/vp415.cpp
index 78454b17225..c99567844ec 100644
--- a/src/mame/skeleton/vp415.cpp
+++ b/src/mame/skeleton/vp415.cpp
@@ -520,7 +520,7 @@ void vp415_state::vp415(machine_config &config)
m_drivecpu->set_addrmap(AS_PROGRAM, &vp415_state::drive_program_map);
m_drivecpu->set_addrmap(AS_IO, &vp415_state::drive_io_map);
- i8155_device &i8155(I8155(config, I8155_TAG, 0));
+ i8155_device &i8155(I8155(config, I8155_TAG));
i8155.out_pa_callback().set(CHARGEN_TAG, FUNC(mb88303_device::da_w));
i8155.in_pb_callback().set(FUNC(vp415_state::drive_i8155_pb_r));
i8155.in_pc_callback().set(FUNC(vp415_state::drive_i8155_pc_r));
@@ -530,7 +530,7 @@ void vp415_state::vp415(machine_config &config)
ppi.out_pb_callback().set(FUNC(vp415_state::drive_i8255_pb_w));
ppi.in_pc_callback().set(FUNC(vp415_state::drive_i8255_pc_r));
- MB88303(config, m_chargen, 0);
+ MB88303(config, m_chargen);
saa1043_device &saa1043(SAA1043(config, SYNCGEN_TAG, XTAL(5'000'000)));
saa1043.v2_callback().set(FUNC(vp415_state::refv_w));
diff --git a/src/mame/skeleton/vsmilepro.cpp b/src/mame/skeleton/vsmilepro.cpp
index bf3d844dde7..2672f24f3ac 100644
--- a/src/mame/skeleton/vsmilepro.cpp
+++ b/src/mame/skeleton/vsmilepro.cpp
@@ -55,7 +55,7 @@ INPUT_PORTS_END
void vsmilpro_state::vsmilpro(machine_config &config)
{
/* basic machine hardware */
- ARM9(config, m_maincpu, 150000000);
+ ARM9(config, m_maincpu, XTAL::u(150000000));
m_maincpu->set_addrmap(AS_PROGRAM, &vsmilpro_state::vsmilpro_map);
CDROM(config, "cdrom").set_interface("vsmile_vdisk");
diff --git a/src/mame/skeleton/wicat.cpp b/src/mame/skeleton/wicat.cpp
index db3110aac62..b675b54ba6c 100644
--- a/src/mame/skeleton/wicat.cpp
+++ b/src/mame/skeleton/wicat.cpp
@@ -637,7 +637,7 @@ void wicat_state::wicat(machine_config &config)
m_via->writepb_handler().set(FUNC(wicat_state::via_b_w));
m_via->irq_handler().set_inputline(m_maincpu, M68K_IRQ_1);
- MM58174(config, m_rtc, 0);
+ MM58174(config, m_rtc);
// internal terminal
SCN2661C(config, m_uart[0], 5.0688_MHz_XTAL); // connected to terminal board
@@ -705,7 +705,7 @@ void wicat_state::wicat(machine_config &config)
INPUT_MERGER_ALL_HIGH(config, "dmairq").output_handler().set_inputline(m_videocpu, z8002_device::NMI_LINE);
- IM6402(config, m_videouart, 0);
+ IM6402(config, m_videouart);
m_videouart->set_rrc(0);
m_videouart->set_trc(1200);
m_videouart->dr_callback().set(m_videoirq, FUNC(input_merger_device::in_w<2>));
diff --git a/src/mame/skeleton/zeebo_qualcomm_adreno130.cpp b/src/mame/skeleton/zeebo_qualcomm_adreno130.cpp
index c26ef04de57..fd871584ecc 100644
--- a/src/mame/skeleton/zeebo_qualcomm_adreno130.cpp
+++ b/src/mame/skeleton/zeebo_qualcomm_adreno130.cpp
@@ -120,7 +120,7 @@ uint32_t zeebo_game_state::screen_update(screen_device &screen, bitmap_rgb32 &bi
void zeebo_game_state::zeebo(machine_config &config)
{
- ARM11(config, m_maincpu, 528000000); // 528 MHz ARM11 based SoC
+ ARM11(config, m_maincpu, XTAL::u(528000000)); // 528 MHz ARM11 based SoC
m_maincpu->set_addrmap(AS_PROGRAM, &zeebo_game_state::zeebo_arm11_map);
screen_device &screen(SCREEN(config, "screen", SCREEN_TYPE_RASTER));
diff --git a/src/mame/skeleton/zms8085.cpp b/src/mame/skeleton/zms8085.cpp
index 17e80822d7d..b522f48d5c0 100644
--- a/src/mame/skeleton/zms8085.cpp
+++ b/src/mame/skeleton/zms8085.cpp
@@ -343,7 +343,7 @@ void zms8085_state::zephyr(machine_config &config)
m_uart->write_dav_callback().set_inputline("maincpu", I8085_RST65_LINE);
m_uart->set_auto_rdav(true);
- CLOCK(config, m_uart_clock, 153600); // should actually be configurable somehow
+ CLOCK(config, m_uart_clock, XTAL::u(153600)); // should actually be configurable somehow
m_uart_clock->signal_handler().set(m_uart, FUNC(ay51013_device::write_tcp));
m_uart_clock->signal_handler().append(m_uart, FUNC(ay51013_device::write_rcp));
diff --git a/src/mame/skeleton/zorba.cpp b/src/mame/skeleton/zorba.cpp
index e0d40e09204..4a410c8bb2d 100644
--- a/src/mame/skeleton/zorba.cpp
+++ b/src/mame/skeleton/zorba.cpp
@@ -148,7 +148,7 @@ void zorba_state::zorba(machine_config &config)
/* sound hardware */
SPEAKER(config, "mono").front_center();
- BEEP(config, m_beep, 800).add_route(ALL_OUTPUTS, "mono", 1.00); // should be horizontal frequency / 16, so depends on CRTC parameters
+ BEEP(config, m_beep, XTAL::u(800)).add_route(ALL_OUTPUTS, "mono", 1.00); // should be horizontal frequency / 16, so depends on CRTC parameters
INPUT_MERGER_ANY_HIGH(config, "irq0").output_handler().set(FUNC(zorba_state::irq_w<0>));
INPUT_MERGER_ANY_HIGH(config, "irq1").output_handler().set(FUNC(zorba_state::irq_w<1>));
@@ -185,13 +185,13 @@ void zorba_state::zorba(machine_config &config)
// port A - disk select etc, beeper
// port B - parallel interface
- PIA6821(config, m_pia0, 0);
+ PIA6821(config, m_pia0);
m_pia0->writepa_handler().set(FUNC(zorba_state::pia0_porta_w));
m_pia0->writepb_handler().set("parprndata", FUNC(output_latch_device::write));
m_pia0->cb2_handler().set("parprn", FUNC(centronics_device::write_strobe));
// IEEE488 interface
- PIA6821(config, m_pia1, 0);
+ PIA6821(config, m_pia1);
m_pia1->readpa_handler().set(m_ieee, FUNC(ieee488_device::dio_r)); // TODO: gated with PB1
m_pia1->writepa_handler().set(m_ieee, FUNC(ieee488_device::host_dio_w)); // TODO: gated with PB1
m_pia1->readpb_handler().set(FUNC(zorba_state::pia1_portb_r));
@@ -202,7 +202,7 @@ void zorba_state::zorba(machine_config &config)
m_pia1->irqb_handler().set("irq1", FUNC(input_merger_device::in_w<1>));
// PIT
- pit8254_device &pit(PIT8254(config, "pit", 0));
+ pit8254_device &pit(PIT8254(config, "pit"));
pit.set_clk<0>(24_MHz_XTAL / 3);
pit.set_clk<1>(24_MHz_XTAL / 3);
pit.set_clk<2>(24_MHz_XTAL / 3);
diff --git a/src/mame/skeleton/zorbakbd.h b/src/mame/skeleton/zorbakbd.h
index 4a88735ae41..11b321c995a 100644
--- a/src/mame/skeleton/zorbakbd.h
+++ b/src/mame/skeleton/zorbakbd.h
@@ -15,7 +15,7 @@ class zorba_keyboard_device : public device_t
public:
auto rxd_cb() { return m_rxd_cb.bind(); }
- zorba_keyboard_device(machine_config const &mconfig, char const *tag, device_t *owner, uint32_t clock = 0);
+ zorba_keyboard_device(machine_config const &mconfig, char const *tag, device_t *owner, const XTAL &clock = XTAL());
DECLARE_WRITE_LINE_MEMBER(txd_w);
diff --git a/src/mame/skeleton/zt8802.cpp b/src/mame/skeleton/zt8802.cpp
index 027e2132156..f0a32907d15 100644
--- a/src/mame/skeleton/zt8802.cpp
+++ b/src/mame/skeleton/zt8802.cpp
@@ -85,11 +85,11 @@ INPUT_PORTS_END
void zt8802_state::zt8802(machine_config &config)
{
- V40(config, m_maincpu, 16'000'000);
+ V40(config, m_maincpu, XTAL::u(16'000'000));
m_maincpu->set_addrmap(AS_PROGRAM, &zt8802_state::mem_map);
m_maincpu->set_addrmap(AS_IO, &zt8802_state::io_map);
- DS1202(config, m_rtc, 32'768);
+ DS1202(config, m_rtc, XTAL::u(32'768));
}
ROM_START( zt8802 )