From dce7adbbbbbcb3bf1527b93ba7a7cbc702d3d64d Mon Sep 17 00:00:00 2001 From: Curt Coder Date: Mon, 17 Mar 2014 20:11:09 +0000 Subject: [PATCH] Cleaned up devcb2 usage. (nw) --- src/emu/bus/abcbus/lux10828.c | 4 ++-- src/emu/bus/abcbus/lux21046.c | 2 +- src/emu/bus/comx35/expbox.c | 8 ++++---- src/emu/bus/econet/e01.c | 4 ++-- src/emu/bus/isa/mc1502_fdc.c | 4 ++-- src/emu/bus/isa/p1_fdc.c | 4 ++-- src/emu/bus/s100/dj2db.c | 4 ++-- src/mess/drivers/abc1600.c | 2 +- src/mess/drivers/compis.c | 2 +- src/mess/machine/ti99/bwg.c | 4 ++-- src/mess/machine/ti99/ti_fdc.c | 4 ++-- 11 files changed, 21 insertions(+), 21 deletions(-) diff --git a/src/emu/bus/abcbus/lux10828.c b/src/emu/bus/abcbus/lux10828.c index 8726a4c4c6f..701d475b638 100644 --- a/src/emu/bus/abcbus/lux10828.c +++ b/src/emu/bus/abcbus/lux10828.c @@ -349,8 +349,8 @@ static MACHINE_CONFIG_FRAGMENT( luxor_55_10828 ) MCFG_Z80PIO_ADD(Z80PIO_TAG, XTAL_4MHz/2, pio_intf) MCFG_MB8876x_ADD(MB8876_TAG, XTAL_4MHz/2) - MCFG_WD_FDC_INTRQ_CALLBACK(DEVWRITELINE(DEVICE_SELF, luxor_55_10828_device, fdc_intrq_w)) - MCFG_WD_FDC_DRQ_CALLBACK(DEVWRITELINE(DEVICE_SELF, luxor_55_10828_device, fdc_drq_w)) + MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(luxor_55_10828_device, fdc_intrq_w)) + MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(luxor_55_10828_device, fdc_drq_w)) MCFG_FLOPPY_DRIVE_ADD(MB8876_TAG":0", abc_floppies, "525dd", floppy_image_device::default_floppy_formats) MCFG_FLOPPY_DRIVE_ADD(MB8876_TAG":1", abc_floppies, "525dd", floppy_image_device::default_floppy_formats) diff --git a/src/emu/bus/abcbus/lux21046.c b/src/emu/bus/abcbus/lux21046.c index ff319db4430..d3a4fb7e124 100644 --- a/src/emu/bus/abcbus/lux21046.c +++ b/src/emu/bus/abcbus/lux21046.c @@ -311,7 +311,7 @@ static MACHINE_CONFIG_FRAGMENT( luxor_55_21046 ) MCFG_Z80DMA_ADD(Z80DMA_TAG, XTAL_16MHz/4, dma_intf) MCFG_FD1793x_ADD(SAB1793_TAG, XTAL_16MHz/16) - MCFG_WD_FDC_INTRQ_CALLBACK(DEVWRITELINE(DEVICE_SELF, luxor_55_21046_device, fdc_intrq_w)) + MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(luxor_55_21046_device, fdc_intrq_w)) MCFG_WD_FDC_DRQ_CALLBACK(DEVWRITELINE(Z80DMA_TAG, z80dma_device, rdy_w)) MACHINE_CONFIG_END diff --git a/src/emu/bus/comx35/expbox.c b/src/emu/bus/comx35/expbox.c index af271126a44..6b5acf04d40 100644 --- a/src/emu/bus/comx35/expbox.c +++ b/src/emu/bus/comx35/expbox.c @@ -102,13 +102,13 @@ const rom_entry *comx_eb_device::device_rom_region() const static MACHINE_CONFIG_FRAGMENT( comx_eb ) MCFG_COMX_EXPANSION_SLOT_ADD(SLOT1_TAG, comx_expansion_cards, "fd") - MCFG_COMX_EXPANSION_SLOT_IRQ_CALLBACK(DEVWRITELINE(DEVICE_SELF, comx_eb_device, slot1_irq_w)) + MCFG_COMX_EXPANSION_SLOT_IRQ_CALLBACK(WRITELINE(comx_eb_device, slot1_irq_w)) MCFG_COMX_EXPANSION_SLOT_ADD(SLOT2_TAG, comx_expansion_cards, "clm") - MCFG_COMX_EXPANSION_SLOT_IRQ_CALLBACK(DEVWRITELINE(DEVICE_SELF, comx_eb_device, slot2_irq_w)) + MCFG_COMX_EXPANSION_SLOT_IRQ_CALLBACK(WRITELINE(comx_eb_device, slot2_irq_w)) MCFG_COMX_EXPANSION_SLOT_ADD(SLOT3_TAG, comx_expansion_cards, "joy") - MCFG_COMX_EXPANSION_SLOT_IRQ_CALLBACK(DEVWRITELINE(DEVICE_SELF, comx_eb_device, slot3_irq_w)) + MCFG_COMX_EXPANSION_SLOT_IRQ_CALLBACK(WRITELINE(comx_eb_device, slot3_irq_w)) MCFG_COMX_EXPANSION_SLOT_ADD(SLOT4_TAG, comx_expansion_cards, "ram") - MCFG_COMX_EXPANSION_SLOT_IRQ_CALLBACK(DEVWRITELINE(DEVICE_SELF, comx_eb_device, slot4_irq_w)) + MCFG_COMX_EXPANSION_SLOT_IRQ_CALLBACK(WRITELINE(comx_eb_device, slot4_irq_w)) MACHINE_CONFIG_END diff --git a/src/emu/bus/econet/e01.c b/src/emu/bus/econet/e01.c index 72ad8da8cb9..53a9a655f19 100644 --- a/src/emu/bus/econet/e01.c +++ b/src/emu/bus/econet/e01.c @@ -265,8 +265,8 @@ static MACHINE_CONFIG_FRAGMENT( e01 ) MCFG_MC6854_ADD(MC6854_TAG, adlc_intf) MCFG_WD2793x_ADD(WD2793_TAG, XTAL_8MHz/4) - MCFG_WD_FDC_INTRQ_CALLBACK(DEVWRITELINE(DEVICE_SELF, e01_device, fdc_irq_w)) - MCFG_WD_FDC_DRQ_CALLBACK(DEVWRITELINE(DEVICE_SELF, e01_device, fdc_drq_w)) + MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(e01_device, fdc_irq_w)) + MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(e01_device, fdc_drq_w)) MCFG_FLOPPY_DRIVE_ADD(WD2793_TAG":0", e01_floppies, "35dd", floppy_image_device::default_floppy_formats) MCFG_FLOPPY_DRIVE_ADD(WD2793_TAG":1", e01_floppies, "35dd", floppy_image_device::default_floppy_formats) diff --git a/src/emu/bus/isa/mc1502_fdc.c b/src/emu/bus/isa/mc1502_fdc.c index 06eef7fbbe0..9c086499e42 100644 --- a/src/emu/bus/isa/mc1502_fdc.c +++ b/src/emu/bus/isa/mc1502_fdc.c @@ -45,8 +45,8 @@ SLOT_INTERFACE_END static MACHINE_CONFIG_FRAGMENT( mc1502_fdc ) MCFG_FD1793x_ADD("fdc", XTAL_16MHz / 16) - MCFG_WD_FDC_INTRQ_CALLBACK(DEVWRITELINE(DEVICE_SELF, mc1502_fdc_device, mc1502_fdc_irq_drq)) - MCFG_WD_FDC_DRQ_CALLBACK(DEVWRITELINE(DEVICE_SELF, mc1502_fdc_device, mc1502_fdc_irq_drq)) + MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(mc1502_fdc_device, mc1502_fdc_irq_drq)) + MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(mc1502_fdc_device, mc1502_fdc_irq_drq)) MCFG_FLOPPY_DRIVE_ADD("fdc:0", mc1502_floppies, "525qd", mc1502_fdc_device::floppy_formats) MCFG_FLOPPY_DRIVE_ADD("fdc:1", mc1502_floppies, "525qd", mc1502_fdc_device::floppy_formats) MACHINE_CONFIG_END diff --git a/src/emu/bus/isa/p1_fdc.c b/src/emu/bus/isa/p1_fdc.c index 4d4fbfaf8f4..0164ce3a06a 100644 --- a/src/emu/bus/isa/p1_fdc.c +++ b/src/emu/bus/isa/p1_fdc.c @@ -45,8 +45,8 @@ SLOT_INTERFACE_END static MACHINE_CONFIG_FRAGMENT( fdc_b504 ) MCFG_FD1793x_ADD("fdc", XTAL_16MHz / 16) - MCFG_WD_FDC_INTRQ_CALLBACK(DEVWRITELINE(DEVICE_SELF, p1_fdc_device, p1_fdc_irq_drq)) - MCFG_WD_FDC_DRQ_CALLBACK(DEVWRITELINE(DEVICE_SELF, p1_fdc_device, p1_fdc_irq_drq)) + MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(p1_fdc_device, p1_fdc_irq_drq)) + MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(p1_fdc_device, p1_fdc_irq_drq)) MCFG_FLOPPY_DRIVE_ADD("fdc:0", poisk1_floppies, "525qd", p1_fdc_device::floppy_formats) MCFG_FLOPPY_DRIVE_ADD("fdc:1", poisk1_floppies, "525qd", p1_fdc_device::floppy_formats) MACHINE_CONFIG_END diff --git a/src/emu/bus/s100/dj2db.c b/src/emu/bus/s100/dj2db.c index 7eda7d56581..ab118c03f3b 100644 --- a/src/emu/bus/s100/dj2db.c +++ b/src/emu/bus/s100/dj2db.c @@ -113,8 +113,8 @@ static MACHINE_CONFIG_FRAGMENT( s100_dj2db ) MCFG_COM8116_FR_HANDLER(WRITELINE(s100_dj2db_device, fr_w)) MCFG_MB8866x_ADD(MB8866_TAG, XTAL_10MHz/5) - MCFG_WD_FDC_INTRQ_CALLBACK(DEVWRITELINE(DEVICE_SELF, s100_dj2db_device, fdc_intrq_w)) - MCFG_WD_FDC_DRQ_CALLBACK(DEVWRITELINE(DEVICE_SELF, s100_dj2db_device, fdc_drq_w)) + MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(s100_dj2db_device, fdc_intrq_w)) + MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(s100_dj2db_device, fdc_drq_w)) MCFG_FLOPPY_DRIVE_ADD(MB8866_TAG":0", s100_dj2db_floppies, "8dsdd", floppy_image_device::default_floppy_formats) MCFG_FLOPPY_DRIVE_ADD(MB8866_TAG":1", s100_dj2db_floppies, NULL, floppy_image_device::default_floppy_formats) diff --git a/src/mess/drivers/abc1600.c b/src/mess/drivers/abc1600.c index 6f9539da966..594303d6de2 100644 --- a/src/mess/drivers/abc1600.c +++ b/src/mess/drivers/abc1600.c @@ -955,7 +955,7 @@ static MACHINE_CONFIG_START( abc1600, abc1600_state ) MCFG_ABCBUS_SLOT_IRQ_CALLBACK(DEVWRITELINE(Z8536B1_TAG, z8536_device, pa7_w)) MCFG_ABCBUS_SLOT_ADD("bus0x", abc1600bus_cards, NULL) MCFG_ABCBUS_SLOT_IRQ_CALLBACK(DEVWRITELINE(Z8536B1_TAG, z8536_device, pa6_w)) - MCFG_ABCBUS_SLOT_NMI_CALLBACK(DEVWRITELINE(DEVICE_SELF, abc1600_state, nmi_w)) + MCFG_ABCBUS_SLOT_NMI_CALLBACK(WRITELINE(abc1600_state, nmi_w)) MCFG_ABCBUS_SLOT_XINT2_CALLBACK(DEVWRITELINE(Z8536B1_TAG, z8536_device, pa2_w)) MCFG_ABCBUS_SLOT_XINT3_CALLBACK(DEVWRITELINE(Z8536B1_TAG, z8536_device, pa3_w)) MCFG_ABCBUS_SLOT_XINT4_CALLBACK(DEVWRITELINE(Z8536B1_TAG, z8536_device, pa4_w)) diff --git a/src/mess/drivers/compis.c b/src/mess/drivers/compis.c index d8c62503c07..a0d7d8e936f 100644 --- a/src/mess/drivers/compis.c +++ b/src/mess/drivers/compis.c @@ -731,7 +731,7 @@ static MACHINE_CONFIG_START( compis, compis_state ) MCFG_I80130_IRQ_CALLBACK(DEVWRITELINE(I80186_TAG, i80186_cpu_device, int0_w)) //MCFG_I80130_SYSTICK_CALLBACK(DEVWRITELINE(I80130_TAG, i80130_device, ir3_w)) MCFG_I80130_DELAY_CALLBACK(DEVWRITELINE(I80130_TAG, i80130_device, ir7_w)) - MCFG_I80130_BAUD_CALLBACK(DEVWRITELINE(DEVICE_SELF, compis_state, tmr2_w)) + MCFG_I80130_BAUD_CALLBACK(WRITELINE(compis_state, tmr2_w)) MCFG_DEVICE_ADD(I8253_TAG, PIT8253, 0) MCFG_PIT8253_CLK0(XTAL_16MHz/8) diff --git a/src/mess/machine/ti99/bwg.c b/src/mess/machine/ti99/bwg.c index 515c7b21f9c..9224db0fee5 100644 --- a/src/mess/machine/ti99/bwg.c +++ b/src/mess/machine/ti99/bwg.c @@ -632,8 +632,8 @@ SLOT_INTERFACE_END MACHINE_CONFIG_FRAGMENT( bwg_fdc ) MCFG_WD1773x_ADD(FDC_TAG, XTAL_8MHz) - MCFG_WD_FDC_INTRQ_CALLBACK(DEVWRITELINE(DEVICE_SELF, snug_bwg_device, fdc_irq_w)) - MCFG_WD_FDC_DRQ_CALLBACK(DEVWRITELINE(DEVICE_SELF, snug_bwg_device, fdc_drq_w)) + MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(snug_bwg_device, fdc_irq_w)) + MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(snug_bwg_device, fdc_drq_w)) MCFG_MM58274C_ADD(CLOCK_TAG, bwg_mm58274c_interface) MCFG_FLOPPY_DRIVE_ADD("0", bwg_floppies, "525dd", snug_bwg_device::floppy_formats) diff --git a/src/mess/machine/ti99/ti_fdc.c b/src/mess/machine/ti99/ti_fdc.c index 6af85c96ee8..04d2d42c503 100644 --- a/src/mess/machine/ti99/ti_fdc.c +++ b/src/mess/machine/ti99/ti_fdc.c @@ -404,8 +404,8 @@ SLOT_INTERFACE_END MACHINE_CONFIG_FRAGMENT( ti_fdc ) MCFG_FD1771x_ADD(FDC_TAG, XTAL_1MHz) - MCFG_WD_FDC_INTRQ_CALLBACK(DEVWRITELINE(DEVICE_SELF, ti_fdc_device, fdc_irq_w)) - MCFG_WD_FDC_DRQ_CALLBACK(DEVWRITELINE(DEVICE_SELF, ti_fdc_device, fdc_drq_w)) + MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(ti_fdc_device, fdc_irq_w)) + MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(ti_fdc_device, fdc_drq_w)) MCFG_FLOPPY_DRIVE_ADD("0", tifdc_floppies, "525dd", ti_fdc_device::floppy_formats) MCFG_FLOPPY_DRIVE_ADD("1", tifdc_floppies, "525dd", ti_fdc_device::floppy_formats) MCFG_FLOPPY_DRIVE_ADD("2", tifdc_floppies, NULL, ti_fdc_device::floppy_formats)