summaryrefslogtreecommitdiffstatshomepage
path: root/src/devices/bus/newbrain/exp.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/devices/bus/newbrain/exp.h')
-rw-r--r--src/devices/bus/newbrain/exp.h34
1 files changed, 16 insertions, 18 deletions
diff --git a/src/devices/bus/newbrain/exp.h b/src/devices/bus/newbrain/exp.h
index 0c07190bdf0..219c819d575 100644
--- a/src/devices/bus/newbrain/exp.h
+++ b/src/devices/bus/newbrain/exp.h
@@ -34,10 +34,10 @@
**********************************************************************/
-#pragma once
+#ifndef MAME_BUS_NEWBRAIN_EXP_H
+#define MAME_BUS_NEWBRAIN_EXP_H
-#ifndef __NEWBRAIN_EXPANSION_SLOT__
-#define __NEWBRAIN_EXPANSION_SLOT__
+#pragma once
@@ -64,17 +64,16 @@
// TYPE DEFINITIONS
//**************************************************************************
-// ======================> newbrain_expansion_slot_t
+// ======================> newbrain_expansion_slot_device
class device_newbrain_expansion_slot_interface;
-class newbrain_expansion_slot_t : public device_t,
+class newbrain_expansion_slot_device : public device_t,
public device_slot_interface
{
public:
// construction/destruction
- newbrain_expansion_slot_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- virtual ~newbrain_expansion_slot_t() { }
+ newbrain_expansion_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// computer interface
uint8_t mreq_r(address_space &space, offs_t offset, uint8_t data, bool &romov, int &exrm, bool &raminh);
@@ -98,29 +97,28 @@ protected:
class device_newbrain_expansion_slot_interface : public device_slot_card_interface
{
public:
- // construction/destruction
- device_newbrain_expansion_slot_interface(const machine_config &mconfig, device_t &device);
- virtual ~device_newbrain_expansion_slot_interface() { }
-
// memory access
- virtual uint8_t mreq_r(address_space &space, offs_t offset, uint8_t data, bool &romov, int &exrm, bool &raminh) { return data; };
- virtual void mreq_w(address_space &space, offs_t offset, uint8_t data, bool &romov, int &exrm, bool &raminh) { };
+ virtual uint8_t mreq_r(address_space &space, offs_t offset, uint8_t data, bool &romov, int &exrm, bool &raminh) { return data; }
+ virtual void mreq_w(address_space &space, offs_t offset, uint8_t data, bool &romov, int &exrm, bool &raminh) { }
// I/O access
- virtual uint8_t iorq_r(address_space &space, offs_t offset, uint8_t data, bool &prtov) { return data; };
- virtual void iorq_w(address_space &space, offs_t offset, uint8_t data, bool &prtov) { };
+ virtual uint8_t iorq_r(address_space &space, offs_t offset, uint8_t data, bool &prtov) { return data; }
+ virtual void iorq_w(address_space &space, offs_t offset, uint8_t data, bool &prtov) { }
protected:
- newbrain_expansion_slot_t *m_slot;
+ // construction/destruction
+ device_newbrain_expansion_slot_interface(const machine_config &mconfig, device_t &device);
+
+ newbrain_expansion_slot_device *m_slot;
};
// device type definition
-extern const device_type NEWBRAIN_EXPANSION_SLOT;
+DECLARE_DEVICE_TYPE(NEWBRAIN_EXPANSION_SLOT, newbrain_expansion_slot_device)
SLOT_INTERFACE_EXTERN( newbrain_expansion_cards );
-#endif
+#endif // MAME_BUS_NEWBRAIN_EXP_H