diff options
Diffstat (limited to 'src/devices/machine/pci-ide.h')
-rw-r--r-- | src/devices/machine/pci-ide.h | 50 |
1 files changed, 24 insertions, 26 deletions
diff --git a/src/devices/machine/pci-ide.h b/src/devices/machine/pci-ide.h index 0781afd404c..79d4e803c07 100644 --- a/src/devices/machine/pci-ide.h +++ b/src/devices/machine/pci-ide.h @@ -26,40 +26,39 @@ public: : ide_pci_device(mconfig, tag, owner, clock) { set_ids(main_id, revision, 0x01018a, subdevice_id); - m_bus_master_tag = bmtag; - m_bus_master_space = bmspace; + m_bus_master_space.set_tag(bmtag, bmspace); } ide_pci_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); auto irq_handler() { return m_irq_handler.bind(); } // This will set the top 12 bits for address decoding in legacy mode. Needed for seattle driver. - void set_legacy_top(int val) { m_legacy_top = val & 0xfff; }; + void set_legacy_top(int val) { m_legacy_top = val & 0xfff; } // Sets the default Programming Interface (PIF) register - void set_pif(int val) { m_pif = val & 0xff; }; + void set_pif(int val) { m_pif = val & 0xff; } protected: - virtual void device_start() override; - virtual void device_reset() override; + virtual void device_start() override ATTR_COLD; + virtual void device_reset() override ATTR_COLD; // optional information overrides - virtual void device_add_mconfig(machine_config &config) override; + virtual void device_add_mconfig(machine_config &config) override ATTR_COLD; - virtual void config_map(address_map &map) override; + virtual void config_map(address_map &map) override ATTR_COLD; private: - DECLARE_WRITE_LINE_MEMBER(ide_interrupt); - DECLARE_WRITE8_MEMBER(prog_if_w); - DECLARE_READ32_MEMBER(pcictrl_r); - DECLARE_WRITE32_MEMBER(pcictrl_w); - 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); + void ide_interrupt(int state); + void prog_if_w(uint8_t data); + uint32_t pcictrl_r(offs_t offset); + void pcictrl_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0); + uint32_t address_base_r(offs_t offset); + void address_base_w(offs_t offset, uint32_t data); + void subsystem_id_w(uint32_t data); + uint32_t ide_read_cs1(offs_t offset, uint32_t mem_mask = ~0); + void ide_write_cs1(offs_t offset, uint32_t data, uint32_t mem_mask = ~0); + uint32_t ide2_read_cs1(offs_t offset, uint32_t mem_mask = ~0); + void ide2_write_cs1(offs_t offset, uint32_t data, uint32_t mem_mask = ~0); required_device<bus_master_ide_controller_device> m_ide; required_device<bus_master_ide_controller_device> m_ide2; @@ -69,15 +68,14 @@ private: // Bits 31-20 for legacy mode hack uint32_t m_legacy_top; uint32_t m_pif; - const char* m_bus_master_tag; - uint32_t m_bus_master_space; + required_address_space m_bus_master_space; uint32_t m_config_data[0x10]; - void chan1_data_command_map(address_map &map); - void chan1_control_map(address_map &map); - void chan2_data_command_map(address_map &map); - void chan2_control_map(address_map &map); - void bus_master_map(address_map &map); + void chan1_data_command_map(address_map &map) ATTR_COLD; + void chan1_control_map(address_map &map) ATTR_COLD; + void chan2_data_command_map(address_map &map) ATTR_COLD; + void chan2_control_map(address_map &map) ATTR_COLD; + void bus_master_map(address_map &map) ATTR_COLD; }; DECLARE_DEVICE_TYPE(IDE_PCI, ide_pci_device) |