summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/ddr
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/ddr
parent5c14bcdfcb4aefb71b5b62387c4ad05dbeb3814e (diff)
full xtal conversionxtal
Diffstat (limited to 'src/mame/ddr')
-rw-r--r--src/mame/ddr/ac1.cpp2
-rw-r--r--src/mame/ddr/c80.cpp2
-rw-r--r--src/mame/ddr/chessmstdm.cpp4
-rw-r--r--src/mame/ddr/huebler.cpp2
-rw-r--r--src/mame/ddr/k7659kb.cpp2
-rw-r--r--src/mame/ddr/k7659kb.h2
-rw-r--r--src/mame/ddr/kc.cpp2
-rw-r--r--src/mame/ddr/kc.h4
-rw-r--r--src/mame/ddr/kc_keyb.cpp2
-rw-r--r--src/mame/ddr/kc_keyb.h2
-rw-r--r--src/mame/ddr/kramermc.cpp4
-rw-r--r--src/mame/ddr/lc80.cpp8
-rw-r--r--src/mame/ddr/llc1.cpp2
-rw-r--r--src/mame/ddr/llc2.cpp4
-rw-r--r--src/mame/ddr/mc8030.cpp4
-rw-r--r--src/mame/ddr/nanos.cpp2
-rw-r--r--src/mame/ddr/pcm.cpp2
-rw-r--r--src/mame/ddr/slc1.cpp2
-rw-r--r--src/mame/ddr/vcs80.cpp4
19 files changed, 28 insertions, 28 deletions
diff --git a/src/mame/ddr/ac1.cpp b/src/mame/ddr/ac1.cpp
index 3caf06bb921..c7ac1945ee2 100644
--- a/src/mame/ddr/ac1.cpp
+++ b/src/mame/ddr/ac1.cpp
@@ -331,7 +331,7 @@ void ac1_state::ac1(machine_config &config)
pio.in_pb_callback().set(FUNC(ac1_state::ac1_port_b_r));
pio.out_pb_callback().set(FUNC(ac1_state::ac1_port_b_w));
- Z80CTC(config, "ctc", 8'000'000 / 4); // all connections go external
+ Z80CTC(config, "ctc", XTAL::u(8'000'000) / 4); // all connections go external
// video hardware
screen_device &screen(SCREEN(config, "screen", SCREEN_TYPE_RASTER));
diff --git a/src/mame/ddr/c80.cpp b/src/mame/ddr/c80.cpp
index d6105f039c1..638f4fd8fdc 100644
--- a/src/mame/ddr/c80.cpp
+++ b/src/mame/ddr/c80.cpp
@@ -71,7 +71,7 @@ namespace {
#define Z80PIO2_TAG "d12"
// You could use a piezo at 455 kHz, or a crystal 500 to 2500 kHz.
// Cassette successfully tested at 455 kHz
-#define MASTER_CLOCK 455000
+#define MASTER_CLOCK XTAL(455000)
class c80_state : public driver_device
{
diff --git a/src/mame/ddr/chessmstdm.cpp b/src/mame/ddr/chessmstdm.cpp
index fe60781591d..1fe7918bf93 100644
--- a/src/mame/ddr/chessmstdm.cpp
+++ b/src/mame/ddr/chessmstdm.cpp
@@ -297,7 +297,7 @@ void chessmstdm_state::chessmstdm(machine_config &config)
m_maincpu->set_addrmap(AS_IO, &chessmstdm_state::chessmstdm_io);
m_maincpu->set_daisy_config(chessmstdm_daisy_chain);
- auto &strobe(CLOCK(config, "strobe", 500)); // from 555 timer, 50% duty
+ auto &strobe(CLOCK(config, "strobe", XTAL::u(500))); // from 555 timer, 50% duty
strobe.signal_handler().set(m_pio[1], FUNC(z80pio_device::strobe_b));
strobe.signal_handler().append([this](int) { m_pio[1]->data_b_write(m_matrix); });
@@ -326,7 +326,7 @@ void chessmstdm_state::chessmstdm(machine_config &config)
// sound hardware
SPEAKER(config, "speaker").front_center();
- BEEP(config, m_beeper, 1000).add_route(ALL_OUTPUTS, "speaker", 0.25);
+ BEEP(config, m_beeper, XTAL::u(1000)).add_route(ALL_OUTPUTS, "speaker", 0.25);
// cartridge
GENERIC_CARTSLOT(config, "cartslot", generic_plain_slot, "chessmstdm_cart");
diff --git a/src/mame/ddr/huebler.cpp b/src/mame/ddr/huebler.cpp
index a6984ac46fc..97ab136788b 100644
--- a/src/mame/ddr/huebler.cpp
+++ b/src/mame/ddr/huebler.cpp
@@ -358,7 +358,7 @@ void amu880_state::amu880(machine_config &config)
/* video hardware */
screen_device &screen(SCREEN(config, SCREEN_TAG, SCREEN_TYPE_RASTER));
screen.set_screen_update(FUNC(amu880_state::screen_update));
- screen.set_raw(9000000, 576, 0*6, 64*6, 320, 0*10, 24*10);
+ screen.set_raw(XTAL::u(9000000), 576, 0*6, 64*6, 320, 0*10, 24*10);
GFXDECODE(config, "gfxdecode", m_palette, gfx_amu880);
PALETTE(config, m_palette, palette_device::MONOCHROME);
diff --git a/src/mame/ddr/k7659kb.cpp b/src/mame/ddr/k7659kb.cpp
index 9ff45834d8b..0bcb7b0560c 100644
--- a/src/mame/ddr/k7659kb.cpp
+++ b/src/mame/ddr/k7659kb.cpp
@@ -195,7 +195,7 @@ ioport_constructor k7659_keyboard_device::device_input_ports() const
// k7659_keyboard_device - constructor
//-------------------------------------------------
-k7659_keyboard_device::k7659_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+k7659_keyboard_device::k7659_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: device_t(mconfig, K7659_KEYBOARD, tag, owner, clock)
, m_keys(*this, "A%u", 1U)
{}
diff --git a/src/mame/ddr/k7659kb.h b/src/mame/ddr/k7659kb.h
index e01ba695418..9b93055a17d 100644
--- a/src/mame/ddr/k7659kb.h
+++ b/src/mame/ddr/k7659kb.h
@@ -31,7 +31,7 @@ class k7659_keyboard_device : public device_t
{
public:
// construction/destruction
- k7659_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ k7659_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
uint8_t read();
diff --git a/src/mame/ddr/kc.cpp b/src/mame/ddr/kc.cpp
index 9a7ea78325b..547a64fa4a9 100644
--- a/src/mame/ddr/kc.cpp
+++ b/src/mame/ddr/kc.cpp
@@ -203,7 +203,7 @@ void kc85_4_state::kc85_4(machine_config &config)
m_z80pio->out_pb_callback().set(FUNC(kc_state::pio_portb_w));
m_z80pio->out_brdy_callback().set(FUNC(kc_state::pio_brdy_cb));
- Z80CTC(config, m_z80ctc, 0);
+ Z80CTC(config, m_z80ctc);
m_z80ctc->intr_callback().set_inputline(m_maincpu, INPUT_LINE_IRQ0);
m_z80ctc->zc_callback<0>().set(FUNC(kc_state::ctc_zc0_callback));
m_z80ctc->zc_callback<1>().set(FUNC(kc_state::ctc_zc1_callback));
diff --git a/src/mame/ddr/kc.h b/src/mame/ddr/kc.h
index 272c235e190..817d195b18c 100644
--- a/src/mame/ddr/kc.h
+++ b/src/mame/ddr/kc.h
@@ -42,8 +42,8 @@
#include "formats/kc_cas.h"
// from service manual
-#define KC85_3_CLOCK 1751938
-#define KC85_4_CLOCK 1773447
+#define KC85_3_CLOCK XTAL::u(1751938)
+#define KC85_4_CLOCK XTAL::u(1773447)
#define KC85_4_SCREEN_PIXEL_RAM_SIZE 0x04000
#define KC85_4_SCREEN_COLOUR_RAM_SIZE 0x04000
diff --git a/src/mame/ddr/kc_keyb.cpp b/src/mame/ddr/kc_keyb.cpp
index 2c8190e7d4e..34cb6abad78 100644
--- a/src/mame/ddr/kc_keyb.cpp
+++ b/src/mame/ddr/kc_keyb.cpp
@@ -435,7 +435,7 @@ INPUT_PORTS_END
//-------------------------------------------------
// kc_keyboard_device - constructor
//-------------------------------------------------
-kc_keyboard_device::kc_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+kc_keyboard_device::kc_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
device_t(mconfig, KC_KEYBOARD, tag, owner, clock),
m_write_out(*this)
{
diff --git a/src/mame/ddr/kc_keyb.h b/src/mame/ddr/kc_keyb.h
index c05cb8c1e5e..64cc4d78768 100644
--- a/src/mame/ddr/kc_keyb.h
+++ b/src/mame/ddr/kc_keyb.h
@@ -22,7 +22,7 @@ class kc_keyboard_device : public device_t
{
public:
// construction/destruction
- kc_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ kc_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
virtual ~kc_keyboard_device();
auto out_wr_callback() { return m_write_out.bind(); }
diff --git a/src/mame/ddr/kramermc.cpp b/src/mame/ddr/kramermc.cpp
index 13ef6bb5b2e..f42d725ae2c 100644
--- a/src/mame/ddr/kramermc.cpp
+++ b/src/mame/ddr/kramermc.cpp
@@ -242,11 +242,11 @@ uint32_t kramermc_state::screen_update_kramermc(screen_device &screen, bitmap_in
void kramermc_state::kramermc(machine_config &config)
{
/* basic machine hardware */
- Z80(config, m_maincpu, 1500000);
+ Z80(config, m_maincpu, XTAL::u(1500000));
m_maincpu->set_addrmap(AS_PROGRAM, &kramermc_state::kramermc_mem);
m_maincpu->set_addrmap(AS_IO, &kramermc_state::kramermc_io);
- z80pio_device& pio(Z80PIO(config, "pio", 1500000));
+ z80pio_device& pio(Z80PIO(config, "pio", XTAL::u(1500000)));
pio.in_pa_callback().set(FUNC(kramermc_state::port_a_r));
pio.out_pa_callback().set(FUNC(kramermc_state::port_a_w));
pio.in_pb_callback().set(FUNC(kramermc_state::port_b_r));
diff --git a/src/mame/ddr/lc80.cpp b/src/mame/ddr/lc80.cpp
index 09329bf7d02..22805d777d9 100644
--- a/src/mame/ddr/lc80.cpp
+++ b/src/mame/ddr/lc80.cpp
@@ -347,7 +347,7 @@ void lc80_state::machine_start()
void lc80_state::lc80(machine_config &config)
{
// basic machine hardware
- Z80(config, m_maincpu, 900000); // UD880D
+ Z80(config, m_maincpu, XTAL::u(900000)); // UD880D
m_maincpu->set_addrmap(AS_PROGRAM, &lc80_state::lc80_mem);
m_maincpu->set_addrmap(AS_IO, &lc80_state::lc80_io);
m_maincpu->halt_cb().set(FUNC(lc80_state::halt_w));
@@ -363,19 +363,19 @@ void lc80_state::lc80(machine_config &config)
SPEAKER_SOUND(config, m_speaker).add_route(ALL_OUTPUTS, "mono", 0.25);
// devices
- Z80CTC(config, m_ctc, 900000);
+ Z80CTC(config, m_ctc, XTAL::u(900000));
m_ctc->intr_callback().set_inputline(m_maincpu, INPUT_LINE_IRQ0);
m_ctc->zc_callback<0>().set(FUNC(lc80_state::ctc_z0_w));
m_ctc->zc_callback<1>().set(FUNC(lc80_state::ctc_z1_w));
m_ctc->zc_callback<2>().set(FUNC(lc80_state::ctc_z2_w));
- Z80PIO(config, m_pio[0], 900000);
+ Z80PIO(config, m_pio[0], XTAL::u(900000));
m_pio[0]->out_int_callback().set_inputline(m_maincpu, INPUT_LINE_IRQ0);
m_pio[0]->out_pa_callback().set(FUNC(lc80_state::pio1_pa_w));
m_pio[0]->in_pb_callback().set(FUNC(lc80_state::pio1_pb_r));
m_pio[0]->out_pb_callback().set(FUNC(lc80_state::pio1_pb_w));
- Z80PIO(config, m_pio[1], 900000);
+ Z80PIO(config, m_pio[1], XTAL::u(900000));
m_pio[1]->out_int_callback().set_inputline(m_maincpu, INPUT_LINE_IRQ0);
m_pio[1]->in_pb_callback().set(FUNC(lc80_state::pio2_pb_r));
diff --git a/src/mame/ddr/llc1.cpp b/src/mame/ddr/llc1.cpp
index 88327b94f3f..e47a8d30113 100644
--- a/src/mame/ddr/llc1.cpp
+++ b/src/mame/ddr/llc1.cpp
@@ -341,7 +341,7 @@ void llc1_state::llc1(machine_config &config)
m_ctc->zc_callback<0>().set(m_ctc, FUNC(z80ctc_device::trg1));
m_ctc->zc_callback<1>().set(m_ctc, FUNC(z80ctc_device::trg2));
- generic_keyboard_device &keyboard(GENERIC_KEYBOARD(config, "keyboard", 0));
+ generic_keyboard_device &keyboard(GENERIC_KEYBOARD(config, "keyboard"));
keyboard.set_keyboard_callback(FUNC(llc1_state::kbd_put));
}
diff --git a/src/mame/ddr/llc2.cpp b/src/mame/ddr/llc2.cpp
index 0aa4a5406a4..d76e129d615 100644
--- a/src/mame/ddr/llc2.cpp
+++ b/src/mame/ddr/llc2.cpp
@@ -277,14 +277,14 @@ void llc2_state::llc2(machine_config &config)
m_ctc->intr_callback().set_inputline(m_maincpu, INPUT_LINE_IRQ0);
m_ctc->set_clk<0>(12_MHz_XTAL / 8);
m_ctc->set_clk<1>(12_MHz_XTAL / 8);
- m_ctc->set_clk<2>(50); // comes from deep in the video section, assumed to be 50Hz
+ m_ctc->set_clk<2>(XTAL::u(50)); // comes from deep in the video section, assumed to be 50Hz
m_ctc->zc_callback<2>().set(m_ctc, FUNC(z80ctc_device::trg3));
CASSETTE(config, m_cass);
m_cass->set_default_state(CASSETTE_STOPPED | CASSETTE_SPEAKER_ENABLED | CASSETTE_MOTOR_ENABLED);
m_cass->add_route(ALL_OUTPUTS, "mono", 0.05);
- K7659_KEYBOARD(config, K7659_KEYBOARD_TAG, 0);
+ K7659_KEYBOARD(config, K7659_KEYBOARD_TAG);
/* internal ram */
RAM(config, RAM_TAG).set_default_size("64K");
diff --git a/src/mame/ddr/mc8030.cpp b/src/mame/ddr/mc8030.cpp
index e8f0abcdfe1..9b08227846a 100644
--- a/src/mame/ddr/mc8030.cpp
+++ b/src/mame/ddr/mc8030.cpp
@@ -230,11 +230,11 @@ void mc8030_state::mc8030(machine_config &config)
// ZC1: to SIO CLK CH B
// ZC2: KMBG (??)
- 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("asp_sio", FUNC(z80sio_device::txca_w));
uart_clock.signal_handler().append("asp_sio", FUNC(z80sio_device::rxca_w));
- z80sio_device& sio(Z80SIO(config, "asp_sio", 4800));
+ z80sio_device& sio(Z80SIO(config, "asp_sio", XTAL::u(4800)));
// SIO CH A in = keyboard; out = beeper; CH B = IFSS (??)
sio.out_txda_callback().set("rs232", FUNC(rs232_port_device::write_txd));
sio.out_dtra_callback().set("rs232", FUNC(rs232_port_device::write_dtr));
diff --git a/src/mame/ddr/nanos.cpp b/src/mame/ddr/nanos.cpp
index 51049295a5c..204af275004 100644
--- a/src/mame/ddr/nanos.cpp
+++ b/src/mame/ddr/nanos.cpp
@@ -522,7 +522,7 @@ void nanos_state::nanos(machine_config &config)
m_pio->out_pb_callback().set(FUNC(nanos_state::port_b_w));
/* UPD765 */
- UPD765A(config, m_fdc, 8'000'000, false, true);
+ UPD765A(config, m_fdc, XTAL::u(8'000'000), false, true);
FLOPPY_CONNECTOR(config, m_floppy, nanos_floppies, "525hd", nanos_state::floppy_formats);
TIMER(config, "keyboard_timer").configure_periodic(FUNC(nanos_state::keyboard_callback), attotime::from_hz(240));
diff --git a/src/mame/ddr/pcm.cpp b/src/mame/ddr/pcm.cpp
index 03b3a0d6586..0a9e73be334 100644
--- a/src/mame/ddr/pcm.cpp
+++ b/src/mame/ddr/pcm.cpp
@@ -321,7 +321,7 @@ void pcm_state::pcm(machine_config &config)
SPEAKER_SOUND(config, "speaker").add_route(ALL_OUTPUTS, "mono", 0.50);
/* Devices */
- K7659_KEYBOARD(config, K7659_KEYBOARD_TAG, 0);
+ K7659_KEYBOARD(config, K7659_KEYBOARD_TAG);
CASSETTE(config, m_cass);
m_cass->add_route(ALL_OUTPUTS, "mono", 0.05);
diff --git a/src/mame/ddr/slc1.cpp b/src/mame/ddr/slc1.cpp
index 3e88bab193e..ef4950b5c45 100644
--- a/src/mame/ddr/slc1.cpp
+++ b/src/mame/ddr/slc1.cpp
@@ -212,7 +212,7 @@ INPUT_PORTS_END
void slc1_state::slc1(machine_config &config)
{
/* basic machine hardware */
- Z80(config, m_maincpu, 2500000);
+ Z80(config, m_maincpu, XTAL::u(2500000));
m_maincpu->set_addrmap(AS_PROGRAM, &slc1_state::mem_map);
m_maincpu->set_addrmap(AS_IO, &slc1_state::io_map);
diff --git a/src/mame/ddr/vcs80.cpp b/src/mame/ddr/vcs80.cpp
index ce6d6e0ba6e..c717e6ab730 100644
--- a/src/mame/ddr/vcs80.cpp
+++ b/src/mame/ddr/vcs80.cpp
@@ -261,7 +261,7 @@ void vcs80_state::machine_start()
void vcs80_state::vcs80(machine_config &config)
{
/* basic machine hardware */
- Z80(config, m_maincpu, 5'000'000 /2); // U880D - Uses a LC oscillator rather than a crystal
+ Z80(config, m_maincpu, XTAL::u(5'000'000) /2); // U880D - Uses a LC oscillator rather than a crystal
m_maincpu->set_addrmap(AS_PROGRAM, &vcs80_state::mem_map);
m_maincpu->set_addrmap(AS_IO, &vcs80_state::io_map);
m_maincpu->set_daisy_config(daisy_chain);
@@ -275,7 +275,7 @@ void vcs80_state::vcs80(machine_config &config)
m_display->set_segmask(0xff, 0xff);
/* devices */
- Z80PIO(config, m_pio, 5'000'000 /2);
+ Z80PIO(config, m_pio, XTAL::u(5'000'000) /2);
m_pio->out_int_callback().set_inputline(m_maincpu, INPUT_LINE_IRQ0);
m_pio->in_pa_callback().set(FUNC(vcs80_state::pio_pa_r));
m_pio->out_pb_callback().set(FUNC(vcs80_state::pio_pb_w));