summaryrefslogtreecommitdiffstatshomepage
path: root/src/devices/bus/multibus
diff options
context:
space:
mode:
Diffstat (limited to 'src/devices/bus/multibus')
-rw-r--r--src/devices/bus/multibus/cpuap.cpp2
-rw-r--r--src/devices/bus/multibus/cpuap.h2
-rw-r--r--src/devices/bus/multibus/isbc202.cpp2
-rw-r--r--src/devices/bus/multibus/isbc202.h2
-rw-r--r--src/devices/bus/multibus/isbc8024.cpp8
-rw-r--r--src/devices/bus/multibus/isbc8024.h2
-rw-r--r--src/devices/bus/multibus/labtam_3232.cpp2
-rw-r--r--src/devices/bus/multibus/labtam_3232.h2
-rw-r--r--src/devices/bus/multibus/labtam_vducom.cpp14
-rw-r--r--src/devices/bus/multibus/labtam_vducom.h2
-rw-r--r--src/devices/bus/multibus/labtam_z80sbc.cpp6
-rw-r--r--src/devices/bus/multibus/labtam_z80sbc.h2
-rw-r--r--src/devices/bus/multibus/multibus.cpp4
-rw-r--r--src/devices/bus/multibus/multibus.h4
-rw-r--r--src/devices/bus/multibus/serad.cpp2
-rw-r--r--src/devices/bus/multibus/serad.h2
16 files changed, 29 insertions, 29 deletions
diff --git a/src/devices/bus/multibus/cpuap.cpp b/src/devices/bus/multibus/cpuap.cpp
index 7e271be8114..015ee83650f 100644
--- a/src/devices/bus/multibus/cpuap.cpp
+++ b/src/devices/bus/multibus/cpuap.cpp
@@ -28,7 +28,7 @@
DEFINE_DEVICE_TYPE(CPUAP, cpuap_device, "cpuap", "Siemens S26361-D333 CPUAP")
-cpuap_device::cpuap_device(machine_config const &mconfig, char const *tag, device_t *owner, u32 clock)
+cpuap_device::cpuap_device(machine_config const &mconfig, char const *tag, device_t *owner, const XTAL &clock)
: device_t(mconfig, CPUAP, tag, owner, clock)
, device_multibus_interface(mconfig, *this)
, m_cpu(*this, "cpu")
diff --git a/src/devices/bus/multibus/cpuap.h b/src/devices/bus/multibus/cpuap.h
index cc4d2ae5a5f..8065483e47d 100644
--- a/src/devices/bus/multibus/cpuap.h
+++ b/src/devices/bus/multibus/cpuap.h
@@ -20,7 +20,7 @@ class cpuap_device
, public device_multibus_interface
{
public:
- cpuap_device(machine_config const &mconfig, char const *tag, device_t *owner, u32 clock);
+ cpuap_device(machine_config const &mconfig, char const *tag, device_t *owner, const XTAL &clock);
protected:
// device_t overrides
diff --git a/src/devices/bus/multibus/isbc202.cpp b/src/devices/bus/multibus/isbc202.cpp
index 502737837d1..b33c2c3c904 100644
--- a/src/devices/bus/multibus/isbc202.cpp
+++ b/src/devices/bus/multibus/isbc202.cpp
@@ -206,7 +206,7 @@ offs_t isbc202_disassembler::disassemble(std::ostream &stream, offs_t pc, const
}
// isbc202_device
-isbc202_device::isbc202_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock)
+isbc202_device::isbc202_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: cpu_device(mconfig , ISBC202 , tag , owner , DERIVED_CLOCK(1, 4))
, device_multibus_interface(mconfig , *this)
, m_mcu(*this , "mcu")
diff --git a/src/devices/bus/multibus/isbc202.h b/src/devices/bus/multibus/isbc202.h
index 6fc94179364..86f120e6694 100644
--- a/src/devices/bus/multibus/isbc202.h
+++ b/src/devices/bus/multibus/isbc202.h
@@ -24,7 +24,7 @@ class isbc202_device : public cpu_device,
{
public:
// Construction/destruction
- isbc202_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock);
+ isbc202_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
virtual ~isbc202_device();
// Access to I/O space by CPU
diff --git a/src/devices/bus/multibus/isbc8024.cpp b/src/devices/bus/multibus/isbc8024.cpp
index b61ae56db45..0f264c932e5 100644
--- a/src/devices/bus/multibus/isbc8024.cpp
+++ b/src/devices/bus/multibus/isbc8024.cpp
@@ -22,7 +22,7 @@
DEFINE_DEVICE_TYPE(ISBC8024, isbc8024_device, "isbc8024", "Intel iSBC 80/24 Single Board Computer")
-isbc8024_device::isbc8024_device(machine_config const &mconfig, char const *tag, device_t *owner, u32 clock)
+isbc8024_device::isbc8024_device(machine_config const &mconfig, char const *tag, device_t *owner, const XTAL &clock)
: device_t(mconfig, ISBC8024, tag, owner, clock)
, device_multibus_interface(mconfig, *this)
, m_cpu(*this, "cpu")
@@ -108,10 +108,10 @@ void isbc8024_device::device_add_mconfig(machine_config &config)
m_pit->out_handler<2>().append(m_pci, FUNC(i8251_device::write_rxc));
m_pit->out_handler<2>().append(m_pci, FUNC(i8251_device::write_txc));
- I8251(config, m_pci, 0);
+ I8251(config, m_pci);
- I8255(config, m_ppi[0], 0); // j1
- I8255(config, m_ppi[1], 0); // j2
+ I8255(config, m_ppi[0]); // j1
+ I8255(config, m_ppi[1]); // j2
PIC8259(config, m_pic);
m_pic->out_int_callback().set_inputline(m_cpu, I8085_INTR_LINE);
diff --git a/src/devices/bus/multibus/isbc8024.h b/src/devices/bus/multibus/isbc8024.h
index 4827c20bbe6..7f3ea05c1aa 100644
--- a/src/devices/bus/multibus/isbc8024.h
+++ b/src/devices/bus/multibus/isbc8024.h
@@ -21,7 +21,7 @@ class isbc8024_device
, public device_multibus_interface
{
public:
- isbc8024_device(machine_config const &mconfig, char const *tag, device_t *owner, u32 clock);
+ isbc8024_device(machine_config const &mconfig, char const *tag, device_t *owner, const XTAL &clock);
protected:
// device_t overrides
diff --git a/src/devices/bus/multibus/labtam_3232.cpp b/src/devices/bus/multibus/labtam_3232.cpp
index 35181ea4a78..5a47602e4c3 100644
--- a/src/devices/bus/multibus/labtam_3232.cpp
+++ b/src/devices/bus/multibus/labtam_3232.cpp
@@ -20,7 +20,7 @@
DEFINE_DEVICE_TYPE(LABTAM_3232, labtam_3232_device, "labtam_3232", "Labtam 3232")
-labtam_3232_device::labtam_3232_device(machine_config const &mconfig, char const *tag, device_t *owner, u32 clock)
+labtam_3232_device::labtam_3232_device(machine_config const &mconfig, char const *tag, device_t *owner, const XTAL &clock)
: device_t(mconfig, LABTAM_3232, tag, owner, clock)
, device_multibus_interface(mconfig, *this)
, m_cpu(*this, "cpu")
diff --git a/src/devices/bus/multibus/labtam_3232.h b/src/devices/bus/multibus/labtam_3232.h
index 4cd89999778..ed75fd54dee 100644
--- a/src/devices/bus/multibus/labtam_3232.h
+++ b/src/devices/bus/multibus/labtam_3232.h
@@ -18,7 +18,7 @@ class labtam_3232_device
, public device_multibus_interface
{
public:
- labtam_3232_device(machine_config const &mconfig, char const *tag, device_t *owner, u32 clock);
+ labtam_3232_device(machine_config const &mconfig, char const *tag, device_t *owner, const XTAL &clock);
protected:
// device_t overrides
diff --git a/src/devices/bus/multibus/labtam_vducom.cpp b/src/devices/bus/multibus/labtam_vducom.cpp
index 3ea3647ad5b..cad6ac0bd81 100644
--- a/src/devices/bus/multibus/labtam_vducom.cpp
+++ b/src/devices/bus/multibus/labtam_vducom.cpp
@@ -30,7 +30,7 @@ enum u7_mask : u8
DEFINE_DEVICE_TYPE(LABTAM_VDUCOM, labtam_vducom_device, "labtam_vducom", "Labtam 8086 VDU COMM")
-labtam_vducom_device::labtam_vducom_device(machine_config const &mconfig, char const *tag, device_t *owner, u32 clock)
+labtam_vducom_device::labtam_vducom_device(machine_config const &mconfig, char const *tag, device_t *owner, const XTAL &clock)
: device_t(mconfig, LABTAM_VDUCOM, tag, owner, clock)
, device_multibus_interface(mconfig, *this)
, m_cpu(*this, "cpu")
@@ -144,12 +144,12 @@ void labtam_vducom_device::device_add_mconfig(machine_config &config)
m_cpu->set_addrmap(AS_IO, &labtam_vducom_device::cpu_pio);
m_cpu->set_irq_acknowledge_callback(m_pic, FUNC(pic8259_device::inta_cb));
- AM9513(config, m_ctc[0], 4'000'000);
+ AM9513(config, m_ctc[0], XTAL::u(4'000'000));
//m_ctc[0]->out1_cb().set(m_pic, FUNC(pic8259_device::ir0_w));
m_ctc[0]->out4_cb().set(m_ctc[0], FUNC(am9513_device::gate5_w)); // ?
m_ctc[0]->out5_cb().set(m_ctc[0], FUNC(am9513_device::source4_w)); // ?
- AM9513(config, m_ctc[1], 4'000'000);
+ AM9513(config, m_ctc[1], XTAL::u(4'000'000));
m_ctc[1]->out1_cb().set(m_com[1], FUNC(upd7201_device::txcb_w));
m_ctc[1]->out2_cb().set(m_com[1], FUNC(upd7201_device::rxcb_w));
m_ctc[1]->out3_cb().set(m_com[1], FUNC(upd7201_device::rxca_w));
@@ -161,15 +161,15 @@ void labtam_vducom_device::device_add_mconfig(machine_config &config)
PIC8259(config, m_pic);
m_pic->out_int_callback().set_inputline(m_cpu, INPUT_LINE_INT0);
- UPD7201(config, m_com[0], 4'000'000);
+ UPD7201(config, m_com[0], XTAL::u(4'000'000));
m_com[0]->out_int_callback().set(m_pic, FUNC(pic8259_device::ir3_w));
- UPD7201(config, m_com[1], 4'000'000);
+ UPD7201(config, m_com[1], XTAL::u(4'000'000));
m_com[1]->out_int_callback().set(m_pic, FUNC(pic8259_device::ir2_w));
X2212(config, m_nvram[0]);
X2212(config, m_nvram[1]);
- MC6845(config, m_crtc, 1'000'000);
+ MC6845(config, m_crtc, XTAL::u(1'000'000));
m_crtc->set_show_border_area(false);
m_crtc->set_hpixels_per_column(16);
m_crtc->set_update_row_callback(FUNC(labtam_vducom_device::update_row));
@@ -179,7 +179,7 @@ void labtam_vducom_device::device_add_mconfig(machine_config &config)
PALETTE(config, m_palette, FUNC(labtam_vducom_device::palette_init), 4);
SCREEN(config, m_screen, SCREEN_TYPE_RASTER);
- m_screen->set_raw(1'000'000, 62*16, 2*16, 52*16, 78*4, 3*4, 75*4);
+ m_screen->set_raw(XTAL::u(1'000'000), 62*16, 2*16, 52*16, 78*4, 3*4, 75*4);
m_screen->set_screen_update(m_crtc, FUNC(mc6845_device::screen_update));
// gfxdecode is only to show the font data in the tile viewer
diff --git a/src/devices/bus/multibus/labtam_vducom.h b/src/devices/bus/multibus/labtam_vducom.h
index 9db27d05fdd..d497c2a107f 100644
--- a/src/devices/bus/multibus/labtam_vducom.h
+++ b/src/devices/bus/multibus/labtam_vducom.h
@@ -26,7 +26,7 @@ class labtam_vducom_device
, public device_multibus_interface
{
public:
- labtam_vducom_device(machine_config const &mconfig, char const *tag, device_t *owner, u32 clock);
+ labtam_vducom_device(machine_config const &mconfig, char const *tag, device_t *owner, const XTAL &clock);
protected:
// device_t overrides
diff --git a/src/devices/bus/multibus/labtam_z80sbc.cpp b/src/devices/bus/multibus/labtam_z80sbc.cpp
index 013add4f7e8..5c4f0e50cc4 100644
--- a/src/devices/bus/multibus/labtam_z80sbc.cpp
+++ b/src/devices/bus/multibus/labtam_z80sbc.cpp
@@ -68,7 +68,7 @@ enum drvstatus_mask : u8
DEFINE_DEVICE_TYPE(LABTAM_Z80SBC, labtam_z80sbc_device, "labtam_z80sbc", "Labtam Z80 SBC")
-labtam_z80sbc_device::labtam_z80sbc_device(machine_config const &mconfig, char const *tag, device_t *owner, u32 clock)
+labtam_z80sbc_device::labtam_z80sbc_device(machine_config const &mconfig, char const *tag, device_t *owner, const XTAL &clock)
: device_t(mconfig, LABTAM_Z80SBC, tag, owner, clock)
, device_multibus_interface(mconfig, *this)
, m_cpu(*this, "cpu")
@@ -332,13 +332,13 @@ void labtam_z80sbc_device::device_add_mconfig(machine_config &config)
AM9519(config, m_uic);
m_uic->out_int_callback().set(m_int, FUNC(input_merger_any_high_device::in_w<3>));
- WD2793(config, m_fdc, 2'000'000);
+ WD2793(config, m_fdc, XTAL::u(2'000'000));
m_fdc->intrq_wr_callback().set(FUNC(labtam_z80sbc_device::fdcint_w));
m_fdc->drq_wr_callback().set(m_dma[0], FUNC(z80dma_device::rdy_w));
// WD1002 irq -> Am9519 ireq3
- AM9513(config, m_stc, 4'000'000);
+ AM9513(config, m_stc, XTAL::u(4'000'000));
m_stc->out4_cb().set(m_uic, FUNC(am9519_device::ireq5_w));
MM58167(config, m_rtc, 32.768_kHz_XTAL);
diff --git a/src/devices/bus/multibus/labtam_z80sbc.h b/src/devices/bus/multibus/labtam_z80sbc.h
index 2e20d6cd7ca..20c307f3049 100644
--- a/src/devices/bus/multibus/labtam_z80sbc.h
+++ b/src/devices/bus/multibus/labtam_z80sbc.h
@@ -25,7 +25,7 @@ class labtam_z80sbc_device
, public device_multibus_interface
{
public:
- labtam_z80sbc_device(machine_config const &mconfig, char const *tag, device_t *owner, u32 clock);
+ labtam_z80sbc_device(machine_config const &mconfig, char const *tag, device_t *owner, const XTAL &clock);
protected:
// device_t overrides
diff --git a/src/devices/bus/multibus/multibus.cpp b/src/devices/bus/multibus/multibus.cpp
index f8c64ac0d08..2ccc2042153 100644
--- a/src/devices/bus/multibus/multibus.cpp
+++ b/src/devices/bus/multibus/multibus.cpp
@@ -24,7 +24,7 @@
DEFINE_DEVICE_TYPE(MULTIBUS, multibus_device, "multibus", "Intel Multibus")
DEFINE_DEVICE_TYPE(MULTIBUS_SLOT, multibus_slot_device, "multibus_slot", "Intel Multibus slot")
-multibus_device::multibus_device(machine_config const &mconfig, char const *tag, device_t *owner, u32 clock)
+multibus_device::multibus_device(machine_config const &mconfig, char const *tag, device_t *owner, const XTAL &clock)
: device_t(mconfig, MULTIBUS, tag, owner, clock)
, device_memory_interface(mconfig, *this)
, m_mem_config("mem", ENDIANNESS_LITTLE, 16, 24)
@@ -45,7 +45,7 @@ void multibus_device::device_start()
m_xack_cb.resolve_safe();
}
-multibus_slot_device::multibus_slot_device(machine_config const &mconfig, char const *tag, device_t *owner, u32 clock)
+multibus_slot_device::multibus_slot_device(machine_config const &mconfig, char const *tag, device_t *owner, const XTAL &clock)
: device_t(mconfig, MULTIBUS_SLOT, tag, owner, clock)
, device_slot_interface(mconfig, *this)
, m_bus(*this, finder_base::DUMMY_TAG)
diff --git a/src/devices/bus/multibus/multibus.h b/src/devices/bus/multibus/multibus.h
index d753db25778..f07dbaa7982 100644
--- a/src/devices/bus/multibus/multibus.h
+++ b/src/devices/bus/multibus/multibus.h
@@ -81,7 +81,7 @@ class multibus_device
, public device_memory_interface
{
public:
- multibus_device(machine_config const &mconfig, char const *tag, device_t *owner, u32 clock);
+ multibus_device(machine_config const &mconfig, char const *tag, device_t *owner, const XTAL &clock);
// interrupt interface
template <unsigned I> auto int_callback() { return m_int_cb[I].bind(); }
@@ -113,7 +113,7 @@ class multibus_slot_device
, public device_slot_interface
{
public:
- multibus_slot_device(machine_config const &mconfig, char const *tag, device_t *owner, u32 clock);
+ multibus_slot_device(machine_config const &mconfig, char const *tag, device_t *owner, const XTAL &clock);
template <typename T, typename U>
multibus_slot_device(machine_config const &mconfig, char const *tag, device_t *owner, T &&bus_tag, U &&slot_options, char const *default_option, bool const fixed)
diff --git a/src/devices/bus/multibus/serad.cpp b/src/devices/bus/multibus/serad.cpp
index f4fa2346a6c..cbbf5c86f26 100644
--- a/src/devices/bus/multibus/serad.cpp
+++ b/src/devices/bus/multibus/serad.cpp
@@ -27,7 +27,7 @@
DEFINE_DEVICE_TYPE(SERAD, serad_device, "serad", "Siemens S26361-D279 SERAD")
-serad_device::serad_device(machine_config const &mconfig, char const *tag, device_t *owner, u32 clock)
+serad_device::serad_device(machine_config const &mconfig, char const *tag, device_t *owner, const XTAL &clock)
: device_t(mconfig, SERAD, tag, owner, clock)
, device_multibus_interface(mconfig, *this)
, m_cpu(*this, "cpu")
diff --git a/src/devices/bus/multibus/serad.h b/src/devices/bus/multibus/serad.h
index 5f82e1c0ec7..4db17508a1d 100644
--- a/src/devices/bus/multibus/serad.h
+++ b/src/devices/bus/multibus/serad.h
@@ -18,7 +18,7 @@ class serad_device
, public device_multibus_interface
{
public:
- serad_device(machine_config const &mconfig, char const *tag, device_t *owner, u32 clock);
+ serad_device(machine_config const &mconfig, char const *tag, device_t *owner, const XTAL &clock);
protected:
// device_t overrides