summaryrefslogtreecommitdiffstatshomepage
path: root/src/devices/bus/intv
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/intv
parent5c14bcdfcb4aefb71b5b62387c4ad05dbeb3814e (diff)
full xtal conversionxtal
Diffstat (limited to 'src/devices/bus/intv')
-rw-r--r--src/devices/bus/intv/ecs.cpp2
-rw-r--r--src/devices/bus/intv/ecs.h2
-rw-r--r--src/devices/bus/intv/rom.cpp10
-rw-r--r--src/devices/bus/intv/rom.h10
-rw-r--r--src/devices/bus/intv/slot.cpp2
-rw-r--r--src/devices/bus/intv/slot.h4
-rw-r--r--src/devices/bus/intv/voice.cpp4
-rw-r--r--src/devices/bus/intv/voice.h2
8 files changed, 18 insertions, 18 deletions
diff --git a/src/devices/bus/intv/ecs.cpp b/src/devices/bus/intv/ecs.cpp
index 50d52a85c77..cd9bedf54f7 100644
--- a/src/devices/bus/intv/ecs.cpp
+++ b/src/devices/bus/intv/ecs.cpp
@@ -28,7 +28,7 @@
DEFINE_DEVICE_TYPE(INTV_ROM_ECS, intv_ecs_device, "intv_ecs", "Intellivision ECS Expansion")
-intv_ecs_device::intv_ecs_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+intv_ecs_device::intv_ecs_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
intv_rom_device(mconfig, INTV_ROM_ECS, tag, owner, clock),
m_snd(*this, "ay8914"),
m_subslot(*this, "subslot"),
diff --git a/src/devices/bus/intv/ecs.h b/src/devices/bus/intv/ecs.h
index 68911831c0a..e8b4d543ae8 100644
--- a/src/devices/bus/intv/ecs.h
+++ b/src/devices/bus/intv/ecs.h
@@ -17,7 +17,7 @@ class intv_ecs_device : public intv_rom_device
{
public:
// construction/destruction
- intv_ecs_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ intv_ecs_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
// reading and writing
diff --git a/src/devices/bus/intv/rom.cpp b/src/devices/bus/intv/rom.cpp
index f320d1cae49..af2f0dbe29b 100644
--- a/src/devices/bus/intv/rom.cpp
+++ b/src/devices/bus/intv/rom.cpp
@@ -23,28 +23,28 @@ DEFINE_DEVICE_TYPE(INTV_ROM_GFACT, intv_gfact_device, "intv_gfact", "Intellivisi
DEFINE_DEVICE_TYPE(INTV_ROM_WSMLB, intv_wsmlb_device, "intv_wsmlb", "Intellivision World Series Baseball Cart")
-intv_rom_device::intv_rom_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock)
+intv_rom_device::intv_rom_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_intv_cart_interface(mconfig, *this)
{
}
-intv_rom_device::intv_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+intv_rom_device::intv_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: intv_rom_device(mconfig, INTV_ROM_STD, tag, owner, clock)
{
}
-intv_ram_device::intv_ram_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+intv_ram_device::intv_ram_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: intv_rom_device(mconfig, INTV_ROM_RAM, tag, owner, clock)
{
}
-intv_gfact_device::intv_gfact_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+intv_gfact_device::intv_gfact_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: intv_rom_device(mconfig, INTV_ROM_GFACT, tag, owner, clock)
{
}
-intv_wsmlb_device::intv_wsmlb_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+intv_wsmlb_device::intv_wsmlb_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: intv_rom_device(mconfig, INTV_ROM_WSMLB, tag, owner, clock)
{
}
diff --git a/src/devices/bus/intv/rom.h b/src/devices/bus/intv/rom.h
index 5266220e1ec..485bf8cb472 100644
--- a/src/devices/bus/intv/rom.h
+++ b/src/devices/bus/intv/rom.h
@@ -13,7 +13,7 @@ class intv_rom_device : public device_t,
{
public:
// construction/destruction
- intv_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ intv_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
// reading and writing
virtual uint16_t read_rom04(offs_t offset) override { return INTV_ROM16_READ(offset + 0x0400); }
@@ -33,7 +33,7 @@ public:
virtual uint16_t read_romf0(offs_t offset) override { return INTV_ROM16_READ(offset + 0xf000); }
protected:
- intv_rom_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+ intv_rom_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 {}
@@ -46,7 +46,7 @@ class intv_ram_device : public intv_rom_device
{
public:
// construction/destruction
- intv_ram_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ intv_ram_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
// reading and writing
virtual uint16_t read_ram(offs_t offset) override { return (int)m_ram[offset & (m_ram.size() - 1)]; }
@@ -59,7 +59,7 @@ class intv_gfact_device : public intv_rom_device
{
public:
// construction/destruction
- intv_gfact_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ intv_gfact_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
// reading and writing
virtual uint16_t read_ram(offs_t offset) override { return (int)m_ram[offset & (m_ram.size() - 1)]; }
@@ -72,7 +72,7 @@ class intv_wsmlb_device : public intv_rom_device
{
public:
// construction/destruction
- intv_wsmlb_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ intv_wsmlb_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
};
diff --git a/src/devices/bus/intv/slot.cpp b/src/devices/bus/intv/slot.cpp
index 97d5b9ee308..061fdc9d311 100644
--- a/src/devices/bus/intv/slot.cpp
+++ b/src/devices/bus/intv/slot.cpp
@@ -144,7 +144,7 @@ void device_intv_cart_interface::ram_alloc(uint32_t size)
//-------------------------------------------------
// intv_cart_slot_device - constructor
//-------------------------------------------------
-intv_cart_slot_device::intv_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+intv_cart_slot_device::intv_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
device_t(mconfig, INTV_CART_SLOT, tag, owner, clock),
device_cartrom_image_interface(mconfig, *this),
device_single_card_slot_interface<device_intv_cart_interface>(mconfig, *this),
diff --git a/src/devices/bus/intv/slot.h b/src/devices/bus/intv/slot.h
index 4e4bc130730..54c419e3ff0 100644
--- a/src/devices/bus/intv/slot.h
+++ b/src/devices/bus/intv/slot.h
@@ -100,7 +100,7 @@ public:
// construction/destruction
template <typename T>
intv_cart_slot_device(machine_config const &mconfig, char const *tag, device_t *owner, T &&opts, char const *dflt)
- : intv_cart_slot_device(mconfig, tag, owner, 0)
+ : intv_cart_slot_device(mconfig, tag, owner)
{
option_reset();
opts(*this);
@@ -108,7 +108,7 @@ public:
set_fixed(false);
}
- intv_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock = 0);
+ intv_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock = XTAL());
virtual ~intv_cart_slot_device();
// image-level overrides
diff --git a/src/devices/bus/intv/voice.cpp b/src/devices/bus/intv/voice.cpp
index 8f5e542b0e2..e5c825f7855 100644
--- a/src/devices/bus/intv/voice.cpp
+++ b/src/devices/bus/intv/voice.cpp
@@ -22,7 +22,7 @@
DEFINE_DEVICE_TYPE(INTV_ROM_VOICE, intv_voice_device, "intv_voice", "Intellivision Intellivoice Expansion")
-intv_voice_device::intv_voice_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+intv_voice_device::intv_voice_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: intv_rom_device(mconfig, INTV_ROM_VOICE, tag, owner, clock),
m_speech(*this, "sp0256_speech"),
m_subslot(*this, "subslot"),
@@ -73,7 +73,7 @@ void intv_voice_device::device_add_mconfig(machine_config &config)
{
SPEAKER(config, "mono_voice").front_center();
- SP0256(config, m_speech, 3120000);
+ SP0256(config, m_speech, XTAL::u(3120000));
/* The Intellivoice uses a speaker with its own volume control so the relative volumes to use are subjective */
m_speech->add_route(ALL_OUTPUTS, "mono_voice", 1.00);
diff --git a/src/devices/bus/intv/voice.h b/src/devices/bus/intv/voice.h
index 7369058c435..b9262b718b8 100644
--- a/src/devices/bus/intv/voice.h
+++ b/src/devices/bus/intv/voice.h
@@ -14,7 +14,7 @@ class intv_voice_device : public intv_rom_device
{
public:
// construction/destruction
- intv_voice_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ intv_voice_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
// reading and writing
// actual IntelliVoice access