summaryrefslogtreecommitdiffstatshomepage
path: root/src/emu/machine/i8212.h
diff options
context:
space:
mode:
author Aaron Giles <aaron@aarongiles.com>2011-04-27 05:11:18 +0000
committer Aaron Giles <aaron@aarongiles.com>2011-04-27 05:11:18 +0000
commit919913f118760c0ca41ab63512bd5c106f6fd840 (patch)
treecd6c115c8e9c5280ac4bd16eabfe69c7341151c2 /src/emu/machine/i8212.h
parent84f2c31f7d6f6c667427b1d60c83e6dc9f420d60 (diff)
Collapsed device_config and device_t into one class. Updated all
existing modern devices and the legacy wrappers to work in this environment. This in general greatly simplifies writing a modern device. [Aaron Giles] General notes: * some more cleanup probably needs to happen behind this change, but I needed to get it in before the next device modernization or import from MESS :) * new template function device_creator which automatically defines the static function that creates the device; use this instead of creating a static_alloc_device_config function * added device_stop() method which is called at around the time the previous device_t's destructor was called; if you auto_free anything, do it here because the machine is gone when the destructor is called * changed the static_set_* calls to pass a device_t & instead of a device_config * * for many devices, the static config structure member names over- lapped the device's names for devcb_* functions; in these cases the members in the interface were renamed to have a _cb suffix * changed the driver_enumerator to only cache 100 machine_configs because caching them all took a ton of memory; fortunately this implementation detail is completely hidden behind the driver_enumerator interface * got rid of the macros for creating derived classes; doing it manually is now clean enough that it isn't worth hiding the details in a macro
Diffstat (limited to 'src/emu/machine/i8212.h')
-rw-r--r--src/emu/machine/i8212.h39
1 files changed, 7 insertions, 32 deletions
diff --git a/src/emu/machine/i8212.h b/src/emu/machine/i8212.h
index 6390a4d6f7d..3ed32cbbfe9 100644
--- a/src/emu/machine/i8212.h
+++ b/src/emu/machine/i8212.h
@@ -64,46 +64,22 @@ enum
struct i8212_interface
{
- devcb_write_line out_int_func;
+ devcb_write_line m_out_int_cb;
- devcb_read8 in_di_func;
- devcb_write8 out_do_func;
-};
-
-
-
-// ======================> i8212_device_config
-
-class i8212_device_config : public device_config,
- public i8212_interface
-{
- friend class i8212_device;
-
- // construction/destruction
- i8212_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 overrides
- virtual void device_config_complete();
+ devcb_read8 m_in_di_cb;
+ devcb_write8 m_out_do_cb;
};
// ======================> i8212_device
-class i8212_device : public device_t
+class i8212_device : public device_t, public i8212_interface
{
- friend class i8212_device_config;
-
+public:
// construction/destruction
- i8212_device(running_machine &_machine, const i8212_device_config &_config);
+ i8212_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
-public:
DECLARE_READ8_MEMBER( data_r );
DECLARE_WRITE8_MEMBER( data_w );
@@ -112,6 +88,7 @@ public:
protected:
// device-level overrides
+ virtual void device_config_complete();
virtual void device_start();
virtual void device_reset();
@@ -123,8 +100,6 @@ private:
int m_md; // mode
int m_stb; // strobe
UINT8 m_data; // data latch
-
- const i8212_device_config &m_config;
};