summaryrefslogtreecommitdiffstatshomepage
path: root/src/devices/bus/cbus
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/cbus
parent5c14bcdfcb4aefb71b5b62387c4ad05dbeb3814e (diff)
full xtal conversionxtal
Diffstat (limited to 'src/devices/bus/cbus')
-rw-r--r--src/devices/bus/cbus/mpu_pc98.cpp2
-rw-r--r--src/devices/bus/cbus/mpu_pc98.h2
-rw-r--r--src/devices/bus/cbus/pc9801_118.cpp2
-rw-r--r--src/devices/bus/cbus/pc9801_118.h2
-rw-r--r--src/devices/bus/cbus/pc9801_26.cpp2
-rw-r--r--src/devices/bus/cbus/pc9801_26.h2
-rw-r--r--src/devices/bus/cbus/pc9801_55.cpp6
-rw-r--r--src/devices/bus/cbus/pc9801_55.h8
-rw-r--r--src/devices/bus/cbus/pc9801_86.cpp12
-rw-r--r--src/devices/bus/cbus/pc9801_86.h8
-rw-r--r--src/devices/bus/cbus/pc9801_amd98.cpp8
-rw-r--r--src/devices/bus/cbus/pc9801_amd98.h2
-rw-r--r--src/devices/bus/cbus/pc9801_cbus.cpp2
-rw-r--r--src/devices/bus/cbus/pc9801_cbus.h4
-rw-r--r--src/devices/bus/cbus/pc9801_snd.cpp2
-rw-r--r--src/devices/bus/cbus/pc9801_snd.h2
16 files changed, 33 insertions, 33 deletions
diff --git a/src/devices/bus/cbus/mpu_pc98.cpp b/src/devices/bus/cbus/mpu_pc98.cpp
index 2ba192d4b0d..815f2f9591f 100644
--- a/src/devices/bus/cbus/mpu_pc98.cpp
+++ b/src/devices/bus/cbus/mpu_pc98.cpp
@@ -54,7 +54,7 @@ void mpu_pc98_device::device_add_mconfig(machine_config &config)
// LIVE DEVICE
//**************************************************************************
-mpu_pc98_device::mpu_pc98_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+mpu_pc98_device::mpu_pc98_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: device_t(mconfig, MPU_PC98, tag, owner, clock)
, m_bus(*this, DEVICE_SELF_OWNER)
, m_mpu401(*this, MPU_CORE_TAG)
diff --git a/src/devices/bus/cbus/mpu_pc98.h b/src/devices/bus/cbus/mpu_pc98.h
index 798f8b8f11e..b8bb6e735ff 100644
--- a/src/devices/bus/cbus/mpu_pc98.h
+++ b/src/devices/bus/cbus/mpu_pc98.h
@@ -18,7 +18,7 @@ class mpu_pc98_device : public device_t
{
public:
// construction/destruction
- mpu_pc98_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ mpu_pc98_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// device-level overrides
diff --git a/src/devices/bus/cbus/pc9801_118.cpp b/src/devices/bus/cbus/pc9801_118.cpp
index 403a23b4658..0a6ac5ee9a2 100644
--- a/src/devices/bus/cbus/pc9801_118.cpp
+++ b/src/devices/bus/cbus/pc9801_118.cpp
@@ -148,7 +148,7 @@ const tiny_rom_entry *pc9801_118_device::device_rom_region() const
// pc9801_118_device - constructor
//-------------------------------------------------
-pc9801_118_device::pc9801_118_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+pc9801_118_device::pc9801_118_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: pc9801_snd_device(mconfig, PC9801_118, tag, owner, clock),
m_bus(*this, DEVICE_SELF_OWNER),
m_opn3(*this, "opn3")
diff --git a/src/devices/bus/cbus/pc9801_118.h b/src/devices/bus/cbus/pc9801_118.h
index 94ac3bfe24c..3a92996cd02 100644
--- a/src/devices/bus/cbus/pc9801_118.h
+++ b/src/devices/bus/cbus/pc9801_118.h
@@ -26,7 +26,7 @@ class pc9801_118_device : public pc9801_snd_device
{
public:
// construction/destruction
- pc9801_118_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ pc9801_118_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
static constexpr feature_type imperfect_features() { return feature::SOUND; }
diff --git a/src/devices/bus/cbus/pc9801_26.cpp b/src/devices/bus/cbus/pc9801_26.cpp
index 8f8b15740bd..6283d2cc9f4 100644
--- a/src/devices/bus/cbus/pc9801_26.cpp
+++ b/src/devices/bus/cbus/pc9801_26.cpp
@@ -115,7 +115,7 @@ ioport_constructor pc9801_26_device::device_input_ports() const
// pc9801_26_device - constructor
//-------------------------------------------------
-pc9801_26_device::pc9801_26_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+pc9801_26_device::pc9801_26_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: pc9801_snd_device(mconfig, PC9801_26, tag, owner, clock)
, m_bus(*this, DEVICE_SELF_OWNER)
, m_opn(*this, "opn")
diff --git a/src/devices/bus/cbus/pc9801_26.h b/src/devices/bus/cbus/pc9801_26.h
index 80cd57a20cd..fdb67619200 100644
--- a/src/devices/bus/cbus/pc9801_26.h
+++ b/src/devices/bus/cbus/pc9801_26.h
@@ -25,7 +25,7 @@ class pc9801_26_device : public pc9801_snd_device
{
public:
// construction/destruction
- pc9801_26_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ pc9801_26_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
uint8_t opn_r(offs_t offset);
void opn_w(offs_t offset, uint8_t data);
diff --git a/src/devices/bus/cbus/pc9801_55.cpp b/src/devices/bus/cbus/pc9801_55.cpp
index 879ad2f1a66..44e17b63c60 100644
--- a/src/devices/bus/cbus/pc9801_55.cpp
+++ b/src/devices/bus/cbus/pc9801_55.cpp
@@ -144,7 +144,7 @@ ioport_constructor pc9801_55_device::device_input_ports() const
// pc9801_55u_device - constructor
//-------------------------------------------------
-pc9801_55_device::pc9801_55_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock)
+pc9801_55_device::pc9801_55_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_bus(*this, DEVICE_SELF_OWNER)
, m_scsi_bus(*this, "scsi")
@@ -152,13 +152,13 @@ pc9801_55_device::pc9801_55_device(const machine_config &mconfig, device_type ty
{
}
-pc9801_55u_device::pc9801_55u_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+pc9801_55u_device::pc9801_55u_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: pc9801_55_device(mconfig, PC9801_55U, tag, owner, clock)
{
}
-pc9801_55l_device::pc9801_55l_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+pc9801_55l_device::pc9801_55l_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: pc9801_55_device(mconfig, PC9801_55L, tag, owner, clock)
{
diff --git a/src/devices/bus/cbus/pc9801_55.h b/src/devices/bus/cbus/pc9801_55.h
index b74c754c2b8..212e4501b26 100644
--- a/src/devices/bus/cbus/pc9801_55.h
+++ b/src/devices/bus/cbus/pc9801_55.h
@@ -26,8 +26,8 @@ class pc9801_55_device : public device_t
{
public:
// construction/destruction
- //pc9801_55_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- pc9801_55_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+ //pc9801_55_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
+ pc9801_55_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock);
static constexpr feature_type unemulated_features() { return feature::DISK; }
@@ -55,7 +55,7 @@ private:
class pc9801_55u_device : public pc9801_55_device
{
public:
- pc9801_55u_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ pc9801_55u_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
private:
virtual const tiny_rom_entry *device_rom_region() const override;
@@ -65,7 +65,7 @@ private:
class pc9801_55l_device : public pc9801_55_device
{
public:
- pc9801_55l_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ pc9801_55l_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
private:
virtual const tiny_rom_entry *device_rom_region() const override;
diff --git a/src/devices/bus/cbus/pc9801_86.cpp b/src/devices/bus/cbus/pc9801_86.cpp
index 740906357c5..dd11ad30fd7 100644
--- a/src/devices/bus/cbus/pc9801_86.cpp
+++ b/src/devices/bus/cbus/pc9801_86.cpp
@@ -89,8 +89,8 @@ void pc9801_86_device::pc9801_86_config(machine_config &config)
m_opna->add_route(1, "lspeaker", 1.00);
m_opna->add_route(2, "rspeaker", 1.00);
- DAC_16BIT_R2R_TWOS_COMPLEMENT(config, m_ldac, 0).add_route(ALL_OUTPUTS, "lspeaker", 1.0); // burr brown pcm61p
- DAC_16BIT_R2R_TWOS_COMPLEMENT(config, m_rdac, 0).add_route(ALL_OUTPUTS, "rspeaker", 1.0); // burr brown pcm61p
+ DAC_16BIT_R2R_TWOS_COMPLEMENT(config, m_ldac).add_route(ALL_OUTPUTS, "lspeaker", 1.0); // burr brown pcm61p
+ DAC_16BIT_R2R_TWOS_COMPLEMENT(config, m_rdac).add_route(ALL_OUTPUTS, "rspeaker", 1.0); // burr brown pcm61p
}
void pc9801_86_device::device_add_mconfig(machine_config &config)
@@ -178,7 +178,7 @@ ioport_constructor pc9801_86_device::device_input_ports() const
// pc9801_86_device - constructor
//-------------------------------------------------
-pc9801_86_device::pc9801_86_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock)
+pc9801_86_device::pc9801_86_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock)
: pc9801_snd_device(mconfig, type, tag, owner, clock)
, m_bus(*this, DEVICE_SELF_OWNER)
, m_opna(*this, "opna")
@@ -188,7 +188,7 @@ pc9801_86_device::pc9801_86_device(const machine_config &mconfig, device_type ty
{
}
-pc9801_86_device::pc9801_86_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+pc9801_86_device::pc9801_86_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: pc9801_86_device(mconfig, PC9801_86, tag, owner, clock)
{
@@ -445,7 +445,7 @@ const tiny_rom_entry *pc9801_speakboard_device::device_rom_region() const
return ROM_NAME( pc9801_spb );
}
-pc9801_speakboard_device::pc9801_speakboard_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+pc9801_speakboard_device::pc9801_speakboard_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: pc9801_86_device(mconfig, PC9801_SPEAKBOARD, tag, owner, clock)
, m_opna_slave(*this, "opna_slave")
{
@@ -505,7 +505,7 @@ void pc9801_speakboard_device::opna_slave_w(offs_t offset, u8 data)
DEFINE_DEVICE_TYPE(OTOMICHAN_KAI, otomichan_kai_device, "pc98_otomichan_kai", "MAD Factory Otomi-chan Kai") // 音美(おとみ)ちゃん改
-otomichan_kai_device::otomichan_kai_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+otomichan_kai_device::otomichan_kai_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: pc9801_86_device(mconfig, OTOMICHAN_KAI, tag, owner, clock)
, m_opn2c(*this, "opn2c")
{
diff --git a/src/devices/bus/cbus/pc9801_86.h b/src/devices/bus/cbus/pc9801_86.h
index 7903f11e0b9..e5f8399d94c 100644
--- a/src/devices/bus/cbus/pc9801_86.h
+++ b/src/devices/bus/cbus/pc9801_86.h
@@ -26,8 +26,8 @@ class pc9801_86_device : public pc9801_snd_device
{
public:
// construction/destruction
- pc9801_86_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- pc9801_86_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+ pc9801_86_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
+ pc9801_86_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock);
DECLARE_WRITE_LINE_MEMBER(sound_irq);
@@ -77,7 +77,7 @@ class pc9801_speakboard_device : public pc9801_86_device
{
public:
// construction/destruction
- pc9801_speakboard_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ pc9801_speakboard_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
static constexpr feature_type imperfect_features() { return feature::SOUND; }
@@ -98,7 +98,7 @@ class otomichan_kai_device : public pc9801_86_device
{
public:
// construction/destruction
- otomichan_kai_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ otomichan_kai_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
static constexpr feature_type imperfect_features() { return feature::SOUND; }
diff --git a/src/devices/bus/cbus/pc9801_amd98.cpp b/src/devices/bus/cbus/pc9801_amd98.cpp
index 5b4d66bbdff..a6461f65319 100644
--- a/src/devices/bus/cbus/pc9801_amd98.cpp
+++ b/src/devices/bus/cbus/pc9801_amd98.cpp
@@ -47,17 +47,17 @@ void pc9801_amd98_device::device_add_mconfig(machine_config &config)
{
SPEAKER(config, "lspeaker").front_left();
SPEAKER(config, "rspeaker").front_right();
- AY8910(config, m_ay1, 1'996'800);
+ AY8910(config, m_ay1, XTAL::u(1'996'800));
m_ay1->port_a_read_callback().set_ioport("OPN_PA1");
m_ay1->port_b_write_callback().set(FUNC(pc9801_amd98_device::ay3_address_w));
m_ay1->add_route(ALL_OUTPUTS, "lspeaker", 0.50);
- AY8910(config, m_ay2, 1'996'800);
+ AY8910(config, m_ay2, XTAL::u(1'996'800));
m_ay2->port_a_read_callback().set_ioport("OPN_PA2");
m_ay2->port_b_write_callback().set(FUNC(pc9801_amd98_device::ay3_data_latch_w));
m_ay2->add_route(ALL_OUTPUTS, "rspeaker", 0.50);
- AY8910(config, m_ay3, 1'996'800);
+ AY8910(config, m_ay3, XTAL::u(1'996'800));
m_ay3->add_route(ALL_OUTPUTS, "lspeaker", 0.25);
m_ay3->add_route(ALL_OUTPUTS, "rspeaker", 0.25);
}
@@ -100,7 +100,7 @@ ioport_constructor pc9801_amd98_device::device_input_ports() const
// pc9801_amd98_device - constructor
//-------------------------------------------------
-pc9801_amd98_device::pc9801_amd98_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+pc9801_amd98_device::pc9801_amd98_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: device_t(mconfig, PC9801_AMD98, tag, owner, clock)
, m_bus(*this, DEVICE_SELF_OWNER)
, m_ay1(*this, "ay1")
diff --git a/src/devices/bus/cbus/pc9801_amd98.h b/src/devices/bus/cbus/pc9801_amd98.h
index f26246c768b..fbc74a2dba4 100644
--- a/src/devices/bus/cbus/pc9801_amd98.h
+++ b/src/devices/bus/cbus/pc9801_amd98.h
@@ -24,7 +24,7 @@ class pc9801_amd98_device : public device_t
{
public:
// construction/destruction
- pc9801_amd98_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ pc9801_amd98_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
static constexpr feature_type imperfect_features() { return feature::SOUND; }
diff --git a/src/devices/bus/cbus/pc9801_cbus.cpp b/src/devices/bus/cbus/pc9801_cbus.cpp
index 9077d8cc4ea..aabc8d8a7d6 100644
--- a/src/devices/bus/cbus/pc9801_cbus.cpp
+++ b/src/devices/bus/cbus/pc9801_cbus.cpp
@@ -65,7 +65,7 @@ device_pc9801cbus_card_interface::~device_pc9801cbus_card_interface()
// pc9801_slot_device - constructor
//-------------------------------------------------
-pc9801_slot_device::pc9801_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+pc9801_slot_device::pc9801_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
device_t(mconfig, PC9801CBUS_SLOT, tag, owner, clock),
device_slot_interface(mconfig, *this),
m_memspace(*this, finder_base::DUMMY_TAG, -1),
diff --git a/src/devices/bus/cbus/pc9801_cbus.h b/src/devices/bus/cbus/pc9801_cbus.h
index ab7085dfa86..9a0bf3fe367 100644
--- a/src/devices/bus/cbus/pc9801_cbus.h
+++ b/src/devices/bus/cbus/pc9801_cbus.h
@@ -93,14 +93,14 @@ public:
// construction/destruction
template <typename T>
pc9801_slot_device(machine_config const &mconfig, char const *tag, device_t *owner, T &&opts, char const *dflt)
- : pc9801_slot_device(mconfig, tag, owner, (uint32_t)0)
+ : pc9801_slot_device(mconfig, tag, owner)
{
option_reset();
opts(*this);
set_default_option(dflt);
set_fixed(false);
}
- pc9801_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ pc9801_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
template <typename T> void set_memspace(T &&tag, int spacenum) { m_memspace.set_tag(std::forward<T>(tag), spacenum); }
template <typename T> void set_iospace(T &&tag, int spacenum) { m_iospace.set_tag(std::forward<T>(tag), spacenum); }
diff --git a/src/devices/bus/cbus/pc9801_snd.cpp b/src/devices/bus/cbus/pc9801_snd.cpp
index 3a33cfe6757..8c173c47500 100644
--- a/src/devices/bus/cbus/pc9801_snd.cpp
+++ b/src/devices/bus/cbus/pc9801_snd.cpp
@@ -10,7 +10,7 @@
#include "emu.h"
#include "pc9801_snd.h"
-pc9801_snd_device::pc9801_snd_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock)
+pc9801_snd_device::pc9801_snd_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock)
: device_t(mconfig, type, tag, owner, clock)
{
}
diff --git a/src/devices/bus/cbus/pc9801_snd.h b/src/devices/bus/cbus/pc9801_snd.h
index 0c9c694a4e3..63190b94832 100644
--- a/src/devices/bus/cbus/pc9801_snd.h
+++ b/src/devices/bus/cbus/pc9801_snd.h
@@ -15,7 +15,7 @@
class pc9801_snd_device : public device_t
{
public:
- pc9801_snd_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+ pc9801_snd_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock);
protected:
u8 opn_porta_r();