diff options
author | 2022-06-16 12:47:52 +0200 | |
---|---|---|
committer | 2025-04-29 23:06:41 +0200 | |
commit | 45d4cd52a8194f2ef9e0383cfb2e2a35634af6ff (patch) | |
tree | 4e8d8fcb7382a5e9e0bce5ec59939bcfbe67155a /src/devices/bus/gio64 | |
parent | 5c14bcdfcb4aefb71b5b62387c4ad05dbeb3814e (diff) |
full xtal conversionxtal
Diffstat (limited to 'src/devices/bus/gio64')
-rw-r--r-- | src/devices/bus/gio64/gio64.cpp | 6 | ||||
-rw-r--r-- | src/devices/bus/gio64/gio64.h | 10 | ||||
-rw-r--r-- | src/devices/bus/gio64/newport.cpp | 16 | ||||
-rw-r--r-- | src/devices/bus/gio64/newport.h | 20 |
4 files changed, 26 insertions, 26 deletions
diff --git a/src/devices/bus/gio64/gio64.cpp b/src/devices/bus/gio64/gio64.cpp index 589e2fdf6d7..e62f774f4d3 100644 --- a/src/devices/bus/gio64/gio64.cpp +++ b/src/devices/bus/gio64/gio64.cpp @@ -21,7 +21,7 @@ void gio64_cards(device_slot_interface &device) DEFINE_DEVICE_TYPE(GIO64_SLOT, gio64_slot_device, "gio64_slot", "SGI GIO64 Slot") -gio64_slot_device::gio64_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock, slot_type_t slot_type) +gio64_slot_device::gio64_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock, slot_type_t slot_type) : device_t(mconfig, GIO64_SLOT, tag, owner, clock) , device_slot_interface(mconfig, *this) , m_gio64(*this, finder_base::DUMMY_TAG) @@ -60,12 +60,12 @@ device_memory_interface::space_config_vector gio64_device::memory_space_config() }; } -gio64_device::gio64_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +gio64_device::gio64_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : gio64_device(mconfig, GIO64, tag, owner, clock) { } -gio64_device::gio64_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) +gio64_device::gio64_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_memory_interface(mconfig, *this) , m_space_config("gio64", ENDIANNESS_BIG, 64, 32, 0) diff --git a/src/devices/bus/gio64/gio64.h b/src/devices/bus/gio64/gio64.h index df99dc70dd9..109fbd6ba0a 100644 --- a/src/devices/bus/gio64/gio64.h +++ b/src/devices/bus/gio64/gio64.h @@ -26,7 +26,7 @@ public: // construction/destruction template <typename T, typename U> gio64_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, T &&gio64_tag, slot_type_t slot_type, U &&opts, const char *dflt) - : gio64_slot_device(mconfig, tag, owner, (uint32_t)0, slot_type) + : gio64_slot_device(mconfig, tag, owner, slot_type) { option_reset(); opts(*this); @@ -34,7 +34,7 @@ public: set_fixed(false); m_gio64.set_tag(std::forward<T>(gio64_tag)); } - gio64_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock, slot_type_t slot_type = GIO64_SLOT_EXP0); + gio64_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock, slot_type_t slot_type = GIO64_SLOT_EXP0); protected: // device-level overrides @@ -80,11 +80,11 @@ public: // construction/destruction template <typename T> gio64_device(const machine_config &mconfig, const char *tag, device_t *owner, T &&cpu_tag) - : gio64_device(mconfig, tag, owner, (uint32_t)0) + : gio64_device(mconfig, tag, owner) { } - gio64_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + gio64_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); // inline configuration template <int N> auto interrupt_cb() { return m_interrupt_cb[N].bind(); } @@ -113,7 +113,7 @@ public: void write(offs_t offset, u64 data, u64 mem_mask); protected: - gio64_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); + gio64_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock); // device-level overrides virtual void device_resolve_objects() override; diff --git a/src/devices/bus/gio64/newport.cpp b/src/devices/bus/gio64/newport.cpp index ab796ba3645..b30e94c7d74 100644 --- a/src/devices/bus/gio64/newport.cpp +++ b/src/devices/bus/gio64/newport.cpp @@ -63,7 +63,7 @@ DEFINE_DEVICE_TYPE(GIO64_XL24, gio64_xl24_device, "gio64_xl24", "SGI 24-bit XL b * *************************************/ -xmap9_device::xmap9_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +xmap9_device::xmap9_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, XMAP9, tag, owner, clock) { } @@ -215,7 +215,7 @@ void xmap9_device::write(uint32_t offset, uint32_t data) * *************************************/ -cmap_device::cmap_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +cmap_device::cmap_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, CMAP, tag, owner, clock) , device_palette_interface(mconfig, *this) { @@ -297,7 +297,7 @@ uint32_t cmap_device::read(uint32_t offset) /*static*/ const size_t vc2_device::RAM_SIZE = 0x8000; -vc2_device::vc2_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +vc2_device::vc2_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, VC2, tag, owner, clock) , m_vert_int(*this) , m_screen_timing_changed(*this) @@ -836,7 +836,7 @@ WRITE_LINE_MEMBER(vc2_device::vblank_w) /*static*/ const size_t rb2_device::BUFFER_SIZE = (1280 + 64) * (1024 + 64); -rb2_device::rb2_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +rb2_device::rb2_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, RB2, tag, owner, clock) { } @@ -1079,7 +1079,7 @@ void rb2_device::store_pixel(uint32_t value) /*static*/ const uint32_t newport_base_device::s_host_shifts[4] = { 8, 8, 16, 32 }; -newport_base_device::newport_base_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) +newport_base_device::newport_base_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_gio64_card_interface(mconfig, *this) , m_screen(*this, "screen") @@ -1095,12 +1095,12 @@ newport_base_device::newport_base_device(const machine_config &mconfig, device_t { } -gio64_xl8_device::gio64_xl8_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +gio64_xl8_device::gio64_xl8_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : newport_base_device(mconfig, GIO64_XL8, tag, owner, clock) { } -gio64_xl24_device::gio64_xl24_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +gio64_xl24_device::gio64_xl24_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : newport_base_device(mconfig, GIO64_XL24, tag, owner, clock) { } @@ -4430,7 +4430,7 @@ void newport_base_device::rex3_w(offs_t offset, uint64_t data, uint64_t mem_mask void newport_base_device::device_add_mconfig(machine_config &config) { - VC2(config, m_vc2, 0); + VC2(config, m_vc2); m_vc2->vert_int().set(FUNC(newport_base_device::vrint_w)); m_vc2->screen_timing_changed().set(FUNC(newport_base_device::update_screen_size)); diff --git a/src/devices/bus/gio64/newport.h b/src/devices/bus/gio64/newport.h index 00a6e36e22d..4423ef64454 100644 --- a/src/devices/bus/gio64/newport.h +++ b/src/devices/bus/gio64/newport.h @@ -28,13 +28,13 @@ class xmap9_device : public device_t { public: - xmap9_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock, uint32_t revision) + xmap9_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock, uint32_t revision) : xmap9_device(mconfig, tag, owner, clock) { set_revision(revision); } - xmap9_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + xmap9_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); uint32_t read(uint32_t offset); void write(uint32_t offset, uint32_t data); @@ -79,13 +79,13 @@ class cmap_device : public device_t , public device_palette_interface { public: - cmap_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock, uint32_t revision) + cmap_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock, uint32_t revision) : cmap_device(mconfig, tag, owner, clock) { set_revision(revision); } - cmap_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + cmap_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); uint32_t read(uint32_t offset); void write(uint32_t offset, uint32_t data); @@ -125,7 +125,7 @@ DECLARE_DEVICE_TYPE(CMAP, cmap_device) class vc2_device : public device_t { public: - vc2_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + vc2_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); uint32_t read(uint32_t offset); void write(uint32_t offset, uint32_t data, uint32_t mem_mask); @@ -221,13 +221,13 @@ DECLARE_DEVICE_TYPE(VC2, vc2_device) class rb2_device : public device_t { public: - rb2_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock, uint32_t global_mask) + rb2_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock, uint32_t global_mask) : rb2_device(mconfig, tag, owner, clock) { set_global_mask(global_mask); } - rb2_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + rb2_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); // Getters const uint32_t *rgbci(int y) const { return &m_rgbci[1344 * y]; } @@ -290,7 +290,7 @@ class newport_base_device : public device_t , public device_gio64_card_interface { public: - newport_base_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); + newport_base_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock); uint64_t rex3_r(offs_t offset, uint64_t mem_mask = ~0); void rex3_w(offs_t offset, uint64_t data, uint64_t mem_mask = ~0); @@ -528,7 +528,7 @@ protected: class gio64_xl8_device : public newport_base_device { public: - gio64_xl8_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock = 0U); + gio64_xl8_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock = XTAL()); protected: virtual void device_add_mconfig(machine_config &config) override; @@ -537,7 +537,7 @@ protected: class gio64_xl24_device : public newport_base_device { public: - gio64_xl24_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock = 0U); + gio64_xl24_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock = XTAL()); protected: virtual void device_add_mconfig(machine_config &config) override; |