diff options
Diffstat (limited to 'src/devices/bus/einstein')
-rw-r--r-- | src/devices/bus/einstein/pipe/pipe.cpp | 2 | ||||
-rw-r--r-- | src/devices/bus/einstein/pipe/pipe.h | 4 | ||||
-rw-r--r-- | src/devices/bus/einstein/pipe/silicon_disc.cpp | 2 | ||||
-rw-r--r-- | src/devices/bus/einstein/pipe/silicon_disc.h | 2 | ||||
-rw-r--r-- | src/devices/bus/einstein/pipe/speculator.cpp | 6 | ||||
-rw-r--r-- | src/devices/bus/einstein/pipe/speculator.h | 2 | ||||
-rw-r--r-- | src/devices/bus/einstein/pipe/tk02.cpp | 2 | ||||
-rw-r--r-- | src/devices/bus/einstein/pipe/tk02.h | 2 | ||||
-rw-r--r-- | src/devices/bus/einstein/userport/mouse.cpp | 2 | ||||
-rw-r--r-- | src/devices/bus/einstein/userport/mouse.h | 2 | ||||
-rw-r--r-- | src/devices/bus/einstein/userport/speech.cpp | 4 | ||||
-rw-r--r-- | src/devices/bus/einstein/userport/speech.h | 2 | ||||
-rw-r--r-- | src/devices/bus/einstein/userport/userport.cpp | 6 | ||||
-rw-r--r-- | src/devices/bus/einstein/userport/userport.h | 11 |
14 files changed, 22 insertions, 27 deletions
diff --git a/src/devices/bus/einstein/pipe/pipe.cpp b/src/devices/bus/einstein/pipe/pipe.cpp index f54092e9587..868e56dcf7a 100644 --- a/src/devices/bus/einstein/pipe/pipe.cpp +++ b/src/devices/bus/einstein/pipe/pipe.cpp @@ -30,7 +30,7 @@ DEFINE_DEVICE_TYPE(TATUNG_PIPE, tatung_pipe_device, "tatung_pipe", "Tatung Pipe // tatung_pipe_device - constructor //------------------------------------------------- -tatung_pipe_device::tatung_pipe_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : +tatung_pipe_device::tatung_pipe_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, TATUNG_PIPE, tag, owner, clock), device_single_card_slot_interface<device_tatung_pipe_interface>(mconfig, *this), m_program(*this, finder_base::DUMMY_TAG, -1), diff --git a/src/devices/bus/einstein/pipe/pipe.h b/src/devices/bus/einstein/pipe/pipe.h index 7b2a2fdcbad..2897b582818 100644 --- a/src/devices/bus/einstein/pipe/pipe.h +++ b/src/devices/bus/einstein/pipe/pipe.h @@ -56,9 +56,9 @@ class tatung_pipe_device : public device_t, public device_single_card_slot_inter friend class device_tatung_pipe_interface; public: // construction/destruction - tatung_pipe_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + tatung_pipe_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); template <typename T> - tatung_pipe_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock, T &&opts, const char *dflt) + tatung_pipe_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock, T &&opts, const char *dflt) : tatung_pipe_device(mconfig, tag, owner, clock) { option_reset(); diff --git a/src/devices/bus/einstein/pipe/silicon_disc.cpp b/src/devices/bus/einstein/pipe/silicon_disc.cpp index c0a29f304bd..3f70488551a 100644 --- a/src/devices/bus/einstein/pipe/silicon_disc.cpp +++ b/src/devices/bus/einstein/pipe/silicon_disc.cpp @@ -49,7 +49,7 @@ const tiny_rom_entry *einstein_silicon_disc_device::device_rom_region() const // einstein_silicon_disc_device - constructor //------------------------------------------------- -einstein_silicon_disc_device::einstein_silicon_disc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : +einstein_silicon_disc_device::einstein_silicon_disc_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, EINSTEIN_SILICON_DISC, tag, owner, clock), device_tatung_pipe_interface(mconfig, *this), m_rom(*this, "rom"), diff --git a/src/devices/bus/einstein/pipe/silicon_disc.h b/src/devices/bus/einstein/pipe/silicon_disc.h index c80ef0ed88c..48b5485cb77 100644 --- a/src/devices/bus/einstein/pipe/silicon_disc.h +++ b/src/devices/bus/einstein/pipe/silicon_disc.h @@ -26,7 +26,7 @@ class einstein_silicon_disc_device : public device_t, public device_tatung_pipe_ { public: // construction/destruction - einstein_silicon_disc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + einstein_silicon_disc_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); protected: virtual const tiny_rom_entry *device_rom_region() const override; diff --git a/src/devices/bus/einstein/pipe/speculator.cpp b/src/devices/bus/einstein/pipe/speculator.cpp index e99d3978cb4..4a05436724c 100644 --- a/src/devices/bus/einstein/pipe/speculator.cpp +++ b/src/devices/bus/einstein/pipe/speculator.cpp @@ -27,7 +27,7 @@ DEFINE_DEVICE_TYPE(EINSTEIN_SPECULATOR, einstein_speculator_device, "einstein_sp void einstein_speculator_device::device_add_mconfig(machine_config &config) { - TTL74123(config, m_ic5a, 0); + TTL74123(config, m_ic5a); m_ic5a->set_connection_type(TTL74123_NOT_GROUNDED_NO_DIODE); m_ic5a->set_resistor_value(RES_K(47)); m_ic5a->set_capacitor_value(CAP_P(560)); @@ -36,7 +36,7 @@ void einstein_speculator_device::device_add_mconfig(machine_config &config) m_ic5a->set_clear_pin_value(0); m_ic5a->out_cb().set(FUNC(einstein_speculator_device::ic5a_q_w)); - TTL74123(config, m_ic5b, 0); + TTL74123(config, m_ic5b); m_ic5b->set_connection_type(TTL74123_NOT_GROUNDED_NO_DIODE); m_ic5b->set_resistor_value(RES_K(47)); m_ic5b->set_capacitor_value(CAP_P(560)); @@ -64,7 +64,7 @@ void einstein_speculator_device::device_add_mconfig(machine_config &config) // einstein_speculator_device - constructor //------------------------------------------------- -einstein_speculator_device::einstein_speculator_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : +einstein_speculator_device::einstein_speculator_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, EINSTEIN_SPECULATOR, tag, owner, clock), device_tatung_pipe_interface(mconfig, *this), m_ic5a(*this, "ic5a"), m_ic5b(*this, "ic5b"), diff --git a/src/devices/bus/einstein/pipe/speculator.h b/src/devices/bus/einstein/pipe/speculator.h index c66b2e0122e..54159838878 100644 --- a/src/devices/bus/einstein/pipe/speculator.h +++ b/src/devices/bus/einstein/pipe/speculator.h @@ -30,7 +30,7 @@ class einstein_speculator_device : public device_t, public device_tatung_pipe_in { public: // construction/destruction - einstein_speculator_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + einstein_speculator_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual void int_w(int state) override; diff --git a/src/devices/bus/einstein/pipe/tk02.cpp b/src/devices/bus/einstein/pipe/tk02.cpp index 74cd880e151..668426f458b 100644 --- a/src/devices/bus/einstein/pipe/tk02.cpp +++ b/src/devices/bus/einstein/pipe/tk02.cpp @@ -126,7 +126,7 @@ void tk02_device::device_add_mconfig(machine_config &config) // tk02_device - constructor //------------------------------------------------- -tk02_device::tk02_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : +tk02_device::tk02_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, TK02_80COL, tag, owner, clock), device_tatung_pipe_interface(mconfig, *this), m_pipe(*this, "pipe"), diff --git a/src/devices/bus/einstein/pipe/tk02.h b/src/devices/bus/einstein/pipe/tk02.h index 3834585ed2a..aaccafb48c0 100644 --- a/src/devices/bus/einstein/pipe/tk02.h +++ b/src/devices/bus/einstein/pipe/tk02.h @@ -26,7 +26,7 @@ class tk02_device : public device_t, public device_tatung_pipe_interface { public: // construction/destruction - tk02_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + tk02_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); protected: virtual const tiny_rom_entry *device_rom_region() const override; diff --git a/src/devices/bus/einstein/userport/mouse.cpp b/src/devices/bus/einstein/userport/mouse.cpp index 945bff5d37c..e0613d4f1e5 100644 --- a/src/devices/bus/einstein/userport/mouse.cpp +++ b/src/devices/bus/einstein/userport/mouse.cpp @@ -48,7 +48,7 @@ ioport_constructor einstein_mouse_device::device_input_ports() const // einstein_speech_device - constructor //------------------------------------------------- -einstein_mouse_device::einstein_mouse_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : +einstein_mouse_device::einstein_mouse_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, EINSTEIN_MOUSE, tag, owner, clock), device_einstein_userport_interface(mconfig, *this), m_mouse_b(*this, "mouse_b"), diff --git a/src/devices/bus/einstein/userport/mouse.h b/src/devices/bus/einstein/userport/mouse.h index dad8200d06b..8ec38ae4004 100644 --- a/src/devices/bus/einstein/userport/mouse.h +++ b/src/devices/bus/einstein/userport/mouse.h @@ -24,7 +24,7 @@ class einstein_mouse_device : public device_t, public device_einstein_userport_i { public: // construction/destruction - einstein_mouse_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + einstein_mouse_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); protected: virtual ioport_constructor device_input_ports() const override; diff --git a/src/devices/bus/einstein/userport/speech.cpp b/src/devices/bus/einstein/userport/speech.cpp index 435423f9f82..3a822109d49 100644 --- a/src/devices/bus/einstein/userport/speech.cpp +++ b/src/devices/bus/einstein/userport/speech.cpp @@ -40,7 +40,7 @@ const tiny_rom_entry *einstein_speech_device::device_rom_region() const void einstein_speech_device::device_add_mconfig(machine_config &config) { SPEAKER(config, "mono").front_center(); - SP0256(config, m_sp0256, 3120000); // ??? + SP0256(config, m_sp0256, XTAL::u(3120000)); // ??? m_sp0256->add_route(ALL_OUTPUTS, "mono", 1.00); } @@ -53,7 +53,7 @@ void einstein_speech_device::device_add_mconfig(machine_config &config) // einstein_speech_device - constructor //------------------------------------------------- -einstein_speech_device::einstein_speech_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : +einstein_speech_device::einstein_speech_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, EINSTEIN_SPEECH, tag, owner, clock), device_einstein_userport_interface(mconfig, *this), m_sp0256(*this, "sp0256") diff --git a/src/devices/bus/einstein/userport/speech.h b/src/devices/bus/einstein/userport/speech.h index 4c62b24e842..494e5e5d54d 100644 --- a/src/devices/bus/einstein/userport/speech.h +++ b/src/devices/bus/einstein/userport/speech.h @@ -25,7 +25,7 @@ class einstein_speech_device : public device_t, public device_einstein_userport_ { public: // construction/destruction - einstein_speech_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + einstein_speech_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); protected: virtual const tiny_rom_entry *device_rom_region() const override; diff --git a/src/devices/bus/einstein/userport/userport.cpp b/src/devices/bus/einstein/userport/userport.cpp index e2fdd06acd2..ce1ebcc4b97 100644 --- a/src/devices/bus/einstein/userport/userport.cpp +++ b/src/devices/bus/einstein/userport/userport.cpp @@ -29,12 +29,16 @@ DEFINE_DEVICE_TYPE(EINSTEIN_USERPORT, einstein_userport_device, "einstein_userpo // einstein_userport_device - constructor //------------------------------------------------- -einstein_userport_device::einstein_userport_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : +einstein_userport_device::einstein_userport_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, EINSTEIN_USERPORT, tag, owner, clock), device_single_card_slot_interface<device_einstein_userport_interface>(mconfig, *this), m_card(nullptr), m_bstb_handler(*this) { + option_reset(); + einstein_userport_cards(*this); + set_default_option(nullptr); + set_fixed(false); } //------------------------------------------------- diff --git a/src/devices/bus/einstein/userport/userport.h b/src/devices/bus/einstein/userport/userport.h index d543f14d7c6..fde4e708cfb 100644 --- a/src/devices/bus/einstein/userport/userport.h +++ b/src/devices/bus/einstein/userport/userport.h @@ -36,16 +36,7 @@ class einstein_userport_device : public device_t, public device_single_card_slot { public: // construction/destruction - einstein_userport_device(machine_config const &mconfig, char const *tag, device_t *owner) - : einstein_userport_device(mconfig, tag, owner, (uint32_t)0) - { - option_reset(); - einstein_userport_cards(*this); - set_default_option(nullptr); - set_fixed(false); - } - - einstein_userport_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + einstein_userport_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock = XTAL()); virtual ~einstein_userport_device(); // callbacks |