From 919913f118760c0ca41ab63512bd5c106f6fd840 Mon Sep 17 00:00:00 2001 From: Aaron Giles Date: Wed, 27 Apr 2011 05:11:18 +0000 Subject: 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 --- src/emu/machine/i8155.h | 57 +++++++++++++------------------------------------ 1 file changed, 15 insertions(+), 42 deletions(-) (limited to 'src/emu/machine/i8155.h') diff --git a/src/emu/machine/i8155.h b/src/emu/machine/i8155.h index 282791da933..56929d9caf0 100644 --- a/src/emu/machine/i8155.h +++ b/src/emu/machine/i8155.h @@ -67,46 +67,17 @@ struct i8155_interface { - devcb_read8 in_pa_func; - devcb_write8 out_pa_func; + devcb_read8 in_pa_cb; + devcb_write8 out_pa_cb; - devcb_read8 in_pb_func; - devcb_write8 out_pb_func; + devcb_read8 in_pb_cb; + devcb_write8 out_pb_cb; - devcb_read8 in_pc_func; - devcb_write8 out_pc_func; + devcb_read8 in_pc_cb; + devcb_write8 out_pc_cb; // this gets called for each change of the TIMER OUT pin (pin 6) - devcb_write_line out_to_func; -}; - - - -// ======================> i8155_device_config - -class i8155_device_config : public device_config, - public device_config_memory_interface, - public i8155_interface -{ - friend class i8155_device; - - // construction/destruction - i8155_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(); - - // device_config_memory_interface overrides - virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const; - - // address space configurations - const address_space_config m_space_config; + devcb_write_line out_to_cb; }; @@ -114,14 +85,13 @@ protected: // ======================> i8155_device class i8155_device : public device_t, - public device_memory_interface + public device_memory_interface, + public i8155_interface { - friend class i8155_device_config; - +public: // construction/destruction - i8155_device(running_machine &_machine, const i8155_device_config &_config); + i8155_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); -public: DECLARE_READ8_MEMBER( io_r ); DECLARE_WRITE8_MEMBER( io_w ); @@ -134,10 +104,13 @@ 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); + virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const; + inline UINT8 get_timer_mode(); inline void timer_output(); inline void pulse_timer_output(); @@ -169,7 +142,7 @@ private: // timers emu_timer *m_timer; // counter timer - const i8155_device_config &m_config; + const address_space_config m_space_config; }; -- cgit v1.2.3-70-g09d2