Previous 199869 Revisions Next

r18719 Friday 26th October, 2012 at 14:28:03 UTC by smf
changed DEVICE_SELF_OWNER to DEVICE_SELF in IDE config & in MCFG_IDE_CONTROLLER_ADD add the ide controller after the slots (nw)
[src/emu/machine]idectrl.h
[src/mame/drivers]calchase.c chihiro.c cobra.c djmain.c funkball.c gamecstl.c jaguar.c kinst.c mediagx.c midqslvr.c qdrmfgp.c queen.c savquest.c seattle.c taitotz.c taitowlf.c twinkle.c vegas.c voyager.c xtom3d.c
[src/mess/drivers]bebox.c
[src/mess/machine]isa_ide.c
[src/mess/machine/ti99]tn_ide.c

trunk/src/emu/machine/idectrl.h
r18718r18719
144144***************************************************************************/
145145
146146#define MCFG_IDE_CONTROLLER_ADD(_tag, _slotintf, _master, _slave, _fixed) \
147   MCFG_DEVICE_ADD(_tag, IDE_CONTROLLER, 0) \
148147   MCFG_IDE_SLOT_ADD("drive_0", _slotintf, _master, NULL, _fixed) \
149148   MCFG_IDE_SLOT_ADD("drive_1", _slotintf, _slave, NULL, _fixed) \
150   MCFG_DEVICE_MODIFY(_tag)
149   MCFG_DEVICE_ADD(_tag, IDE_CONTROLLER, 0)
151150
152151#define MCFG_IDE_SLOT_ADD(_tag, _slot_intf, _def_slot, _def_inp, _fixed) \
153152   MCFG_DEVICE_ADD(_tag, IDE_SLOT, 0) \
trunk/src/mess/machine/isa_ide.c
r18718r18719
4444
4545static MACHINE_CONFIG_FRAGMENT( ide )
4646   MCFG_IDE_CONTROLLER_ADD("ide", ide_image_devices, "hdd", "hdd", false)
47   MCFG_IDE_CONTROLLER_IRQ_HANDLER(DEVWRITELINE(DEVICE_SELF_OWNER, isa16_ide_device, ide_interrupt))
47   MCFG_IDE_CONTROLLER_IRQ_HANDLER(DEVWRITELINE(DEVICE_SELF, isa16_ide_device, ide_interrupt))
4848MACHINE_CONFIG_END
4949
5050static INPUT_PORTS_START( ide )
trunk/src/mess/machine/ti99/tn_ide.c
r18718r18719
336336MACHINE_CONFIG_FRAGMENT( tn_ide )
337337   MCFG_RTC65271_ADD( "ide_rtc", ide_rtc_cfg )
338338   MCFG_IDE_CONTROLLER_ADD( "ide", ide_image_devices, "hdd", NULL, false)  // see idectrl.c
339   MCFG_IDE_CONTROLLER_IRQ_HANDLER(DEVWRITELINE(DEVICE_SELF_OWNER, nouspikel_ide_interface_device, ide_interrupt_callback))
339   MCFG_IDE_CONTROLLER_IRQ_HANDLER(DEVWRITELINE(DEVICE_SELF, nouspikel_ide_interface_device, ide_interrupt_callback))
340340//  MCFG_IDE_CONTROLLER_REGIONS(":peribox:idehd0:drive", NULL)
341341MACHINE_CONFIG_END
342342
trunk/src/mess/drivers/bebox.c
r18718r18719
193193   MCFG_LSI53C810_ADD( "scsi:lsi53c810", lsi53c810_intf)
194194
195195   MCFG_IDE_CONTROLLER_ADD( "ide", ide_image_devices, "hdd", NULL, false )   /* FIXME */
196   MCFG_IDE_CONTROLLER_IRQ_HANDLER(DEVWRITELINE(DEVICE_SELF_OWNER, bebox_state, bebox_ide_interrupt))
196   MCFG_IDE_CONTROLLER_IRQ_HANDLER(DEVWRITELINE(DEVICE_SELF, bebox_state, bebox_ide_interrupt))
197197
198198   /* pci */
199199   MCFG_PCI_BUS_ADD("pcibus", 0)
trunk/src/mame/drivers/twinkle.c
r18718r18719
890890   MCFG_AM53CF96_IRQ_HANDLER(DEVWRITELINE("^maincpu:irq", psxirq_device, intin10))
891891
892892   MCFG_IDE_CONTROLLER_ADD("ide", ide_devices, "hdd", NULL, true)
893   MCFG_IDE_CONTROLLER_IRQ_HANDLER(DEVWRITELINE(DEVICE_SELF_OWNER, twinkle_state, ide_interrupt))
893   MCFG_IDE_CONTROLLER_IRQ_HANDLER(DEVWRITELINE(DEVICE_SELF, twinkle_state, ide_interrupt))
894894
895895   MCFG_RTC65271_ADD("rtc", twinkle_rtc)
896896
trunk/src/mame/drivers/cobra.c
r18718r18719
32453245   MCFG_PCI_BUS_LEGACY_DEVICE(0, NULL, mpc106_pci_r, mpc106_pci_w)
32463246
32473247   MCFG_IDE_CONTROLLER_ADD("ide", ide_devices, "hdd", NULL, true)
3248   MCFG_IDE_CONTROLLER_IRQ_HANDLER(DEVWRITELINE(DEVICE_SELF_OWNER, cobra_state, ide_interrupt))
3248   MCFG_IDE_CONTROLLER_IRQ_HANDLER(DEVWRITELINE(DEVICE_SELF, cobra_state, ide_interrupt))
32493249
32503250   /* video hardware */
32513251
trunk/src/mame/drivers/qdrmfgp.c
r18718r18719
671671   MCFG_NVRAM_ADD_1FILL("nvram")
672672
673673   MCFG_IDE_CONTROLLER_ADD("ide", ide_devices, "hdd", NULL, true)
674   MCFG_IDE_CONTROLLER_IRQ_HANDLER(DEVWRITELINE(DEVICE_SELF_OWNER, qdrmfgp_state, ide_interrupt))
674   MCFG_IDE_CONTROLLER_IRQ_HANDLER(DEVWRITELINE(DEVICE_SELF, qdrmfgp_state, ide_interrupt))
675675
676676   /* video hardware */
677677   MCFG_SCREEN_ADD("screen", RASTER)
r18718r18719
707707   MCFG_NVRAM_ADD_1FILL("nvram")
708708
709709   MCFG_IDE_CONTROLLER_ADD("ide", ide_devices, "hdd", NULL, true)
710   MCFG_IDE_CONTROLLER_IRQ_HANDLER(DEVWRITELINE(DEVICE_SELF_OWNER, qdrmfgp_state, gp2_ide_interrupt))
710   MCFG_IDE_CONTROLLER_IRQ_HANDLER(DEVWRITELINE(DEVICE_SELF, qdrmfgp_state, gp2_ide_interrupt))
711711
712712   /* video hardware */
713713   MCFG_SCREEN_ADD("screen", RASTER)
trunk/src/mame/drivers/seattle.c
r18718r18719
25452545   MCFG_NVRAM_ADD_1FILL("nvram")
25462546
25472547   MCFG_IDE_CONTROLLER_ADD("ide", ide_devices, "hdd", NULL, true)
2548   MCFG_IDE_CONTROLLER_IRQ_HANDLER(DEVWRITELINE(DEVICE_SELF_OWNER, seattle_state, ide_interrupt))
2548   MCFG_IDE_CONTROLLER_IRQ_HANDLER(DEVWRITELINE(DEVICE_SELF, seattle_state, ide_interrupt))
25492549   MCFG_IDE_CONTROLLER_BUS_MASTER("maincpu", AS_PROGRAM)
25502550
25512551   MCFG_3DFX_VOODOO_1_ADD("voodoo", STD_VOODOO_1_CLOCK, voodoo_intf)
trunk/src/mame/drivers/vegas.c
r18718r18719
22462246   MCFG_M48T37_ADD("timekeeper")
22472247
22482248   MCFG_IDE_CONTROLLER_ADD("ide", ide_devices, "hdd", NULL, true)
2249   MCFG_IDE_CONTROLLER_IRQ_HANDLER(DEVWRITELINE(DEVICE_SELF_OWNER, vegas_state, ide_interrupt))
2249   MCFG_IDE_CONTROLLER_IRQ_HANDLER(DEVWRITELINE(DEVICE_SELF, vegas_state, ide_interrupt))
22502250   MCFG_IDE_CONTROLLER_BUS_MASTER("maincpu", AS_PROGRAM)
22512251
22522252   MCFG_SMC91C94_ADD("ethernet", ethernet_intf)
trunk/src/mame/drivers/jaguar.c
r18718r18719
15821582   MCFG_NVRAM_ADD_1FILL("nvram")
15831583
15841584   MCFG_IDE_CONTROLLER_ADD("ide", ide_devices, "hdd", NULL, true)
1585   MCFG_IDE_CONTROLLER_IRQ_HANDLER(DEVWRITELINE(DEVICE_SELF_OWNER, jaguar_state, external_int))
1585   MCFG_IDE_CONTROLLER_IRQ_HANDLER(DEVWRITELINE(DEVICE_SELF, jaguar_state, external_int))
15861586
15871587   /* video hardware */
15881588   MCFG_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
trunk/src/mame/drivers/savquest.c
r18718r18719
555555   MCFG_PCI_BUS_LEGACY_DEVICE(7, NULL, intel82371ab_pci_r, intel82371ab_pci_w)
556556
557557   MCFG_IDE_CONTROLLER_ADD("ide", ide_devices, "hdd", NULL, true)
558   MCFG_IDE_CONTROLLER_IRQ_HANDLER(DEVWRITELINE(DEVICE_SELF_OWNER, savquest_state, ide_interrupt))
558   MCFG_IDE_CONTROLLER_IRQ_HANDLER(DEVWRITELINE(DEVICE_SELF, savquest_state, ide_interrupt))
559559
560560   /* video hardware */
561561   MCFG_FRAGMENT_ADD( pcvideo_vga )
trunk/src/mame/drivers/midqslvr.c
r18718r18719
704704   MCFG_PCI_BUS_LEGACY_DEVICE(31, NULL, intel82371ab_pci_r, intel82371ab_pci_w)
705705
706706   MCFG_IDE_CONTROLLER_ADD("ide", ide_devices, "hdd", NULL, true)
707   MCFG_IDE_CONTROLLER_IRQ_HANDLER(DEVWRITELINE(DEVICE_SELF_OWNER, midqslvr_state, ide_interrupt))
707   MCFG_IDE_CONTROLLER_IRQ_HANDLER(DEVWRITELINE(DEVICE_SELF, midqslvr_state, ide_interrupt))
708708
709709   /* video hardware */
710710   MCFG_FRAGMENT_ADD( pcvideo_vga )
trunk/src/mame/drivers/djmain.c
r18718r18719
14561456
14571457
14581458   MCFG_IDE_CONTROLLER_ADD("ide", ide_devices, "hdd", NULL, true)
1459   MCFG_IDE_CONTROLLER_IRQ_HANDLER(DEVWRITELINE(DEVICE_SELF_OWNER, djmain_state, ide_interrupt))
1459   MCFG_IDE_CONTROLLER_IRQ_HANDLER(DEVWRITELINE(DEVICE_SELF, djmain_state, ide_interrupt))
14601460
14611461   /* video hardware */
14621462   MCFG_SCREEN_ADD("screen", RASTER)
trunk/src/mame/drivers/calchase.c
r18718r18719
930930   MCFG_PIC8259_ADD( "pic8259_1", calchase_pic8259_1_config )
931931   MCFG_PIC8259_ADD( "pic8259_2", calchase_pic8259_2_config )
932932   MCFG_IDE_CONTROLLER_ADD("ide", ide_devices, "hdd", NULL, true)
933   MCFG_IDE_CONTROLLER_IRQ_HANDLER(DEVWRITELINE(DEVICE_SELF_OWNER, calchase_state, ide_interrupt))
933   MCFG_IDE_CONTROLLER_IRQ_HANDLER(DEVWRITELINE(DEVICE_SELF, calchase_state, ide_interrupt))
934934
935935   MCFG_MC146818_ADD( "rtc", MC146818_STANDARD )
936936   MCFG_PCI_BUS_LEGACY_ADD("pcibus", 0)
trunk/src/mame/drivers/mediagx.c
r18718r18719
11851185   MCFG_PIC8259_ADD( "pic8259_slave", mediagx_pic8259_2_config )
11861186
11871187   MCFG_IDE_CONTROLLER_ADD("ide", ide_devices, "hdd", NULL, true)
1188   MCFG_IDE_CONTROLLER_IRQ_HANDLER(DEVWRITELINE(DEVICE_SELF_OWNER, mediagx_state, ide_interrupt))
1188   MCFG_IDE_CONTROLLER_IRQ_HANDLER(DEVWRITELINE(DEVICE_SELF, mediagx_state, ide_interrupt))
11891189
11901190   MCFG_TIMER_DRIVER_ADD("sound_timer", mediagx_state, sound_timer_callback)
11911191
trunk/src/mame/drivers/xtom3d.c
r18718r18719
696696   MCFG_PCI_BUS_LEGACY_DEVICE(7, NULL, intel82371ab_pci_r, intel82371ab_pci_w)
697697
698698   MCFG_IDE_CONTROLLER_ADD("ide", ide_devices, "hdd", NULL, true)
699   MCFG_IDE_CONTROLLER_IRQ_HANDLER(DEVWRITELINE(DEVICE_SELF_OWNER, xtom3d_state, ide_interrupt))
699   MCFG_IDE_CONTROLLER_IRQ_HANDLER(DEVWRITELINE(DEVICE_SELF, xtom3d_state, ide_interrupt))
700700
701701   /* video hardware */
702702   MCFG_FRAGMENT_ADD( pcvideo_vga )
trunk/src/mame/drivers/voyager.c
r18718r18719
774774   MCFG_PIC8259_ADD( "pic8259_1", voyager_pic8259_1_config )
775775   MCFG_PIC8259_ADD( "pic8259_2", voyager_pic8259_2_config )
776776   MCFG_IDE_CONTROLLER_ADD("ide", ide_devices, "hdd", NULL, true)
777   MCFG_IDE_CONTROLLER_IRQ_HANDLER(DEVWRITELINE(DEVICE_SELF_OWNER, voyager_state, ide_interrupt))
777   MCFG_IDE_CONTROLLER_IRQ_HANDLER(DEVWRITELINE(DEVICE_SELF, voyager_state, ide_interrupt))
778778
779779   MCFG_MC146818_ADD( "rtc", MC146818_STANDARD )
780780   MCFG_PCI_BUS_LEGACY_ADD("pcibus", 0)
trunk/src/mame/drivers/chihiro.c
r18718r18719
18451845   MCFG_PIC8259_ADD( "pic8259_2", chihiro_pic8259_2_config )
18461846   MCFG_PIT8254_ADD( "pit8254", chihiro_pit8254_config )
18471847   MCFG_IDE_CONTROLLER_ADD( "ide", ide_baseboard, NULL, "bb", true)
1848   MCFG_IDE_CONTROLLER_IRQ_HANDLER(DEVWRITELINE(DEVICE_SELF_OWNER, chihiro_state, ide_interrupt))
1848   MCFG_IDE_CONTROLLER_IRQ_HANDLER(DEVWRITELINE(DEVICE_SELF, chihiro_state, ide_interrupt))
18491849   MCFG_IDE_CONTROLLER_BUS_MASTER("maincpu", AS_PROGRAM)
18501850
18511851   /* video hardware */
trunk/src/mame/drivers/kinst.c
r18718r18719
675675
676676
677677   MCFG_IDE_CONTROLLER_ADD("ide", ide_devices, "hdd", NULL, true)
678   MCFG_IDE_CONTROLLER_IRQ_HANDLER(DEVWRITELINE(DEVICE_SELF_OWNER, kinst_state, ide_interrupt))
678   MCFG_IDE_CONTROLLER_IRQ_HANDLER(DEVWRITELINE(DEVICE_SELF, kinst_state, ide_interrupt))
679679
680680   /* video hardware */
681681   MCFG_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
trunk/src/mame/drivers/taitowlf.c
r18718r18719
645645   MCFG_PIC8259_ADD( "pic8259_1", taitowlf_pic8259_1_config )
646646   MCFG_PIC8259_ADD( "pic8259_2", taitowlf_pic8259_2_config )
647647   MCFG_IDE_CONTROLLER_ADD("ide", ide_devices, "hdd", NULL, true)
648   MCFG_IDE_CONTROLLER_IRQ_HANDLER(DEVWRITELINE(DEVICE_SELF_OWNER, taitowlf_state, ide_interrupt))
648   MCFG_IDE_CONTROLLER_IRQ_HANDLER(DEVWRITELINE(DEVICE_SELF, taitowlf_state, ide_interrupt))
649649   MCFG_MC146818_ADD( "rtc", MC146818_STANDARD )
650650
651651   /* video hardware */
trunk/src/mame/drivers/funkball.c
r18718r18719
11711171   MCFG_PCI_BUS_LEGACY_DEVICE(18, NULL, cx5510_pci_r, cx5510_pci_w)
11721172
11731173   MCFG_IDE_CONTROLLER_ADD("ide", ide_devices, "hdd", NULL, true)
1174   MCFG_IDE_CONTROLLER_IRQ_HANDLER(DEVWRITELINE(DEVICE_SELF_OWNER, funkball_state, ide_interrupt))
1174   MCFG_IDE_CONTROLLER_IRQ_HANDLER(DEVWRITELINE(DEVICE_SELF, funkball_state, ide_interrupt))
11751175
11761176   /* video hardware */
11771177   MCFG_3DFX_VOODOO_1_ADD("voodoo_0", STD_VOODOO_1_CLOCK, voodoo_intf)
trunk/src/mame/drivers/taitotz.c
r18718r18719
24982498   MCFG_QUANTUM_TIME(attotime::from_hz(120))
24992499
25002500   MCFG_IDE_CONTROLLER_ADD("ide", ide_devices, "hdd", NULL, true)
2501   MCFG_IDE_CONTROLLER_IRQ_HANDLER(DEVWRITELINE(DEVICE_SELF_OWNER, taitotz_state, ide_interrupt))
2501   MCFG_IDE_CONTROLLER_IRQ_HANDLER(DEVWRITELINE(DEVICE_SELF, taitotz_state, ide_interrupt))
25022502
25032503   MCFG_NVRAM_ADD_0FILL("nvram")
25042504
trunk/src/mame/drivers/gamecstl.c
r18718r18719
708708   MCFG_PIC8259_ADD( "pic8259_2", gamecstl_pic8259_2_config )
709709
710710   MCFG_IDE_CONTROLLER_ADD("ide", ide_devices, "hdd", NULL, true)
711   MCFG_IDE_CONTROLLER_IRQ_HANDLER(DEVWRITELINE(DEVICE_SELF_OWNER, gamecstl_state, ide_interrupt))
711   MCFG_IDE_CONTROLLER_IRQ_HANDLER(DEVWRITELINE(DEVICE_SELF, gamecstl_state, ide_interrupt))
712712
713713   MCFG_MC146818_ADD( "rtc", MC146818_STANDARD )
714714
trunk/src/mame/drivers/queen.c
r18718r18719
689689   MCFG_PCI_BUS_LEGACY_DEVICE(7, NULL, intel82371ab_pci_r, intel82371ab_pci_w)
690690
691691   MCFG_IDE_CONTROLLER_ADD("ide", ide_devices, "hdd", NULL, true)
692   MCFG_IDE_CONTROLLER_IRQ_HANDLER(DEVWRITELINE(DEVICE_SELF_OWNER, queen_state, ide_interrupt))
692   MCFG_IDE_CONTROLLER_IRQ_HANDLER(DEVWRITELINE(DEVICE_SELF, queen_state, ide_interrupt))
693693
694694   /* video hardware */
695695   MCFG_FRAGMENT_ADD( pcvideo_vga )

Previous 199869 Revisions Next

© 1997-2024 The MAME Team