diff options
author | Ivan Vangelista <mesgnet@yahoo.it> | 2018-02-15 19:05:05 +0100 |
---|---|---|
committer | Ivan Vangelista <mesgnet@yahoo.it> | 2018-02-15 19:05:05 +0100 |
commit | 504dbe7b1a843c84d5b2fe21d59821c6e9b47d6f (patch) | |
tree | 8003670f0bb7c6d73b332b2335658309738d9757 /src/devices/machine/pci-ide.h | |
parent | d846c04d02292faa48422f6a77b58ae209547711 (diff) |
devices/machine: some private-ization (nw)
+ removed some duplication
Diffstat (limited to 'src/devices/machine/pci-ide.h')
-rw-r--r-- | src/devices/machine/pci-ide.h | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/src/devices/machine/pci-ide.h b/src/devices/machine/pci-ide.h index a0b706f4972..25005342704 100644 --- a/src/devices/machine/pci-ide.h +++ b/src/devices/machine/pci-ide.h @@ -40,13 +40,7 @@ TODO: class ide_pci_device : public pci_device { public: ide_pci_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - required_device<bus_master_ide_controller_device> m_ide; - required_device<bus_master_ide_controller_device> m_ide2; - virtual void config_map(address_map &map) override; - DECLARE_READ32_MEMBER(ide_read_cs1); - DECLARE_WRITE32_MEMBER(ide_write_cs1); - DECLARE_READ32_MEMBER(ide2_read_cs1); - DECLARE_WRITE32_MEMBER(ide2_write_cs1); + void set_irq_info(const char *tag, const int irq_num); template <class Object> static devcb_base &set_irq_handler(device_t &device, Object &&cb) { return downcast<ide_pci_device &>(device).m_irq_handler.set_callback(std::forward<Object>(cb)); } void set_legacy_top(int val) { m_legacy_top = val & 0xfff; }; @@ -59,6 +53,8 @@ protected: // optional information overrides virtual void device_add_mconfig(machine_config &config) override; + virtual void config_map(address_map &map) override; + private: DECLARE_WRITE_LINE_MEMBER(ide_interrupt); DECLARE_WRITE8_MEMBER(prog_if_w); @@ -67,6 +63,13 @@ private: DECLARE_READ32_MEMBER(address_base_r); DECLARE_WRITE32_MEMBER(address_base_w); DECLARE_WRITE32_MEMBER(subsystem_id_w); + DECLARE_READ32_MEMBER(ide_read_cs1); + DECLARE_WRITE32_MEMBER(ide_write_cs1); + DECLARE_READ32_MEMBER(ide2_read_cs1); + DECLARE_WRITE32_MEMBER(ide2_write_cs1); + + required_device<bus_master_ide_controller_device> m_ide; + required_device<bus_master_ide_controller_device> m_ide2; const char *m_cpu_tag; cpu_device *m_cpu; |