summaryrefslogtreecommitdiffstatshomepage
path: root/src/devices/bus/adam/exp.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/devices/bus/adam/exp.h')
-rw-r--r--src/devices/bus/adam/exp.h18
1 files changed, 7 insertions, 11 deletions
diff --git a/src/devices/bus/adam/exp.h b/src/devices/bus/adam/exp.h
index f0c5ee2d19b..6a856faa826 100644
--- a/src/devices/bus/adam/exp.h
+++ b/src/devices/bus/adam/exp.h
@@ -6,10 +6,10 @@
**********************************************************************/
-#pragma once
+#ifndef MAME_BUS_ADAM_EXP_H
+#define MAME_BUS_ADAM_EXP_H
-#ifndef __ADAM_EXPANSION_SLOT__
-#define __ADAM_EXPANSION_SLOT__
+#pragma once
#include "softlist_dev.h"
@@ -55,7 +55,7 @@ public:
adam_expansion_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
virtual ~adam_expansion_slot_device() { }
- template<class _Object> static devcb_base &set_irq_wr_callback(device_t &device, _Object object) { return downcast<adam_expansion_slot_device &>(device).m_write_irq.set_callback(object); }
+ template <class Object> static devcb_base &set_irq_wr_callback(device_t &device, Object &&cb) { return downcast<adam_expansion_slot_device &>(device).m_write_irq.set_callback(std::forward<Object>(cb)); }
// computer interface
uint8_t bd_r(address_space &space, offs_t offset, uint8_t data, int bmreq, int biorq, int aux_rom_cs, int cas1, int cas2);
@@ -98,12 +98,10 @@ class device_adam_expansion_slot_card_interface : public device_slot_card_interf
{
friend class adam_expansion_slot_device;
-public:
+protected:
// construction/destruction
device_adam_expansion_slot_card_interface(const machine_config &mconfig, device_t &device);
- virtual ~device_adam_expansion_slot_card_interface() { }
-protected:
// runtime
virtual uint8_t adam_bd_r(address_space &space, offs_t offset, uint8_t data, int bmreq, int biorq, int aux_rom_cs, int cas1, int cas2) { return data; }
virtual void adam_bd_w(address_space &space, offs_t offset, uint8_t data, int bmreq, int biorq, int aux_rom_cs, int cas1, int cas2) { }
@@ -115,13 +113,11 @@ protected:
// device type definition
-extern const device_type ADAM_EXPANSION_SLOT;
+DECLARE_DEVICE_TYPE(ADAM_EXPANSION_SLOT, adam_expansion_slot_device)
SLOT_INTERFACE_EXTERN( adam_slot1_devices );
SLOT_INTERFACE_EXTERN( adam_slot2_devices );
SLOT_INTERFACE_EXTERN( adam_slot3_devices );
-
-
-#endif
+#endif // MAME_BUS_ADAM_EXP_H