diff options
Diffstat (limited to 'src/devices/bus/acorn/system')
-rw-r--r-- | src/devices/bus/acorn/system/32k.cpp | 2 | ||||
-rw-r--r-- | src/devices/bus/acorn/system/32k.h | 2 | ||||
-rw-r--r-- | src/devices/bus/acorn/system/8k.cpp | 2 | ||||
-rw-r--r-- | src/devices/bus/acorn/system/8k.h | 2 | ||||
-rw-r--r-- | src/devices/bus/acorn/system/cass.cpp | 4 | ||||
-rw-r--r-- | src/devices/bus/acorn/system/cass.h | 2 | ||||
-rw-r--r-- | src/devices/bus/acorn/system/econet.cpp | 4 | ||||
-rw-r--r-- | src/devices/bus/acorn/system/econet.h | 2 | ||||
-rw-r--r-- | src/devices/bus/acorn/system/fdc.cpp | 2 | ||||
-rw-r--r-- | src/devices/bus/acorn/system/fdc.h | 2 | ||||
-rw-r--r-- | src/devices/bus/acorn/system/vdu40.cpp | 2 | ||||
-rw-r--r-- | src/devices/bus/acorn/system/vdu40.h | 2 | ||||
-rw-r--r-- | src/devices/bus/acorn/system/vdu80.cpp | 2 | ||||
-rw-r--r-- | src/devices/bus/acorn/system/vdu80.h | 2 | ||||
-rw-r--r-- | src/devices/bus/acorn/system/vib.cpp | 4 | ||||
-rw-r--r-- | src/devices/bus/acorn/system/vib.h | 2 |
16 files changed, 19 insertions, 19 deletions
diff --git a/src/devices/bus/acorn/system/32k.cpp b/src/devices/bus/acorn/system/32k.cpp index 00eb80050e9..6d6673fb00a 100644 --- a/src/devices/bus/acorn/system/32k.cpp +++ b/src/devices/bus/acorn/system/32k.cpp @@ -60,7 +60,7 @@ ioport_constructor acorn_32k_device::device_input_ports() const // acorn_32k_device - constructor //------------------------------------------------- -acorn_32k_device::acorn_32k_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +acorn_32k_device::acorn_32k_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, ACORN_32K, tag, owner, clock) , device_acorn_bus_interface(mconfig, *this) , m_links(*this, "LINKS") diff --git a/src/devices/bus/acorn/system/32k.h b/src/devices/bus/acorn/system/32k.h index f3d3b76be5c..9dc5ba37b51 100644 --- a/src/devices/bus/acorn/system/32k.h +++ b/src/devices/bus/acorn/system/32k.h @@ -26,7 +26,7 @@ class acorn_32k_device : { public: // construction/destruction - acorn_32k_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + acorn_32k_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); protected: // device-level overrides diff --git a/src/devices/bus/acorn/system/8k.cpp b/src/devices/bus/acorn/system/8k.cpp index b2e1c7bb3d2..e48d9f908a6 100644 --- a/src/devices/bus/acorn/system/8k.cpp +++ b/src/devices/bus/acorn/system/8k.cpp @@ -83,7 +83,7 @@ void acorn_8k_device::device_add_mconfig(machine_config &config) // acorn_8k_device - constructor //------------------------------------------------- -acorn_8k_device::acorn_8k_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +acorn_8k_device::acorn_8k_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, ACORN_8K, tag, owner, clock) , device_acorn_bus_interface(mconfig, *this) , m_rom(*this, "rom%u", 0) diff --git a/src/devices/bus/acorn/system/8k.h b/src/devices/bus/acorn/system/8k.h index 09f089c1563..6420f6383fe 100644 --- a/src/devices/bus/acorn/system/8k.h +++ b/src/devices/bus/acorn/system/8k.h @@ -29,7 +29,7 @@ class acorn_8k_device : { public: // construction/destruction - acorn_8k_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + acorn_8k_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); protected: // device-level overrides diff --git a/src/devices/bus/acorn/system/cass.cpp b/src/devices/bus/acorn/system/cass.cpp index 6e5b8faf40c..98f239ea930 100644 --- a/src/devices/bus/acorn/system/cass.cpp +++ b/src/devices/bus/acorn/system/cass.cpp @@ -30,7 +30,7 @@ void acorn_cass_device::device_add_mconfig(machine_config &config) SPEAKER(config, "mono").front_center(); WAVE(config, "wave", "cassette").add_route(ALL_OUTPUTS, "mono", 0.25); - CASSETTE(config, "cassette", 0); + CASSETTE(config, "cassette"); TIMER(config, "cass_c").configure_periodic(FUNC(acorn_cass_device::cass_c), attotime::from_hz(4800)); TIMER(config, "cass_p").configure_periodic(FUNC(acorn_cass_device::cass_p), attotime::from_hz(40000)); } @@ -44,7 +44,7 @@ void acorn_cass_device::device_add_mconfig(machine_config &config) // acorn_cass_device - constructor //------------------------------------------------- -acorn_cass_device::acorn_cass_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +acorn_cass_device::acorn_cass_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, ACORN_CASS, tag, owner, clock) , device_acorn_bus_interface(mconfig, *this) , m_cass(*this, "cassette") diff --git a/src/devices/bus/acorn/system/cass.h b/src/devices/bus/acorn/system/cass.h index 02a323bb994..23e6b79eb8d 100644 --- a/src/devices/bus/acorn/system/cass.h +++ b/src/devices/bus/acorn/system/cass.h @@ -28,7 +28,7 @@ class acorn_cass_device : { public: // construction/destruction - acorn_cass_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + acorn_cass_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); protected: // device-level overrides diff --git a/src/devices/bus/acorn/system/econet.cpp b/src/devices/bus/acorn/system/econet.cpp index f8a0737e456..e24fb7ea53d 100644 --- a/src/devices/bus/acorn/system/econet.cpp +++ b/src/devices/bus/acorn/system/econet.cpp @@ -30,7 +30,7 @@ void acorn_econet_device::device_add_mconfig(machine_config &config) m_adlc->out_txd_cb().set(m_econet, FUNC(econet_device::host_data_w)); m_adlc->out_irq_cb().set(FUNC(acorn_econet_device::bus_irq_w)); - ECONET(config, m_econet, 0); + ECONET(config, m_econet); m_econet->clk_wr_callback().set(m_adlc, FUNC(mc6854_device::txc_w)); m_econet->clk_wr_callback().append(m_adlc, FUNC(mc6854_device::rxc_w)); m_econet->data_wr_callback().set(m_adlc, FUNC(mc6854_device::set_rx)); @@ -46,7 +46,7 @@ void acorn_econet_device::device_add_mconfig(machine_config &config) // acorn_econet_device - constructor //------------------------------------------------- -acorn_econet_device::acorn_econet_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +acorn_econet_device::acorn_econet_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, ACORN_ECONET, tag, owner, clock) , device_acorn_bus_interface(mconfig, *this) , m_adlc(*this, "mc6854") diff --git a/src/devices/bus/acorn/system/econet.h b/src/devices/bus/acorn/system/econet.h index b5e470975c9..07d3e15ce8c 100644 --- a/src/devices/bus/acorn/system/econet.h +++ b/src/devices/bus/acorn/system/econet.h @@ -28,7 +28,7 @@ class acorn_econet_device : { public: // construction/destruction - acorn_econet_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + acorn_econet_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); protected: // device-level overrides diff --git a/src/devices/bus/acorn/system/fdc.cpp b/src/devices/bus/acorn/system/fdc.cpp index 397fbb9ac50..a77bd3c933b 100644 --- a/src/devices/bus/acorn/system/fdc.cpp +++ b/src/devices/bus/acorn/system/fdc.cpp @@ -61,7 +61,7 @@ void acorn_fdc_device::device_add_mconfig(machine_config &config) // acorn_fdc_device - constructor //------------------------------------------------- -acorn_fdc_device::acorn_fdc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +acorn_fdc_device::acorn_fdc_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, ACORN_FDC, tag, owner, clock) , device_acorn_bus_interface(mconfig, *this) , m_fdc(*this, "i8271") diff --git a/src/devices/bus/acorn/system/fdc.h b/src/devices/bus/acorn/system/fdc.h index f943b1f6767..60c68f670e9 100644 --- a/src/devices/bus/acorn/system/fdc.h +++ b/src/devices/bus/acorn/system/fdc.h @@ -29,7 +29,7 @@ class acorn_fdc_device : { public: // construction/destruction - acorn_fdc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + acorn_fdc_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); static void floppy_formats(format_registration &fr); diff --git a/src/devices/bus/acorn/system/vdu40.cpp b/src/devices/bus/acorn/system/vdu40.cpp index 7bc8629ac35..236848d5294 100644 --- a/src/devices/bus/acorn/system/vdu40.cpp +++ b/src/devices/bus/acorn/system/vdu40.cpp @@ -53,7 +53,7 @@ void acorn_vdu40_device::device_add_mconfig(machine_config &config) // acorn_vdu40_device - constructor //------------------------------------------------- -acorn_vdu40_device::acorn_vdu40_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +acorn_vdu40_device::acorn_vdu40_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, ACORN_VDU40, tag, owner, clock) , device_acorn_bus_interface(mconfig, *this) , m_screen(*this, "screen") diff --git a/src/devices/bus/acorn/system/vdu40.h b/src/devices/bus/acorn/system/vdu40.h index ff80a76d1ea..1b961343cb4 100644 --- a/src/devices/bus/acorn/system/vdu40.h +++ b/src/devices/bus/acorn/system/vdu40.h @@ -30,7 +30,7 @@ class acorn_vdu40_device : { public: // construction/destruction - acorn_vdu40_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + acorn_vdu40_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); protected: // device-level overrides diff --git a/src/devices/bus/acorn/system/vdu80.cpp b/src/devices/bus/acorn/system/vdu80.cpp index 77bad0bf32c..e3bb1f6fb43 100644 --- a/src/devices/bus/acorn/system/vdu80.cpp +++ b/src/devices/bus/acorn/system/vdu80.cpp @@ -118,7 +118,7 @@ const tiny_rom_entry *acorn_vdu80_device::device_rom_region() const // acorn_vdu80_device - constructor //------------------------------------------------- -acorn_vdu80_device::acorn_vdu80_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +acorn_vdu80_device::acorn_vdu80_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, ACORN_VDU80, tag, owner, clock) , device_acorn_bus_interface(mconfig, *this) , m_chargen(*this, "chargen") diff --git a/src/devices/bus/acorn/system/vdu80.h b/src/devices/bus/acorn/system/vdu80.h index 8ebb7e0a327..2f1c33d7d76 100644 --- a/src/devices/bus/acorn/system/vdu80.h +++ b/src/devices/bus/acorn/system/vdu80.h @@ -29,7 +29,7 @@ class acorn_vdu80_device : { public: // construction/destruction - acorn_vdu80_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + acorn_vdu80_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); protected: // device-level overrides diff --git a/src/devices/bus/acorn/system/vib.cpp b/src/devices/bus/acorn/system/vib.cpp index bf685daac95..4a4be409e40 100644 --- a/src/devices/bus/acorn/system/vib.cpp +++ b/src/devices/bus/acorn/system/vib.cpp @@ -29,7 +29,7 @@ DEFINE_DEVICE_TYPE(ACORN_VIB, acorn_vib_device, "acorn_vib", "Acorn Versatile In // acorn_vib_device - constructor //------------------------------------------------- -acorn_vib_device::acorn_vib_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +acorn_vib_device::acorn_vib_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, ACORN_VIB, tag, owner, clock) , device_acorn_bus_interface(mconfig, *this) , m_ppi8255(*this, "ppi8255") @@ -149,7 +149,7 @@ void acorn_vib_device::device_add_mconfig(machine_config &config) { INPUT_MERGER_ANY_HIGH(config, m_irqs).output_handler().set(FUNC(acorn_vib_device::irq_w)); - MOS6522(config, m_via6522, 1'000'000); // TODO: derive clock from bus (pin 29 = ϕ2) + MOS6522(config, m_via6522, XTAL::u(1'000'000)); // TODO: derive clock from bus (pin 29 = ϕ2) m_via6522->writepa_handler().set("cent_data_out", FUNC(output_latch_device::write)); m_via6522->ca2_handler().set(m_centronics, FUNC(centronics_device::write_strobe)); m_via6522->irq_handler().set(m_irqs, FUNC(input_merger_device::in_w<0>)); diff --git a/src/devices/bus/acorn/system/vib.h b/src/devices/bus/acorn/system/vib.h index bd4d886e281..e5d6ad34ccd 100644 --- a/src/devices/bus/acorn/system/vib.h +++ b/src/devices/bus/acorn/system/vib.h @@ -33,7 +33,7 @@ class acorn_vib_device : { public: // construction/destruction - acorn_vib_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + acorn_vib_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); protected: // device-level overrides |