From ca1f8ecc00f397d84ede003bd023edf1d6f32ff2 Mon Sep 17 00:00:00 2001 From: Dirk Best Date: Sat, 30 Jul 2016 13:12:43 +0200 Subject: apricot: rename apricot_keyboard_device to avoid clashes --- src/devices/bus/apricot/keyboard/keyboard.cpp | 18 +++++++++--------- src/devices/bus/apricot/keyboard/keyboard.h | 14 +++++++------- 2 files changed, 16 insertions(+), 16 deletions(-) (limited to 'src/devices/bus/apricot') 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; +const device_type APRICOT_KEYBOARD_INTERFACE = &device_creator; //************************************************************************** @@ -22,10 +22,10 @@ const device_type APRICOT_KEYBOARD_INTERFACE = &device_creator(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(device.owner()); + m_host = dynamic_cast(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 static devcb_base &set_in_handler(device_t &device, _Object object) - { return downcast(device).m_in_handler.set_callback(object); } + { return downcast(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; }; -- cgit v1.2.3-70-g09d2