diff options
Diffstat (limited to 'src/devices/bus/nscsi')
26 files changed, 66 insertions, 66 deletions
diff --git a/src/devices/bus/nscsi/applecd.cpp b/src/devices/bus/nscsi/applecd.cpp index aec8a154c7a..b75bfe4d329 100644 --- a/src/devices/bus/nscsi/applecd.cpp +++ b/src/devices/bus/nscsi/applecd.cpp @@ -44,7 +44,7 @@ DEFINE_DEVICE_TYPE(APPLECD150, applecd150_device, "aplcd150", "AppleCD 150") -applecd150_device::applecd150_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +applecd150_device::applecd150_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, APPLECD150, tag, owner, clock) , nscsi_slot_card_interface(mconfig, *this, "scsic") { diff --git a/src/devices/bus/nscsi/applecd.h b/src/devices/bus/nscsi/applecd.h index 577dfcf5b01..a2b8b6002d5 100644 --- a/src/devices/bus/nscsi/applecd.h +++ b/src/devices/bus/nscsi/applecd.h @@ -11,7 +11,7 @@ class applecd150_device : public device_t, public nscsi_slot_card_interface { public: - applecd150_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + applecd150_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); static constexpr feature_type unemulated_features() { return feature::DISK; } diff --git a/src/devices/bus/nscsi/cd.cpp b/src/devices/bus/nscsi/cd.cpp index db71c61a1e8..b2149bfd885 100644 --- a/src/devices/bus/nscsi/cd.cpp +++ b/src/devices/bus/nscsi/cd.cpp @@ -17,58 +17,58 @@ DEFINE_DEVICE_TYPE(NSCSI_XM5701, nscsi_toshiba_xm5701_device, "nxm5701", "XM-570 DEFINE_DEVICE_TYPE(NSCSI_XM5701SUN, nscsi_toshiba_xm5701_sun_device, "nxm5701sun", "XM-5701B Sun 12x CD-ROM (New)") DEFINE_DEVICE_TYPE(NSCSI_CDROM_APPLE, nscsi_cdrom_apple_device, "scsi_cdrom_apple", "Apple SCSI CD-ROM") -nscsi_cdrom_device::nscsi_cdrom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : +nscsi_cdrom_device::nscsi_cdrom_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nscsi_cdrom_device(mconfig, NSCSI_CDROM, tag, owner, "Sony", "CDU-76S", "1.0", 0x00, 0x05) { } -nscsi_cdrom_sgi_device::nscsi_cdrom_sgi_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : +nscsi_cdrom_sgi_device::nscsi_cdrom_sgi_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nscsi_cdrom_device(mconfig, NSCSI_CDROM_SGI, tag, owner, "Sony", "CDU-76S", "1.0", 0x00, 0x05) { } -nscsi_cdrom_news_device::nscsi_cdrom_news_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : +nscsi_cdrom_news_device::nscsi_cdrom_news_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nscsi_cdrom_device(mconfig, NSCSI_CDROM_NEWS, tag, owner, "Sony", "CD-ROM CDU-541", "1.0A", 0x00, 0x05) { } -nscsi_dec_rrd45_device::nscsi_dec_rrd45_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : +nscsi_dec_rrd45_device::nscsi_dec_rrd45_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nscsi_cdrom_device(mconfig, NSCSI_RRD45, tag, owner, "DEC ", "RRD45 (C) DEC ", "0436", 0x98, 0x02) { } -nscsi_toshiba_xm3301_device::nscsi_toshiba_xm3301_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : +nscsi_toshiba_xm3301_device::nscsi_toshiba_xm3301_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nscsi_cdrom_device(mconfig, NSCSI_XM3301, tag, owner, "TOSHIBA ", "CD-ROM XM-3301TA", "0272", 0x88, 0x02) { } -nscsi_toshiba_xm5301_sun_device::nscsi_toshiba_xm5301_sun_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : +nscsi_toshiba_xm5301_sun_device::nscsi_toshiba_xm5301_sun_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nscsi_cdrom_device(mconfig, NSCSI_XM5301SUN, tag, owner, "TOSHIBA ", "XM-5301TASUN4XCD", "2915", 0x98, 0x02) { } -nscsi_toshiba_xm5401_sun_device::nscsi_toshiba_xm5401_sun_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : +nscsi_toshiba_xm5401_sun_device::nscsi_toshiba_xm5401_sun_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nscsi_cdrom_device(mconfig, NSCSI_XM5401SUN, tag, owner, "TOSHIBA ", "XM-5401TASUN4XCD", "1036", 0x98, 0x02) { } -nscsi_toshiba_xm5701_device::nscsi_toshiba_xm5701_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : +nscsi_toshiba_xm5701_device::nscsi_toshiba_xm5701_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nscsi_cdrom_device(mconfig, NSCSI_XM5701, tag, owner, "TOSHIBA ", "CD-ROM XM-5701TA", "3136", 0x98, 0x02) { } -nscsi_toshiba_xm5701_sun_device::nscsi_toshiba_xm5701_sun_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : +nscsi_toshiba_xm5701_sun_device::nscsi_toshiba_xm5701_sun_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nscsi_cdrom_device(mconfig, NSCSI_XM5701SUN, tag, owner, "TOSHIBA ", "XM5701TASUN12XCD", "0997", 0x98, 0x02) { } // drive identifies as an original Apple CDSC (Sony CDU-8001 with custom firmware) -nscsi_cdrom_apple_device::nscsi_cdrom_apple_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : +nscsi_cdrom_apple_device::nscsi_cdrom_apple_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nscsi_cdrom_device(mconfig, NSCSI_CDROM_APPLE, tag, owner, "Sony", "CD-ROM CDU-8001", "1.0", 0x00, 0x05) { } -nscsi_cdrom_device::nscsi_cdrom_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) +nscsi_cdrom_device::nscsi_cdrom_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock) : nscsi_full_device(mconfig, type, tag, owner, clock) , cdrom(nullptr) , bytes_per_block(bytes_per_sector) diff --git a/src/devices/bus/nscsi/cd.h b/src/devices/bus/nscsi/cd.h index c1745615474..b48ec459c5d 100644 --- a/src/devices/bus/nscsi/cd.h +++ b/src/devices/bus/nscsi/cd.h @@ -12,15 +12,15 @@ class nscsi_cdrom_device : public nscsi_full_device { public: - nscsi_cdrom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock = 0); + nscsi_cdrom_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock = XTAL()); void set_block_size(u32 block_size); protected: - nscsi_cdrom_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock = 0); + nscsi_cdrom_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock = XTAL()); nscsi_cdrom_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const char *mfr, const char *product, const char *rev, uint8_t inq_data, uint8_t compliance) - : nscsi_cdrom_device(mconfig, type, tag, owner, 0) + : nscsi_cdrom_device(mconfig, type, tag, owner) { strncpy(manufacturer, mfr, 8); strncpy(this->product, product, 16); @@ -61,7 +61,7 @@ private: class nscsi_cdrom_sgi_device : public nscsi_cdrom_device { public: - nscsi_cdrom_sgi_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock = 0); + nscsi_cdrom_sgi_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock = XTAL()); protected: virtual void scsi_command() override; @@ -77,43 +77,43 @@ public: class nscsi_dec_rrd45_device : public nscsi_cdrom_device { public: - nscsi_dec_rrd45_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock = 0); + nscsi_dec_rrd45_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock = XTAL()); }; class nscsi_toshiba_xm3301_device : public nscsi_cdrom_device { public: - nscsi_toshiba_xm3301_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock = 0); + nscsi_toshiba_xm3301_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock = XTAL()); }; class nscsi_toshiba_xm5301_sun_device : public nscsi_cdrom_device { public: - nscsi_toshiba_xm5301_sun_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock = 0); + nscsi_toshiba_xm5301_sun_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock = XTAL()); }; class nscsi_toshiba_xm5401_sun_device : public nscsi_cdrom_device { public: - nscsi_toshiba_xm5401_sun_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock = 0); + nscsi_toshiba_xm5401_sun_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock = XTAL()); }; class nscsi_toshiba_xm5701_device : public nscsi_cdrom_device { public: - nscsi_toshiba_xm5701_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock = 0); + nscsi_toshiba_xm5701_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock = XTAL()); }; class nscsi_toshiba_xm5701_sun_device : public nscsi_cdrom_device { public: - nscsi_toshiba_xm5701_sun_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock = 0); + nscsi_toshiba_xm5701_sun_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock = XTAL()); }; class nscsi_cdrom_apple_device : public nscsi_cdrom_device { public: - nscsi_cdrom_apple_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock = 0); + nscsi_cdrom_apple_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock = XTAL()); protected: virtual void scsi_command() override; diff --git a/src/devices/bus/nscsi/cdd2000.cpp b/src/devices/bus/nscsi/cdd2000.cpp index 4a2e9c57811..4cb57266e00 100644 --- a/src/devices/bus/nscsi/cdd2000.cpp +++ b/src/devices/bus/nscsi/cdd2000.cpp @@ -13,7 +13,7 @@ DEFINE_DEVICE_TYPE(CDD2000, cdd2000_device, "cdd2000", "Philips CDD2000 CD-R") -cdd2000_device::cdd2000_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +cdd2000_device::cdd2000_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, CDD2000, tag, owner, clock) , nscsi_slot_card_interface(mconfig, *this, "scsic") , m_cdcpu(*this, "cdcpu") @@ -34,11 +34,11 @@ void cdd2000_device::mem_map(address_map &map) void cdd2000_device::device_add_mconfig(machine_config &config) { - mc68hc11f1_device &cdcpu(MC68HC11F1(config, m_cdcpu, 8'000'000)); // type and clock guessed + mc68hc11f1_device &cdcpu(MC68HC11F1(config, m_cdcpu, XTAL::u(8'000'000))); // type and clock guessed cdcpu.set_addrmap(AS_PROGRAM, &cdd2000_device::mem_map); cdcpu.set_default_config(0x0b); - NCR53CF94(config, "scsic", 25'000'000); // type and clock guessed + NCR53CF94(config, "scsic", XTAL::u(25'000'000)); // type and clock guessed } ROM_START(cdd2000) diff --git a/src/devices/bus/nscsi/cdd2000.h b/src/devices/bus/nscsi/cdd2000.h index 8f2b6eb6a20..80139a8e550 100644 --- a/src/devices/bus/nscsi/cdd2000.h +++ b/src/devices/bus/nscsi/cdd2000.h @@ -11,7 +11,7 @@ class cdd2000_device : public device_t, public nscsi_slot_card_interface { public: - cdd2000_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + cdd2000_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); static constexpr feature_type unemulated_features() { return feature::DISK; } diff --git a/src/devices/bus/nscsi/cdrn820s.cpp b/src/devices/bus/nscsi/cdrn820s.cpp index 9c74b8a31d4..703432a8e10 100644 --- a/src/devices/bus/nscsi/cdrn820s.cpp +++ b/src/devices/bus/nscsi/cdrn820s.cpp @@ -12,14 +12,14 @@ DEFINE_DEVICE_TYPE(CDRN820S, cdrn820s_device, "cdrn820s", "Caravelle CDR-N820s") -cdrn820s_device::cdrn820s_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock) +cdrn820s_device::cdrn820s_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, type, tag, owner, clock) , nscsi_slot_card_interface(mconfig, *this, "scsic") , m_h8(*this, "h8") { } -cdrn820s_device::cdrn820s_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +cdrn820s_device::cdrn820s_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : cdrn820s_device(mconfig, CDRN820S, tag, owner, clock) { } @@ -35,11 +35,11 @@ void cdrn820s_device::mem_map(address_map &map) void cdrn820s_device::device_add_mconfig(machine_config &config) { - H83048(config, m_h8, 8'000'000); // type and clock unknown + H83048(config, m_h8, XTAL::u(8'000'000)); // type and clock unknown m_h8->set_addrmap(AS_PROGRAM, &cdrn820s_device::mem_map); m_h8->set_mode_a20(); - WD33C93A(config, "scsic", 10'000'000); // type and clock unknown + WD33C93A(config, "scsic", XTAL::u(10'000'000)); // type and clock unknown } ROM_START(cdrn820s) diff --git a/src/devices/bus/nscsi/cdrn820s.h b/src/devices/bus/nscsi/cdrn820s.h index c76fb007bbd..178db17f212 100644 --- a/src/devices/bus/nscsi/cdrn820s.h +++ b/src/devices/bus/nscsi/cdrn820s.h @@ -12,12 +12,12 @@ class cdrn820s_device : public device_t, public nscsi_slot_card_interface { public: - cdrn820s_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + cdrn820s_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); static constexpr feature_type unemulated_features() { return feature::DISK; } protected: - cdrn820s_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock); + cdrn820s_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock); virtual void device_start() override; virtual void device_add_mconfig(machine_config &config) override; diff --git a/src/devices/bus/nscsi/cdu415.cpp b/src/devices/bus/nscsi/cdu415.cpp index a3b733b01d7..65cfb90af4a 100644 --- a/src/devices/bus/nscsi/cdu415.cpp +++ b/src/devices/bus/nscsi/cdu415.cpp @@ -18,7 +18,7 @@ DEFINE_DEVICE_TYPE(CDU415, cdu415_device, "cdu415", "Sony CDU415 CD-R") -cdu415_device::cdu415_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +cdu415_device::cdu415_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, CDU415, tag, owner, clock) , nscsi_slot_card_interface(mconfig, *this, "cxd1804ar") , m_mcu(*this, "mcu") @@ -46,11 +46,11 @@ void cdu415_device::io_map(address_map &map) void cdu415_device::device_add_mconfig(machine_config &config) { - H83032(config, m_mcu, 10000000); + H83032(config, m_mcu, XTAL::u(10000000)); m_mcu->set_addrmap(AS_PROGRAM, &cdu415_device::mem_map); m_mcu->set_addrmap(AS_IO, &cdu415_device::io_map); - NCR53C94(config, m_scsi, 25'000'000); // Temporary placeholder + NCR53C94(config, m_scsi, XTAL::u(25'000'000)); // Temporary placeholder } ROM_START(cdu415) diff --git a/src/devices/bus/nscsi/cdu415.h b/src/devices/bus/nscsi/cdu415.h index 2874c69a8cf..8549ef45577 100644 --- a/src/devices/bus/nscsi/cdu415.h +++ b/src/devices/bus/nscsi/cdu415.h @@ -13,7 +13,7 @@ class cdu415_device : public device_t, public nscsi_slot_card_interface { public: - cdu415_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + cdu415_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); static constexpr feature_type unemulated_features() { return feature::DISK; } diff --git a/src/devices/bus/nscsi/cdu561.cpp b/src/devices/bus/nscsi/cdu561.cpp index 2382ab23382..f1389cfdda5 100644 --- a/src/devices/bus/nscsi/cdu561.cpp +++ b/src/devices/bus/nscsi/cdu561.cpp @@ -43,7 +43,7 @@ DEFINE_DEVICE_TYPE(CDU561_25, cdu561_25_device, "cdu561_25", "Sony CDU561-25") -cdu561_25_device::cdu561_25_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +cdu561_25_device::cdu561_25_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, CDU561_25, tag, owner, clock) , nscsi_slot_card_interface(mconfig, *this, "scsic") { diff --git a/src/devices/bus/nscsi/cdu561.h b/src/devices/bus/nscsi/cdu561.h index 1e61ec179c9..bd96d81d7eb 100644 --- a/src/devices/bus/nscsi/cdu561.h +++ b/src/devices/bus/nscsi/cdu561.h @@ -11,7 +11,7 @@ class cdu561_25_device : public device_t, public nscsi_slot_card_interface { public: - cdu561_25_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + cdu561_25_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); static constexpr feature_type unemulated_features() { return feature::DISK; } diff --git a/src/devices/bus/nscsi/cdu75s.cpp b/src/devices/bus/nscsi/cdu75s.cpp index 40fd92c72fc..05a4015fc12 100644 --- a/src/devices/bus/nscsi/cdu75s.cpp +++ b/src/devices/bus/nscsi/cdu75s.cpp @@ -27,7 +27,7 @@ DEFINE_DEVICE_TYPE(CDU75S, cdu75s_device, "cdu75s", "Sony/Apple CDU75S CD-R") -cdu75s_device::cdu75s_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +cdu75s_device::cdu75s_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, CDU75S, tag, owner, clock) , nscsi_slot_card_interface(mconfig, *this, "fas204") , m_mcu(*this, "mcu") @@ -61,7 +61,7 @@ void cdu75s_device::device_add_mconfig(machine_config &config) m_mcu->set_addrmap(AS_PROGRAM, &cdu75s_device::mem_map); m_mcu->set_addrmap(AS_IO, &cdu75s_device::io_map); - NCR53C94(config, m_scsi, 25'000'000); // FAS204, compatible + NCR53C94(config, m_scsi, XTAL::u(25'000'000)); // FAS204, compatible } ROM_START(cdu75s) diff --git a/src/devices/bus/nscsi/cdu75s.h b/src/devices/bus/nscsi/cdu75s.h index b57550f9033..0ab63028f11 100644 --- a/src/devices/bus/nscsi/cdu75s.h +++ b/src/devices/bus/nscsi/cdu75s.h @@ -13,7 +13,7 @@ class cdu75s_device : public device_t, public nscsi_slot_card_interface { public: - cdu75s_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + cdu75s_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); static constexpr feature_type unemulated_features() { return feature::DISK; } diff --git a/src/devices/bus/nscsi/cfp1080s.cpp b/src/devices/bus/nscsi/cfp1080s.cpp index 8425348d78c..949f78b4867 100644 --- a/src/devices/bus/nscsi/cfp1080s.cpp +++ b/src/devices/bus/nscsi/cfp1080s.cpp @@ -22,7 +22,7 @@ DEFINE_DEVICE_TYPE(CFP1080S, cfp1080s_device, "cfp1080s", "Conner CFP1080S") -cfp1080s_device::cfp1080s_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +cfp1080s_device::cfp1080s_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nscsi_device(mconfig, CFP1080S, tag, owner, clock) , nscsi_slot_card_interface(mconfig, *this, DEVICE_SELF) , m_hdcpu(*this, "hdcpu") @@ -80,7 +80,7 @@ void cfp1080s_device::mem_map(address_map &map) void cfp1080s_device::device_add_mconfig(machine_config &config) { - MC68HC16Z1(config, m_hdcpu, 20'000'000); // exact type and clock unknown + MC68HC16Z1(config, m_hdcpu, XTAL::u(20'000'000)); // exact type and clock unknown m_hdcpu->set_addrmap(AS_PROGRAM, &cfp1080s_device::mem_map); } diff --git a/src/devices/bus/nscsi/cfp1080s.h b/src/devices/bus/nscsi/cfp1080s.h index 8b0ea6d568b..8ee9f31f3f0 100644 --- a/src/devices/bus/nscsi/cfp1080s.h +++ b/src/devices/bus/nscsi/cfp1080s.h @@ -11,7 +11,7 @@ class cfp1080s_device : public nscsi_device, public nscsi_slot_card_interface { public: - cfp1080s_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + cfp1080s_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); static constexpr feature_type unemulated_features() { return feature::DISK; } diff --git a/src/devices/bus/nscsi/crd254sh.cpp b/src/devices/bus/nscsi/crd254sh.cpp index 80fc5fae740..c06728c1f67 100644 --- a/src/devices/bus/nscsi/crd254sh.cpp +++ b/src/devices/bus/nscsi/crd254sh.cpp @@ -26,7 +26,7 @@ DEFINE_DEVICE_TYPE(CRD254SH, crd254sh_device, "crd254sh", "Sanyo CRD-254SH CD-ROM") -crd254sh_device::crd254sh_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +crd254sh_device::crd254sh_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, CRD254SH, tag, owner, clock) , nscsi_slot_card_interface(mconfig, *this, "dummy_scsi") , m_mcu(*this, "mcu") diff --git a/src/devices/bus/nscsi/crd254sh.h b/src/devices/bus/nscsi/crd254sh.h index c1ac2e4123d..1a01595adb8 100644 --- a/src/devices/bus/nscsi/crd254sh.h +++ b/src/devices/bus/nscsi/crd254sh.h @@ -13,7 +13,7 @@ class crd254sh_device : public device_t, public nscsi_slot_card_interface { public: - crd254sh_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + crd254sh_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); static constexpr feature_type unemulated_features() { return feature::DISK; } diff --git a/src/devices/bus/nscsi/cw7501.cpp b/src/devices/bus/nscsi/cw7501.cpp index c3ff2286f57..5eb085d1658 100644 --- a/src/devices/bus/nscsi/cw7501.cpp +++ b/src/devices/bus/nscsi/cw7501.cpp @@ -13,19 +13,19 @@ DEFINE_DEVICE_TYPE(CW7501, cw7501_device, "cw7501", "Panasonic CW-7501 CD-R") DEFINE_DEVICE_TYPE(CDR4210, cdr4210_device, "cdr4210", "Creative Technology Blaster CD-R 4210") -cw7501_device::cw7501_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock) +cw7501_device::cw7501_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, type, tag, owner, clock) , nscsi_slot_card_interface(mconfig, *this, "scsic") , m_cdcpu(*this, "cdcpu") { } -cw7501_device::cw7501_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +cw7501_device::cw7501_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : cw7501_device(mconfig, CW7501, tag, owner, clock) { } -cdr4210_device::cdr4210_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +cdr4210_device::cdr4210_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : cw7501_device(mconfig, CDR4210, tag, owner, clock) { } @@ -67,10 +67,10 @@ void cw7501_device::mem_map(address_map &map) void cw7501_device::device_add_mconfig(machine_config &config) { - M37710S4(config, m_cdcpu, 12'500'000); // type and clock are total guesses + M37710S4(config, m_cdcpu, XTAL::u(12'500'000)); // type and clock are total guesses m_cdcpu->set_addrmap(AS_PROGRAM, &cw7501_device::mem_map); - NCR53CF94(config, "scsic", 25'000'000); // type and clock guessed + NCR53CF94(config, "scsic", XTAL::u(25'000'000)); // type and clock guessed } ROM_START(cw7501) diff --git a/src/devices/bus/nscsi/cw7501.h b/src/devices/bus/nscsi/cw7501.h index 0b785c4d3ba..437708f0244 100644 --- a/src/devices/bus/nscsi/cw7501.h +++ b/src/devices/bus/nscsi/cw7501.h @@ -12,12 +12,12 @@ class cw7501_device : public device_t, public nscsi_slot_card_interface { public: - cw7501_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + cw7501_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); static constexpr feature_type unemulated_features() { return feature::DISK; } protected: - cw7501_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock); + cw7501_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock); virtual void device_start() override; virtual void device_add_mconfig(machine_config &config) override; @@ -38,7 +38,7 @@ private: class cdr4210_device : public cw7501_device { public: - cdr4210_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + cdr4210_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); static constexpr feature_type unemulated_features() { return feature::DISK; } diff --git a/src/devices/bus/nscsi/hd.cpp b/src/devices/bus/nscsi/hd.cpp index 7e0f48730a8..4bcf0864a7e 100644 --- a/src/devices/bus/nscsi/hd.cpp +++ b/src/devices/bus/nscsi/hd.cpp @@ -15,12 +15,12 @@ DEFINE_DEVICE_TYPE(NSCSI_HARDDISK, nscsi_harddisk_device, "scsi_harddisk", "SCSI Hard Disk") -nscsi_harddisk_device::nscsi_harddisk_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : +nscsi_harddisk_device::nscsi_harddisk_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nscsi_harddisk_device(mconfig, NSCSI_HARDDISK, tag, owner, clock) { } -nscsi_harddisk_device::nscsi_harddisk_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) : +nscsi_harddisk_device::nscsi_harddisk_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock) : nscsi_full_device(mconfig, type, tag, owner, clock), image(*this, "image"), harddisk(nullptr), lba(0), cur_lba(0), blocks(0), bytes_per_sector(0) { } diff --git a/src/devices/bus/nscsi/hd.h b/src/devices/bus/nscsi/hd.h index 7ee1f851d26..ac563c647a0 100644 --- a/src/devices/bus/nscsi/hd.h +++ b/src/devices/bus/nscsi/hd.h @@ -11,10 +11,10 @@ class nscsi_harddisk_device : public nscsi_full_device { public: - nscsi_harddisk_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + nscsi_harddisk_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); protected: - nscsi_harddisk_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); + nscsi_harddisk_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock); virtual void device_start() override; virtual void device_reset() override; diff --git a/src/devices/bus/nscsi/s1410.cpp b/src/devices/bus/nscsi/s1410.cpp index 4667ce04b98..c0812a6db52 100644 --- a/src/devices/bus/nscsi/s1410.cpp +++ b/src/devices/bus/nscsi/s1410.cpp @@ -13,7 +13,7 @@ DEFINE_DEVICE_TYPE(NSCSI_S1410, nscsi_s1410_device, "scsi_s1410", "Xebec S1410 5.25 Inch Winchester Disk Controller") -nscsi_s1410_device::nscsi_s1410_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : +nscsi_s1410_device::nscsi_s1410_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : nscsi_harddisk_device(mconfig, NSCSI_S1410, tag, owner, clock) { } diff --git a/src/devices/bus/nscsi/s1410.h b/src/devices/bus/nscsi/s1410.h index bd44a53c830..d9f0263e07e 100644 --- a/src/devices/bus/nscsi/s1410.h +++ b/src/devices/bus/nscsi/s1410.h @@ -11,7 +11,7 @@ class nscsi_s1410_device : public nscsi_harddisk_device { public: - nscsi_s1410_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + nscsi_s1410_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); protected: // SCSI status returns diff --git a/src/devices/bus/nscsi/smoc501.cpp b/src/devices/bus/nscsi/smoc501.cpp index 48ede8a888c..c2abb92bbc9 100644 --- a/src/devices/bus/nscsi/smoc501.cpp +++ b/src/devices/bus/nscsi/smoc501.cpp @@ -19,7 +19,7 @@ DEFINE_DEVICE_TYPE(SMOC501, smoc501_device, "smoc501", "Sony SMO-C501 MO Disk Controller") -smoc501_device::smoc501_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +smoc501_device::smoc501_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, SMOC501, tag, owner, clock) , nscsi_slot_card_interface(mconfig, *this, "scsic") { @@ -73,10 +73,10 @@ ioport_constructor smoc501_device::device_input_ports() const void smoc501_device::device_add_mconfig(machine_config &config) { - v40_device &mpu(V40(config, "mpu", 16'000'000)); // clock is guessed + v40_device &mpu(V40(config, "mpu", XTAL::u(16'000'000))); // clock is guessed mpu.set_addrmap(AS_PROGRAM, &smoc501_device::mem_map); - wd33c93_device &scsic(WD33C93(config, "scsic", 10'000'000)); // clock is guessed + wd33c93_device &scsic(WD33C93(config, "scsic", XTAL::u(10'000'000))); // clock is guessed scsic.irq_cb().set_inputline("mpu", INPUT_LINE_IRQ5); } diff --git a/src/devices/bus/nscsi/smoc501.h b/src/devices/bus/nscsi/smoc501.h index a5a30179f82..76950aea0a1 100644 --- a/src/devices/bus/nscsi/smoc501.h +++ b/src/devices/bus/nscsi/smoc501.h @@ -11,7 +11,7 @@ class smoc501_device : public device_t, public nscsi_slot_card_interface { public: - smoc501_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + smoc501_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); static constexpr feature_type unemulated_features() { return feature::DISK; } |