diff options
Diffstat (limited to 'src/mame/machine/xbox.cpp')
-rw-r--r-- | src/mame/machine/xbox.cpp | 29 |
1 files changed, 5 insertions, 24 deletions
diff --git a/src/mame/machine/xbox.cpp b/src/mame/machine/xbox.cpp index e31e0a9c479..31e88041bcb 100644 --- a/src/mame/machine/xbox.cpp +++ b/src/mame/machine/xbox.cpp @@ -3,6 +3,7 @@ #include "emu.h" #include "machine/pci.h" +#include "machine/idectrl.h" #include "includes/xbox_pci.h" #include "includes/xbox.h" @@ -553,26 +554,6 @@ IRQ_CALLBACK_MEMBER(xbox_base_state::irq_callback) return r; } -WRITE_LINE_MEMBER(xbox_base_state::ohci_usb_interrupt_changed) -{ - mcpxlpc->irq1(state); -} - -WRITE_LINE_MEMBER(xbox_base_state::nv2a_interrupt_changed) -{ - mcpxlpc->irq3(state); -} - -WRITE_LINE_MEMBER(xbox_base_state::smbus_interrupt_changed) -{ - mcpxlpc->irq11(state); -} - -WRITE_LINE_MEMBER(xbox_base_state::ide_interrupt_changed) -{ - mcpxlpc->irq14(state); -} - /* * SMbus devices */ @@ -882,20 +863,20 @@ void xbox_base_state::xbox_base(machine_config &config) NV2A_RAM(config, ":pci:00.3", 0, 128); // 128 megabytes MCPX_ISALPC(config, ":pci:01.0", 0, 0).interrupt_output().set(FUNC(xbox_base_state::maincpu_interrupt)); XBOX_SUPERIO(config, ":pci:01.0:0", 0); - MCPX_SMBUS(config, ":pci:01.1", 0).interrupt_handler().set(FUNC(xbox_base_state::smbus_interrupt_changed)); + MCPX_SMBUS(config, ":pci:01.1", 0).interrupt_handler().set(":pci:01.0", FUNC(mcpx_isalpc_device::irq11)); //.set(FUNC(xbox_base_state::smbus_interrupt_changed)); XBOX_PIC16LC(config, ":pci:01.1:110", 0); // these 3 are on smbus number 1 XBOX_CX25871(config, ":pci:01.1:145", 0); XBOX_EEPROM(config, ":pci:01.1:154", 0); - MCPX_OHCI(config, ":pci:02.0", 0).interrupt_handler().set(FUNC(xbox_base_state::ohci_usb_interrupt_changed)); + MCPX_OHCI(config, ":pci:02.0", 0).interrupt_handler().set(":pci:01.0", FUNC(mcpx_isalpc_device::irq1)); //.set(FUNC(xbox_base_state::ohci_usb_interrupt_changed)); MCPX_OHCI(config, ":pci:03.0", 0); MCPX_ETH(config, ":pci:04.0", 0); MCPX_APU(config, ":pci:05.0", 0, m_maincpu); MCPX_AC97_AUDIO(config, ":pci:06.0", 0); MCPX_AC97_MODEM(config, ":pci:06.1", 0); PCI_BRIDGE(config, ":pci:08.0", 0, 0x10de01b8, 0); - MCPX_IDE(config, ":pci:09.0", 0).pri_interrupt_handler().set(FUNC(xbox_base_state::ide_interrupt_changed)); + MCPX_IDE(config, ":pci:09.0", 0).pri_interrupt_handler().set(":pci:01.0", FUNC(mcpx_isalpc_device::irq14)); //.set(FUNC(xbox_base_state::ide_interrupt_changed)); NV2A_AGP(config, ":pci:1e.0", 0, 0x10de01b7, 0); - NV2A_GPU(config, ":pci:1e.0:00.0", 0, m_maincpu).interrupt_handler().set(FUNC(xbox_base_state::nv2a_interrupt_changed)); + NV2A_GPU(config, ":pci:1e.0:00.0", 0, m_maincpu).interrupt_handler().set(":pci:01.0", FUNC(mcpx_isalpc_device::irq3)); //.set(FUNC(xbox_base_state::nv2a_interrupt_changed)); /* video hardware */ screen_device &screen(SCREEN(config, "screen", SCREEN_TYPE_RASTER)); |