summaryrefslogtreecommitdiffstatshomepage
path: root/src/devices/bus/cbm2
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/devices/bus/cbm2
parent5c14bcdfcb4aefb71b5b62387c4ad05dbeb3814e (diff)
full xtal conversionxtal
Diffstat (limited to 'src/devices/bus/cbm2')
-rw-r--r--src/devices/bus/cbm2/24k.cpp2
-rw-r--r--src/devices/bus/cbm2/24k.h2
-rw-r--r--src/devices/bus/cbm2/exp.cpp2
-rw-r--r--src/devices/bus/cbm2/exp.h6
-rw-r--r--src/devices/bus/cbm2/hrg.cpp10
-rw-r--r--src/devices/bus/cbm2/hrg.h6
-rw-r--r--src/devices/bus/cbm2/std.cpp2
-rw-r--r--src/devices/bus/cbm2/std.h2
-rw-r--r--src/devices/bus/cbm2/user.cpp2
-rw-r--r--src/devices/bus/cbm2/user.h4
10 files changed, 19 insertions, 19 deletions
diff --git a/src/devices/bus/cbm2/24k.cpp b/src/devices/bus/cbm2/24k.cpp
index c56474c7be9..c5fccaf6d65 100644
--- a/src/devices/bus/cbm2/24k.cpp
+++ b/src/devices/bus/cbm2/24k.cpp
@@ -27,7 +27,7 @@ DEFINE_DEVICE_TYPE(CBM2_24K, cbm2_24k_cartridge_device, "cbm2_24k", "CBM-II 24K
// cbm2_24k_cartridge_device - constructor
//-------------------------------------------------
-cbm2_24k_cartridge_device::cbm2_24k_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+cbm2_24k_cartridge_device::cbm2_24k_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
device_t(mconfig, CBM2_24K, tag, owner, clock),
device_cbm2_expansion_card_interface(mconfig, *this),
m_ram(*this, "ram", 0x6000, ENDIANNESS_LITTLE)
diff --git a/src/devices/bus/cbm2/24k.h b/src/devices/bus/cbm2/24k.h
index 554ba721444..5450b3edf4d 100644
--- a/src/devices/bus/cbm2/24k.h
+++ b/src/devices/bus/cbm2/24k.h
@@ -26,7 +26,7 @@ class cbm2_24k_cartridge_device : public device_t,
{
public:
// construction/destruction
- cbm2_24k_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ cbm2_24k_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/cbm2/exp.cpp b/src/devices/bus/cbm2/exp.cpp
index c43e540e181..c3879d2a627 100644
--- a/src/devices/bus/cbm2/exp.cpp
+++ b/src/devices/bus/cbm2/exp.cpp
@@ -60,7 +60,7 @@ device_cbm2_expansion_card_interface::~device_cbm2_expansion_card_interface()
// cbm2_expansion_slot_device - constructor
//-------------------------------------------------
-cbm2_expansion_slot_device::cbm2_expansion_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+cbm2_expansion_slot_device::cbm2_expansion_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
device_t(mconfig, CBM2_EXPANSION_SLOT, tag, owner, clock),
device_single_card_slot_interface<device_cbm2_expansion_card_interface>(mconfig, *this),
device_cartrom_image_interface(mconfig, *this),
diff --git a/src/devices/bus/cbm2/exp.h b/src/devices/bus/cbm2/exp.h
index 19ed3d01dac..030be49ce06 100644
--- a/src/devices/bus/cbm2/exp.h
+++ b/src/devices/bus/cbm2/exp.h
@@ -48,7 +48,7 @@ class cbm2_expansion_slot_device : public device_t,
public:
// construction/destruction
template <typename T>
- cbm2_expansion_slot_device(machine_config const &mconfig, char const *tag, device_t *owner, uint32_t clock, T &&opts, char const *dflt)
+ cbm2_expansion_slot_device(machine_config const &mconfig, char const *tag, device_t *owner, const XTAL &clock, T &&opts, char const *dflt)
: cbm2_expansion_slot_device(mconfig, tag, owner, clock)
{
option_reset();
@@ -56,14 +56,14 @@ public:
set_default_option(dflt);
set_fixed(false);
}
- cbm2_expansion_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock = 0);
+ cbm2_expansion_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock = XTAL());
// computer interface
uint8_t read(offs_t offset, uint8_t data, int csbank1, int csbank2, int csbank3);
void write(offs_t offset, uint8_t data, int csbank1, int csbank2, int csbank3);
// cartridge interface
- int phi2() { return clock(); }
+ XTAL phi2() { return clock(); }
protected:
// device-level overrides
diff --git a/src/devices/bus/cbm2/hrg.cpp b/src/devices/bus/cbm2/hrg.cpp
index 166e38e76b2..c635070cda0 100644
--- a/src/devices/bus/cbm2/hrg.cpp
+++ b/src/devices/bus/cbm2/hrg.cpp
@@ -97,7 +97,7 @@ void cbm2_hrg_a_device::device_add_mconfig(machine_config &config)
screen.set_refresh_hz(25);
PALETTE(config, "palette", palette_device::MONOCHROME);
- EF9365(config, m_gdc, 1750000);
+ EF9365(config, m_gdc, XTAL::u(1750000));
m_gdc->set_screen(SCREEN_TAG);
m_gdc->set_addrmap(0, &cbm2_hrg_a_device::hrg_a_map);
m_gdc->set_palette_tag("palette");
@@ -114,7 +114,7 @@ void cbm2_hrg_b_device::device_add_mconfig(machine_config &config)
screen.set_refresh_hz(50);
PALETTE(config, "palette", palette_device::MONOCHROME);
- EF9365(config, m_gdc, 1750000); //EF9366
+ EF9365(config, m_gdc, XTAL::u(1750000)); //EF9366
m_gdc->set_screen(SCREEN_TAG);
m_gdc->set_addrmap(0, &cbm2_hrg_b_device::hrg_b_map);
m_gdc->set_palette_tag("palette");
@@ -132,7 +132,7 @@ void cbm2_hrg_b_device::device_add_mconfig(machine_config &config)
// cbm2_hrg_device - constructor
//-------------------------------------------------
-cbm2_hrg_device::cbm2_hrg_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) :
+cbm2_hrg_device::cbm2_hrg_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock) :
device_t(mconfig, type, tag, owner, clock),
device_cbm2_expansion_card_interface(mconfig, *this),
m_gdc(*this, EF9366_TAG),
@@ -140,12 +140,12 @@ cbm2_hrg_device::cbm2_hrg_device(const machine_config &mconfig, device_type type
{
}
-cbm2_hrg_a_device::cbm2_hrg_a_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+cbm2_hrg_a_device::cbm2_hrg_a_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
cbm2_hrg_device(mconfig, CBM2_HRG_A, tag, owner, clock)
{
}
-cbm2_hrg_b_device::cbm2_hrg_b_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+cbm2_hrg_b_device::cbm2_hrg_b_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
cbm2_hrg_device(mconfig, CBM2_HRG_B, tag, owner, clock)
{
}
diff --git a/src/devices/bus/cbm2/hrg.h b/src/devices/bus/cbm2/hrg.h
index 3b6a20c94e8..d1ba273ee14 100644
--- a/src/devices/bus/cbm2/hrg.h
+++ b/src/devices/bus/cbm2/hrg.h
@@ -31,7 +31,7 @@ public:
protected:
// construction/destruction
- cbm2_hrg_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+ cbm2_hrg_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock);
// device-level overrides
virtual void device_start() override;
@@ -54,7 +54,7 @@ class cbm2_hrg_a_device : public cbm2_hrg_device
{
public:
// construction/destruction
- cbm2_hrg_a_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ cbm2_hrg_a_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// optional information overrides
@@ -71,7 +71,7 @@ class cbm2_hrg_b_device : public cbm2_hrg_device
{
public:
// construction/destruction
- cbm2_hrg_b_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ cbm2_hrg_b_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// optional information overrides
diff --git a/src/devices/bus/cbm2/std.cpp b/src/devices/bus/cbm2/std.cpp
index 51653c72755..5a1a3f51be4 100644
--- a/src/devices/bus/cbm2/std.cpp
+++ b/src/devices/bus/cbm2/std.cpp
@@ -27,7 +27,7 @@ DEFINE_DEVICE_TYPE(CBM2_STD, cbm2_standard_cartridge_device, "cbm2_standard", "C
// cbm2_standard_cartridge_device - constructor
//-------------------------------------------------
-cbm2_standard_cartridge_device::cbm2_standard_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+cbm2_standard_cartridge_device::cbm2_standard_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
device_t(mconfig, CBM2_STD, tag, owner, clock),
device_cbm2_expansion_card_interface(mconfig, *this)
{
diff --git a/src/devices/bus/cbm2/std.h b/src/devices/bus/cbm2/std.h
index ee941ca580a..209a2237444 100644
--- a/src/devices/bus/cbm2/std.h
+++ b/src/devices/bus/cbm2/std.h
@@ -26,7 +26,7 @@ class cbm2_standard_cartridge_device : public device_t,
{
public:
// construction/destruction
- cbm2_standard_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ cbm2_standard_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/cbm2/user.cpp b/src/devices/bus/cbm2/user.cpp
index 5dc12567096..d9ca37c7b0f 100644
--- a/src/devices/bus/cbm2/user.cpp
+++ b/src/devices/bus/cbm2/user.cpp
@@ -43,7 +43,7 @@ device_cbm2_user_port_interface::device_cbm2_user_port_interface(const machine_c
// cbm2_user_port_device - constructor
//-------------------------------------------------
-cbm2_user_port_device::cbm2_user_port_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+cbm2_user_port_device::cbm2_user_port_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
device_t(mconfig, CBM2_USER_PORT, tag, owner, clock),
device_single_card_slot_interface<device_cbm2_user_port_interface>(mconfig, *this),
m_write_irq(*this),
diff --git a/src/devices/bus/cbm2/user.h b/src/devices/bus/cbm2/user.h
index 4a49807118d..7e236149539 100644
--- a/src/devices/bus/cbm2/user.h
+++ b/src/devices/bus/cbm2/user.h
@@ -73,14 +73,14 @@ public:
// construction/destruction
template <typename T>
cbm2_user_port_device(const machine_config &mconfig, const char *tag, device_t *owner, T &&opts, const char *dflt)
- : cbm2_user_port_device(mconfig, tag, owner, 0)
+ : cbm2_user_port_device(mconfig, tag, owner)
{
option_reset();
opts(*this);
set_default_option(dflt);
set_fixed(false);
}
- cbm2_user_port_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ cbm2_user_port_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock = XTAL());
auto irq_callback() { return m_write_irq.bind(); }
auto sp_callback() { return m_write_sp.bind(); }