From eb2eb18b367448755b047bb8d65a9cab8584c50a Mon Sep 17 00:00:00 2001 From: yz70s Date: Fri, 1 Jun 2018 20:48:03 +0200 Subject: xbox_pci.cpp: move ids into constructors (nw) --- src/mame/machine/xbox.cpp | 20 ++++++++++---------- src/mame/machine/xbox_pci.cpp | 9 +++++++++ 2 files changed, 19 insertions(+), 10 deletions(-) diff --git a/src/mame/machine/xbox.cpp b/src/mame/machine/xbox.cpp index e4a35dfa27d..3198cd5f0f1 100644 --- a/src/mame/machine/xbox.cpp +++ b/src/mame/machine/xbox.cpp @@ -871,22 +871,22 @@ MACHINE_CONFIG_START(xbox_base_state::xbox_base) MCFG_DEVICE_ADD(":pci", PCI_ROOT, 0) MCFG_DEVICE_ADD(":pci:00.0", NV2A_HOST, 0, m_maincpu) - MCFG_DEVICE_ADD(":pci:00.3", NV2A_RAM, 0) downcast(*device).set_ids(0x10de02a6, 0, 0, 0); - MCFG_DEVICE_ADD(":pci:01.0", MCPX_LPC, 0) downcast(*device).set_ids(0x10de01b2, 0xb4, 0, 0); // revision id must be at least 0xb4, otherwise usb will require a hub - MCFG_DEVICE_ADD(":pci:01.1", MCPX_SMBUS, 0) downcast(*device).set_ids(0x10de01b4, 0, 0, 0); + MCFG_DEVICE_ADD(":pci:00.3", NV2A_RAM, 0) + MCFG_DEVICE_ADD(":pci:01.0", MCPX_LPC, 0) + MCFG_DEVICE_ADD(":pci:01.1", MCPX_SMBUS, 0) MCFG_MCPX_SMBUS_INTERRUPT_HANDLER(WRITELINE(*this, xbox_base_state, xbox_smbus_interrupt_changed)) - MCFG_DEVICE_ADD(":pci:02.0", MCPX_OHCI, 0) downcast(*device).set_ids(0x10de01c2, 0, 0, 0); + MCFG_DEVICE_ADD(":pci:02.0", MCPX_OHCI, 0) MCFG_MCPX_OHCI_INTERRUPT_HANDLER(WRITELINE(*this, xbox_base_state, xbox_ohci_usb_interrupt_changed)) - MCFG_DEVICE_ADD(":pci:03.0", MCPX_OHCI, 0) downcast(*device).set_ids(0x10de01c2, 0, 0, 0); - MCFG_DEVICE_ADD(":pci:04.0", MCPX_ETH, 0) downcast(*device).set_ids(0x10de01c3, 0, 0, 0); + MCFG_DEVICE_ADD(":pci:03.0", MCPX_OHCI, 0) + MCFG_DEVICE_ADD(":pci:04.0", MCPX_ETH, 0) MCFG_DEVICE_ADD(":pci:05.0", MCPX_APU, 0, m_maincpu) - MCFG_DEVICE_ADD(":pci:06.0", MCPX_AC97_AUDIO, 0) downcast(*device).set_ids(0x10de01b1, 0, 0, 0); - MCFG_DEVICE_ADD(":pci:06.1", MCPX_AC97_MODEM, 0) downcast(*device).set_ids(0x10de01c1, 0, 0, 0); + MCFG_DEVICE_ADD(":pci:06.0", MCPX_AC97_AUDIO, 0) + MCFG_DEVICE_ADD(":pci:06.1", MCPX_AC97_MODEM, 0) MCFG_DEVICE_ADD(":pci:08.0", PCI_BRIDGE, 0, 0x10de01b8, 0) - MCFG_DEVICE_ADD(":pci:09.0", MCPX_IDE, 0) downcast(*device).set_ids(0x10de01bc, 0, 0, 0); + MCFG_DEVICE_ADD(":pci:09.0", MCPX_IDE, 0) MCFG_MCPX_IDE_INTERRUPT_HANDLER(WRITELINE("pic8259_2", pic8259_device, ir6_w)) MCFG_DEVICE_ADD(":pci:1e.0", NV2A_AGP, 0, 0x10de01b7, 0) - MCFG_DEVICE_ADD(":pci:1e.0:00.0", NV2A_GPU, 0) downcast(*device).set_ids(0x10de02a0, 0, 0, 0); + MCFG_DEVICE_ADD(":pci:1e.0:00.0", NV2A_GPU, 0) MCFG_MCPX_NV2A_GPU_CPU(m_maincpu) MCFG_MCPX_NV2A_GPU_INTERRUPT_HANDLER(WRITELINE(*this, xbox_base_state, xbox_nv2a_interrupt_changed)) diff --git a/src/mame/machine/xbox_pci.cpp b/src/mame/machine/xbox_pci.cpp index c2d53ec277f..68468c0674c 100644 --- a/src/mame/machine/xbox_pci.cpp +++ b/src/mame/machine/xbox_pci.cpp @@ -64,6 +64,7 @@ void nv2a_ram_device::config_map(address_map &map) nv2a_ram_device::nv2a_ram_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : pci_device(mconfig, NV2A_RAM, tag, owner, clock) { + set_ids(0x10de02a6, 0, 0, 0); } READ32_MEMBER(nv2a_ram_device::config_register_r) @@ -89,6 +90,7 @@ void mcpx_lpc_device::lpc_io(address_map &map) mcpx_lpc_device::mcpx_lpc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : pci_device(mconfig, MCPX_LPC, tag, owner, clock) { + set_ids(0x10de01b2, 0xb4, 0, 0); // revision id must be at least 0xb4, otherwise usb will require a hub } void mcpx_lpc_device::device_start() @@ -137,6 +139,7 @@ mcpx_smbus_device::mcpx_smbus_device(const machine_config &mconfig, const char * : pci_device(mconfig, MCPX_SMBUS, tag, owner, clock), m_interrupt_handler(*this) { + set_ids(0x10de01b4, 0, 0, 0); } void mcpx_smbus_device::device_start() @@ -232,6 +235,7 @@ mcpx_ohci_device::mcpx_ohci_device(const machine_config &mconfig, const char *ta timer(nullptr), connecteds_count(0) { + set_ids(0x10de01c2, 0, 0, 0); } void mcpx_ohci_device::plug_usb_device(int port, ohci_function *function) @@ -331,6 +335,7 @@ void mcpx_eth_device::eth_io(address_map &map) mcpx_eth_device::mcpx_eth_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : pci_device(mconfig, MCPX_ETH, tag, owner, clock) { + set_ids(0x10de01c3, 0, 0, 0); } void mcpx_eth_device::device_start() @@ -576,6 +581,7 @@ void mcpx_ac97_audio_device::ac97_io1(address_map &map) mcpx_ac97_audio_device::mcpx_ac97_audio_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : pci_device(mconfig, MCPX_AC97_AUDIO, tag, owner, clock) { + set_ids(0x10de01b1, 0, 0, 0); } void mcpx_ac97_audio_device::device_start() @@ -669,6 +675,7 @@ DEFINE_DEVICE_TYPE(MCPX_AC97_MODEM, mcpx_ac97_modem_device, "mcpx_ac97_modem", " mcpx_ac97_modem_device::mcpx_ac97_modem_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : pci_device(mconfig, MCPX_AC97_MODEM, tag, owner, clock) { + set_ids(0x10de01c1, 0, 0, 0); } /* @@ -686,6 +693,7 @@ mcpx_ide_device::mcpx_ide_device(const machine_config &mconfig, const char *tag, : pci_device(mconfig, MCPX_IDE, tag, owner, clock), m_interrupt_handler(*this) { + set_ids(0x10de01bc, 0, 0, 0); } void mcpx_ide_device::device_start() @@ -756,6 +764,7 @@ nv2a_gpu_device::nv2a_gpu_device(const machine_config &mconfig, const char *tag, m_interrupt_handler(*this), m_program(nullptr) { + set_ids(0x10de02a0, 0, 0, 0); } void nv2a_gpu_device::device_start() -- cgit v1.2.3