diff options
author | 2022-06-16 12:47:52 +0200 | |
---|---|---|
committer | 2025-04-29 23:06:41 +0200 | |
commit | 45d4cd52a8194f2ef9e0383cfb2e2a35634af6ff (patch) | |
tree | 4e8d8fcb7382a5e9e0bce5ec59939bcfbe67155a /src/devices/bus/plus4 | |
parent | 5c14bcdfcb4aefb71b5b62387c4ad05dbeb3814e (diff) |
full xtal conversionxtal
Diffstat (limited to 'src/devices/bus/plus4')
-rw-r--r-- | src/devices/bus/plus4/c1551.cpp | 8 | ||||
-rw-r--r-- | src/devices/bus/plus4/c1551.h | 2 | ||||
-rw-r--r-- | src/devices/bus/plus4/diag264_lb_user.cpp | 2 | ||||
-rw-r--r-- | src/devices/bus/plus4/diag264_lb_user.h | 2 | ||||
-rw-r--r-- | src/devices/bus/plus4/exp.cpp | 2 | ||||
-rw-r--r-- | src/devices/bus/plus4/exp.h | 6 | ||||
-rw-r--r-- | src/devices/bus/plus4/sid.cpp | 2 | ||||
-rw-r--r-- | src/devices/bus/plus4/sid.h | 2 | ||||
-rw-r--r-- | src/devices/bus/plus4/std.cpp | 2 | ||||
-rw-r--r-- | src/devices/bus/plus4/std.h | 2 |
10 files changed, 15 insertions, 15 deletions
diff --git a/src/devices/bus/plus4/c1551.cpp b/src/devices/bus/plus4/c1551.cpp index 42bca7daa57..16592c2a53f 100644 --- a/src/devices/bus/plus4/c1551.cpp +++ b/src/devices/bus/plus4/c1551.cpp @@ -344,7 +344,7 @@ void c1551_device::device_add_mconfig(machine_config &config) PLS100(config, m_pla); - TPI6525(config, m_tpi0, 0); + TPI6525(config, m_tpi0); m_tpi0->in_pa_cb().set(FUNC(c1551_device::tcbm_data_r)); m_tpi0->out_pa_cb().set(FUNC(c1551_device::tcbm_data_w)); m_tpi0->in_pb_cb().set(m_ga, FUNC(c64h156_device::yb_r)); @@ -352,7 +352,7 @@ void c1551_device::device_add_mconfig(machine_config &config) m_tpi0->in_pc_cb().set(FUNC(c1551_device::tpi0_pc_r)); m_tpi0->out_pc_cb().set(FUNC(c1551_device::tpi0_pc_w)); - TPI6525(config, m_tpi1, 0); + TPI6525(config, m_tpi1); m_tpi1->in_pa_cb().set(FUNC(c1551_device::tcbm_data_r)); m_tpi1->out_pa_cb().set(FUNC(c1551_device::tcbm_data_w)); m_tpi1->in_pb_cb().set(FUNC(c1551_device::tpi1_pb_r)); @@ -362,7 +362,7 @@ void c1551_device::device_add_mconfig(machine_config &config) C64H156(config, m_ga, XTAL(16'000'000)); m_ga->byte_callback().set(m_ga, FUNC(c64h156_device::atni_w)); - floppy_connector &connector(FLOPPY_CONNECTOR(config, C64H156_TAG":0", 0)); + floppy_connector &connector(FLOPPY_CONNECTOR(config, C64H156_TAG":0")); connector.option_add("525ssqd", FLOPPY_525_SSQD); connector.set_default_option("525ssqd"); connector.set_fixed(true); @@ -408,7 +408,7 @@ ioport_constructor c1551_device::device_input_ports() const // c1551_device - constructor //------------------------------------------------- -c1551_device::c1551_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +c1551_device::c1551_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, C1551, tag, owner, clock) , device_plus4_expansion_card_interface(mconfig, *this) , m_maincpu(*this, M6510T_TAG) diff --git a/src/devices/bus/plus4/c1551.h b/src/devices/bus/plus4/c1551.h index eddad2c8046..b44f4275bd3 100644 --- a/src/devices/bus/plus4/c1551.h +++ b/src/devices/bus/plus4/c1551.h @@ -30,7 +30,7 @@ class c1551_device : public device_t, public device_plus4_expansion_card_interfa { public: // construction/destruction - c1551_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + c1551_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); protected: // device-level overrides diff --git a/src/devices/bus/plus4/diag264_lb_user.cpp b/src/devices/bus/plus4/diag264_lb_user.cpp index a8e4dc32b8c..82113623c3d 100644 --- a/src/devices/bus/plus4/diag264_lb_user.cpp +++ b/src/devices/bus/plus4/diag264_lb_user.cpp @@ -27,7 +27,7 @@ DEFINE_DEVICE_TYPE(DIAG264_USER_PORT_LOOPBACK, diag264_user_port_loopback_device // diag264_user_port_loopback_device - constructor //------------------------------------------------- -diag264_user_port_loopback_device::diag264_user_port_loopback_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +diag264_user_port_loopback_device::diag264_user_port_loopback_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, DIAG264_USER_PORT_LOOPBACK, tag, owner, clock) , device_pet_user_port_interface(mconfig, *this) { diff --git a/src/devices/bus/plus4/diag264_lb_user.h b/src/devices/bus/plus4/diag264_lb_user.h index dd45e469106..611d0c95f7c 100644 --- a/src/devices/bus/plus4/diag264_lb_user.h +++ b/src/devices/bus/plus4/diag264_lb_user.h @@ -25,7 +25,7 @@ class diag264_user_port_loopback_device : public device_t, public device_pet_use { public: // construction/destruction - diag264_user_port_loopback_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + diag264_user_port_loopback_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); protected: // device-level overrides diff --git a/src/devices/bus/plus4/exp.cpp b/src/devices/bus/plus4/exp.cpp index 1086683c02a..ab260c33548 100644 --- a/src/devices/bus/plus4/exp.cpp +++ b/src/devices/bus/plus4/exp.cpp @@ -64,7 +64,7 @@ device_plus4_expansion_card_interface::~device_plus4_expansion_card_interface() // plus4_expansion_slot_device - constructor //------------------------------------------------- -plus4_expansion_slot_device::plus4_expansion_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : +plus4_expansion_slot_device::plus4_expansion_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, PLUS4_EXPANSION_SLOT, tag, owner, clock), device_single_card_slot_interface<device_plus4_expansion_card_interface>(mconfig, *this), device_cartrom_image_interface(mconfig, *this), diff --git a/src/devices/bus/plus4/exp.h b/src/devices/bus/plus4/exp.h index bac19750c2d..2744e46dae8 100644 --- a/src/devices/bus/plus4/exp.h +++ b/src/devices/bus/plus4/exp.h @@ -57,7 +57,7 @@ class plus4_expansion_slot_device : public device_t, public: // construction/destruction template <typename T> - plus4_expansion_slot_device(machine_config const &mconfig, char const *tag, device_t *owner, uint32_t clock, T &&opts, char const *dflt) + plus4_expansion_slot_device(machine_config const &mconfig, char const *tag, device_t *owner, const XTAL &clock, T &&opts, char const *dflt) : plus4_expansion_slot_device(mconfig, tag, owner, clock) { option_reset(); @@ -65,7 +65,7 @@ public: set_default_option(dflt); set_fixed(false); } - plus4_expansion_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + plus4_expansion_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); auto irq_wr_callback() { return m_write_irq.bind(); } auto cd_rd_callback() { return m_read_dma_cd.bind(); } @@ -81,7 +81,7 @@ public: void dma_cd_w(offs_t offset, uint8_t data) { m_write_dma_cd(offset, data); } DECLARE_WRITE_LINE_MEMBER( irq_w ) { m_write_irq(state); } DECLARE_WRITE_LINE_MEMBER( aec_w ) { m_write_aec(state); } - int phi2() { return clock(); } + XTAL phi2() { return clock(); } protected: // device-level overrides diff --git a/src/devices/bus/plus4/sid.cpp b/src/devices/bus/plus4/sid.cpp index b5c6e9d897f..5c0b9dcfbb6 100644 --- a/src/devices/bus/plus4/sid.cpp +++ b/src/devices/bus/plus4/sid.cpp @@ -82,7 +82,7 @@ void plus4_sid_cartridge_device::device_add_mconfig(machine_config &config) // plus4_sid_cartridge_device - constructor //------------------------------------------------- -plus4_sid_cartridge_device::plus4_sid_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : +plus4_sid_cartridge_device::plus4_sid_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, PLUS4_SID, tag, owner, clock), device_plus4_expansion_card_interface(mconfig, *this), m_sid(*this, MOS8580_TAG), diff --git a/src/devices/bus/plus4/sid.h b/src/devices/bus/plus4/sid.h index 1566381e6d2..73045f5a4e7 100644 --- a/src/devices/bus/plus4/sid.h +++ b/src/devices/bus/plus4/sid.h @@ -28,7 +28,7 @@ class plus4_sid_cartridge_device : public device_t, { public: // construction/destruction - plus4_sid_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + plus4_sid_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); protected: // device-level overrides diff --git a/src/devices/bus/plus4/std.cpp b/src/devices/bus/plus4/std.cpp index ed9e9ff83a5..73157b36292 100644 --- a/src/devices/bus/plus4/std.cpp +++ b/src/devices/bus/plus4/std.cpp @@ -27,7 +27,7 @@ DEFINE_DEVICE_TYPE(PLUS4_STD, plus4_standard_cartridge_device, "plus4_standard", // plus4_standard_cartridge_device - constructor //------------------------------------------------- -plus4_standard_cartridge_device::plus4_standard_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : +plus4_standard_cartridge_device::plus4_standard_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, PLUS4_STD, tag, owner, clock), device_plus4_expansion_card_interface(mconfig, *this) { diff --git a/src/devices/bus/plus4/std.h b/src/devices/bus/plus4/std.h index f1f3ae75328..6a3de9f252b 100644 --- a/src/devices/bus/plus4/std.h +++ b/src/devices/bus/plus4/std.h @@ -26,7 +26,7 @@ class plus4_standard_cartridge_device : public device_t, { public: // construction/destruction - plus4_standard_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + plus4_standard_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); protected: // device-level overrides |