diff options
Diffstat (limited to 'src/devices/cpu/i8089')
-rw-r--r-- | src/devices/cpu/i8089/i8089.cpp | 6 | ||||
-rw-r--r-- | src/devices/cpu/i8089/i8089.h | 10 | ||||
-rw-r--r-- | src/devices/cpu/i8089/i8089_channel.cpp | 2 | ||||
-rw-r--r-- | src/devices/cpu/i8089/i8089_channel.h | 2 |
4 files changed, 6 insertions, 14 deletions
diff --git a/src/devices/cpu/i8089/i8089.cpp b/src/devices/cpu/i8089/i8089.cpp index 7cc3420a619..3a9d3915536 100644 --- a/src/devices/cpu/i8089/i8089.cpp +++ b/src/devices/cpu/i8089/i8089.cpp @@ -34,7 +34,7 @@ DEFINE_DEVICE_TYPE(I8089, i8089_device, "i8089", "Intel 8089 I/O Processor") // i8089_device - constructor //------------------------------------------------- -i8089_device::i8089_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : +i8089_device::i8089_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : cpu_device(mconfig, I8089, tag, owner, clock), m_icount(0), m_ch1(*this, "1"), @@ -210,8 +210,8 @@ void i8089_device::state_string_export(const device_state_entry &entry, std::str void i8089_device::device_add_mconfig(machine_config &config) { - I8089_CHANNEL(config, m_ch1, 0).sintr().set(FUNC(i8089_device::ch1_sintr_w)); - I8089_CHANNEL(config, m_ch2, 0).sintr().set(FUNC(i8089_device::ch2_sintr_w)); + I8089_CHANNEL(config, m_ch1).sintr().set(FUNC(i8089_device::ch1_sintr_w)); + I8089_CHANNEL(config, m_ch2).sintr().set(FUNC(i8089_device::ch2_sintr_w)); } diff --git a/src/devices/cpu/i8089/i8089.h b/src/devices/cpu/i8089/i8089.h index 19f81136336..36068c8c4e7 100644 --- a/src/devices/cpu/i8089/i8089.h +++ b/src/devices/cpu/i8089/i8089.h @@ -11,20 +11,12 @@ #pragma once -#ifdef _MSC_VER -// MSVC seems to want to actually instantiate templates when it gets an extern template declaration, effectively defeating the purpose of extern template declatations altogether -// In this case it causes a problem because the required_device template can't be instantiated for the incomplete i8089_channel_device type #include "i8089_channel.h" -#endif - //************************************************************************** // TYPE DEFINITIONS //************************************************************************** -// forward declaration -class i8089_channel_device; - // ======================> i8089_device class i8089_device : public cpu_device @@ -33,7 +25,7 @@ class i8089_device : public cpu_device public: // construction/destruction - i8089_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + i8089_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); // callbacks auto sintr1() { return m_write_sintr1.bind(); } diff --git a/src/devices/cpu/i8089/i8089_channel.cpp b/src/devices/cpu/i8089/i8089_channel.cpp index d13606a1ca5..fd88674fb86 100644 --- a/src/devices/cpu/i8089/i8089_channel.cpp +++ b/src/devices/cpu/i8089/i8089_channel.cpp @@ -49,7 +49,7 @@ DEFINE_DEVICE_TYPE(I8089_CHANNEL, i8089_channel_device, "i8089_channel", "Intel // i8089_channel_device - constructor //------------------------------------------------- -i8089_channel_device::i8089_channel_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : +i8089_channel_device::i8089_channel_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, I8089_CHANNEL, tag, owner, clock), m_write_sintr(*this), m_iop(nullptr), diff --git a/src/devices/cpu/i8089/i8089_channel.h b/src/devices/cpu/i8089/i8089_channel.h index 89aa511193b..c7d7d8aeac4 100644 --- a/src/devices/cpu/i8089/i8089_channel.h +++ b/src/devices/cpu/i8089/i8089_channel.h @@ -25,7 +25,7 @@ class i8089_channel_device : public device_t { public: // construction/destruction - i8089_channel_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + i8089_channel_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); auto sintr() { return m_write_sintr.bind(); } |