diff options
author | 2016-07-30 13:12:43 +0200 | |
---|---|---|
committer | 2016-07-30 13:29:46 +0200 | |
commit | ca1f8ecc00f397d84ede003bd023edf1d6f32ff2 (patch) | |
tree | 6161a5583b019bbdd972a824350a5a4716e07b6a /src/devices/bus/apricot | |
parent | 8bb468a3db4bdba4f266f173851886ba54c23e80 (diff) |
apricot: rename apricot_keyboard_device to avoid clashes
Diffstat (limited to 'src/devices/bus/apricot')
-rw-r--r-- | src/devices/bus/apricot/keyboard/keyboard.cpp | 18 | ||||
-rw-r--r-- | src/devices/bus/apricot/keyboard/keyboard.h | 14 |
2 files changed, 16 insertions, 16 deletions
diff --git a/src/devices/bus/apricot/keyboard/keyboard.cpp b/src/devices/bus/apricot/keyboard/keyboard.cpp index d970f187c4f..e045b319e4f 100644 --- a/src/devices/bus/apricot/keyboard/keyboard.cpp +++ b/src/devices/bus/apricot/keyboard/keyboard.cpp @@ -14,7 +14,7 @@ // DEVICE DEFINITIONS //************************************************************************** -const device_type APRICOT_KEYBOARD_INTERFACE = &device_creator<apricot_keyboard_device>; +const device_type APRICOT_KEYBOARD_INTERFACE = &device_creator<apricot_keyboard_bus_device>; //************************************************************************** @@ -22,10 +22,10 @@ const device_type APRICOT_KEYBOARD_INTERFACE = &device_creator<apricot_keyboard_ //************************************************************************** //------------------------------------------------- -// apricot_keyboard_device - constructor +// apricot_keyboard_bus_device - constructor //------------------------------------------------- -apricot_keyboard_device::apricot_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : +apricot_keyboard_bus_device::apricot_keyboard_bus_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, APRICOT_KEYBOARD_INTERFACE, "Apricot Keyboard Interface", tag, owner, clock, "apricot_kbd", __FILE__), device_slot_interface(mconfig, *this), m_kbd(nullptr), @@ -34,10 +34,10 @@ apricot_keyboard_device::apricot_keyboard_device(const machine_config &mconfig, } //------------------------------------------------- -// apricot_keyboard_device - destructor +// apricot_keyboard_bus_device - destructor //------------------------------------------------- -apricot_keyboard_device::~apricot_keyboard_device() +apricot_keyboard_bus_device::~apricot_keyboard_bus_device() { } @@ -45,7 +45,7 @@ apricot_keyboard_device::~apricot_keyboard_device() // device_start - device-specific startup //------------------------------------------------- -void apricot_keyboard_device::device_start() +void apricot_keyboard_bus_device::device_start() { // get connected keyboard m_kbd = dynamic_cast<device_apricot_keyboard_interface *>(get_card_device()); @@ -58,7 +58,7 @@ void apricot_keyboard_device::device_start() // device_reset - device-specific reset //------------------------------------------------- -void apricot_keyboard_device::device_reset() +void apricot_keyboard_bus_device::device_reset() { } @@ -66,7 +66,7 @@ void apricot_keyboard_device::device_reset() // host to module interface //------------------------------------------------- -WRITE_LINE_MEMBER( apricot_keyboard_device::out_w ) +WRITE_LINE_MEMBER( apricot_keyboard_bus_device::out_w ) { if (m_kbd) m_kbd->out_w(state); @@ -84,7 +84,7 @@ WRITE_LINE_MEMBER( apricot_keyboard_device::out_w ) device_apricot_keyboard_interface::device_apricot_keyboard_interface(const machine_config &mconfig, device_t &device) : device_slot_card_interface(mconfig, device) { - m_host = dynamic_cast<apricot_keyboard_device *>(device.owner()); + m_host = dynamic_cast<apricot_keyboard_bus_device *>(device.owner()); } //------------------------------------------------- diff --git a/src/devices/bus/apricot/keyboard/keyboard.h b/src/devices/bus/apricot/keyboard/keyboard.h index 851ea954b3b..577d2dee683 100644 --- a/src/devices/bus/apricot/keyboard/keyboard.h +++ b/src/devices/bus/apricot/keyboard/keyboard.h @@ -44,7 +44,7 @@ MCFG_DEVICE_SLOT_INTERFACE(apricot_keyboard_devices, _def_slot, false) #define MCFG_APRICOT_KEYBOARD_IN_HANDLER(_devcb) \ - devcb = &apricot_keyboard_device::set_in_handler(*device, DEVCB_##_devcb); + devcb = &apricot_keyboard_bus_device::set_in_handler(*device, DEVCB_##_devcb); //************************************************************************** @@ -53,18 +53,18 @@ class device_apricot_keyboard_interface; -// ======================> apricot_keyboard_device +// ======================> apricot_keyboard_bus_device -class apricot_keyboard_device : public device_t, public device_slot_interface +class apricot_keyboard_bus_device : public device_t, public device_slot_interface { public: // construction/destruction - apricot_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - virtual ~apricot_keyboard_device(); + apricot_keyboard_bus_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + virtual ~apricot_keyboard_bus_device(); // callbacks template<class _Object> static devcb_base &set_in_handler(device_t &device, _Object object) - { return downcast<apricot_keyboard_device &>(device).m_in_handler.set_callback(object); } + { return downcast<apricot_keyboard_bus_device &>(device).m_in_handler.set_callback(object); } // called from keyboard DECLARE_WRITE_LINE_MEMBER( in_w ) { m_in_handler(state); } @@ -95,7 +95,7 @@ public: virtual void out_w(int state) {}; protected: - apricot_keyboard_device *m_host; + apricot_keyboard_bus_device *m_host; }; |