diff options
author | 2011-04-27 05:11:18 +0000 | |
---|---|---|
committer | 2011-04-27 05:11:18 +0000 | |
commit | 919913f118760c0ca41ab63512bd5c106f6fd840 (patch) | |
tree | cd6c115c8e9c5280ac4bd16eabfe69c7341151c2 /src/emu/machine/z8536.h | |
parent | 84f2c31f7d6f6c667427b1d60c83e6dc9f420d60 (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/z8536.h')
-rw-r--r-- | src/emu/machine/z8536.h | 47 |
1 files changed, 12 insertions, 35 deletions
diff --git a/src/emu/machine/z8536.h b/src/emu/machine/z8536.h index 9a71eafa92f..10862269ade 100644 --- a/src/emu/machine/z8536.h +++ b/src/emu/machine/z8536.h @@ -67,50 +67,28 @@ struct z8536_interface { - devcb_write_line m_out_int_func; + devcb_write_line m_out_int_cb; - devcb_read8 m_in_pa_func; - devcb_write8 m_out_pa_func; + devcb_read8 m_in_pa_cb; + devcb_write8 m_out_pa_cb; - devcb_read8 m_in_pb_func; - devcb_write8 m_out_pb_func; + devcb_read8 m_in_pb_cb; + devcb_write8 m_out_pb_cb; - devcb_read8 m_in_pc_func; - devcb_write8 m_out_pc_func; -}; - - -// ======================> z8536_device_config - -class z8536_device_config : public device_config, - public z8536_interface -{ - friend class z8536_device; - - // construction/destruction - z8536_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_pc_cb; + devcb_write8 m_out_pc_cb; }; // ======================> z8536_device -class z8536_device : public device_t +class z8536_device : public device_t, + public z8536_interface { - friend class z8536_device_config; - +public: // construction/destruction - z8536_device(running_machine &_machine, const z8536_device_config &_config); + z8536_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); -public: DECLARE_READ8_MEMBER( read ); DECLARE_WRITE8_MEMBER( write ); @@ -131,6 +109,7 @@ public: protected: // device-level overrides + virtual void device_config_complete(); virtual void device_start(); virtual void device_reset(); virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); @@ -169,8 +148,6 @@ private: // timers emu_timer *m_timer[3]; - - const z8536_device_config &m_config; }; |