summaryrefslogtreecommitdiffstatshomepage
path: root/src/emu/machine/er2055.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/emu/machine/er2055.h')
-rw-r--r--src/emu/machine/er2055.h39
1 files changed, 8 insertions, 31 deletions
diff --git a/src/emu/machine/er2055.h b/src/emu/machine/er2055.h
index 833b43918e4..f47b503d57c 100644
--- a/src/emu/machine/er2055.h
+++ b/src/emu/machine/er2055.h
@@ -58,43 +58,16 @@
//**************************************************************************
-// ======================> er2055_device_config
-
-class er2055_device_config : public device_config,
- public device_config_memory_interface,
- public device_config_nvram_interface
-{
- friend class er2055_device;
-
- // construction/destruction
- er2055_device_config(const machine_config &mconfig, const char *tag, const device_config *owner, UINT32 clock);
-
-public:
- // allocators
- static device_config *static_alloc_device_config(const machine_config &mconfig, const char *tag, const device_config *owner, UINT32 clock);
- virtual device_t *alloc_device(running_machine &machine) const;
-
-protected:
- // device_config_memory_interface overrides
- virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const;
-
- // device-specific configuration
- address_space_config m_space_config;
-};
-
-
// ======================> er2055_device
class er2055_device : public device_t,
public device_memory_interface,
public device_nvram_interface
{
- friend class er2055_device_config;
-
+public:
// construction/destruction
- er2055_device(running_machine &_machine, const er2055_device_config &config);
+ er2055_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
-public:
// I/O operations
UINT8 data() const { return m_data; }
void set_address(UINT8 address) { m_address = address & 0x3f; }
@@ -107,6 +80,9 @@ protected:
// device-level overrides
virtual void device_start();
+ // device_memory_interface overrides
+ virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const;
+
// device_nvram_interface overrides
virtual void nvram_default();
virtual void nvram_read(emu_file &file);
@@ -120,9 +96,10 @@ protected:
static const UINT8 CS1 = 0x08;
static const UINT8 CS2 = 0x10;
- // internal state
- const er2055_device_config &m_config;
+ // configuration state
+ address_space_config m_space_config;
+ // internal state
UINT8 m_control_state;
UINT8 m_address;
UINT8 m_data;