summaryrefslogtreecommitdiffstatshomepage
path: root/src/devices/machine/lpci.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/devices/machine/lpci.h')
-rw-r--r--src/devices/machine/lpci.h37
1 files changed, 24 insertions, 13 deletions
diff --git a/src/devices/machine/lpci.h b/src/devices/machine/lpci.h
index 46aeb83aa5d..ef300c47c1e 100644
--- a/src/devices/machine/lpci.h
+++ b/src/devices/machine/lpci.h
@@ -33,32 +33,44 @@ public:
}
pci_bus_legacy_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- DECLARE_READ32_MEMBER( read );
- DECLARE_WRITE32_MEMBER( write );
+ uint32_t read(offs_t offset, uint32_t mem_mask = ~0);
+ void write(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
- DECLARE_READ64_MEMBER( read_64be );
- DECLARE_WRITE64_MEMBER( write_64be );
+ uint64_t read_64be(offs_t offset, uint64_t mem_mask = ~0);
+ void write_64be(offs_t offset, uint64_t data, uint64_t mem_mask = ~0);
void set_busnum(int busnum) { m_busnum = busnum; }
- void set_father(const char *father) { m_father = father; }
+ template <typename T>
+ void set_father(T &&tag) { m_father.set_tag(std::forward<T>(tag)); }
- template <typename... T> void set_device_read(int num, T &&... args) { m_read_callback[num] = pci_bus_legacy_read_delegate(std::forward<T>(args)...); }
- template <typename... T> void set_device_write(int num, T &&... args) { m_write_callback[num] = pci_bus_legacy_write_delegate(std::forward<T>(args)...); }
+ template <typename F, typename G>
+ void set_device(int num, F &&read, const char *rname, G &&write, const char *wname)
+ {
+ m_read_callback[num].set(std::forward<F>(read), rname);
+ m_write_callback[num].set(std::forward<G>(write), wname);
+ }
+
+ template <typename T, typename F, typename G>
+ void set_device(int num, T &&target, F &&read, const char *rname, G &&write, const char *wname)
+ {
+ m_read_callback[num].set(target, std::forward<F>(read), rname);
+ m_write_callback[num].set(target, std::forward<G>(write), wname);
+ }
pci_bus_legacy_device *pci_search_bustree(int busnum, int devicenum, pci_bus_legacy_device *pcibus);
void add_sibling(pci_bus_legacy_device *sibling, int busnum);
protected:
// device-level overrides
- virtual void device_start() override;
- virtual void device_reset() override;
+ virtual void device_start() override ATTR_COLD;
+ virtual void device_reset() override ATTR_COLD;
virtual void device_post_load() override;
private:
uint8_t m_busnum;
- pci_bus_legacy_read_delegate m_read_callback[32];
- pci_bus_legacy_write_delegate m_write_callback[32];
- const char * m_father;
+ pci_bus_legacy_read_delegate::array<32> m_read_callback;
+ pci_bus_legacy_write_delegate::array<32> m_write_callback;
+ optional_device<pci_bus_legacy_device> m_father;
pci_bus_legacy_device * m_siblings[8];
uint8_t m_siblings_busnum[8];
int m_siblings_count;
@@ -72,5 +84,4 @@ private:
// device type definition
DECLARE_DEVICE_TYPE(PCI_BUS_LEGACY, pci_bus_legacy_device)
-
#endif // MAME_MACHINE_LPCI_H