diff options
Diffstat (limited to 'src/devices/imagedev')
36 files changed, 124 insertions, 124 deletions
diff --git a/src/devices/imagedev/avivideo.cpp b/src/devices/imagedev/avivideo.cpp index f1a2b7e1cdc..e12a046b23e 100644 --- a/src/devices/imagedev/avivideo.cpp +++ b/src/devices/imagedev/avivideo.cpp @@ -23,7 +23,7 @@ DEFINE_DEVICE_TYPE(IMAGE_AVIVIDEO, avivideo_image_device, "avivideo_image", "AVI // avivideo_image_device - constructor //------------------------------------------------- -avivideo_image_device::avivideo_image_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : +avivideo_image_device::avivideo_image_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, IMAGE_AVIVIDEO, tag, owner, clock), device_image_interface(mconfig, *this), m_frame(nullptr), diff --git a/src/devices/imagedev/avivideo.h b/src/devices/imagedev/avivideo.h index 5af11df4187..782205250c7 100644 --- a/src/devices/imagedev/avivideo.h +++ b/src/devices/imagedev/avivideo.h @@ -26,7 +26,7 @@ class avivideo_image_device : public device_t, public device_image_interface { public: // construction/destruction - avivideo_image_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock = 0); + avivideo_image_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock = XTAL()); virtual ~avivideo_image_device(); // image-level overrides diff --git a/src/devices/imagedev/bitbngr.cpp b/src/devices/imagedev/bitbngr.cpp index dc31c4ccb83..643afdc3cd7 100644 --- a/src/devices/imagedev/bitbngr.cpp +++ b/src/devices/imagedev/bitbngr.cpp @@ -25,7 +25,7 @@ DEFINE_DEVICE_TYPE(BITBANGER, bitbanger_device, "bitbanger", "Bitbanger") ctor -------------------------------------------------*/ -bitbanger_device::bitbanger_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : +bitbanger_device::bitbanger_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, BITBANGER, tag, owner, clock), device_image_interface(mconfig, *this), m_interface(nullptr), diff --git a/src/devices/imagedev/bitbngr.h b/src/devices/imagedev/bitbngr.h index 5b02417cfc3..6f7eb9ce444 100644 --- a/src/devices/imagedev/bitbngr.h +++ b/src/devices/imagedev/bitbngr.h @@ -17,7 +17,7 @@ public: void set_readonly(bool is_readonly) { m_is_readonly = is_readonly; } // construction/destruction - bitbanger_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + bitbanger_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); // image-level overrides virtual image_init_result call_load() override; diff --git a/src/devices/imagedev/cassette.cpp b/src/devices/imagedev/cassette.cpp index 2bf7c2a4808..15e59e31f8b 100644 --- a/src/devices/imagedev/cassette.cpp +++ b/src/devices/imagedev/cassette.cpp @@ -32,7 +32,7 @@ DEFINE_DEVICE_TYPE(CASSETTE, cassette_image_device, "cassette_image", "Cassette" // cassette_image_device - constructor //------------------------------------------------- -cassette_image_device::cassette_image_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : +cassette_image_device::cassette_image_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, CASSETTE, tag, owner, clock), device_image_interface(mconfig, *this), device_sound_interface(mconfig, *this), diff --git a/src/devices/imagedev/cassette.h b/src/devices/imagedev/cassette.h index ad71e062e70..4047272f43e 100644 --- a/src/devices/imagedev/cassette.h +++ b/src/devices/imagedev/cassette.h @@ -49,7 +49,7 @@ class cassette_image_device : public device_t, { public: // construction/destruction - cassette_image_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock = 0); + cassette_image_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock = XTAL()); virtual ~cassette_image_device(); void set_formats(const cassette_image::Format* const *formats) { m_formats = formats; } diff --git a/src/devices/imagedev/chd_cd.cpp b/src/devices/imagedev/chd_cd.cpp index cf87d17b5ef..c9b7191384e 100644 --- a/src/devices/imagedev/chd_cd.cpp +++ b/src/devices/imagedev/chd_cd.cpp @@ -21,12 +21,12 @@ DEFINE_DEVICE_TYPE(CDROM, cdrom_image_device, "cdrom_image", "CD-ROM Image") // cdrom_image_device - constructor //------------------------------------------------- -cdrom_image_device::cdrom_image_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +cdrom_image_device::cdrom_image_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : cdrom_image_device(mconfig, CDROM, tag, owner, clock) { } -cdrom_image_device::cdrom_image_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) +cdrom_image_device::cdrom_image_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_image_interface(mconfig, *this), m_cdrom_handle(nullptr), diff --git a/src/devices/imagedev/chd_cd.h b/src/devices/imagedev/chd_cd.h index e93b7969c62..d4b1eac0882 100644 --- a/src/devices/imagedev/chd_cd.h +++ b/src/devices/imagedev/chd_cd.h @@ -27,7 +27,7 @@ class cdrom_image_device : public device_t, { public: // construction/destruction - cdrom_image_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock = 0); + cdrom_image_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock = XTAL()); virtual ~cdrom_image_device(); void set_interface(const char *interface) { m_interface = interface; } @@ -49,7 +49,7 @@ public: cdrom_file *get_cdrom_file() { return m_cdrom_handle; } protected: - cdrom_image_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); + cdrom_image_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock); // device-level overrides virtual void device_config_complete() override; diff --git a/src/devices/imagedev/diablo.cpp b/src/devices/imagedev/diablo.cpp index 5f8b45e4064..b34d0b92604 100644 --- a/src/devices/imagedev/diablo.cpp +++ b/src/devices/imagedev/diablo.cpp @@ -34,7 +34,7 @@ DEFINE_DEVICE_TYPE(DIABLO, diablo_image_device, "diablo_image", "Diablo") // diablo_image_device - constructor //------------------------------------------------- -diablo_image_device::diablo_image_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +diablo_image_device::diablo_image_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : harddisk_image_base_device(mconfig, DIABLO, tag, owner, clock), m_chd(nullptr), m_hard_disk_handle(nullptr), diff --git a/src/devices/imagedev/diablo.h b/src/devices/imagedev/diablo.h index 2b483bf8388..974defebc00 100644 --- a/src/devices/imagedev/diablo.h +++ b/src/devices/imagedev/diablo.h @@ -24,7 +24,7 @@ class diablo_image_device : public harddisk_image_base_device { public: // construction/destruction - diablo_image_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + diablo_image_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual ~diablo_image_device(); template <typename Object> void set_device_load(Object &&cb) { m_device_image_load = std::forward<Object>(cb); } diff --git a/src/devices/imagedev/flopdrv.cpp b/src/devices/imagedev/flopdrv.cpp index eba391f966e..c13820a8b7a 100644 --- a/src/devices/imagedev/flopdrv.cpp +++ b/src/devices/imagedev/flopdrv.cpp @@ -614,12 +614,12 @@ DEFINE_DEVICE_TYPE(LEGACY_FLOPPY, legacy_floppy_image_device, "legacy_floppy_ima // legacy_floppy_image_device - constructor //------------------------------------------------- -legacy_floppy_image_device::legacy_floppy_image_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +legacy_floppy_image_device::legacy_floppy_image_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : legacy_floppy_image_device(mconfig, LEGACY_FLOPPY, tag, owner, clock) { } -legacy_floppy_image_device::legacy_floppy_image_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) +legacy_floppy_image_device::legacy_floppy_image_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_image_interface(mconfig, *this), m_out_idx_func(*this), diff --git a/src/devices/imagedev/flopdrv.h b/src/devices/imagedev/flopdrv.h index a3241cc4b89..da98ea1097c 100644 --- a/src/devices/imagedev/flopdrv.h +++ b/src/devices/imagedev/flopdrv.h @@ -90,13 +90,13 @@ class legacy_floppy_image_device : public device_t, { public: // construction/destruction - legacy_floppy_image_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock, const floppy_interface *config) - : legacy_floppy_image_device(mconfig, tag, owner, clock) + legacy_floppy_image_device(const machine_config &mconfig, const char *tag, device_t *owner, const floppy_interface *config) + : legacy_floppy_image_device(mconfig, tag, owner) { set_floppy_config(config); } - legacy_floppy_image_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + legacy_floppy_image_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock = XTAL()); ~legacy_floppy_image_device(); void set_floppy_config(const floppy_interface *config) { m_config = config; } @@ -163,7 +163,7 @@ private: TIMER_CALLBACK_MEMBER( set_wpt ); protected: - legacy_floppy_image_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); + legacy_floppy_image_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock); // device overrides virtual void device_config_complete() override; diff --git a/src/devices/imagedev/floppy.cpp b/src/devices/imagedev/floppy.cpp index 3c00336dcd8..4d26d44171f 100644 --- a/src/devices/imagedev/floppy.cpp +++ b/src/devices/imagedev/floppy.cpp @@ -208,7 +208,7 @@ void floppy_image_device::default_pc_floppy_formats(format_registration &fr) fr.add_pc_formats(); } -floppy_connector::floppy_connector(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : +floppy_connector::floppy_connector(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, FLOPPY_CONNECTOR, tag, owner, clock), device_slot_interface(mconfig, *this), formats(nullptr), @@ -248,7 +248,7 @@ floppy_image_device *floppy_connector::get_device() // floppy_image_device - constructor //------------------------------------------------- -floppy_image_device::floppy_image_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) +floppy_image_device::floppy_image_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_image_interface(mconfig, *this), input_format(nullptr), @@ -1500,7 +1500,7 @@ static const char *const floppy525_sample_names[] = nullptr }; -floppy_sound_device::floppy_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +floppy_sound_device::floppy_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : samples_device(mconfig, FLOPPYSOUND, tag, owner, clock), m_sound(nullptr), m_step_base(0), @@ -1801,13 +1801,13 @@ void floppy_sound_device::sound_stream_update(sound_stream &stream, std::vector< void floppy_image_device::device_add_mconfig(machine_config &config) { SPEAKER(config, FLOPSPK).front_center(); - FLOPPYSOUND(config, FLOPSND_TAG, 44100).add_route(ALL_OUTPUTS, FLOPSPK, 0.5); + FLOPPYSOUND(config, FLOPSND_TAG, XTAL::u(44100)).add_route(ALL_OUTPUTS, FLOPSPK, 0.5); if (FLUX_SCREEN) { SCREEN(config, m_flux_screen, SCREEN_TYPE_RASTER); m_flux_screen->set_screen_update(FUNC(floppy_image_device::flux_screen_update)); - m_flux_screen->set_raw(30*(flux_screen_sx+1)*(flux_screen_sy+1), flux_screen_sx+1, 0, flux_screen_sx, flux_screen_sy+1, 0, flux_screen_sy); + m_flux_screen->set_raw(XTAL::u(30*(flux_screen_sx+1)*(flux_screen_sy+1)), flux_screen_sx+1, 0, flux_screen_sx, flux_screen_sy+1, 0, flux_screen_sy); m_flux_screen->set_physical_aspect(1, 2); } } @@ -1824,7 +1824,7 @@ DEFINE_DEVICE_TYPE(FLOPPYSOUND, floppy_sound_device, "flopsnd", "Floppy sound") // 3" single-sided double density //------------------------------------------------- -floppy_3_ssdd::floppy_3_ssdd(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : +floppy_3_ssdd::floppy_3_ssdd(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : floppy_image_device(mconfig, FLOPPY_3_SSDD, tag, owner, clock) { } @@ -1847,7 +1847,7 @@ void floppy_3_ssdd::setup_characteristics() // 3" double-sided double density //------------------------------------------------- -floppy_3_dsdd::floppy_3_dsdd(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : +floppy_3_dsdd::floppy_3_dsdd(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : floppy_image_device(mconfig, FLOPPY_3_DSDD, tag, owner, clock) { } @@ -1871,7 +1871,7 @@ void floppy_3_dsdd::setup_characteristics() // 3.5" single-sided double density //------------------------------------------------- -floppy_35_ssdd::floppy_35_ssdd(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : +floppy_35_ssdd::floppy_35_ssdd(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : floppy_image_device(mconfig, FLOPPY_35_SSDD, tag, owner, clock) { } @@ -1895,7 +1895,7 @@ void floppy_35_ssdd::setup_characteristics() // 3.5" double-sided double density //------------------------------------------------- -floppy_35_dd::floppy_35_dd(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : +floppy_35_dd::floppy_35_dd(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : floppy_image_device(mconfig, FLOPPY_35_DD, tag, owner, clock) { } @@ -1920,7 +1920,7 @@ void floppy_35_dd::setup_characteristics() // 3.5" high density //------------------------------------------------- -floppy_35_hd::floppy_35_hd(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : +floppy_35_hd::floppy_35_hd(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : floppy_image_device(mconfig, FLOPPY_35_HD, tag, owner, clock) { } @@ -1946,7 +1946,7 @@ void floppy_35_hd::setup_characteristics() // 3.5" extended density //------------------------------------------------- -floppy_35_ed::floppy_35_ed(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : +floppy_35_ed::floppy_35_ed(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : floppy_image_device(mconfig, FLOPPY_35_ED, tag, owner, clock) { } @@ -1973,7 +1973,7 @@ void floppy_35_ed::setup_characteristics() // 5.25" single-sided single density 35 tracks //------------------------------------------------- -floppy_525_sssd_35t::floppy_525_sssd_35t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : +floppy_525_sssd_35t::floppy_525_sssd_35t(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : floppy_image_device(mconfig, FLOPPY_525_SSSD_35T, tag, owner, clock) { } @@ -1996,7 +1996,7 @@ void floppy_525_sssd_35t::setup_characteristics() // 5.25" double-sided single density 35 tracks //------------------------------------------------- -floppy_525_sd_35t::floppy_525_sd_35t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : +floppy_525_sd_35t::floppy_525_sd_35t(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : floppy_image_device(mconfig, FLOPPY_525_SD_35T, tag, owner, clock) { } @@ -2020,7 +2020,7 @@ void floppy_525_sd_35t::setup_characteristics() // 5.25" single-sided single density, VTECH edition //------------------------------------------------- -floppy_525_vtech::floppy_525_vtech(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : +floppy_525_vtech::floppy_525_vtech(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : floppy_image_device(mconfig, FLOPPY_525_VTECH, tag, owner, clock) { amplifier_freakout_time = attotime::from_usec(64); @@ -2044,7 +2044,7 @@ void floppy_525_vtech::setup_characteristics() // 5.25" single-sided single density //------------------------------------------------- -floppy_525_sssd::floppy_525_sssd(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : +floppy_525_sssd::floppy_525_sssd(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : floppy_image_device(mconfig, FLOPPY_525_SSSD, tag, owner, clock) { } @@ -2067,7 +2067,7 @@ void floppy_525_sssd::setup_characteristics() // 5.25" double-sided single density //------------------------------------------------- -floppy_525_sd::floppy_525_sd(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : +floppy_525_sd::floppy_525_sd(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : floppy_image_device(mconfig, FLOPPY_525_SD, tag, owner, clock) { } @@ -2090,7 +2090,7 @@ void floppy_525_sd::setup_characteristics() // 5.25" single-sided double density //------------------------------------------------- -floppy_525_ssdd::floppy_525_ssdd(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : +floppy_525_ssdd::floppy_525_ssdd(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : floppy_image_device(mconfig, FLOPPY_525_SSDD, tag, owner, clock) { } @@ -2114,7 +2114,7 @@ void floppy_525_ssdd::setup_characteristics() // 5.25" double-sided double density //------------------------------------------------- -floppy_525_dd::floppy_525_dd(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : +floppy_525_dd::floppy_525_dd(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : floppy_image_device(mconfig, FLOPPY_525_DD, tag, owner, clock) { } @@ -2139,7 +2139,7 @@ void floppy_525_dd::setup_characteristics() // 5.25" single-sided quad density //------------------------------------------------- -floppy_525_ssqd::floppy_525_ssqd(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : +floppy_525_ssqd::floppy_525_ssqd(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : floppy_image_device(mconfig, FLOPPY_525_SSQD, tag, owner, clock) { } @@ -2164,7 +2164,7 @@ void floppy_525_ssqd::setup_characteristics() // 5.25" double-sided quad density //------------------------------------------------- -floppy_525_qd::floppy_525_qd(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : +floppy_525_qd::floppy_525_qd(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : floppy_image_device(mconfig, FLOPPY_525_QD, tag, owner, clock) { } @@ -2192,7 +2192,7 @@ void floppy_525_qd::setup_characteristics() // 5.25" high density //------------------------------------------------- -floppy_525_hd::floppy_525_hd(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : +floppy_525_hd::floppy_525_hd(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : floppy_image_device(mconfig, FLOPPY_525_HD, tag, owner, clock) { } @@ -2220,7 +2220,7 @@ void floppy_525_hd::setup_characteristics() // 8" single-sided single density //------------------------------------------------- -floppy_8_sssd::floppy_8_sssd(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : +floppy_8_sssd::floppy_8_sssd(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : floppy_image_device(mconfig, FLOPPY_8_SSSD, tag, owner, clock) { } @@ -2244,7 +2244,7 @@ void floppy_8_sssd::setup_characteristics() // 8" double-sided single density //------------------------------------------------- -floppy_8_dssd::floppy_8_dssd(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : +floppy_8_dssd::floppy_8_dssd(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : floppy_image_device(mconfig, FLOPPY_8_DSSD, tag, owner, clock) { } @@ -2269,7 +2269,7 @@ void floppy_8_dssd::setup_characteristics() // 8" single-sided double density //------------------------------------------------- -floppy_8_ssdd::floppy_8_ssdd(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : +floppy_8_ssdd::floppy_8_ssdd(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : floppy_image_device(mconfig, FLOPPY_8_SSDD, tag, owner, clock) { } @@ -2294,7 +2294,7 @@ void floppy_8_ssdd::setup_characteristics() // 8" double-sided double density //------------------------------------------------- -floppy_8_dsdd::floppy_8_dsdd(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : +floppy_8_dsdd::floppy_8_dsdd(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : floppy_image_device(mconfig, FLOPPY_8_DSDD, tag, owner, clock) { } @@ -2331,7 +2331,7 @@ void floppy_8_dsdd::setup_characteristics() // //------------------------------------------------- -epson_smd_165::epson_smd_165(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : +epson_smd_165::epson_smd_165(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : floppy_image_device(mconfig, EPSON_SMD_165, tag, owner, clock) { } @@ -2378,7 +2378,7 @@ void epson_smd_165::setup_characteristics() // //------------------------------------------------- -epson_sd_320::epson_sd_320(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : +epson_sd_320::epson_sd_320(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : floppy_image_device(mconfig, EPSON_SD_320, tag, owner, clock) { } @@ -2406,7 +2406,7 @@ void epson_sd_320::setup_characteristics() // //------------------------------------------------- -epson_sd_321::epson_sd_321(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : +epson_sd_321::epson_sd_321(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : floppy_image_device(mconfig, EPSON_SD_321, tag, owner, clock) { } @@ -2438,7 +2438,7 @@ void epson_sd_321::setup_characteristics() // //------------------------------------------------- -pana_ju_363::pana_ju_363(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : +pana_ju_363::pana_ju_363(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : floppy_image_device(mconfig, PANA_JU_363, tag, owner, clock) { } @@ -2470,7 +2470,7 @@ void pana_ju_363::setup_characteristics() // //------------------------------------------------- -sony_oa_d31v::sony_oa_d31v(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : +sony_oa_d31v::sony_oa_d31v(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : floppy_image_device(mconfig, SONY_OA_D31V, tag, owner, clock) { } @@ -2502,7 +2502,7 @@ void sony_oa_d31v::setup_characteristics() // //------------------------------------------------- -sony_oa_d32w::sony_oa_d32w(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : +sony_oa_d32w::sony_oa_d32w(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : floppy_image_device(mconfig, SONY_OA_D32W, tag, owner, clock) { } @@ -2535,7 +2535,7 @@ void sony_oa_d32w::setup_characteristics() // //------------------------------------------------- -sony_oa_d32v::sony_oa_d32v(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : +sony_oa_d32v::sony_oa_d32v(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : floppy_image_device(mconfig, SONY_OA_D32V, tag, owner, clock) { } @@ -2566,7 +2566,7 @@ void sony_oa_d32v::setup_characteristics() // //------------------------------------------------- -teac_fd_30a::teac_fd_30a(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : +teac_fd_30a::teac_fd_30a(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : floppy_image_device(mconfig, TEAC_FD_30A, tag, owner, clock) { } @@ -2595,7 +2595,7 @@ void teac_fd_30a::setup_characteristics() // //------------------------------------------------- -teac_fd_55e::teac_fd_55e(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : +teac_fd_55e::teac_fd_55e(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : floppy_image_device(mconfig, TEAC_FD_55E, tag, owner, clock) { } @@ -2626,7 +2626,7 @@ void teac_fd_55e::setup_characteristics() // //------------------------------------------------- -teac_fd_55f::teac_fd_55f(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : +teac_fd_55f::teac_fd_55f(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : floppy_image_device(mconfig, TEAC_FD_55F, tag, owner, clock) { } @@ -2660,7 +2660,7 @@ void teac_fd_55f::setup_characteristics() // //------------------------------------------------- -teac_fd_55g::teac_fd_55g(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : +teac_fd_55g::teac_fd_55g(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : floppy_image_device(mconfig, TEAC_FD_55G, tag, owner, clock) { } @@ -2690,7 +2690,7 @@ void teac_fd_55g::setup_characteristics() // used in the Commodoere 1541 disk drive //------------------------------------------------- -alps_3255190x::alps_3255190x(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : +alps_3255190x::alps_3255190x(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : floppy_image_device(mconfig, ALPS_3255190X, tag, owner, clock) { } @@ -2714,7 +2714,7 @@ void alps_3255190x::setup_characteristics() // IBM 6360 -- 8" single-sided single density //------------------------------------------------- -ibm_6360::ibm_6360(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : +ibm_6360::ibm_6360(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : floppy_image_device(mconfig, IBM_6360, tag, owner, clock) { } @@ -2740,7 +2740,7 @@ void ibm_6360::setup_characteristics() // Variable-speed Macintosh drives //------------------------------------------------- -mac_floppy_device::mac_floppy_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) : floppy_image_device(mconfig, type, tag, owner, clock) +mac_floppy_device::mac_floppy_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock) : floppy_image_device(mconfig, type, tag, owner, clock) { m_has_mfm = false; dskchg_writable = true; @@ -2963,7 +2963,7 @@ void mac_floppy_device::tfsel_w(int state) } } -oa_d34v_device::oa_d34v_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : mac_floppy_device(mconfig, OAD34V, tag, owner, clock) +oa_d34v_device::oa_d34v_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : mac_floppy_device(mconfig, OAD34V, tag, owner, clock) { } @@ -2990,7 +2990,7 @@ void oa_d34v_device::track_changed() floppy_image_device::track_changed(); } -mfd51w_device::mfd51w_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : mac_floppy_device(mconfig, MFD51W, tag, owner, clock) +mfd51w_device::mfd51w_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : mac_floppy_device(mconfig, MFD51W, tag, owner, clock) { } void mfd51w_device::setup_characteristics() @@ -3009,7 +3009,7 @@ bool mfd51w_device::is_2m() const return true; } -mfd75w_device::mfd75w_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : mac_floppy_device(mconfig, MFD75W, tag, owner, clock) +mfd75w_device::mfd75w_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : mac_floppy_device(mconfig, MFD75W, tag, owner, clock) { m_has_mfm = true; } diff --git a/src/devices/imagedev/floppy.h b/src/devices/imagedev/floppy.h index 3d551ee72ab..8f04c73ac31 100644 --- a/src/devices/imagedev/floppy.h +++ b/src/devices/imagedev/floppy.h @@ -164,7 +164,7 @@ protected: virtual void add_format(const floppy_image_format_t &type, u32 image_size, const char *name, const char *description) override; }; - floppy_image_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); + floppy_image_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock); // device-level overrides virtual void device_start() override; @@ -309,7 +309,7 @@ protected: #define DECLARE_FLOPPY_IMAGE_DEVICE(Type, Name, Interface) \ class Name : public floppy_image_device { \ public: \ - Name(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); \ + Name(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); \ virtual ~Name(); \ virtual const char *image_interface() const noexcept override { return Interface; } \ protected: \ @@ -369,7 +369,7 @@ protected: bool m_strb; bool m_mfm, m_has_mfm; - mac_floppy_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); + mac_floppy_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; @@ -381,7 +381,7 @@ protected: // 400K GCR class oa_d34v_device : public mac_floppy_device { public: - oa_d34v_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + oa_d34v_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual ~oa_d34v_device() = default; protected: virtual void setup_characteristics() override; @@ -393,7 +393,7 @@ protected: // 400/800K GCR (e.g. dual-sided) class mfd51w_device : public mac_floppy_device { public: - mfd51w_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + mfd51w_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual ~mfd51w_device() = default; protected: virtual void setup_characteristics() override; @@ -404,7 +404,7 @@ protected: // 400/800K GCR + 1.44 MFM (Superdrive) class mfd75w_device : public mac_floppy_device { public: - mfd75w_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + mfd75w_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual ~mfd75w_device() = default; protected: @@ -425,7 +425,7 @@ DECLARE_DEVICE_TYPE(MFD75W, mfd75w_device) class floppy_sound_device : public samples_device { public: - floppy_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + floppy_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); void motor(bool on, bool withdisk); void step(int track); bool samples_loaded() { return m_loaded; } @@ -463,7 +463,7 @@ class floppy_connector: public device_t, public: template <typename T> floppy_connector(const machine_config &mconfig, const char *tag, device_t *owner, T &&opts, const char *dflt, std::function<void (format_registration &fr)> formats, bool fixed = false) - : floppy_connector(mconfig, tag, owner, 0) + : floppy_connector(mconfig, tag, owner) { option_reset(); opts(*this); @@ -472,7 +472,7 @@ public: set_formats(formats); } floppy_connector(const machine_config &mconfig, const char *tag, device_t *owner, const char *option, const device_type &devtype, bool is_default, std::function<void (format_registration &fr)> formats) - : floppy_connector(mconfig, tag, owner, 0) + : floppy_connector(mconfig, tag, owner) { option_reset(); option_add(option, devtype); @@ -481,7 +481,7 @@ public: set_fixed(false); set_formats(formats); } - floppy_connector(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock = 0); + floppy_connector(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock = XTAL()); virtual ~floppy_connector(); void set_formats(std::function<void (format_registration &fr)> formats); diff --git a/src/devices/imagedev/harddriv.cpp b/src/devices/imagedev/harddriv.cpp index decb4e09909..fdd96bf2e81 100644 --- a/src/devices/imagedev/harddriv.cpp +++ b/src/devices/imagedev/harddriv.cpp @@ -43,7 +43,7 @@ DEFINE_DEVICE_TYPE(HARDDISK, harddisk_image_device, "harddisk_image", "Harddisk" // harddisk_image_base_device - constructor //------------------------------------------------- -harddisk_image_base_device::harddisk_image_base_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) +harddisk_image_base_device::harddisk_image_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_image_interface(mconfig, *this) { @@ -53,7 +53,7 @@ harddisk_image_base_device::harddisk_image_base_device(const machine_config &mco // harddisk_image_device - constructor //------------------------------------------------- -harddisk_image_device::harddisk_image_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +harddisk_image_device::harddisk_image_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : harddisk_image_device(mconfig, HARDDISK, tag, owner, clock) { } @@ -62,7 +62,7 @@ harddisk_image_device::harddisk_image_device(const machine_config &mconfig, cons // harddisk_image_device - constructor for subclasses //------------------------------------------------- -harddisk_image_device::harddisk_image_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) +harddisk_image_device::harddisk_image_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock) : harddisk_image_base_device(mconfig, type, tag, owner, clock), m_chd(nullptr), m_hard_disk_handle(nullptr), diff --git a/src/devices/imagedev/harddriv.h b/src/devices/imagedev/harddriv.h index 5b3b8d7dde3..0101354c67b 100644 --- a/src/devices/imagedev/harddriv.h +++ b/src/devices/imagedev/harddriv.h @@ -24,7 +24,7 @@ class harddisk_image_base_device : public device_t, public device_image_interfac { protected: // construction/destruction - harddisk_image_base_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); + harddisk_image_base_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock); // image-level overrides virtual bool is_readable() const noexcept override { return true; } @@ -42,11 +42,11 @@ class harddisk_image_device : public harddisk_image_base_device public: // construction/destruction harddisk_image_device(const machine_config &mconfig, const char *tag, device_t *owner, const char *intf) - : harddisk_image_device(mconfig, tag, owner, (uint32_t)0) + : harddisk_image_device(mconfig, tag, owner) { set_interface(intf); } - harddisk_image_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock = 0); + harddisk_image_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock = XTAL()); virtual ~harddisk_image_device(); template <typename... T> void set_device_load(T &&... args) { m_device_image_load.set(std::forward<T>(args)...); } @@ -67,7 +67,7 @@ public: hard_disk_file *get_hard_disk_file() { return m_hard_disk_handle; } protected: - harddisk_image_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); + harddisk_image_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock); // device-level overrides virtual void device_config_complete() override; diff --git a/src/devices/imagedev/magtape.cpp b/src/devices/imagedev/magtape.cpp index dd1754ff4e3..02660b5db9c 100644 --- a/src/devices/imagedev/magtape.cpp +++ b/src/devices/imagedev/magtape.cpp @@ -18,13 +18,13 @@ #include "softlist_dev.h" -magtape_image_device::magtape_image_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock) +magtape_image_device::magtape_image_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_image_interface(mconfig, *this) { } -microtape_image_device::microtape_image_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock) +microtape_image_device::microtape_image_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock) : magtape_image_device(mconfig, type, tag, owner, clock) { } diff --git a/src/devices/imagedev/magtape.h b/src/devices/imagedev/magtape.h index 5834573240c..3feb855a25a 100644 --- a/src/devices/imagedev/magtape.h +++ b/src/devices/imagedev/magtape.h @@ -33,7 +33,7 @@ public: protected: // construction/destruction - magtape_image_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); + magtape_image_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock); // device_image_interface implementation virtual const software_list_loader &get_software_list_loader() const override; @@ -45,7 +45,7 @@ class microtape_image_device : public magtape_image_device { protected: // construction/destruction - microtape_image_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); + microtape_image_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock); // image-level overrides virtual const char *image_type_name() const noexcept override { return "microtape"; } diff --git a/src/devices/imagedev/mfmhd.cpp b/src/devices/imagedev/mfmhd.cpp index 7bbab1e97da..34a3a667836 100644 --- a/src/devices/imagedev/mfmhd.cpp +++ b/src/devices/imagedev/mfmhd.cpp @@ -304,7 +304,7 @@ enum STEP_SETTLE }; -mfm_harddisk_device::mfm_harddisk_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) +mfm_harddisk_device::mfm_harddisk_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_image_interface(mconfig, *this), m_index_timer(nullptr), @@ -938,7 +938,7 @@ int mfm_harddisk_device::get_actual_heads() /* The generic HD takes any kind of CHD HD image and magically creates enough heads and cylinders. */ -mfm_hd_generic_device::mfm_hd_generic_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +mfm_hd_generic_device::mfm_hd_generic_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : mfm_harddisk_device(mconfig, MFMHD_GENERIC, tag, owner, clock) { } @@ -948,7 +948,7 @@ DEFINE_DEVICE_TYPE(MFMHD_GENERIC, mfm_hd_generic_device, "mfm_harddisk", "Generi /* Various models. */ -mfm_hd_st213_device::mfm_hd_st213_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +mfm_hd_st213_device::mfm_hd_st213_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : mfm_harddisk_device(mconfig, MFMHD_ST213, tag, owner, clock) { m_phys_cylinders = 670; @@ -961,7 +961,7 @@ mfm_hd_st213_device::mfm_hd_st213_device(const machine_config &mconfig, const ch DEFINE_DEVICE_TYPE(MFMHD_ST213, mfm_hd_st213_device, "mfm_hd_st213", "Seagate ST-213 MFM hard disk") -mfm_hd_st225_device::mfm_hd_st225_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +mfm_hd_st225_device::mfm_hd_st225_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : mfm_harddisk_device(mconfig, MFMHD_ST225, tag, owner, clock) { m_phys_cylinders = 670; @@ -974,7 +974,7 @@ mfm_hd_st225_device::mfm_hd_st225_device(const machine_config &mconfig, const ch DEFINE_DEVICE_TYPE(MFMHD_ST225, mfm_hd_st225_device, "mfm_hd_st225", "Seagate ST-225 MFM hard disk") -mfm_hd_st251_device::mfm_hd_st251_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +mfm_hd_st251_device::mfm_hd_st251_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : mfm_harddisk_device(mconfig, MFMHD_ST251, tag, owner, clock) { m_phys_cylinders = 821; @@ -1182,7 +1182,7 @@ uint16_t* mfmhd_trackimage_cache::get_trackimage(int cylinder, int head) // ================================================================ -mfm_harddisk_connector::mfm_harddisk_connector(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock): +mfm_harddisk_connector::mfm_harddisk_connector(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock): device_t(mconfig, MFM_HD_CONNECTOR, tag, owner, clock), device_slot_interface(mconfig, *this), m_encoding(), diff --git a/src/devices/imagedev/mfmhd.h b/src/devices/imagedev/mfmhd.h index ce66a43fa3b..4ae5f23a27a 100644 --- a/src/devices/imagedev/mfmhd.h +++ b/src/devices/imagedev/mfmhd.h @@ -113,7 +113,7 @@ public: int get_actual_heads(); protected: - mfm_harddisk_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); + mfm_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_stop() override; @@ -188,7 +188,7 @@ private: class mfm_hd_generic_device : public mfm_harddisk_device { public: - mfm_hd_generic_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + mfm_hd_generic_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); }; DECLARE_DEVICE_TYPE(MFMHD_GENERIC, mfm_hd_generic_device) @@ -196,7 +196,7 @@ DECLARE_DEVICE_TYPE(MFMHD_GENERIC, mfm_hd_generic_device) class mfm_hd_st213_device : public mfm_harddisk_device { public: - mfm_hd_st213_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + mfm_hd_st213_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); }; DECLARE_DEVICE_TYPE(MFMHD_ST213, mfm_hd_st213_device) @@ -204,7 +204,7 @@ DECLARE_DEVICE_TYPE(MFMHD_ST213, mfm_hd_st213_device) class mfm_hd_st225_device : public mfm_harddisk_device { public: - mfm_hd_st225_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + mfm_hd_st225_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); }; DECLARE_DEVICE_TYPE(MFMHD_ST225, mfm_hd_st225_device) @@ -212,7 +212,7 @@ DECLARE_DEVICE_TYPE(MFMHD_ST225, mfm_hd_st225_device) class mfm_hd_st251_device : public mfm_harddisk_device { public: - mfm_hd_st251_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + mfm_hd_st251_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); }; DECLARE_DEVICE_TYPE(MFMHD_ST251, mfm_hd_st251_device) @@ -228,7 +228,7 @@ public: template <typename T> mfm_harddisk_connector(const machine_config &mconfig, const char *tag, device_t *owner, T &&opts, const char *dflt, mfmhd_enc_t enc, int spinup, int cache, const mfmhd_format_type format, bool fixed = false) - : mfm_harddisk_connector(mconfig, tag, owner, 0) + : mfm_harddisk_connector(mconfig, tag, owner) { option_reset(); opts(*this); @@ -237,7 +237,7 @@ public: configure(enc, spinup, cache, format); } - mfm_harddisk_connector(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + mfm_harddisk_connector(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock = XTAL()); ~mfm_harddisk_connector(); mfm_harddisk_device *get_device(); diff --git a/src/devices/imagedev/microdrv.cpp b/src/devices/imagedev/microdrv.cpp index 02168270523..a2c44d7de3a 100644 --- a/src/devices/imagedev/microdrv.cpp +++ b/src/devices/imagedev/microdrv.cpp @@ -45,7 +45,7 @@ DEFINE_DEVICE_TYPE(MICRODRIVE, microdrive_image_device, "microdrive_image", "Sin // microdrive_image_device - constructor //------------------------------------------------- -microdrive_image_device::microdrive_image_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : +microdrive_image_device::microdrive_image_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : microtape_image_device(mconfig, MICRODRIVE, tag, owner, clock), m_write_comms_out(*this) { diff --git a/src/devices/imagedev/microdrv.h b/src/devices/imagedev/microdrv.h index 5bd7d6a37da..51cfcd6676a 100644 --- a/src/devices/imagedev/microdrv.h +++ b/src/devices/imagedev/microdrv.h @@ -34,7 +34,7 @@ class microdrive_image_device : public microtape_image_device { public: // construction/destruction - microdrive_image_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock = 0); + microdrive_image_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock = XTAL()); virtual ~microdrive_image_device(); auto comms_out_wr_callback() { return m_write_comms_out.bind(); } diff --git a/src/devices/imagedev/midiin.cpp b/src/devices/imagedev/midiin.cpp index 59211d06f88..cefeb6cfb05 100644 --- a/src/devices/imagedev/midiin.cpp +++ b/src/devices/imagedev/midiin.cpp @@ -48,7 +48,7 @@ INPUT_PORTS_END ctor -------------------------------------------------*/ -midiin_device::midiin_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +midiin_device::midiin_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, MIDIIN, tag, owner, clock), device_image_interface(mconfig, *this), device_serial_interface(mconfig, *this), @@ -90,8 +90,8 @@ void midiin_device::device_reset() // we don't Rx, we Tx at 31250 8-N-1 set_data_frame(1, 8, PARITY_NONE, STOP_BITS_1); - set_rcv_rate(0); - set_tra_rate(31250); + set_rcv_rate(XTAL::u(0)); + set_tra_rate(XTAL::u(31250)); } /*------------------------------------------------- diff --git a/src/devices/imagedev/midiin.h b/src/devices/imagedev/midiin.h index aed7d3b15a9..02bd4e16ee7 100644 --- a/src/devices/imagedev/midiin.h +++ b/src/devices/imagedev/midiin.h @@ -26,7 +26,7 @@ class midiin_device : public device_t, { public: // construction/destruction - midiin_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + midiin_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); ~midiin_device(); auto input_callback() { return m_input_cb.bind(); } diff --git a/src/devices/imagedev/midiout.cpp b/src/devices/imagedev/midiout.cpp index 026b6520143..08130f5746f 100644 --- a/src/devices/imagedev/midiout.cpp +++ b/src/devices/imagedev/midiout.cpp @@ -22,7 +22,7 @@ DEFINE_DEVICE_TYPE(MIDIOUT, midiout_device, "midiout", "MIDI Out image device") ctor -------------------------------------------------*/ -midiout_device::midiout_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +midiout_device::midiout_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, MIDIOUT, tag, owner, clock), device_image_interface(mconfig, *this), device_serial_interface(mconfig, *this), @@ -47,8 +47,8 @@ void midiout_device::device_reset() { // we don't Tx, we Rx at 31250 8-N-1 set_data_frame(1, 8, PARITY_NONE, STOP_BITS_1); - set_rcv_rate(31250); - set_tra_rate(0); + set_rcv_rate(XTAL::u(31250)); + set_tra_rate(XTAL::u(0)); } /*------------------------------------------------- diff --git a/src/devices/imagedev/midiout.h b/src/devices/imagedev/midiout.h index 7b39e4fff5e..5714d239985 100644 --- a/src/devices/imagedev/midiout.h +++ b/src/devices/imagedev/midiout.h @@ -26,7 +26,7 @@ class midiout_device : public device_t, { public: // construction/destruction - midiout_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + midiout_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); ~midiout_device(); // image-level overrides diff --git a/src/devices/imagedev/papertape.cpp b/src/devices/imagedev/papertape.cpp index f8cea6b2996..3522f6e4821 100644 --- a/src/devices/imagedev/papertape.cpp +++ b/src/devices/imagedev/papertape.cpp @@ -16,18 +16,18 @@ #include "softlist_dev.h" -paper_tape_image_device::paper_tape_image_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock) +paper_tape_image_device::paper_tape_image_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_image_interface(mconfig, *this) { } -paper_tape_reader_device::paper_tape_reader_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock) +paper_tape_reader_device::paper_tape_reader_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock) : paper_tape_image_device(mconfig, type, tag, owner, clock) { } -paper_tape_punch_device::paper_tape_punch_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock) +paper_tape_punch_device::paper_tape_punch_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock) : paper_tape_image_device(mconfig, type, tag, owner, clock) { } diff --git a/src/devices/imagedev/papertape.h b/src/devices/imagedev/papertape.h index a0fa6b9cada..a90dabc45f4 100644 --- a/src/devices/imagedev/papertape.h +++ b/src/devices/imagedev/papertape.h @@ -29,7 +29,7 @@ public: protected: // construction/destruction - paper_tape_image_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock); + paper_tape_image_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock); }; // ======================> paper_tape_reader_device @@ -45,7 +45,7 @@ public: protected: // construction/destruction - paper_tape_reader_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock); + paper_tape_reader_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock); // device_image_interface implementation virtual const software_list_loader &get_software_list_loader() const override; @@ -65,7 +65,7 @@ public: protected: // construction/destruction - paper_tape_punch_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock); + paper_tape_punch_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock); }; #endif // MAME_DEVICES_IMAGEDEV_PAPERTAPE_H diff --git a/src/devices/imagedev/picture.cpp b/src/devices/imagedev/picture.cpp index b617cd2eeba..ffb8c3e1899 100644 --- a/src/devices/imagedev/picture.cpp +++ b/src/devices/imagedev/picture.cpp @@ -23,7 +23,7 @@ DEFINE_DEVICE_TYPE(IMAGE_PICTURE, picture_image_device, "picture_image", "Still // picture_image_device - constructor //------------------------------------------------- -picture_image_device::picture_image_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : +picture_image_device::picture_image_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, IMAGE_PICTURE, tag, owner, clock), device_image_interface(mconfig, *this) { diff --git a/src/devices/imagedev/picture.h b/src/devices/imagedev/picture.h index b53dab22062..6f0df15986a 100644 --- a/src/devices/imagedev/picture.h +++ b/src/devices/imagedev/picture.h @@ -26,7 +26,7 @@ class picture_image_device : public device_t, { public: // construction/destruction - picture_image_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock = 0); + picture_image_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock = XTAL()); virtual ~picture_image_device(); // image-level overrides diff --git a/src/devices/imagedev/printer.cpp b/src/devices/imagedev/printer.cpp index 2eb187d843a..0bcef6b9f7e 100644 --- a/src/devices/imagedev/printer.cpp +++ b/src/devices/imagedev/printer.cpp @@ -19,7 +19,7 @@ DEFINE_DEVICE_TYPE(PRINTER, printer_image_device, "printer_image", "Printer") // printer_image_device - constructor //------------------------------------------------- -printer_image_device::printer_image_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : +printer_image_device::printer_image_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, PRINTER, tag, owner, clock), device_image_interface(mconfig, *this), m_online_cb(*this) diff --git a/src/devices/imagedev/printer.h b/src/devices/imagedev/printer.h index 509ecc43ef2..0b8c16de166 100644 --- a/src/devices/imagedev/printer.h +++ b/src/devices/imagedev/printer.h @@ -25,7 +25,7 @@ class printer_image_device : public device_t, { public: // construction/destruction - printer_image_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + printer_image_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); auto online_callback() { return m_online_cb.bind(); } diff --git a/src/devices/imagedev/snapquik.cpp b/src/devices/imagedev/snapquik.cpp index 53c682827ea..0726a0c334a 100644 --- a/src/devices/imagedev/snapquik.cpp +++ b/src/devices/imagedev/snapquik.cpp @@ -20,12 +20,12 @@ DEFINE_DEVICE_TYPE(SNAPSHOT, snapshot_image_device, "snapsot_image", "Snapshot") // snapshot_image_device - constructor //------------------------------------------------- -snapshot_image_device::snapshot_image_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +snapshot_image_device::snapshot_image_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : snapshot_image_device(mconfig, SNAPSHOT, tag, owner, clock) { } -snapshot_image_device::snapshot_image_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) +snapshot_image_device::snapshot_image_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_image_interface(mconfig, *this) , m_load(*this) @@ -90,7 +90,7 @@ DEFINE_DEVICE_TYPE(QUICKLOAD, quickload_image_device, "quickload", "Quickload") // quickload_image_device - constructor //------------------------------------------------- -quickload_image_device::quickload_image_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +quickload_image_device::quickload_image_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : snapshot_image_device(mconfig, QUICKLOAD, tag, owner, clock) { } diff --git a/src/devices/imagedev/snapquik.h b/src/devices/imagedev/snapquik.h index f312e4d4f39..489db53cb35 100644 --- a/src/devices/imagedev/snapquik.h +++ b/src/devices/imagedev/snapquik.h @@ -22,12 +22,12 @@ public: // construction/destruction snapshot_image_device(const machine_config &mconfig, const char *tag, device_t *owner, const char* extensions, attotime delay = attotime::zero) - : snapshot_image_device(mconfig, tag, owner, 0U) + : snapshot_image_device(mconfig, tag, owner) { set_extensions(extensions); set_delay(delay); } - snapshot_image_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + snapshot_image_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock = XTAL()); virtual ~snapshot_image_device(); void set_interface(const char *interface) { m_interface = interface; } @@ -49,7 +49,7 @@ public: template <typename... T> void set_load_callback(T &&... args) { m_load.set(std::forward<T>(args)...); } protected: - snapshot_image_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); + snapshot_image_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock); // device-level overrides virtual void device_start() override; @@ -76,12 +76,12 @@ class quickload_image_device : public snapshot_image_device public: // construction/destruction quickload_image_device(const machine_config &mconfig, const char *tag, device_t *owner, const char* extensions, attotime delay = attotime::zero) - : quickload_image_device(mconfig, tag, owner, 0U) + : quickload_image_device(mconfig, tag, owner) { set_extensions(extensions); set_delay(delay); } - quickload_image_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock = 0U); + quickload_image_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock = XTAL()); virtual const char *image_type_name() const noexcept override { return "quickload"; } virtual const char *image_brief_type_name() const noexcept override { return "quik"; } diff --git a/src/devices/imagedev/wafadrive.cpp b/src/devices/imagedev/wafadrive.cpp index 237e809075b..1958aaee0b4 100644 --- a/src/devices/imagedev/wafadrive.cpp +++ b/src/devices/imagedev/wafadrive.cpp @@ -23,7 +23,7 @@ DEFINE_DEVICE_TYPE(WAFADRIVE_IMAGE, wafadrive_image_device, "wafadrive_image", " // microdrive_image_device - constructor //------------------------------------------------- -wafadrive_image_device::wafadrive_image_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : +wafadrive_image_device::wafadrive_image_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : microtape_image_device(mconfig, WAFADRIVE_IMAGE, tag, owner, clock) { } diff --git a/src/devices/imagedev/wafadrive.h b/src/devices/imagedev/wafadrive.h index 532288dcba9..435e27f1247 100644 --- a/src/devices/imagedev/wafadrive.h +++ b/src/devices/imagedev/wafadrive.h @@ -26,7 +26,7 @@ class wafadrive_image_device : public microtape_image_device { public: // construction/destruction - wafadrive_image_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock = 0); + wafadrive_image_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock = XTAL()); virtual ~wafadrive_image_device(); // image-level overrides |