diff options
author | 2014-04-15 14:56:57 +0000 | |
---|---|---|
committer | 2014-04-15 14:56:57 +0000 | |
commit | eb436c17f22bc7bc85816565ad85124096c9141d (patch) | |
tree | 2eb6d5c6de5d259e3cdd0d36c728fe9afb283b02 /src/mess/machine | |
parent | 35c5f993beca05fe2686aeba5c43c97d4d59cf9e (diff) |
isa8_device and isa16_device: converted to devcb2 (nw)
Diffstat (limited to 'src/mess/machine')
-rw-r--r-- | src/mess/machine/apollo.c | 48 | ||||
-rw-r--r-- | src/mess/machine/genpc.c | 28 |
2 files changed, 31 insertions, 45 deletions
diff --git a/src/mess/machine/apollo.c b/src/mess/machine/apollo.c index 47168890569..e062f65b65c 100644 --- a/src/mess/machine/apollo.c +++ b/src/mess/machine/apollo.c @@ -780,33 +780,6 @@ WRITE_LINE_MEMBER(apollo_state::sio2_irq_handler) #undef VERBOSE #define VERBOSE 0 -static const isa16bus_interface isabus_intf = -{ - // interrupts - DEVCB_DEVICE_LINE_MEMBER(APOLLO_PIC2_TAG, pic8259_device, ir2_w), // in place of irq 2 on at irq 9 is used - DEVCB_DEVICE_LINE_MEMBER(APOLLO_PIC1_TAG, pic8259_device, ir3_w), - DEVCB_DEVICE_LINE_MEMBER(APOLLO_PIC1_TAG, pic8259_device, ir4_w), - DEVCB_DEVICE_LINE_MEMBER(APOLLO_PIC1_TAG, pic8259_device, ir5_w), - DEVCB_DEVICE_LINE_MEMBER(APOLLO_PIC1_TAG, pic8259_device, ir6_w), - DEVCB_DEVICE_LINE_MEMBER(APOLLO_PIC1_TAG, pic8259_device, ir7_w), - - DEVCB_DEVICE_LINE_MEMBER(APOLLO_PIC2_TAG, pic8259_device, ir3_w), - DEVCB_DEVICE_LINE_MEMBER(APOLLO_PIC2_TAG, pic8259_device, ir4_w), - DEVCB_DEVICE_LINE_MEMBER(APOLLO_PIC2_TAG, pic8259_device, ir5_w), - DEVCB_DEVICE_LINE_MEMBER(APOLLO_PIC2_TAG, pic8259_device, ir6_w), - DEVCB_DEVICE_LINE_MEMBER(APOLLO_PIC2_TAG, pic8259_device, ir7_w), - - // dma request - DEVCB_DEVICE_LINE_MEMBER(APOLLO_DMA1_TAG, am9517a_device, dreq0_w), - DEVCB_DEVICE_LINE_MEMBER(APOLLO_DMA1_TAG, am9517a_device, dreq1_w), - DEVCB_DEVICE_LINE_MEMBER(APOLLO_DMA1_TAG, am9517a_device, dreq2_w), - DEVCB_DEVICE_LINE_MEMBER(APOLLO_DMA1_TAG, am9517a_device, dreq3_w), - - DEVCB_DEVICE_LINE_MEMBER(APOLLO_DMA2_TAG, am9517a_device, dreq1_w), - DEVCB_DEVICE_LINE_MEMBER(APOLLO_DMA2_TAG, am9517a_device, dreq2_w), - DEVCB_DEVICE_LINE_MEMBER(APOLLO_DMA2_TAG, am9517a_device, dreq3_w), -}; - static SLOT_INTERFACE_START(apollo_isa_cards) SLOT_INTERFACE("wdc", ISA16_OMTI8621) // Combo ESDI/AT floppy controller SLOT_INTERFACE("ctape", ISA8_SC499) // Archive SC499 cartridge tape @@ -832,8 +805,27 @@ MACHINE_CONFIG_FRAGMENT( common ) MCFG_MC68681_ADD( APOLLO_SIO2_TAG, XTAL_3_6864MHz ) MCFG_MC68681_IRQ_CALLBACK(WRITELINE(apollo_state, sio2_irq_handler)) - MCFG_ISA16_BUS_ADD(APOLLO_ISA_TAG, ":"MAINCPU, isabus_intf) + MCFG_DEVICE_ADD(APOLLO_ISA_TAG, ISA16, 0) + MCFG_ISA16_CPU(":"MAINCPU) MCFG_ISA16_BUS_CUSTOM_SPACES() + MCFG_ISA_OUT_IRQ2_CB(DEVWRITELINE(APOLLO_PIC2_TAG, pic8259_device, ir2_w)) // in place of irq 2 on at irq 9 is used + MCFG_ISA_OUT_IRQ3_CB(DEVWRITELINE(APOLLO_PIC1_TAG, pic8259_device, ir3_w)) + MCFG_ISA_OUT_IRQ4_CB(DEVWRITELINE(APOLLO_PIC1_TAG, pic8259_device, ir4_w)) + MCFG_ISA_OUT_IRQ5_CB(DEVWRITELINE(APOLLO_PIC1_TAG, pic8259_device, ir5_w)) + MCFG_ISA_OUT_IRQ6_CB(DEVWRITELINE(APOLLO_PIC1_TAG, pic8259_device, ir6_w)) + MCFG_ISA_OUT_IRQ7_CB(DEVWRITELINE(APOLLO_PIC1_TAG, pic8259_device, ir7_w)) + MCFG_ISA_OUT_IRQ10_CB(DEVWRITELINE(APOLLO_PIC2_TAG, pic8259_device, ir3_w)) + MCFG_ISA_OUT_IRQ11_CB(DEVWRITELINE(APOLLO_PIC2_TAG, pic8259_device, ir4_w)) + MCFG_ISA_OUT_IRQ12_CB(DEVWRITELINE(APOLLO_PIC2_TAG, pic8259_device, ir5_w)) + MCFG_ISA_OUT_IRQ14_CB(DEVWRITELINE(APOLLO_PIC2_TAG, pic8259_device, ir6_w)) + MCFG_ISA_OUT_IRQ15_CB(DEVWRITELINE(APOLLO_PIC2_TAG, pic8259_device, ir7_w)) + MCFG_ISA_OUT_DRQ0_CB(DEVWRITELINE(APOLLO_DMA1_TAG, am9517a_device, dreq0_w)) + MCFG_ISA_OUT_DRQ1_CB(DEVWRITELINE(APOLLO_DMA1_TAG, am9517a_device, dreq1_w)) + MCFG_ISA_OUT_DRQ2_CB(DEVWRITELINE(APOLLO_DMA1_TAG, am9517a_device, dreq2_w)) + MCFG_ISA_OUT_DRQ3_CB(DEVWRITELINE(APOLLO_DMA1_TAG, am9517a_device, dreq3_w)) + MCFG_ISA_OUT_DRQ5_CB(DEVWRITELINE(APOLLO_DMA2_TAG, am9517a_device, dreq1_w)) + MCFG_ISA_OUT_DRQ6_CB(DEVWRITELINE(APOLLO_DMA2_TAG, am9517a_device, dreq2_w)) + MCFG_ISA_OUT_DRQ7_CB(DEVWRITELINE(APOLLO_DMA2_TAG, am9517a_device, dreq3_w)) MCFG_ISA16_SLOT_ADD(APOLLO_ISA_TAG, "isa1", apollo_isa_cards, "wdc", false) MCFG_ISA16_SLOT_ADD(APOLLO_ISA_TAG, "isa2", apollo_isa_cards, "ctape", false) MCFG_ISA16_SLOT_ADD(APOLLO_ISA_TAG, "isa3", apollo_isa_cards, "3c505", false) diff --git a/src/mess/machine/genpc.c b/src/mess/machine/genpc.c index 53a2296264b..e8d27d68114 100644 --- a/src/mess/machine/genpc.c +++ b/src/mess/machine/genpc.c @@ -412,22 +412,6 @@ I8255A_INTERFACE( pc_ppi8255_interface ) DEVCB_NULL }; -static const isa8bus_interface isabus_intf = -{ - // interrupts - DEVCB_DEVICE_LINE_MEMBER("pic8259", pic8259_device, ir2_w), - DEVCB_DEVICE_LINE_MEMBER("pic8259", pic8259_device, ir3_w), - DEVCB_DEVICE_LINE_MEMBER("pic8259", pic8259_device, ir4_w), - DEVCB_DEVICE_LINE_MEMBER("pic8259", pic8259_device, ir5_w), - DEVCB_DEVICE_LINE_MEMBER("pic8259", pic8259_device, ir6_w), - DEVCB_DEVICE_LINE_MEMBER("pic8259", pic8259_device, ir7_w), - - // dma request - DEVCB_DEVICE_LINE_MEMBER("dma8237", am9517a_device, dreq1_w), - DEVCB_DEVICE_LINE_MEMBER("dma8237", am9517a_device, dreq2_w), - DEVCB_DEVICE_LINE_MEMBER("dma8237", am9517a_device, dreq3_w) -}; - static const pc_kbdc_interface pc_kbdc_intf = { DEVCB_DEVICE_LINE_MEMBER(DEVICE_SELF_OWNER, ibm5160_mb_device, keyboard_clock_w), @@ -482,7 +466,17 @@ static MACHINE_CONFIG_FRAGMENT( ibm5160_mb_config ) MCFG_I8255A_ADD( "ppi8255", pc_ppi8255_interface ) - MCFG_ISA8_BUS_ADD("isa", ":maincpu", isabus_intf) + MCFG_DEVICE_ADD("isa", ISA8, 0) + MCFG_ISA8_CPU(":maincpu") + MCFG_ISA_OUT_IRQ2_CB(DEVWRITELINE("pic8259", pic8259_device, ir2_w)) + MCFG_ISA_OUT_IRQ3_CB(DEVWRITELINE("pic8259", pic8259_device, ir3_w)) + MCFG_ISA_OUT_IRQ4_CB(DEVWRITELINE("pic8259", pic8259_device, ir4_w)) + MCFG_ISA_OUT_IRQ5_CB(DEVWRITELINE("pic8259", pic8259_device, ir5_w)) + MCFG_ISA_OUT_IRQ6_CB(DEVWRITELINE("pic8259", pic8259_device, ir6_w)) + MCFG_ISA_OUT_IRQ7_CB(DEVWRITELINE("pic8259", pic8259_device, ir7_w)) + MCFG_ISA_OUT_DRQ1_CB(DEVWRITELINE("dma8237", am9517a_device, dreq1_w)) + MCFG_ISA_OUT_DRQ2_CB(DEVWRITELINE("dma8237", am9517a_device, dreq2_w)) + MCFG_ISA_OUT_DRQ3_CB(DEVWRITELINE("dma8237", am9517a_device, dreq3_w)) MCFG_PC_KBDC_ADD("pc_kbdc", pc_kbdc_intf) |