summaryrefslogtreecommitdiffstatshomepage
path: root/src/devices/bus/psx/ctlrport.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/devices/bus/psx/ctlrport.cpp')
-rw-r--r--src/devices/bus/psx/ctlrport.cpp35
1 files changed, 17 insertions, 18 deletions
diff --git a/src/devices/bus/psx/ctlrport.cpp b/src/devices/bus/psx/ctlrport.cpp
index 5ca35dc27ec..b125617cc41 100644
--- a/src/devices/bus/psx/ctlrport.cpp
+++ b/src/devices/bus/psx/ctlrport.cpp
@@ -7,14 +7,16 @@
#include "analogue.h"
#include "multitap.h"
-const device_type PSX_CONTROLLER_PORT = device_creator<psx_controller_port_device>;
+DEFINE_DEVICE_TYPE(PSX_CONTROLLER_PORT, psx_controller_port_device, "psx_controller_port", "Playstation Controller Port")
+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) :
- device_t(mconfig, PSX_CONTROLLER_PORT, "Playstation Controller Port", tag, owner, clock, "psx_controller_port", __FILE__),
- device_slot_interface(mconfig, *this),
- m_tx(false),
- m_dev(nullptr),
- m_card(*this, "card")
+ device_t(mconfig, PSX_CONTROLLER_PORT, tag, owner, clock),
+ device_slot_interface(mconfig, *this),
+ m_tx(false),
+ m_dev(nullptr),
+ m_card(*this, "card")
{
}
@@ -40,10 +42,9 @@ void psx_controller_port_device::disable_card(bool state)
m_card->disable(state);
}
-const device_type PSXCONTROLLERPORTS = device_creator<psxcontrollerports_device>;
-
-psxcontrollerports_device::psxcontrollerports_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
- : device_t(mconfig, PSXCONTROLLERPORTS, "PSXCONTROLLERPORTS", tag, owner, clock, "psxcontrollerports", __FILE__), m_port0(nullptr), m_port1(nullptr),
+psxcontrollerports_device::psxcontrollerports_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+ device_t(mconfig, PSXCONTROLLERPORTS, tag, owner, clock),
+ m_port0(nullptr), m_port1(nullptr),
m_dsr_handler(*this),
m_rxd_handler(*this)
{
@@ -100,8 +101,8 @@ void psxcontrollerports_device::ack()
}
device_psx_controller_interface::device_psx_controller_interface(const machine_config &mconfig, device_t &device) :
- device_slot_card_interface(mconfig, device), m_odata(0), m_idata(0), m_bit(0), m_count(0), m_memcard(false), m_clock(false), m_sel(false),
- m_ack(true), m_rx(false), m_ack_timer(nullptr), m_owner(nullptr)
+ device_slot_card_interface(mconfig, device), m_odata(0), m_idata(0), m_bit(0), m_count(0), m_memcard(false), m_clock(false), m_sel(false),
+ m_ack(true), m_rx(false), m_ack_timer(nullptr), m_owner(nullptr)
{
}
@@ -172,13 +173,11 @@ void device_psx_controller_interface::sel_w(bool state) {
m_sel = state;
}
-const device_type PSX_STANDARD_CONTROLLER = device_creator<psx_standard_controller_device>;
-
psx_standard_controller_device::psx_standard_controller_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
- device_t(mconfig, PSX_STANDARD_CONTROLLER, "Playstation Standard Controller", tag, owner, clock, "psx_standard_controller", __FILE__),
- device_psx_controller_interface(mconfig, *this),
- m_pad0(*this,"PSXPAD0"),
- m_pad1(*this,"PSXPAD1")
+ device_t(mconfig, PSX_STANDARD_CONTROLLER, tag, owner, clock),
+ device_psx_controller_interface(mconfig, *this),
+ m_pad0(*this, "PSXPAD0"),
+ m_pad1(*this, "PSXPAD1")
{
}