diff options
Diffstat (limited to 'src/mame/includes/xbox_pci.h')
-rw-r--r-- | src/mame/includes/xbox_pci.h | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/mame/includes/xbox_pci.h b/src/mame/includes/xbox_pci.h index 8acf6acc7f0..431fe3f2e15 100644 --- a/src/mame/includes/xbox_pci.h +++ b/src/mame/includes/xbox_pci.h @@ -17,7 +17,7 @@ public: nv2a_host_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); virtual void map_extra(uint64_t memory_window_start, uint64_t memory_window_end, uint64_t memory_offset, address_space *memory_space, uint64_t io_window_start, uint64_t io_window_end, uint64_t io_offset, address_space *io_space) override; - void set_cpu_tag(const char *_cpu_tag); + void set_cpu_tag(const char *cpu_tag); protected: virtual void device_start() override; @@ -80,7 +80,7 @@ public: mcpx_smbus_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); void register_device(int address, std::function<int(int command, int rw, int data)> callback) { if (address < 128) smbusst.devices[address] = callback; } - template<class _Object> static devcb_base &set_interrupt_handler(device_t &device, _Object object) { return downcast<mcpx_smbus_device &>(device).m_interrupt_handler.set_callback(object); } + template<class Object> devcb_base &set_interrupt_handler(Object object) { return m_interrupt_handler.set_callback(object); } DECLARE_READ32_MEMBER(smbus_r); DECLARE_WRITE32_MEMBER(smbus_w); @@ -109,7 +109,7 @@ private: extern const device_type MCPX_SMBUS; #define MCFG_MCPX_SMBUS_INTERRUPT_HANDLER(_devcb) \ - devcb = &mcpx_smbus_device::set_interrupt_handler(*device, DEVCB_##_devcb); + devcb = &downcast<mcpx_smbus_device &>(*device).set_interrupt_handler(DEVCB_##_devcb); /* * OHCI USB Controller @@ -121,7 +121,7 @@ public: void set_hack_callback(std::function<void(void)> hack) { hack_callback = hack; } void plug_usb_device(int port, ohci_function *function); - template<class _Object> static devcb_base &set_interrupt_handler(device_t &device, _Object object) { return downcast<mcpx_ohci_device &>(device).m_interrupt_handler.set_callback(object); } + template<class Object> devcb_base &set_interrupt_handler(Object object) { return m_interrupt_handler.set_callback(object); } DECLARE_READ32_MEMBER(ohci_r); DECLARE_WRITE32_MEMBER(ohci_w); @@ -148,7 +148,7 @@ private: extern const device_type MCPX_OHCI; #define MCFG_MCPX_OHCI_INTERRUPT_HANDLER(_devcb) \ - devcb = &mcpx_ohci_device::set_interrupt_handler(*device, DEVCB_##_devcb); + devcb = &downcast<mcpx_ohci_device &>(*device).set_interrupt_handler(DEVCB_##_devcb); /* * Ethernet @@ -181,7 +181,7 @@ extern const device_type MCPX_ETH; class mcpx_apu_device : public pci_device { public: mcpx_apu_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - void set_cpu_tag(const char *_cpu_tag); + void set_cpu_tag(const char *cpu_tag); DECLARE_READ32_MEMBER(apu_r); DECLARE_WRITE32_MEMBER(apu_w); @@ -274,7 +274,7 @@ class mcpx_ide_device : public pci_device { public: mcpx_ide_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - template<class _Object> static devcb_base &set_interrupt_handler(device_t &device, _Object object) { return downcast<mcpx_ide_device &>(device).m_interrupt_handler.set_callback(object); } + template<class Object> devcb_base &set_interrupt_handler(Object object) { return m_interrupt_handler.set_callback(object); } protected: virtual void device_start() override; @@ -290,7 +290,7 @@ private: extern const device_type MCPX_IDE; #define MCFG_MCPX_IDE_INTERRUPT_HANDLER(_devcb) \ - devcb = &mcpx_ide_device::set_interrupt_handler(*device, DEVCB_##_devcb); + devcb = &downcast<mcpx_ide_device &>(*device).set_interrupt_handler(DEVCB_##_devcb); /* * AGP Bridge @@ -314,10 +314,10 @@ DECLARE_DEVICE_TYPE(NV2A_AGP, nv2a_agp_device) class nv2a_gpu_device : public pci_device { public: nv2a_gpu_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - void set_cpu_tag(const char *_cpu_tag); + void set_cpu_tag(const char *cpu_tag); nv2a_renderer *debug_get_renderer() { return nvidia_nv2a; } - template<class _Object> static devcb_base &set_interrupt_handler(device_t &device, _Object object) { return downcast<nv2a_gpu_device &>(device).m_interrupt_handler.set_callback(object); } + template<class Object> devcb_base &set_interrupt_handler(Object object) { return m_interrupt_handler.set_callback(object); } DECLARE_READ32_MEMBER(geforce_r); DECLARE_WRITE32_MEMBER(geforce_w); @@ -342,6 +342,6 @@ DECLARE_DEVICE_TYPE(NV2A_GPU, nv2a_gpu_device) #define MCFG_MCPX_NV2A_GPU_CPU(_cpu_tag) \ downcast<nv2a_gpu_device *>(device)->set_cpu_tag(_cpu_tag); #define MCFG_MCPX_NV2A_GPU_INTERRUPT_HANDLER(_devcb) \ - devcb = &nv2a_gpu_device::set_interrupt_handler(*device, DEVCB_##_devcb); + devcb = &downcast<nv2a_gpu_device &>(*device).set_interrupt_handler(DEVCB_##_devcb); #endif // MAME_INCLUDES_XBOX_PCI_H |