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/ieee488 | |
parent | 5c14bcdfcb4aefb71b5b62387c4ad05dbeb3814e (diff) |
full xtal conversionxtal
Diffstat (limited to 'src/devices/bus/ieee488')
30 files changed, 67 insertions, 67 deletions
diff --git a/src/devices/bus/ieee488/c2031.cpp b/src/devices/bus/ieee488/c2031.cpp index 4efdd03e7b5..9a41957ab46 100644 --- a/src/devices/bus/ieee488/c2031.cpp +++ b/src/devices/bus/ieee488/c2031.cpp @@ -320,7 +320,7 @@ void c2031_device::device_add_mconfig(machine_config &config) C64H156(config, m_ga, XTAL(16'000'000)); m_ga->byte_callback().set(FUNC(c2031_device::byte_w)); - floppy_connector &connector(FLOPPY_CONNECTOR(config, C64H156_TAG":0", 0)); + floppy_connector &connector(FLOPPY_CONNECTOR(config, C64H156_TAG":0")); connector.option_add("525ssqd", FLOPPY_525_SSQD); connector.set_default_option("525ssqd"); connector.set_fixed(true); @@ -386,7 +386,7 @@ inline int c2031_device::get_device_number() // c2031_device - constructor //------------------------------------------------- -c2031_device::c2031_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +c2031_device::c2031_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, C2031, tag, owner, clock) , device_ieee488_interface(mconfig, *this) , m_maincpu(*this, M6502_TAG) diff --git a/src/devices/bus/ieee488/c2031.h b/src/devices/bus/ieee488/c2031.h index f3a0dc02074..783fa06c4fd 100644 --- a/src/devices/bus/ieee488/c2031.h +++ b/src/devices/bus/ieee488/c2031.h @@ -30,7 +30,7 @@ class c2031_device : public device_t, { public: // construction/destruction - c2031_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + c2031_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); protected: // device-level overrides diff --git a/src/devices/bus/ieee488/c2040.cpp b/src/devices/bus/ieee488/c2040.cpp index 886dd01bbf2..237e7739df0 100644 --- a/src/devices/bus/ieee488/c2040.cpp +++ b/src/devices/bus/ieee488/c2040.cpp @@ -573,7 +573,7 @@ inline void c2040_device::update_ieee_signals() // c2040_device - constructor //------------------------------------------------- -c2040_device::c2040_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) : +c2040_device::c2040_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_ieee488_interface(mconfig, *this), m_maincpu(*this, M6502_TAG), @@ -595,7 +595,7 @@ c2040_device::c2040_device(const machine_config &mconfig, device_type type, cons { } -c2040_device::c2040_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : +c2040_device::c2040_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : c2040_device(mconfig, C2040, tag, owner, clock) { } @@ -605,7 +605,7 @@ c2040_device::c2040_device(const machine_config &mconfig, const char *tag, devic // c3040_device - constructor //------------------------------------------------- -c3040_device::c3040_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : +c3040_device::c3040_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : c2040_device(mconfig, C3040, tag, owner, clock) { } @@ -615,7 +615,7 @@ c3040_device::c3040_device(const machine_config &mconfig, const char *tag, devic // c4040_device - constructor //------------------------------------------------- -c4040_device::c4040_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : +c4040_device::c4040_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : c2040_device(mconfig, C4040, tag, owner, clock) { } diff --git a/src/devices/bus/ieee488/c2040.h b/src/devices/bus/ieee488/c2040.h index 41f4f4f967e..0dc7195f20d 100644 --- a/src/devices/bus/ieee488/c2040.h +++ b/src/devices/bus/ieee488/c2040.h @@ -30,7 +30,7 @@ class c2040_device : public device_t, public device_ieee488_interface { public: // construction/destruction - c2040_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + c2040_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); uint8_t dio_r(); void dio_w(uint8_t data); @@ -43,7 +43,7 @@ public: void c2040_fdc_mem(address_map &map); void c2040_main_mem(address_map &map); protected: - c2040_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); + c2040_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; @@ -98,7 +98,7 @@ class c3040_device : public c2040_device { public: // construction/destruction - c3040_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + c3040_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); protected: // optional information overrides @@ -116,7 +116,7 @@ class c4040_device : public c2040_device { public: // construction/destruction - c4040_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + c4040_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); protected: // optional information overrides diff --git a/src/devices/bus/ieee488/c2040fdc.cpp b/src/devices/bus/ieee488/c2040fdc.cpp index 18c02bba831..fb14726d397 100644 --- a/src/devices/bus/ieee488/c2040fdc.cpp +++ b/src/devices/bus/ieee488/c2040fdc.cpp @@ -70,7 +70,7 @@ const tiny_rom_entry *c2040_fdc_device::device_rom_region() const // c2040_fdc_device - constructor //------------------------------------------------- -c2040_fdc_device::c2040_fdc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : +c2040_fdc_device::c2040_fdc_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, C2040_FDC, tag, owner, clock), m_write_sync(*this), m_write_ready(*this), diff --git a/src/devices/bus/ieee488/c2040fdc.h b/src/devices/bus/ieee488/c2040fdc.h index 2198f6aa738..2b97150d2fe 100644 --- a/src/devices/bus/ieee488/c2040fdc.h +++ b/src/devices/bus/ieee488/c2040fdc.h @@ -28,7 +28,7 @@ class c2040_fdc_device : public device_t { public: // construction/destruction - c2040_fdc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + c2040_fdc_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); auto sync_wr_callback() { return m_write_sync.bind(); } auto ready_wr_callback() { return m_write_ready.bind(); } diff --git a/src/devices/bus/ieee488/c8050.cpp b/src/devices/bus/ieee488/c8050.cpp index 60358de4944..7c2ec038ebe 100644 --- a/src/devices/bus/ieee488/c8050.cpp +++ b/src/devices/bus/ieee488/c8050.cpp @@ -680,7 +680,7 @@ inline void c8050_device::update_ieee_signals() // c8050_device - constructor //------------------------------------------------- -c8050_device::c8050_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) : +c8050_device::c8050_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_ieee488_interface(mconfig, *this), m_maincpu(*this, M6502_TAG), @@ -701,7 +701,7 @@ c8050_device::c8050_device(const machine_config &mconfig, device_type type, cons { } -c8050_device::c8050_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : +c8050_device::c8050_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : c8050_device(mconfig, C8050, tag, owner, clock) { } @@ -711,7 +711,7 @@ c8050_device::c8050_device(const machine_config &mconfig, const char *tag, devic // c8250_device - constructor //------------------------------------------------- -c8250_device::c8250_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : +c8250_device::c8250_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : c8050_device(mconfig, C8250, tag, owner, clock) { } @@ -721,7 +721,7 @@ c8250_device::c8250_device(const machine_config &mconfig, const char *tag, devic // c8250lp_device - constructor //------------------------------------------------- -c8250lp_device::c8250lp_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : +c8250lp_device::c8250lp_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : c8050_device(mconfig, C8250LP, tag, owner, clock) { } @@ -731,7 +731,7 @@ c8250lp_device::c8250lp_device(const machine_config &mconfig, const char *tag, d // sfd1001_device - constructor //------------------------------------------------- -sfd1001_device::sfd1001_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : +sfd1001_device::sfd1001_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : c8050_device(mconfig, SFD1001, tag, owner, clock) { } diff --git a/src/devices/bus/ieee488/c8050.h b/src/devices/bus/ieee488/c8050.h index a8047617408..284704ab608 100644 --- a/src/devices/bus/ieee488/c8050.h +++ b/src/devices/bus/ieee488/c8050.h @@ -30,7 +30,7 @@ class c8050_device : public device_t, public device_ieee488_interface { public: // construction/destruction - c8050_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + c8050_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); uint8_t dio_r(); void dio_w(uint8_t data); @@ -45,7 +45,7 @@ public: void c8250lp_fdc_mem(address_map &map); void sfd1001_fdc_mem(address_map &map); protected: - c8050_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); + c8050_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; @@ -92,7 +92,7 @@ class c8250_device : public c8050_device { public: // construction/destruction - c8250_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + c8250_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); protected: // optional information overrides @@ -109,7 +109,7 @@ class c8250lp_device : public c8050_device { public: // construction/destruction - c8250lp_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + c8250lp_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); protected: // optional information overrides @@ -127,7 +127,7 @@ class sfd1001_device : public c8050_device { public: // construction/destruction - sfd1001_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + sfd1001_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); protected: // optional information overrides diff --git a/src/devices/bus/ieee488/c8050fdc.cpp b/src/devices/bus/ieee488/c8050fdc.cpp index eea107417c9..b044566b5c5 100644 --- a/src/devices/bus/ieee488/c8050fdc.cpp +++ b/src/devices/bus/ieee488/c8050fdc.cpp @@ -72,7 +72,7 @@ const tiny_rom_entry *c8050_fdc_device::device_rom_region() const // c8050_fdc_device - constructor //------------------------------------------------- -c8050_fdc_device::c8050_fdc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : +c8050_fdc_device::c8050_fdc_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, C8050_FDC, tag, owner, clock), m_write_sync(*this), m_write_ready(*this), diff --git a/src/devices/bus/ieee488/c8050fdc.h b/src/devices/bus/ieee488/c8050fdc.h index dd390b1b7c5..03248c63379 100644 --- a/src/devices/bus/ieee488/c8050fdc.h +++ b/src/devices/bus/ieee488/c8050fdc.h @@ -28,7 +28,7 @@ class c8050_fdc_device : public device_t { public: // construction/destruction - c8050_fdc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + c8050_fdc_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); auto sync_wr_callback() { return m_write_sync.bind(); } auto ready_wr_callback() { return m_write_ready.bind(); } diff --git a/src/devices/bus/ieee488/c8280.cpp b/src/devices/bus/ieee488/c8280.cpp index 1d9eb476110..a347272ec06 100644 --- a/src/devices/bus/ieee488/c8280.cpp +++ b/src/devices/bus/ieee488/c8280.cpp @@ -379,7 +379,7 @@ inline void c8280_device::update_ieee_signals() // c8280_device - constructor //------------------------------------------------- -c8280_device::c8280_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : +c8280_device::c8280_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, C8280, tag, owner, clock), device_ieee488_interface(mconfig, *this), m_maincpu(*this, M6502_DOS_TAG), diff --git a/src/devices/bus/ieee488/c8280.h b/src/devices/bus/ieee488/c8280.h index 1317a6c13f7..c8196f60033 100644 --- a/src/devices/bus/ieee488/c8280.h +++ b/src/devices/bus/ieee488/c8280.h @@ -30,7 +30,7 @@ class c8280_device : public device_t, public device_ieee488_interface { public: // construction/destruction - c8280_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + c8280_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); protected: // device-level overrides diff --git a/src/devices/bus/ieee488/d9060.cpp b/src/devices/bus/ieee488/d9060.cpp index 464db8cc902..b88ab032d9c 100644 --- a/src/devices/bus/ieee488/d9060.cpp +++ b/src/devices/bus/ieee488/d9060.cpp @@ -469,7 +469,7 @@ inline void d9060_device_base::update_ieee_signals() // d9060_device_base - constructor //------------------------------------------------- -d9060_device_base::d9060_device_base(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock, uint32_t variant) +d9060_device_base::d9060_device_base(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock, uint32_t variant) : device_t(mconfig, type, tag, owner, clock) , device_ieee488_interface(mconfig, *this) , m_maincpu(*this, M6502_DOS_TAG) @@ -496,7 +496,7 @@ d9060_device_base::d9060_device_base(const machine_config &mconfig, device_type // d9060_device - constructor //------------------------------------------------- -d9060_device::d9060_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +d9060_device::d9060_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : d9060_device_base(mconfig, D9060, tag, owner, clock, TYPE_9060) { } @@ -506,7 +506,7 @@ d9060_device::d9060_device(const machine_config &mconfig, const char *tag, devic // d9090_device - constructor //------------------------------------------------- -d9090_device::d9090_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +d9090_device::d9090_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : d9060_device_base(mconfig, D9090, tag, owner, clock, TYPE_9090) { } diff --git a/src/devices/bus/ieee488/d9060.h b/src/devices/bus/ieee488/d9060.h index a5da444dbcf..0027bad7dcf 100644 --- a/src/devices/bus/ieee488/d9060.h +++ b/src/devices/bus/ieee488/d9060.h @@ -36,7 +36,7 @@ protected: }; // construction/destruction - d9060_device_base(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock, uint32_t variant); + d9060_device_base(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock, uint32_t variant); // device-level overrides virtual void device_start() override; @@ -97,7 +97,7 @@ class d9060_device : public d9060_device_base { public: // construction/destruction - d9060_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + d9060_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); }; @@ -107,7 +107,7 @@ class d9090_device : public d9060_device_base { public: // construction/destruction - d9090_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + d9090_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); }; diff --git a/src/devices/bus/ieee488/grid2102.cpp b/src/devices/bus/ieee488/grid2102.cpp index 4e6bc92c391..3a0bc8e5a20 100644 --- a/src/devices/bus/ieee488/grid2102.cpp +++ b/src/devices/bus/ieee488/grid2102.cpp @@ -65,7 +65,7 @@ uint8_t grid2101_hdd_device::identify_response[56] = { }; -grid210x_device::grid210x_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock, int bus_addr, uint8_t *identify_response, attotime read_delay) +grid210x_device::grid210x_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock, int bus_addr, uint8_t *identify_response, attotime read_delay) : device_t(mconfig, type, tag, owner, clock), device_ieee488_interface(mconfig, *this), device_image_interface(mconfig, *this), @@ -298,18 +298,18 @@ void grid210x_device::ieee488_ren(int state) { LOG("grid210x_device ren state set to %d\n", state); } -grid2101_hdd_device::grid2101_hdd_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +grid2101_hdd_device::grid2101_hdd_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : grid210x_device(mconfig, GRID2101_HDD, tag, owner, clock, 4, identify_response, attotime::from_usec(150)) { } -grid2101_floppy_device::grid2101_floppy_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : grid210x_device(mconfig, GRID2101_FLOPPY, tag, owner, clock, 5, identify_response) +grid2101_floppy_device::grid2101_floppy_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : grid210x_device(mconfig, GRID2101_FLOPPY, tag, owner, clock, 5, identify_response) { } -grid2102_device::grid2102_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : grid210x_device(mconfig, GRID2102, tag, owner, clock, 6, identify_response) +grid2102_device::grid2102_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : grid210x_device(mconfig, GRID2102, tag, owner, clock, 6, identify_response) { } diff --git a/src/devices/bus/ieee488/grid2102.h b/src/devices/bus/ieee488/grid2102.h index 11cdbcecdd0..501cf62f41c 100644 --- a/src/devices/bus/ieee488/grid2102.h +++ b/src/devices/bus/ieee488/grid2102.h @@ -28,7 +28,7 @@ class grid210x_device : public device_t, { public: // construction/destruction - grid210x_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock, int bus_addr, uint8_t *identify_response, attotime read_delay = attotime::from_msec(5)); + grid210x_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock, int bus_addr, uint8_t *identify_response, attotime read_delay = attotime::from_msec(5)); protected: // device-level overrides @@ -84,7 +84,7 @@ protected: class grid2102_device : public grid210x_device { public: // construction/destruction - grid2102_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + grid2102_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); private: static uint8_t identify_response[]; }; @@ -92,7 +92,7 @@ private: class grid2101_floppy_device : public grid210x_device { public: // construction/destruction - grid2101_floppy_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + grid2101_floppy_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); private: static uint8_t identify_response[]; }; @@ -100,7 +100,7 @@ private: class grid2101_hdd_device : public grid210x_device { public: // construction/destruction - grid2101_hdd_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + grid2101_hdd_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); // image-level overrides virtual const char *image_type_name() const noexcept override { return "harddisk"; } diff --git a/src/devices/bus/ieee488/hardbox.cpp b/src/devices/bus/ieee488/hardbox.cpp index 0ad2db1abfb..96dca16c18a 100644 --- a/src/devices/bus/ieee488/hardbox.cpp +++ b/src/devices/bus/ieee488/hardbox.cpp @@ -286,7 +286,7 @@ void hardbox_device::device_add_mconfig(machine_config &config) ppi1.in_pc_callback().set(FUNC(hardbox_device::ppi1_pc_r)); ppi1.out_pc_callback().set(FUNC(hardbox_device::ppi1_pc_w)); - CORVUS_HDC(config, m_hdc, 0); + CORVUS_HDC(config, m_hdc); HARDDISK(config, "harddisk1", "corvus_hdd"); HARDDISK(config, "harddisk2", "corvus_hdd"); HARDDISK(config, "harddisk3", "corvus_hdd"); @@ -336,7 +336,7 @@ ioport_constructor hardbox_device::device_input_ports() const // hardbox_device - constructor //------------------------------------------------- -hardbox_device::hardbox_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +hardbox_device::hardbox_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, HARDBOX, tag, owner, clock) , device_ieee488_interface(mconfig, *this) , m_maincpu(*this, Z80_TAG) diff --git a/src/devices/bus/ieee488/hardbox.h b/src/devices/bus/ieee488/hardbox.h index 4b22ab57354..6b9fdcc194c 100644 --- a/src/devices/bus/ieee488/hardbox.h +++ b/src/devices/bus/ieee488/hardbox.h @@ -31,7 +31,7 @@ class hardbox_device : public device_t, { public: // construction/destruction - hardbox_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + hardbox_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); protected: // device-level overrides diff --git a/src/devices/bus/ieee488/hp9122c.cpp b/src/devices/bus/ieee488/hp9122c.cpp index f9619617ca1..cc8328ba658 100644 --- a/src/devices/bus/ieee488/hp9122c.cpp +++ b/src/devices/bus/ieee488/hp9122c.cpp @@ -17,7 +17,7 @@ DEFINE_DEVICE_TYPE(HP9122C, hp9122c_device, "hp9122c", "HP9122C Dual High density disk drive") -hp9122c_device::hp9122c_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +hp9122c_device::hp9122c_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t{mconfig, HP9122C, tag, owner, clock}, device_ieee488_interface{mconfig, *this}, m_cpu{*this , "cpu"}, diff --git a/src/devices/bus/ieee488/hp9122c.h b/src/devices/bus/ieee488/hp9122c.h index 0c2d4854251..4d31493f6f0 100644 --- a/src/devices/bus/ieee488/hp9122c.h +++ b/src/devices/bus/ieee488/hp9122c.h @@ -25,7 +25,7 @@ class hp9122c_device : public device_t, { public: // construction/destruction - hp9122c_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + hp9122c_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); protected: virtual void device_start() override; diff --git a/src/devices/bus/ieee488/hp9895.cpp b/src/devices/bus/ieee488/hp9895.cpp index aead54c0a18..fa9f4cd8925 100644 --- a/src/devices/bus/ieee488/hp9895.cpp +++ b/src/devices/bus/ieee488/hp9895.cpp @@ -132,7 +132,7 @@ static const uint8_t xv_drive_masks[] = { BIT_MASK(REG_XV_DRIVE1_BIT) }; -hp9895_device::hp9895_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +hp9895_device::hp9895_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, HP9895, tag, owner, clock), device_ieee488_interface(mconfig, *this), m_cpu(*this , "cpu"), @@ -870,12 +870,12 @@ const tiny_rom_entry *hp9895_device::device_rom_region() const void hp9895_device::device_add_mconfig(machine_config &config) { - Z80(config, m_cpu, 4000000); + Z80(config, m_cpu, XTAL::u(4000000)); m_cpu->set_addrmap(AS_PROGRAM, &hp9895_device::z80_program_map); m_cpu->set_addrmap(AS_IO, &hp9895_device::z80_io_map); m_cpu->refresh_cb().set(FUNC(hp9895_device::z80_m1_w)); - PHI(config, m_phi, 0); + PHI(config, m_phi); m_phi->eoi_write_cb().set(FUNC(hp9895_device::phi_eoi_w)); m_phi->dav_write_cb().set(FUNC(hp9895_device::phi_dav_w)); m_phi->nrfd_write_cb().set(FUNC(hp9895_device::phi_nrfd_w)); diff --git a/src/devices/bus/ieee488/hp9895.h b/src/devices/bus/ieee488/hp9895.h index 1cb77d60090..8ee212a7a78 100644 --- a/src/devices/bus/ieee488/hp9895.h +++ b/src/devices/bus/ieee488/hp9895.h @@ -24,7 +24,7 @@ class hp9895_device : public device_t, { public: // construction/destruction - hp9895_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + hp9895_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); protected: virtual void device_start() override; diff --git a/src/devices/bus/ieee488/ieee488.cpp b/src/devices/bus/ieee488/ieee488.cpp index 947aad2d1f7..6caf46b2f72 100644 --- a/src/devices/bus/ieee488/ieee488.cpp +++ b/src/devices/bus/ieee488/ieee488.cpp @@ -64,7 +64,7 @@ device_ieee488_interface::~device_ieee488_interface() // ieee488_slot_device - constructor //------------------------------------------------- -ieee488_slot_device::ieee488_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : +ieee488_slot_device::ieee488_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, IEEE488_SLOT, tag, owner, clock), device_slot_interface(mconfig, *this), m_address(0) @@ -95,7 +95,7 @@ void ieee488_slot_device::device_start() void ieee488_slot_device::add_cbm_slot(machine_config &config, const char *_tag, int _address, const char *_def_slot) { - ieee488_slot_device &slot(IEEE488_SLOT(config, _tag, 0)); + ieee488_slot_device &slot(IEEE488_SLOT(config, _tag)); cbm_ieee488_devices(slot); slot.set_default_option(_def_slot); slot.set_address(_address); @@ -109,7 +109,7 @@ void ieee488_slot_device::add_cbm_slot(machine_config &config, const char *_tag, // ieee488_device - constructor //------------------------------------------------- -ieee488_device::ieee488_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : +ieee488_device::ieee488_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, IEEE488, tag, owner, clock), m_write_eoi(*this), m_write_dav(*this), diff --git a/src/devices/bus/ieee488/ieee488.h b/src/devices/bus/ieee488/ieee488.h index 5a83d0fe927..cb5c3f06501 100644 --- a/src/devices/bus/ieee488/ieee488.h +++ b/src/devices/bus/ieee488/ieee488.h @@ -41,7 +41,7 @@ class ieee488_device : public device_t { public: // construction/destruction - ieee488_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock = 0); + ieee488_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock = XTAL()); auto eoi_callback() { return m_write_eoi.bind(); } auto dav_callback() { return m_write_dav.bind(); } @@ -171,7 +171,7 @@ public: // construction/destruction template <typename T> ieee488_slot_device(machine_config const &mconfig, char const *tag, device_t *owner, int address, T &&opts, char const *dflt) - : ieee488_slot_device(mconfig, tag, owner, (uint32_t)0) + : ieee488_slot_device(mconfig, tag, owner) { option_reset(); opts(*this); @@ -179,7 +179,7 @@ public: set_fixed(false); set_address(address); } - ieee488_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + ieee488_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock = XTAL()); static void add_cbm_slot(machine_config &config, const char *_tag, int _address, const char *_def_slot); static void add_cbm_defaults(machine_config &config, const char *_default_drive) diff --git a/src/devices/bus/ieee488/remote488.cpp b/src/devices/bus/ieee488/remote488.cpp index d559622dad6..83843d09c95 100644 --- a/src/devices/bus/ieee488/remote488.cpp +++ b/src/devices/bus/ieee488/remote488.cpp @@ -243,7 +243,7 @@ constexpr unsigned AH_TO_MS = 10; // Timeout in AH to report a byte st // device type definition DEFINE_DEVICE_TYPE(REMOTE488, remote488_device, "remote488", "IEEE-488 Remotizer") -remote488_device::remote488_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : +remote488_device::remote488_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig , REMOTE488 , tag , owner , clock), device_ieee488_interface(mconfig , *this), m_stream(*this , "stream") @@ -252,7 +252,7 @@ remote488_device::remote488_device(const machine_config &mconfig, const char *ta void remote488_device::device_add_mconfig(machine_config &config) { - BITBANGER(config, m_stream, 0); + BITBANGER(config, m_stream); } void remote488_device::ieee488_eoi(int state) diff --git a/src/devices/bus/ieee488/remote488.h b/src/devices/bus/ieee488/remote488.h index bcb64866a05..3112fa607bc 100644 --- a/src/devices/bus/ieee488/remote488.h +++ b/src/devices/bus/ieee488/remote488.h @@ -19,7 +19,7 @@ class remote488_device : public device_t, { public: // construction/destruction - remote488_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + remote488_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); // device_ieee488_interface overrides virtual void ieee488_eoi(int state) override; diff --git a/src/devices/bus/ieee488/shark.cpp b/src/devices/bus/ieee488/shark.cpp index 1e160b6c310..0d4db989a43 100644 --- a/src/devices/bus/ieee488/shark.cpp +++ b/src/devices/bus/ieee488/shark.cpp @@ -83,12 +83,12 @@ void mshark_device::mshark_io(address_map &map) void mshark_device::device_add_mconfig(machine_config &config) { // basic machine hardware - I8085A(config, m_maincpu, 1000000); + I8085A(config, m_maincpu, XTAL::u(1000000)); m_maincpu->set_addrmap(AS_PROGRAM, &mshark_device::mshark_mem); m_maincpu->set_addrmap(AS_IO, &mshark_device::mshark_io); // devices - HARDDISK(config, "harddisk1", 0); + HARDDISK(config, "harddisk1"); RS232_PORT(config, RS232_TAG, default_rs232_devices, nullptr); } @@ -120,7 +120,7 @@ ioport_constructor mshark_device::device_input_ports() const // mshark_device - constructor //------------------------------------------------- -mshark_device::mshark_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +mshark_device::mshark_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, MSHARK, tag, owner, clock) , device_ieee488_interface(mconfig, *this) , m_maincpu(*this, I8085_TAG) diff --git a/src/devices/bus/ieee488/shark.h b/src/devices/bus/ieee488/shark.h index 6ba13e138e8..a79c7b4d4db 100644 --- a/src/devices/bus/ieee488/shark.h +++ b/src/devices/bus/ieee488/shark.h @@ -28,7 +28,7 @@ class mshark_device : public device_t, { public: // construction/destruction - mshark_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + mshark_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); protected: // device-level overrides diff --git a/src/devices/bus/ieee488/softbox.cpp b/src/devices/bus/ieee488/softbox.cpp index 0a38d5ce9cf..c834e999812 100644 --- a/src/devices/bus/ieee488/softbox.cpp +++ b/src/devices/bus/ieee488/softbox.cpp @@ -239,7 +239,7 @@ void softbox_device::device_add_mconfig(machine_config &config) m_maincpu->set_addrmap(AS_IO, &softbox_device::softbox_io); // devices - i8251_device &i8251(I8251(config, I8251_TAG, 0)); + i8251_device &i8251(I8251(config, I8251_TAG)); i8251.txd_handler().set(RS232_TAG, FUNC(rs232_port_device::write_txd)); i8251.dtr_handler().set(RS232_TAG, FUNC(rs232_port_device::write_dtr)); i8251.rts_handler().set(RS232_TAG, FUNC(rs232_port_device::write_rts)); @@ -264,7 +264,7 @@ void softbox_device::device_add_mconfig(machine_config &config) m_dbrg->fr_handler().set(I8251_TAG, FUNC(i8251_device::write_rxc)); m_dbrg->ft_handler().set(I8251_TAG, FUNC(i8251_device::write_txc)); - CORVUS_HDC(config, m_hdc, 0); + CORVUS_HDC(config, m_hdc); HARDDISK(config, "harddisk1", "corvus_hdd"); HARDDISK(config, "harddisk2", "corvus_hdd"); HARDDISK(config, "harddisk3", "corvus_hdd"); @@ -312,7 +312,7 @@ ioport_constructor softbox_device::device_input_ports() const // softbox_device - constructor //------------------------------------------------- -softbox_device::softbox_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +softbox_device::softbox_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, SOFTBOX, tag, owner, clock) , device_ieee488_interface(mconfig, *this) , m_maincpu(*this, Z80_TAG) diff --git a/src/devices/bus/ieee488/softbox.h b/src/devices/bus/ieee488/softbox.h index 6b1f4a1dee0..656cc4d268a 100644 --- a/src/devices/bus/ieee488/softbox.h +++ b/src/devices/bus/ieee488/softbox.h @@ -33,7 +33,7 @@ class softbox_device : public device_t, { public: // construction/destruction - softbox_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + softbox_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); protected: // device-level overrides |