summaryrefslogtreecommitdiffstatshomepage
path: root/src/devices/bus/cbm2/hrg.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/devices/bus/cbm2/hrg.h')
-rw-r--r--src/devices/bus/cbm2/hrg.h35
1 files changed, 17 insertions, 18 deletions
diff --git a/src/devices/bus/cbm2/hrg.h b/src/devices/bus/cbm2/hrg.h
index 72db8dc8564..289ff89a604 100644
--- a/src/devices/bus/cbm2/hrg.h
+++ b/src/devices/bus/cbm2/hrg.h
@@ -6,10 +6,10 @@
**********************************************************************/
-#pragma once
+#ifndef MAME_BUS_CBM2_HRG_H
+#define MAME_BUS_CBM2_HRG_H
-#ifndef __CBM2_GRAPHIC__
-#define __CBM2_GRAPHIC__
+#pragma once
#include "exp.h"
#include "video/ef9365.h"
@@ -20,19 +20,19 @@
// TYPE DEFINITIONS
//**************************************************************************
-// ======================> cbm2_hrg_t
+// ======================> cbm2_hrg_device
-class cbm2_hrg_t : public device_t,
+class cbm2_hrg_device : public device_t,
public device_cbm2_expansion_card_interface
{
public:
- // construction/destruction
- cbm2_hrg_t(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
-
// optional information overrides
virtual const tiny_rom_entry *device_rom_region() const override;
protected:
+ // construction/destruction
+ cbm2_hrg_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+
// device-level overrides
virtual void device_start() override;
virtual void device_reset() override;
@@ -47,26 +47,26 @@ private:
};
-// ======================> cbm2_hrg_a_t
+// ======================> cbm2_hrg_a_device
-class cbm2_hrg_a_t : public cbm2_hrg_t
+class cbm2_hrg_a_device : public cbm2_hrg_device
{
public:
// construction/destruction
- cbm2_hrg_a_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ cbm2_hrg_a_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
};
-// ======================> cbm2_hrg_b_t
+// ======================> cbm2_hrg_b_device
-class cbm2_hrg_b_t : public cbm2_hrg_t
+class cbm2_hrg_b_device : public cbm2_hrg_device
{
public:
// construction/destruction
- cbm2_hrg_b_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ cbm2_hrg_b_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// optional information overrides
virtual machine_config_constructor device_mconfig_additions() const override;
@@ -74,9 +74,8 @@ public:
// device type definition
-extern const device_type CBM2_HRG_A;
-extern const device_type CBM2_HRG_B;
-
+DECLARE_DEVICE_TYPE(CBM2_HRG_A, cbm2_hrg_a_device)
+DECLARE_DEVICE_TYPE(CBM2_HRG_B, cbm2_hrg_b_device)
-#endif
+#endif // MAME_BUS_CBM2_HRG_H