summaryrefslogtreecommitdiffstatshomepage
path: root/src/devices/bus/interpro/sr
diff options
context:
space:
mode:
Diffstat (limited to 'src/devices/bus/interpro/sr')
-rw-r--r--src/devices/bus/interpro/sr/edge.cpp38
-rw-r--r--src/devices/bus/interpro/sr/edge.h22
-rw-r--r--src/devices/bus/interpro/sr/gt.cpp64
-rw-r--r--src/devices/bus/interpro/sr/gt.h20
-rw-r--r--src/devices/bus/interpro/sr/sr.cpp8
-rw-r--r--src/devices/bus/interpro/sr/sr.h18
6 files changed, 85 insertions, 85 deletions
diff --git a/src/devices/bus/interpro/sr/edge.cpp b/src/devices/bus/interpro/sr/edge.cpp
index 7b5dc82d95f..26466c79261 100644
--- a/src/devices/bus/interpro/sr/edge.cpp
+++ b/src/devices/bus/interpro/sr/edge.cpp
@@ -477,7 +477,7 @@ void mpcb828_device::device_add_mconfig(machine_config &config)
m_dsp->set_disable();
//m_dsp->set_addrmap(0, map_dynamic<2>);
- BT458(config, "ramdac", 83'020'800);
+ BT458(config, "ramdac", XTAL::u(83'020'800));
SCC8530N(config, m_scc, 4.9152_MHz_XTAL);
m_scc->out_int_callback().set(FUNC(mpcb828_device::scc_irq));
@@ -508,7 +508,7 @@ void mpcb849_device::device_add_mconfig(machine_config &config)
m_dsp->holda().set(FUNC(mpcb828_device::holda));
m_dsp->set_disable();
- BT458(config, "ramdac", 0); // unconfirmed clock
+ BT458(config, "ramdac"); // unconfirmed clock
SCC8530N(config, m_scc, 4.9152_MHz_XTAL);
m_scc->out_int_callback().set(FUNC(mpcb849_device::scc_irq));
@@ -536,9 +536,9 @@ void mpcba63_device::device_add_mconfig(machine_config &config)
//m_screen->set_raw(83'020'800, 1504, 296 + 20, 1184 + 296 + 20, 920, 34, 884 + 34);
//m_screen->set_screen_update().set(FUNC(mpcba63_device::screen_update));
//m_screen->screen_vblank().set(FUNC(?, vblank));
- //BT457(config, "ramdac0", 0); // PS045701-165
- //BT457(config, "ramdac1", 0);
- //BT457(config, "ramdac2", 0);
+ //BT457(config, "ramdac0"); // PS045701-165
+ //BT457(config, "ramdac1");
+ //BT457(config, "ramdac2");
}
/*
@@ -579,12 +579,12 @@ void mpcb896_device::device_add_mconfig(machine_config &config)
RAM(config, "sram").set_default_size("256KiB").set_default_value(0);
RAM(config, "vram").set_default_size("18MiB").set_default_value(0);
- BT457(config, "ramdac0", 164'609'300);
- BT457(config, "ramdac1", 164'609'300);
- BT457(config, "ramdac2", 164'609'300);
+ BT457(config, "ramdac0", XTAL::u(164'609'300));
+ BT457(config, "ramdac1", XTAL::u(164'609'300));
+ BT457(config, "ramdac2", XTAL::u(164'609'300));
}
-edge1_device_base::edge1_device_base(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock)
+edge1_device_base::edge1_device_base(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock)
: device_t(mconfig, type, tag, owner, clock)
, device_srx_card_interface(mconfig, *this)
, m_screen(*this, "screen")
@@ -596,13 +596,13 @@ edge1_device_base::edge1_device_base(const machine_config &mconfig, device_type
{
}
-edge2_processor_device_base::edge2_processor_device_base(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock)
+edge2_processor_device_base::edge2_processor_device_base(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock)
: device_t(mconfig, type, tag, owner, clock)
, device_srx_card_interface(mconfig, *this)
{
}
-edge2plus_processor_device_base::edge2plus_processor_device_base(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock)
+edge2plus_processor_device_base::edge2plus_processor_device_base(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock)
: device_t(mconfig, type, tag, owner, clock)
, device_srx_card_interface(mconfig, *this)
, m_dsp1(*this, "dsp1")
@@ -611,13 +611,13 @@ edge2plus_processor_device_base::edge2plus_processor_device_base(const machine_c
{
}
-edge2_framebuffer_device_base::edge2_framebuffer_device_base(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock)
+edge2_framebuffer_device_base::edge2_framebuffer_device_base(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock)
: device_t(mconfig, type, tag, owner, clock)
, device_srx_card_interface(mconfig, *this)
{
}
-edge2plus_framebuffer_device_base::edge2plus_framebuffer_device_base(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock)
+edge2plus_framebuffer_device_base::edge2plus_framebuffer_device_base(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock)
: device_t(mconfig, type, tag, owner, clock)
, device_srx_card_interface(mconfig, *this)
, m_screen(*this, "screen")
@@ -627,32 +627,32 @@ edge2plus_framebuffer_device_base::edge2plus_framebuffer_device_base(const machi
{
}
-mpcb828_device::mpcb828_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+mpcb828_device::mpcb828_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: edge1_device_base(mconfig, MPCB828, tag, owner, clock)
{
}
-mpcb849_device::mpcb849_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+mpcb849_device::mpcb849_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: edge1_device_base(mconfig, MPCB849, tag, owner, clock)
{
}
-mpcb030_device::mpcb030_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+mpcb030_device::mpcb030_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: edge2_processor_device_base(mconfig, MPCB030, tag, owner, clock)
{
}
-mpcba63_device::mpcba63_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+mpcba63_device::mpcba63_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: edge2_framebuffer_device_base(mconfig, MPCBA63, tag, owner, clock)
{
}
-msmt094_device::msmt094_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+msmt094_device::msmt094_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: edge2plus_processor_device_base(mconfig, MSMT094, tag, owner, clock)
{
}
-mpcb896_device::mpcb896_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+mpcb896_device::mpcb896_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: edge2plus_framebuffer_device_base(mconfig, MPCB896, tag, owner, clock)
{
}
diff --git a/src/devices/bus/interpro/sr/edge.h b/src/devices/bus/interpro/sr/edge.h
index d96896dd187..1a8852f976e 100644
--- a/src/devices/bus/interpro/sr/edge.h
+++ b/src/devices/bus/interpro/sr/edge.h
@@ -21,7 +21,7 @@ public:
DECLARE_WRITE_LINE_MEMBER(vblank);
protected:
- edge1_device_base(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+ edge1_device_base(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock);
virtual void map(address_map &map) override;
virtual void map_dynamic(address_map &map);
@@ -77,7 +77,7 @@ private:
class edge2_processor_device_base : public device_t, public device_srx_card_interface
{
protected:
- edge2_processor_device_base(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+ edge2_processor_device_base(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock);
virtual void map(address_map &map) override;
@@ -87,7 +87,7 @@ protected:
class edge2_framebuffer_device_base : public device_t, public device_srx_card_interface
{
protected:
- edge2_framebuffer_device_base(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+ edge2_framebuffer_device_base(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock);
virtual void map(address_map &map) override;
@@ -101,7 +101,7 @@ public:
required_device<tms3203x_device> m_dsp1;
protected:
- edge2plus_processor_device_base(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+ edge2plus_processor_device_base(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock);
virtual void map(address_map &map) override;
@@ -150,7 +150,7 @@ class edge2plus_framebuffer_device_base : public device_t, public device_srx_car
protected:
friend class edge2plus_processor_device_base;
- edge2plus_framebuffer_device_base(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+ edge2plus_framebuffer_device_base(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock);
virtual void map(address_map &map) override;
virtual void device_start() override;
@@ -179,7 +179,7 @@ private:
class mpcb828_device : public edge1_device_base
{
public:
- mpcb828_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ mpcb828_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
virtual const tiny_rom_entry *device_rom_region() const override;
@@ -189,7 +189,7 @@ protected:
class mpcb849_device : public edge1_device_base
{
public:
- mpcb849_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ mpcb849_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
virtual const tiny_rom_entry *device_rom_region() const override;
@@ -201,7 +201,7 @@ protected:
class mpcb030_device : public edge2_processor_device_base
{
public:
- mpcb030_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ mpcb030_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
virtual const tiny_rom_entry *device_rom_region() const override;
@@ -211,7 +211,7 @@ protected:
class msmt094_device : public edge2plus_processor_device_base
{
public:
- msmt094_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ msmt094_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
virtual const tiny_rom_entry *device_rom_region() const override;
@@ -221,7 +221,7 @@ protected:
class mpcba63_device : public edge2_framebuffer_device_base
{
public:
- mpcba63_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ mpcba63_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
virtual const tiny_rom_entry *device_rom_region() const override;
@@ -233,7 +233,7 @@ protected:
class mpcb896_device : public edge2plus_framebuffer_device_base
{
public:
- mpcb896_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ mpcb896_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
virtual const tiny_rom_entry *device_rom_region() const override;
diff --git a/src/devices/bus/interpro/sr/gt.cpp b/src/devices/bus/interpro/sr/gt.cpp
index 15158ede040..4a636d44bea 100644
--- a/src/devices/bus/interpro/sr/gt.cpp
+++ b/src/devices/bus/interpro/sr/gt.cpp
@@ -296,8 +296,8 @@ ROM_END
void gt_device_base::device_add_mconfig(machine_config &config)
{
- DP8510(config, m_bpu[0], 0);
- DP8510(config, m_bpu[1], 0);
+ DP8510(config, m_bpu[0]);
+ DP8510(config, m_bpu[1]);
}
void interpro_digitizer_devices(device_slot_interface &device)
@@ -349,8 +349,8 @@ void mpcb963_device::device_add_mconfig(machine_config &config)
m_screen[0]->set_screen_update(FUNC(mpcb963_device::screen_update<0>));
m_screen[0]->screen_vblank().set(FUNC(device_cbus_card_interface::irq3));
BT459(config, m_ramdac[0], pixclock);
- RAM(config, m_vram[0], 0).set_default_size("1M");
- RAM(config, m_mram[0], 0).set_default_size("128K");
+ RAM(config, m_vram[0]).set_default_size("1M");
+ RAM(config, m_mram[0]).set_default_size("128K");
}
void mpcba79_device::device_add_mconfig(machine_config &config)
@@ -364,15 +364,15 @@ void mpcba79_device::device_add_mconfig(machine_config &config)
m_screen[0]->set_screen_update(FUNC(mpcba79_device::screen_update<0>));
m_screen[0]->screen_vblank().set(FUNC(device_cbus_card_interface::irq3));
BT459(config, m_ramdac[0], pixclock);
- RAM(config, m_vram[0], 0).set_default_size("1M");
- RAM(config, m_mram[0], 0).set_default_size("128K");
+ RAM(config, m_vram[0]).set_default_size("1M");
+ RAM(config, m_mram[0]).set_default_size("128K");
SCREEN(config, m_screen[1], SCREEN_TYPE_RASTER);
m_screen[1]->set_raw(pixclock, 1504, 296 + GT_X_DELTA, 1184 + 296 + GT_X_DELTA, 920, 34, 884 + 34);
m_screen[1]->set_screen_update(FUNC(mpcba79_device::screen_update<1>));
BT459(config, m_ramdac[1], pixclock);
- RAM(config, m_vram[1], 0).set_default_size("1M");
- RAM(config, m_mram[1], 0).set_default_size("128K");
+ RAM(config, m_vram[1]).set_default_size("1M");
+ RAM(config, m_mram[1]).set_default_size("128K");
}
/*
@@ -397,8 +397,8 @@ void msmt070_device::device_add_mconfig(machine_config &config)
m_screen[0]->set_screen_update(FUNC(msmt070_device::screen_update<0>));
m_screen[0]->screen_vblank().set(FUNC(device_cbus_card_interface::irq3));
BT459(config, m_ramdac[0], pixclock);
- RAM(config, m_vram[0], 0).set_default_size("2M");
- RAM(config, m_mram[0], 0).set_default_size("128K");
+ RAM(config, m_vram[0]).set_default_size("2M");
+ RAM(config, m_mram[0]).set_default_size("128K");
}
void msmt071_device::device_add_mconfig(machine_config &config)
@@ -412,15 +412,15 @@ void msmt071_device::device_add_mconfig(machine_config &config)
m_screen[0]->set_screen_update(FUNC(msmt071_device::screen_update<0>));
m_screen[0]->screen_vblank().set(FUNC(device_cbus_card_interface::irq3));
BT459(config, m_ramdac[0], pixclock);
- RAM(config, m_vram[0], 0).set_default_size("2M");
- RAM(config, m_mram[0], 0).set_default_size("128K");
+ RAM(config, m_vram[0]).set_default_size("2M");
+ RAM(config, m_mram[0]).set_default_size("128K");
SCREEN(config, m_screen[1], SCREEN_TYPE_RASTER);
m_screen[1]->set_raw(pixclock, 1472, 264 + GT_X_DELTA, 1184 + 264 + GT_X_DELTA, 944, 57, 884 + 57);
m_screen[1]->set_screen_update(FUNC(msmt071_device::screen_update<1>));
BT459(config, m_ramdac[1], pixclock);
- RAM(config, m_vram[1], 0).set_default_size("2M");
- RAM(config, m_mram[1], 0).set_default_size("128K");
+ RAM(config, m_vram[1]).set_default_size("2M");
+ RAM(config, m_mram[1]).set_default_size("128K");
}
/*
@@ -447,8 +447,8 @@ void msmt081_device::device_add_mconfig(machine_config &config)
BT459(config, m_ramdac[0], pixclock);
// FIXME: following memory sizes are pure speculation
- RAM(config, m_vram[0], 0).set_default_size("4M"); // guess
- RAM(config, m_mram[0], 0).set_default_size("256K"); // guess
+ RAM(config, m_vram[0]).set_default_size("4M"); // guess
+ RAM(config, m_mram[0]).set_default_size("256K"); // guess
}
/*
@@ -467,9 +467,9 @@ void mpcbb68_device::device_add_mconfig(machine_config &config)
BT459(config, m_ramdac[0], pixclock);
// FIXME: pure speculation
- RAM(config, m_vram[0], 0).set_default_size("2M");
- RAM(config, m_mram[0], 0).set_default_size("128K");
- RAM(config, m_hram[0], 0).set_default_size("512K");
+ RAM(config, m_vram[0]).set_default_size("2M");
+ RAM(config, m_mram[0]).set_default_size("128K");
+ RAM(config, m_hram[0]).set_default_size("512K");
}
/*
@@ -494,12 +494,12 @@ void mpcbb92_device::device_add_mconfig(machine_config &config)
BT459(config, m_ramdac[0], pixclock);
// FIXME: following memory sizes are pure speculation (40 parts @ 256Kx4?)
- RAM(config, m_vram[0], 0).set_default_size("4M");
- RAM(config, m_mram[0], 0).set_default_size("256K");
- RAM(config, m_hram[0], 0).set_default_size("1M");
+ RAM(config, m_vram[0]).set_default_size("4M");
+ RAM(config, m_mram[0]).set_default_size("256K");
+ RAM(config, m_hram[0]).set_default_size("1M");
}
-gt_device_base::gt_device_base(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock, const bool double_buffered, const bool masked_reads)
+gt_device_base::gt_device_base(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock, const bool double_buffered, const bool masked_reads)
: device_t(mconfig, type, tag, owner, clock)
, m_screen(*this, "screen%u", 0)
, m_ramdac(*this, "ramdac%u", 0)
@@ -512,13 +512,13 @@ gt_device_base::gt_device_base(const machine_config &mconfig, device_type type,
{
}
-gt_device::gt_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock, const bool double_buffered)
+gt_device::gt_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock, const bool double_buffered)
: gt_device_base(mconfig, type, tag, owner, clock, double_buffered, true)
, device_cbus_card_interface(mconfig, *this)
{
}
-gtdb_device::gtdb_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock)
+gtdb_device::gtdb_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock)
: gt_device_base(mconfig, type, tag, owner, clock, true, false)
, device_srx_card_interface(mconfig, *this)
, m_hram(*this, "hram%u", 0)
@@ -526,37 +526,37 @@ gtdb_device::gtdb_device(const machine_config &mconfig, device_type type, const
{
}
-mpcb963_device::mpcb963_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+mpcb963_device::mpcb963_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: gt_device(mconfig, MPCB963, tag, owner, clock, false)
{
}
-mpcba79_device::mpcba79_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+mpcba79_device::mpcba79_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: gt_device(mconfig, MPCBA79, tag, owner, clock, false)
{
}
-msmt070_device::msmt070_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+msmt070_device::msmt070_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: gt_device(mconfig, MSMT070, tag, owner, clock, true)
{
}
-msmt071_device::msmt071_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+msmt071_device::msmt071_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: gt_device(mconfig, MSMT071, tag, owner, clock, true)
{
}
-msmt081_device::msmt081_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+msmt081_device::msmt081_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: gt_device(mconfig, MSMT081, tag, owner, clock, true)
{
}
-mpcbb68_device::mpcbb68_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+mpcbb68_device::mpcbb68_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: gtdb_device(mconfig, MPCBB68, tag, owner, clock)
{
}
-mpcbb92_device::mpcbb92_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+mpcbb92_device::mpcbb92_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: gtdb_device(mconfig, MPCBB92, tag, owner, clock)
{
}
diff --git a/src/devices/bus/interpro/sr/gt.h b/src/devices/bus/interpro/sr/gt.h
index aeeb70941ea..d5bb514d230 100644
--- a/src/devices/bus/interpro/sr/gt.h
+++ b/src/devices/bus/interpro/sr/gt.h
@@ -15,7 +15,7 @@
class gt_device_base : public device_t
{
protected:
- gt_device_base(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock, const bool double_buffered, const bool masked_reads);
+ gt_device_base(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock, const bool double_buffered, const bool masked_reads);
virtual void map(address_map &map);
@@ -248,7 +248,7 @@ private:
class gt_device : public gt_device_base, public device_cbus_card_interface
{
protected:
- gt_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock, const bool double_buffered);
+ gt_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock, const bool double_buffered);
virtual void map(address_map &map) override;
};
@@ -256,7 +256,7 @@ protected:
class gtdb_device : public gt_device_base, public device_srx_card_interface
{
protected:
- gtdb_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+ gtdb_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock);
virtual void map(address_map &map) override;
virtual void map_dynamic(address_map &map);
@@ -306,7 +306,7 @@ private:
class mpcb963_device : public gt_device
{
public:
- mpcb963_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ mpcb963_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
virtual const tiny_rom_entry *device_rom_region() const override;
@@ -316,7 +316,7 @@ protected:
class mpcba79_device : public gt_device
{
public:
- mpcba79_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ mpcba79_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
virtual const tiny_rom_entry *device_rom_region() const override;
@@ -327,7 +327,7 @@ protected:
class msmt070_device : public gt_device
{
public:
- msmt070_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ msmt070_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
virtual const tiny_rom_entry *device_rom_region() const override;
@@ -337,7 +337,7 @@ protected:
class msmt071_device : public gt_device
{
public:
- msmt071_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ msmt071_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
virtual const tiny_rom_entry *device_rom_region() const override;
@@ -347,7 +347,7 @@ protected:
class msmt081_device : public gt_device
{
public:
- msmt081_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ msmt081_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
virtual const tiny_rom_entry *device_rom_region() const override;
@@ -357,7 +357,7 @@ protected:
class mpcbb68_device : public gtdb_device
{
public:
- mpcbb68_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ mpcbb68_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
virtual const tiny_rom_entry *device_rom_region() const override;
@@ -367,7 +367,7 @@ protected:
class mpcbb92_device : public gtdb_device
{
public:
- mpcbb92_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ mpcbb92_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
virtual const tiny_rom_entry *device_rom_region() const override;
diff --git a/src/devices/bus/interpro/sr/sr.cpp b/src/devices/bus/interpro/sr/sr.cpp
index 82071af86d2..634ba65ed4e 100644
--- a/src/devices/bus/interpro/sr/sr.cpp
+++ b/src/devices/bus/interpro/sr/sr.cpp
@@ -274,7 +274,7 @@ void interpro_bus_device::device_resolve_objects()
m_out_irq3_cb.resolve_safe();
}
-cbus_bus_device::cbus_bus_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock)
+cbus_bus_device::cbus_bus_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: interpro_bus_device(mconfig, CBUS_BUS, tag, owner, clock)
, m_slot_count(0)
{
@@ -285,7 +285,7 @@ void cbus_bus_device::device_start()
{
}
-cbus_slot_device::cbus_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock)
+cbus_slot_device::cbus_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: device_t(mconfig, CBUS_SLOT, tag, owner, clock)
, device_slot_interface(mconfig, *this)
, m_bus(*this, finder_base::DUMMY_TAG)
@@ -313,7 +313,7 @@ void device_cbus_card_interface::set_bus_device(cbus_bus_device &bus_device)
m_bus->install_card(*this, device().memregion(m_idprom_region), &device_cbus_card_interface::map);
}
-srx_bus_device::srx_bus_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock)
+srx_bus_device::srx_bus_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: interpro_bus_device(mconfig, SRX_BUS, tag, owner, clock)
, m_slot_count(1) // first slot is used by the system board
{
@@ -324,7 +324,7 @@ void srx_bus_device::device_start()
{
}
-srx_slot_device::srx_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock)
+srx_slot_device::srx_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: device_t(mconfig, SRX_SLOT, tag, owner, clock)
, device_slot_interface(mconfig, *this)
, m_bus(*this, finder_base::DUMMY_TAG)
diff --git a/src/devices/bus/interpro/sr/sr.h b/src/devices/bus/interpro/sr/sr.h
index 0d30905943b..0e6ed8e46aa 100644
--- a/src/devices/bus/interpro/sr/sr.h
+++ b/src/devices/bus/interpro/sr/sr.h
@@ -26,7 +26,7 @@ public:
protected:
// construction/destruction
- interpro_bus_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock)
+ interpro_bus_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock)
: device_t(mconfig, type, tag, owner, clock)
, m_main_space(*this, finder_base::DUMMY_TAG, -1)
, m_io_space(*this, finder_base::DUMMY_TAG, -1)
@@ -57,7 +57,7 @@ class cbus_bus_device : public interpro_bus_device
{
public:
// construction/destruction
- cbus_bus_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock);
+ cbus_bus_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
static const u32 CBUS_BASE = 0x87000000;
static const u32 CBUS_SIZE = 0x01000000;
@@ -100,8 +100,8 @@ class cbus_slot_device : public device_t, public device_slot_interface
public:
// construction/destruction
template <typename T, typename U>
- cbus_slot_device(machine_config const &mconfig, char const *tag, device_t *owner, u32 clock, T &&bus_tag, U &&slot_options, const char *default_option, const bool fixed)
- : cbus_slot_device(mconfig, tag, owner, clock)
+ cbus_slot_device(machine_config const &mconfig, char const *tag, device_t *owner, T &&bus_tag, U &&slot_options, const char *default_option, const bool fixed)
+ : cbus_slot_device(mconfig, tag, owner)
{
m_bus.set_tag(std::forward<T>(bus_tag));
option_reset();
@@ -109,7 +109,7 @@ public:
set_default_option(default_option);
set_fixed(fixed);
}
- cbus_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock);
+ cbus_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock = XTAL());
protected:
// device-level overrides
@@ -154,7 +154,7 @@ class srx_bus_device : public interpro_bus_device
{
public:
// construction/destruction
- srx_bus_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock);
+ srx_bus_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
static const u32 SRX_BASE = 0x8f000000;
static const u32 SRX_SIZE = 0x8000;
@@ -212,8 +212,8 @@ class srx_slot_device : public device_t, public device_slot_interface
public:
// construction/destruction
template <typename T, typename U>
- srx_slot_device(machine_config const &mconfig, char const *tag, device_t *owner, u32 clock, T &&bus_tag, U &&slot_options, const char *default_option, const bool fixed)
- : srx_slot_device(mconfig, tag, owner, clock)
+ srx_slot_device(machine_config const &mconfig, char const *tag, device_t *owner, T &&bus_tag, U &&slot_options, const char *default_option, const bool fixed)
+ : srx_slot_device(mconfig, tag, owner)
{
m_bus.set_tag(std::forward<T>(bus_tag));
option_reset();
@@ -221,7 +221,7 @@ public:
set_default_option(default_option);
set_fixed(fixed);
}
- srx_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock);
+ srx_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock = XTAL());
protected:
// device-level overrides