summaryrefslogtreecommitdiffstatshomepage
path: root/src/devices/bus/vic20
diff options
context:
space:
mode:
Diffstat (limited to 'src/devices/bus/vic20')
-rw-r--r--src/devices/bus/vic20/4cga.cpp2
-rw-r--r--src/devices/bus/vic20/4cga.h2
-rw-r--r--src/devices/bus/vic20/exp.cpp2
-rw-r--r--src/devices/bus/vic20/exp.h4
-rw-r--r--src/devices/bus/vic20/fe3.cpp2
-rw-r--r--src/devices/bus/vic20/fe3.h2
-rw-r--r--src/devices/bus/vic20/megacart.cpp2
-rw-r--r--src/devices/bus/vic20/megacart.h2
-rw-r--r--src/devices/bus/vic20/speakeasy.cpp4
-rw-r--r--src/devices/bus/vic20/speakeasy.h2
-rw-r--r--src/devices/bus/vic20/std.cpp2
-rw-r--r--src/devices/bus/vic20/std.h2
-rw-r--r--src/devices/bus/vic20/vic1010.cpp2
-rw-r--r--src/devices/bus/vic20/vic1010.h2
-rw-r--r--src/devices/bus/vic20/vic1011.cpp2
-rw-r--r--src/devices/bus/vic20/vic1011.h2
-rw-r--r--src/devices/bus/vic20/vic1110.cpp2
-rw-r--r--src/devices/bus/vic20/vic1110.h2
-rw-r--r--src/devices/bus/vic20/vic1111.cpp2
-rw-r--r--src/devices/bus/vic20/vic1111.h2
-rw-r--r--src/devices/bus/vic20/vic1112.cpp4
-rw-r--r--src/devices/bus/vic20/vic1112.h2
-rw-r--r--src/devices/bus/vic20/vic1210.cpp2
-rw-r--r--src/devices/bus/vic20/vic1210.h2
-rw-r--r--src/devices/bus/vic20/videopak.cpp2
-rw-r--r--src/devices/bus/vic20/videopak.h2
26 files changed, 29 insertions, 29 deletions
diff --git a/src/devices/bus/vic20/4cga.cpp b/src/devices/bus/vic20/4cga.cpp
index f806598433a..0025c44a443 100644
--- a/src/devices/bus/vic20/4cga.cpp
+++ b/src/devices/bus/vic20/4cga.cpp
@@ -59,7 +59,7 @@ ioport_constructor c64_4cga_device::device_input_ports() const
// c64_4cga_device - constructor
//-------------------------------------------------
-c64_4cga_device::c64_4cga_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+c64_4cga_device::c64_4cga_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
device_t(mconfig, C64_4CGA, tag, owner, clock),
device_pet_user_port_interface(mconfig, *this),
m_port(0),
diff --git a/src/devices/bus/vic20/4cga.h b/src/devices/bus/vic20/4cga.h
index b4e1ada9a05..9e63863848e 100644
--- a/src/devices/bus/vic20/4cga.h
+++ b/src/devices/bus/vic20/4cga.h
@@ -27,7 +27,7 @@ class c64_4cga_device : public device_t,
{
public:
// construction/destruction
- c64_4cga_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ c64_4cga_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
// optional information overrides
virtual ioport_constructor device_input_ports() const override;
diff --git a/src/devices/bus/vic20/exp.cpp b/src/devices/bus/vic20/exp.cpp
index 0746b3092da..a84f967499a 100644
--- a/src/devices/bus/vic20/exp.cpp
+++ b/src/devices/bus/vic20/exp.cpp
@@ -52,7 +52,7 @@ device_vic20_expansion_card_interface::~device_vic20_expansion_card_interface()
// vic20_expansion_slot_device - constructor
//-------------------------------------------------
-vic20_expansion_slot_device::vic20_expansion_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+vic20_expansion_slot_device::vic20_expansion_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
device_t(mconfig, VIC20_EXPANSION_SLOT, tag, owner, clock),
device_single_card_slot_interface<device_vic20_expansion_card_interface>(mconfig, *this),
device_cartrom_image_interface(mconfig, *this),
diff --git a/src/devices/bus/vic20/exp.h b/src/devices/bus/vic20/exp.h
index 124bc7bb9c1..36518a31ce3 100644
--- a/src/devices/bus/vic20/exp.h
+++ b/src/devices/bus/vic20/exp.h
@@ -54,7 +54,7 @@ class vic20_expansion_slot_device : public device_t,
public:
// construction/destruction
template <typename T>
- vic20_expansion_slot_device(machine_config const &mconfig, char const *tag, device_t *owner, uint32_t clock, T &&opts, char const *dflt)
+ vic20_expansion_slot_device(machine_config const &mconfig, char const *tag, device_t *owner, const XTAL &clock, T &&opts, char const *dflt)
: vic20_expansion_slot_device(mconfig, tag, owner, clock)
{
option_reset();
@@ -62,7 +62,7 @@ public:
set_default_option(dflt);
set_fixed(false);
}
- vic20_expansion_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ vic20_expansion_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
static void add_passthrough(machine_config &config, const char *_tag);
diff --git a/src/devices/bus/vic20/fe3.cpp b/src/devices/bus/vic20/fe3.cpp
index 230dc076bb4..91a7a9573eb 100644
--- a/src/devices/bus/vic20/fe3.cpp
+++ b/src/devices/bus/vic20/fe3.cpp
@@ -101,7 +101,7 @@ void vic20_final_expansion_3_device::device_add_mconfig(machine_config &config)
// vic20_final_expansion_3_device - constructor
//-------------------------------------------------
-vic20_final_expansion_3_device::vic20_final_expansion_3_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+vic20_final_expansion_3_device::vic20_final_expansion_3_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
device_t(mconfig, VIC20_FE3, tag, owner, clock),
device_vic20_expansion_card_interface(mconfig, *this),
m_flash_rom(*this, AM29F040_TAG),
diff --git a/src/devices/bus/vic20/fe3.h b/src/devices/bus/vic20/fe3.h
index c82fff2f7ee..20619cfb8a0 100644
--- a/src/devices/bus/vic20/fe3.h
+++ b/src/devices/bus/vic20/fe3.h
@@ -27,7 +27,7 @@ class vic20_final_expansion_3_device : public device_t,
{
public:
// construction/destruction
- vic20_final_expansion_3_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ vic20_final_expansion_3_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// device-level overrides
diff --git a/src/devices/bus/vic20/megacart.cpp b/src/devices/bus/vic20/megacart.cpp
index 21171bf4343..44c89fdd62c 100644
--- a/src/devices/bus/vic20/megacart.cpp
+++ b/src/devices/bus/vic20/megacart.cpp
@@ -35,7 +35,7 @@ void vic20_megacart_device::device_add_mconfig(machine_config &config)
// vic20_megacart_device - constructor
//-------------------------------------------------
-vic20_megacart_device::vic20_megacart_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+vic20_megacart_device::vic20_megacart_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: device_t(mconfig, VIC20_MEGACART, tag, owner, clock)
, device_vic20_expansion_card_interface(mconfig, *this)
, device_nvram_interface(mconfig, *this)
diff --git a/src/devices/bus/vic20/megacart.h b/src/devices/bus/vic20/megacart.h
index e1c691a9a4b..05adc6ac641 100644
--- a/src/devices/bus/vic20/megacart.h
+++ b/src/devices/bus/vic20/megacart.h
@@ -27,7 +27,7 @@ class vic20_megacart_device : public device_t,
{
public:
// construction/destruction
- vic20_megacart_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ vic20_megacart_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// device-level overrides
diff --git a/src/devices/bus/vic20/speakeasy.cpp b/src/devices/bus/vic20/speakeasy.cpp
index 6128852d540..5401592c783 100644
--- a/src/devices/bus/vic20/speakeasy.cpp
+++ b/src/devices/bus/vic20/speakeasy.cpp
@@ -37,7 +37,7 @@ void vic20_speakeasy_device::device_add_mconfig(machine_config &config)
{
SPEAKER(config, "mono").front_center();
- VOTRAX_SC01(config, m_votrax, 720000).add_route(ALL_OUTPUTS, "mono", 0.85);
+ VOTRAX_SC01(config, m_votrax, XTAL::u(720000)).add_route(ALL_OUTPUTS, "mono", 0.85);
}
@@ -50,7 +50,7 @@ void vic20_speakeasy_device::device_add_mconfig(machine_config &config)
// vic20_speakeasy_device - constructor
//-------------------------------------------------
-vic20_speakeasy_device::vic20_speakeasy_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+vic20_speakeasy_device::vic20_speakeasy_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
device_t(mconfig, VIC20_SPEAKEASY, tag, owner, clock),
device_vic20_expansion_card_interface(mconfig, *this),
m_votrax(*this, SC01A_TAG)
diff --git a/src/devices/bus/vic20/speakeasy.h b/src/devices/bus/vic20/speakeasy.h
index 6df3880d2df..9bbcba26c67 100644
--- a/src/devices/bus/vic20/speakeasy.h
+++ b/src/devices/bus/vic20/speakeasy.h
@@ -28,7 +28,7 @@ class vic20_speakeasy_device : public device_t,
{
public:
// construction/destruction
- vic20_speakeasy_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ vic20_speakeasy_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// device-level overrides
diff --git a/src/devices/bus/vic20/std.cpp b/src/devices/bus/vic20/std.cpp
index 988540719d8..77f1d54eda0 100644
--- a/src/devices/bus/vic20/std.cpp
+++ b/src/devices/bus/vic20/std.cpp
@@ -27,7 +27,7 @@ DEFINE_DEVICE_TYPE(VIC20_STD, vic20_standard_cartridge_device, "vic20_standard",
// vic20_standard_cartridge_device - constructor
//-------------------------------------------------
-vic20_standard_cartridge_device::vic20_standard_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+vic20_standard_cartridge_device::vic20_standard_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: device_t(mconfig, VIC20_STD, tag, owner, clock), device_vic20_expansion_card_interface(mconfig, *this)
{
}
diff --git a/src/devices/bus/vic20/std.h b/src/devices/bus/vic20/std.h
index 0318f80aa54..f07040551e1 100644
--- a/src/devices/bus/vic20/std.h
+++ b/src/devices/bus/vic20/std.h
@@ -26,7 +26,7 @@ class vic20_standard_cartridge_device : public device_t,
{
public:
// construction/destruction
- vic20_standard_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ vic20_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/vic20/vic1010.cpp b/src/devices/bus/vic20/vic1010.cpp
index 651ac37156e..a5429a7a51f 100644
--- a/src/devices/bus/vic20/vic1010.cpp
+++ b/src/devices/bus/vic20/vic1010.cpp
@@ -41,7 +41,7 @@ void vic1010_device::device_add_mconfig(machine_config &config)
// vic1010_device - constructor
//-------------------------------------------------
-vic1010_device::vic1010_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+vic1010_device::vic1010_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: device_t(mconfig, VIC1010, tag, owner, clock)
, device_vic20_expansion_card_interface(mconfig, *this)
, m_expansion_slot(*this, "slot%u", 1)
diff --git a/src/devices/bus/vic20/vic1010.h b/src/devices/bus/vic20/vic1010.h
index af85f4bfc3c..f4a7bbdf08b 100644
--- a/src/devices/bus/vic20/vic1010.h
+++ b/src/devices/bus/vic20/vic1010.h
@@ -26,7 +26,7 @@ class vic1010_device : public device_t,
{
public:
// construction/destruction
- vic1010_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ vic1010_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// device-level overrides
diff --git a/src/devices/bus/vic20/vic1011.cpp b/src/devices/bus/vic20/vic1011.cpp
index 893536a5b09..bd20cb1b7d1 100644
--- a/src/devices/bus/vic20/vic1011.cpp
+++ b/src/devices/bus/vic20/vic1011.cpp
@@ -40,7 +40,7 @@ void vic1011_device::device_add_mconfig(machine_config &config)
// vic1011_device - constructor
//-------------------------------------------------
-vic1011_device::vic1011_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+vic1011_device::vic1011_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: device_t(mconfig, VIC1011, tag, owner, clock)
, device_pet_user_port_interface(mconfig, *this)
, m_rs232(*this, "rs232")
diff --git a/src/devices/bus/vic20/vic1011.h b/src/devices/bus/vic20/vic1011.h
index e13bc6550ba..6d3bbfe1dcc 100644
--- a/src/devices/bus/vic20/vic1011.h
+++ b/src/devices/bus/vic20/vic1011.h
@@ -26,7 +26,7 @@ class vic1011_device : public device_t, public device_pet_user_port_interface
{
public:
// construction/destruction
- vic1011_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ vic1011_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
// device_pet_user_port_interface overrides
virtual DECLARE_WRITE_LINE_MEMBER( input_d ) override;
diff --git a/src/devices/bus/vic20/vic1110.cpp b/src/devices/bus/vic20/vic1110.cpp
index f9ee69fd8b1..efc690509fd 100644
--- a/src/devices/bus/vic20/vic1110.cpp
+++ b/src/devices/bus/vic20/vic1110.cpp
@@ -66,7 +66,7 @@ ioport_constructor vic1110_device::device_input_ports() const
// vic1110_device - constructor
//-------------------------------------------------
-vic1110_device::vic1110_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+vic1110_device::vic1110_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: device_t(mconfig, VIC1110, tag, owner, clock)
, device_vic20_expansion_card_interface(mconfig, *this)
, m_ram(*this, "ram", 0x2000, ENDIANNESS_LITTLE)
diff --git a/src/devices/bus/vic20/vic1110.h b/src/devices/bus/vic20/vic1110.h
index 831bc478bf4..bb4e194cdb2 100644
--- a/src/devices/bus/vic20/vic1110.h
+++ b/src/devices/bus/vic20/vic1110.h
@@ -26,7 +26,7 @@ class vic1110_device : public device_t,
{
public:
// construction/destruction
- vic1110_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ vic1110_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
// optional information overrides
virtual ioport_constructor device_input_ports() const override;
diff --git a/src/devices/bus/vic20/vic1111.cpp b/src/devices/bus/vic20/vic1111.cpp
index 4bb3a492ef2..cd56b5780b3 100644
--- a/src/devices/bus/vic20/vic1111.cpp
+++ b/src/devices/bus/vic20/vic1111.cpp
@@ -27,7 +27,7 @@ DEFINE_DEVICE_TYPE(VIC1111, vic1111_device, "vic1111", "VIC-1111 16K RAM Expansi
// vic1111_device - constructor
//-------------------------------------------------
-vic1111_device::vic1111_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+vic1111_device::vic1111_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: device_t(mconfig, VIC1111, tag, owner, clock)
, device_vic20_expansion_card_interface(mconfig, *this)
, m_ram(*this, "ram", 0x4000, ENDIANNESS_LITTLE)
diff --git a/src/devices/bus/vic20/vic1111.h b/src/devices/bus/vic20/vic1111.h
index 7d391875732..80b8e1218d8 100644
--- a/src/devices/bus/vic20/vic1111.h
+++ b/src/devices/bus/vic20/vic1111.h
@@ -26,7 +26,7 @@ class vic1111_device : public device_t,
{
public:
// construction/destruction
- vic1111_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ vic1111_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// device-level overrides
diff --git a/src/devices/bus/vic20/vic1112.cpp b/src/devices/bus/vic20/vic1112.cpp
index ce878ee5f9f..a17638efa44 100644
--- a/src/devices/bus/vic20/vic1112.cpp
+++ b/src/devices/bus/vic20/vic1112.cpp
@@ -111,7 +111,7 @@ void vic1112_device::device_add_mconfig(machine_config &config)
m_via1->cb2_handler().set(IEEE488_TAG, FUNC(ieee488_device::host_eoi_w));
m_via1->irq_handler().set(FUNC(vic1112_device::via1_irq_w));
- IEEE488(config, m_bus, 0);
+ IEEE488(config, m_bus);
ieee488_slot_device::add_cbm_defaults(config, nullptr);
m_bus->srq_callback().set(m_via1, FUNC(via6522_device::write_cb1));
}
@@ -126,7 +126,7 @@ void vic1112_device::device_add_mconfig(machine_config &config)
// vic1112_device - constructor
//-------------------------------------------------
-vic1112_device::vic1112_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+vic1112_device::vic1112_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: device_t(mconfig, VIC1112, tag, owner, clock)
, device_vic20_expansion_card_interface(mconfig, *this)
, m_via0(*this, M6522_0_TAG)
diff --git a/src/devices/bus/vic20/vic1112.h b/src/devices/bus/vic20/vic1112.h
index 8353ad2390d..37d23586a27 100644
--- a/src/devices/bus/vic20/vic1112.h
+++ b/src/devices/bus/vic20/vic1112.h
@@ -31,7 +31,7 @@ class vic1112_device : public device_t,
{
public:
// construction/destruction
- vic1112_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ vic1112_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// device-level overrides
diff --git a/src/devices/bus/vic20/vic1210.cpp b/src/devices/bus/vic20/vic1210.cpp
index 88c94e8fbbd..fe7bfbb1cbd 100644
--- a/src/devices/bus/vic20/vic1210.cpp
+++ b/src/devices/bus/vic20/vic1210.cpp
@@ -28,7 +28,7 @@ DEFINE_DEVICE_TYPE(VIC1210, vic1210_device, "vic1210", "VIC-1210 3K RAM Expansio
// vic1210_device - constructor
//-------------------------------------------------
-vic1210_device::vic1210_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+vic1210_device::vic1210_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: device_t(mconfig, VIC1210, tag, owner, clock)
, device_vic20_expansion_card_interface(mconfig, *this)
, m_ram(*this, "ram", 0xc00, ENDIANNESS_LITTLE)
diff --git a/src/devices/bus/vic20/vic1210.h b/src/devices/bus/vic20/vic1210.h
index 9f20f9164ad..7dedfc838bc 100644
--- a/src/devices/bus/vic20/vic1210.h
+++ b/src/devices/bus/vic20/vic1210.h
@@ -27,7 +27,7 @@ class vic1210_device : public device_t,
{
public:
// construction/destruction
- vic1210_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ vic1210_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// device-level overrides
diff --git a/src/devices/bus/vic20/videopak.cpp b/src/devices/bus/vic20/videopak.cpp
index 542c2fb8320..4a0e4798e23 100644
--- a/src/devices/bus/vic20/videopak.cpp
+++ b/src/devices/bus/vic20/videopak.cpp
@@ -125,7 +125,7 @@ void vic20_video_pak_device::device_add_mconfig(machine_config &config)
// vic20_video_pak_device - constructor
//-------------------------------------------------
-vic20_video_pak_device::vic20_video_pak_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+vic20_video_pak_device::vic20_video_pak_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
device_t(mconfig, VIC20_VIDEO_PAK, tag, owner, clock),
device_vic20_expansion_card_interface(mconfig, *this),
m_crtc(*this, MC6845_TAG),
diff --git a/src/devices/bus/vic20/videopak.h b/src/devices/bus/vic20/videopak.h
index d87b04d35c1..75af909654f 100644
--- a/src/devices/bus/vic20/videopak.h
+++ b/src/devices/bus/vic20/videopak.h
@@ -30,7 +30,7 @@ class vic20_video_pak_device : public device_t,
{
public:
// construction/destruction
- vic20_video_pak_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ vic20_video_pak_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// device-level overrides