diff options
Diffstat (limited to 'src/emu/device.h')
-rw-r--r-- | src/emu/device.h | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/emu/device.h b/src/emu/device.h index 8b3b2c94574..e9d91bf4cf4 100644 --- a/src/emu/device.h +++ b/src/emu/device.h @@ -374,8 +374,7 @@ class device_t : public delegate_late_bind friend class simple_list<device_t>; friend class running_machine; friend class finder_base; - friend class devcb_read_base; - friend class devcb_write_base; + friend class devcb_base; class subdevice_list { @@ -523,8 +522,6 @@ public: // owned object helpers subdevice_list &subdevices() { return m_subdevices; } const subdevice_list &subdevices() const { return m_subdevices; } - const std::list<devcb_read_base *> input_callbacks() const { return m_input_callbacks; } - const std::list<devcb_write_base *> output_callbacks() const { return m_output_callbacks; } // device-relative tag lookups std::string subtag(const char *tag) const; @@ -597,6 +594,7 @@ protected: void post_load(); void notify_clock_changed(); finder_base *register_auto_finder(finder_base &autodev); + void register_callback(devcb_base &callback); //------------------- begin derived class overrides @@ -658,8 +656,7 @@ private: bool m_started; // true if the start function has succeeded finder_base * m_auto_finder_list; // list of objects to auto-find mutable std::vector<rom_entry> m_rom_entries; - std::list<devcb_read_base *> m_input_callbacks; - std::list<devcb_write_base *> m_output_callbacks; + std::list<devcb_base *> m_callbacks; // string formatting buffer for logerror mutable util::ovectorstream m_string_buffer; |