diff options
Diffstat (limited to 'src/devices/bus/psx')
-rw-r--r-- | src/devices/bus/psx/analogue.cpp | 6 | ||||
-rw-r--r-- | src/devices/bus/psx/analogue.h | 6 | ||||
-rw-r--r-- | src/devices/bus/psx/ctlrport.cpp | 8 | ||||
-rw-r--r-- | src/devices/bus/psx/ctlrport.h | 8 | ||||
-rw-r--r-- | src/devices/bus/psx/gamebooster.cpp | 2 | ||||
-rw-r--r-- | src/devices/bus/psx/gamebooster.h | 2 | ||||
-rw-r--r-- | src/devices/bus/psx/memcard.cpp | 2 | ||||
-rw-r--r-- | src/devices/bus/psx/memcard.h | 2 | ||||
-rw-r--r-- | src/devices/bus/psx/multitap.cpp | 2 | ||||
-rw-r--r-- | src/devices/bus/psx/multitap.h | 2 | ||||
-rw-r--r-- | src/devices/bus/psx/parallel.cpp | 2 | ||||
-rw-r--r-- | src/devices/bus/psx/parallel.h | 4 |
12 files changed, 23 insertions, 23 deletions
diff --git a/src/devices/bus/psx/analogue.cpp b/src/devices/bus/psx/analogue.cpp index 61feefeb311..805c75f41b7 100644 --- a/src/devices/bus/psx/analogue.cpp +++ b/src/devices/bus/psx/analogue.cpp @@ -6,7 +6,7 @@ DEFINE_DEVICE_TYPE(PSX_DUALSHOCK, psx_dualshock_device, "psx_dualshock_pad", "Playstation Dualshock Pad") DEFINE_DEVICE_TYPE(PSX_ANALOG_JOYSTICK, psx_analog_joystick_device, "psx_analog_joystick", "Playstation Analog Joystick") -psx_analog_controller_device::psx_analog_controller_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock, model mod) : +psx_analog_controller_device::psx_analog_controller_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock, model mod) : device_t(mconfig, type, tag, owner, clock), device_psx_controller_interface(mconfig, *this), m_model(mod), @@ -24,12 +24,12 @@ psx_analog_controller_device::psx_analog_controller_device(const machine_config { } -psx_dualshock_device::psx_dualshock_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : +psx_dualshock_device::psx_dualshock_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : psx_analog_controller_device(mconfig, PSX_DUALSHOCK, tag, owner, clock, model::DUALSHOCK) { } -psx_analog_joystick_device::psx_analog_joystick_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : +psx_analog_joystick_device::psx_analog_joystick_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : psx_analog_controller_device(mconfig, PSX_ANALOG_JOYSTICK, tag, owner, clock, model::JOYSTICK) { } diff --git a/src/devices/bus/psx/analogue.h b/src/devices/bus/psx/analogue.h index 09eaf9baa65..f4e1abd72f5 100644 --- a/src/devices/bus/psx/analogue.h +++ b/src/devices/bus/psx/analogue.h @@ -19,7 +19,7 @@ public: protected: enum class model { JOYSTICK, DUALSHOCK }; - psx_analog_controller_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock, model mod); + psx_analog_controller_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock, model mod); virtual void device_start() override { } virtual void device_reset() override; @@ -48,13 +48,13 @@ private: class psx_dualshock_device : public psx_analog_controller_device { public: - psx_dualshock_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + psx_dualshock_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); }; class psx_analog_joystick_device : public psx_analog_controller_device { public: - psx_analog_joystick_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + psx_analog_joystick_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); }; #endif // MAME_BUS_PSX_ANALOGUE_H diff --git a/src/devices/bus/psx/ctlrport.cpp b/src/devices/bus/psx/ctlrport.cpp index 1e6158ff614..908b6ce91f4 100644 --- a/src/devices/bus/psx/ctlrport.cpp +++ b/src/devices/bus/psx/ctlrport.cpp @@ -11,7 +11,7 @@ DEFINE_DEVICE_TYPE(PSX_CONTROLLER_PORT, psx_controller_port_device, "psx DEFINE_DEVICE_TYPE(PSXCONTROLLERPORTS, psxcontrollerports_device, "psxcontrollerports", "Playstation Controller Bus") DEFINE_DEVICE_TYPE(PSX_STANDARD_CONTROLLER, psx_standard_controller_device, "psx_standard_controller", "Playstation Standard Controller") -psx_controller_port_device::psx_controller_port_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : +psx_controller_port_device::psx_controller_port_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, PSX_CONTROLLER_PORT, tag, owner, clock), device_single_card_slot_interface<device_psx_controller_interface>(mconfig, *this), m_tx(false), @@ -27,7 +27,7 @@ void psx_controller_port_device::device_config_complete() void psx_controller_port_device::device_add_mconfig(machine_config &config) { - PSXCARD(config, m_card, 0); + PSXCARD(config, m_card); } void psx_controller_port_device::disable_card(bool state) @@ -38,7 +38,7 @@ void psx_controller_port_device::disable_card(bool state) m_card->disable(state); } -psxcontrollerports_device::psxcontrollerports_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : +psxcontrollerports_device::psxcontrollerports_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, PSXCONTROLLERPORTS, tag, owner, clock), m_port0(*this, "^port1"), m_port1(*this, "^port2"), @@ -177,7 +177,7 @@ void device_psx_controller_interface::sel_w(bool state) { m_sel = state; } -psx_standard_controller_device::psx_standard_controller_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : +psx_standard_controller_device::psx_standard_controller_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, PSX_STANDARD_CONTROLLER, tag, owner, clock), device_psx_controller_interface(mconfig, *this), m_pad0(*this, "PSXPAD0"), diff --git a/src/devices/bus/psx/ctlrport.h b/src/devices/bus/psx/ctlrport.h index 5c8fc82dd22..baf48895c4b 100644 --- a/src/devices/bus/psx/ctlrport.h +++ b/src/devices/bus/psx/ctlrport.h @@ -65,7 +65,7 @@ class psx_standard_controller_device : public device_t, public device_psx_controller_interface { public: - psx_standard_controller_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + psx_standard_controller_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual ioport_constructor device_input_ports() const override; @@ -82,7 +82,7 @@ private: class psxcontrollerports_device : public device_t { public: - psxcontrollerports_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + psxcontrollerports_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); void ack(); @@ -110,14 +110,14 @@ class psx_controller_port_device : public device_t, public: template <typename T> psx_controller_port_device(machine_config const &mconfig, char const *tag, device_t *owner, T &&opts, char const *dflt) - : psx_controller_port_device(mconfig, tag, owner, (uint32_t)0) + : psx_controller_port_device(mconfig, tag, owner) { option_reset(); opts(*this); set_default_option(dflt); set_fixed(false); } - psx_controller_port_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + psx_controller_port_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock = XTAL()); typedef delegate<void ()> void_cb; void ack() { if(!ack_cb.isnull()) ack_cb(); } diff --git a/src/devices/bus/psx/gamebooster.cpp b/src/devices/bus/psx/gamebooster.cpp index 1c414ca41a2..96416856073 100644 --- a/src/devices/bus/psx/gamebooster.cpp +++ b/src/devices/bus/psx/gamebooster.cpp @@ -46,7 +46,7 @@ ROM_END // psx_gamebooster_device - constructor //------------------------------------------------- -psx_gamebooster_device::psx_gamebooster_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +psx_gamebooster_device::psx_gamebooster_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, PSX_GAMEBOOSTER, tag, owner, clock) , psx_parallel_interface(mconfig, *this) , device_memory_interface(mconfig, *this) diff --git a/src/devices/bus/psx/gamebooster.h b/src/devices/bus/psx/gamebooster.h index 9e990f726d5..caa6b08a0db 100644 --- a/src/devices/bus/psx/gamebooster.h +++ b/src/devices/bus/psx/gamebooster.h @@ -22,7 +22,7 @@ class psx_gamebooster_device : { public: // construction/destruction - psx_gamebooster_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + psx_gamebooster_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); // psx_parallel_interface implementation virtual uint16_t exp_r(offs_t offset, uint16_t mem_mask = ~0) override; diff --git a/src/devices/bus/psx/memcard.cpp b/src/devices/bus/psx/memcard.cpp index 682439ff76e..451115ed9ff 100644 --- a/src/devices/bus/psx/memcard.cpp +++ b/src/devices/bus/psx/memcard.cpp @@ -41,7 +41,7 @@ enum transfer_states state_end }; -psxcard_device::psxcard_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +psxcard_device::psxcard_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, PSXCARD, tag, owner, clock), device_memcard_image_interface(mconfig, *this), pkt_ptr(0), diff --git a/src/devices/bus/psx/memcard.h b/src/devices/bus/psx/memcard.h index a558f07164c..21705316c87 100644 --- a/src/devices/bus/psx/memcard.h +++ b/src/devices/bus/psx/memcard.h @@ -15,7 +15,7 @@ class psxcard_device : public device_t, public device_memcard_image_interface { public: - psxcard_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + psxcard_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual bool is_reset_on_load() const noexcept override { return false; } virtual const char *file_extensions() const noexcept override { return "mc"; } diff --git a/src/devices/bus/psx/multitap.cpp b/src/devices/bus/psx/multitap.cpp index 5de09102287..447d9f56abc 100644 --- a/src/devices/bus/psx/multitap.cpp +++ b/src/devices/bus/psx/multitap.cpp @@ -7,7 +7,7 @@ DEFINE_DEVICE_TYPE(PSX_MULTITAP, psx_multitap_device, "psx_multitap", "Playstation Multitap") -psx_multitap_device::psx_multitap_device(const machine_config& mconfig, const char* tag, device_t* owner, uint32_t clock) : +psx_multitap_device::psx_multitap_device(const machine_config& mconfig, const char* tag, device_t* owner, const XTAL &clock) : device_t(mconfig, PSX_MULTITAP, tag, owner, clock), device_psx_controller_interface(mconfig, *this), m_activeport(0), diff --git a/src/devices/bus/psx/multitap.h b/src/devices/bus/psx/multitap.h index 0ac7e6626f7..446eeedb8da 100644 --- a/src/devices/bus/psx/multitap.h +++ b/src/devices/bus/psx/multitap.h @@ -11,7 +11,7 @@ class psx_multitap_device : public device_t, public device_psx_controller_interface { public: - psx_multitap_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + psx_multitap_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/psx/parallel.cpp b/src/devices/bus/psx/parallel.cpp index 8faf038cfec..01112b1cd79 100644 --- a/src/devices/bus/psx/parallel.cpp +++ b/src/devices/bus/psx/parallel.cpp @@ -46,7 +46,7 @@ psx_parallel_interface::~psx_parallel_interface() // psx_parallel_slot_device - constructor //------------------------------------------------- -psx_parallel_slot_device::psx_parallel_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : +psx_parallel_slot_device::psx_parallel_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, PSX_PARALLEL_SLOT, tag, owner, clock), device_single_card_slot_interface<psx_parallel_interface>(mconfig, *this), m_card(nullptr) diff --git a/src/devices/bus/psx/parallel.h b/src/devices/bus/psx/parallel.h index 313a2ecc951..52fe3a43233 100644 --- a/src/devices/bus/psx/parallel.h +++ b/src/devices/bus/psx/parallel.h @@ -20,14 +20,14 @@ public: // construction/destruction template <typename T> psx_parallel_slot_device(machine_config const &mconfig, char const *tag, device_t *owner, T &&opts, char const *dflt) - : psx_parallel_slot_device(mconfig, tag, owner, (uint32_t)0) + : psx_parallel_slot_device(mconfig, tag, owner) { option_reset(); opts(*this); set_default_option(dflt); set_fixed(false); } - psx_parallel_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + psx_parallel_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual ~psx_parallel_slot_device(); uint16_t exp_r(offs_t offset); |