diff options
author | Dirk Best <mail@dirk-best.de> | 2015-06-23 15:31:55 +0200 |
---|---|---|
committer | Dirk Best <mail@dirk-best.de> | 2015-06-23 15:32:17 +0200 |
commit | 50071ab8314d68d2b9f80e3aa89d49a45958b847 (patch) | |
tree | 88b7ddc3a612da04a0b5a011ae0f6d5ad20d7da8 | |
parent | 1f3abbeb073aecf35159262ad8b076eed87ed5c0 (diff) |
get rid of all the x
114 files changed, 258 insertions, 258 deletions
diff --git a/src/emu/bus/a2bus/corvfdc01.c b/src/emu/bus/a2bus/corvfdc01.c index 335774af6ae..fc1adf2e269 100644 --- a/src/emu/bus/a2bus/corvfdc01.c +++ b/src/emu/bus/a2bus/corvfdc01.c @@ -35,7 +35,7 @@ static SLOT_INTERFACE_START( corv_floppies ) SLOT_INTERFACE_END MACHINE_CONFIG_FRAGMENT( fdc01 ) - MCFG_FD1793x_ADD(FDC01_FDC_TAG, XTAL_16MHz / 8) + MCFG_FD1793_ADD(FDC01_FDC_TAG, XTAL_16MHz / 8) MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(a2bus_corvfdc01_device, intrq_w)) MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(a2bus_corvfdc01_device, drq_w)) MCFG_FLOPPY_DRIVE_ADD(FDC01_FDC_TAG":0", corv_floppies, "8sssd", a2bus_corvfdc01_device::corv_floppy_formats) diff --git a/src/emu/bus/abcbus/fd2.c b/src/emu/bus/abcbus/fd2.c index 73ddeba54df..7faeefb97c4 100644 --- a/src/emu/bus/abcbus/fd2.c +++ b/src/emu/bus/abcbus/fd2.c @@ -246,7 +246,7 @@ static MACHINE_CONFIG_FRAGMENT( abc_fd2 ) MCFG_Z80PIO_IN_PB_CB(READ8(abc_fd2_t, pio_pb_r)) MCFG_Z80PIO_OUT_PB_CB(WRITE8(abc_fd2_t, pio_pb_w)) - MCFG_FD1771x_ADD(FD1771_TAG, XTAL_4MHz/4) + MCFG_FD1771_ADD(FD1771_TAG, XTAL_4MHz/4) MCFG_WD_FDC_INTRQ_CALLBACK(DEVWRITELINE(Z80PIO_TAG, z80pio_device, pb7_w)) MCFG_WD_FDC_DRQ_CALLBACK(DEVWRITELINE(Z80PIO_TAG, z80pio_device, pb5_w)) MCFG_WD_FDC_HLD_CALLBACK(DEVWRITELINE(Z80PIO_TAG, z80pio_device, pb6_w)) diff --git a/src/emu/bus/abcbus/lux10828.c b/src/emu/bus/abcbus/lux10828.c index f809d8fe13d..705a9e8035b 100644 --- a/src/emu/bus/abcbus/lux10828.c +++ b/src/emu/bus/abcbus/lux10828.c @@ -338,7 +338,7 @@ static MACHINE_CONFIG_FRAGMENT( luxor_55_10828 ) MCFG_Z80PIO_IN_PB_CB(READ8(luxor_55_10828_device, pio_pb_r)) MCFG_Z80PIO_OUT_PB_CB(WRITE8(luxor_55_10828_device, pio_pb_w)) - MCFG_MB8876x_ADD(MB8876_TAG, XTAL_4MHz/2) + MCFG_MB8876_ADD(MB8876_TAG, XTAL_4MHz/2) 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)) diff --git a/src/emu/bus/abcbus/lux21046.c b/src/emu/bus/abcbus/lux21046.c index e5cd3b001b6..67396d81139 100644 --- a/src/emu/bus/abcbus/lux21046.c +++ b/src/emu/bus/abcbus/lux21046.c @@ -298,7 +298,7 @@ static MACHINE_CONFIG_FRAGMENT( luxor_55_21046 ) MCFG_Z80DMA_IN_IORQ_CB(READ8(luxor_55_21046_device, io_read_byte)) MCFG_Z80DMA_OUT_IORQ_CB(WRITE8(luxor_55_21046_device, io_write_byte)) - MCFG_FD1793x_ADD(SAB1793_TAG, XTAL_16MHz/16) + MCFG_FD1793_ADD(SAB1793_TAG, XTAL_16MHz/16) 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/adamnet/fdc.c b/src/emu/bus/adamnet/fdc.c index f915c227f03..afe93d74a29 100644 --- a/src/emu/bus/adamnet/fdc.c +++ b/src/emu/bus/adamnet/fdc.c @@ -128,7 +128,7 @@ static MACHINE_CONFIG_FRAGMENT( adam_fdc ) MCFG_CPU_PROGRAM_MAP(adam_fdc_mem) MCFG_CPU_IO_MAP(adam_fdc_io) - MCFG_WD2793x_ADD(WD2793_TAG, XTAL_4MHz/4) + MCFG_WD2793_ADD(WD2793_TAG, XTAL_4MHz/4) MCFG_WD_FDC_INTRQ_CALLBACK(INPUTLINE(M6801_TAG, INPUT_LINE_NMI)) MCFG_FLOPPY_DRIVE_ADD(WD2793_TAG":0", adam_fdc_floppies, "525ssdd", adam_fdc_device::floppy_formats) diff --git a/src/emu/bus/bml3/bml3mp1802.c b/src/emu/bus/bml3/bml3mp1802.c index 860d827caa3..64db414fa21 100644 --- a/src/emu/bus/bml3/bml3mp1802.c +++ b/src/emu/bus/bml3/bml3mp1802.c @@ -43,7 +43,7 @@ ROM_START( mp1802 ) ROM_END MACHINE_CONFIG_FRAGMENT( mp1802 ) - MCFG_MB8866x_ADD("fdc", XTAL_1MHz) + MCFG_MB8866_ADD("fdc", XTAL_1MHz) MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(bml3bus_mp1802_device, bml3_wd17xx_intrq_w)) MCFG_FLOPPY_DRIVE_ADD("fdc:0", mp1802_floppies, "dd", floppy_image_device::default_floppy_formats) diff --git a/src/emu/bus/cbmiec/c1571.c b/src/emu/bus/cbmiec/c1571.c index 44001fd13c8..a08e88fb696 100644 --- a/src/emu/bus/cbmiec/c1571.c +++ b/src/emu/bus/cbmiec/c1571.c @@ -628,7 +628,7 @@ static MACHINE_CONFIG_FRAGMENT( c1570 ) MCFG_MOS6526_PB_OUTPUT_CALLBACK(WRITE8(c1571_t, cia_pb_w)) MCFG_MOS6526_PC_CALLBACK(WRITELINE(c1571_t, cia_pc_w)) - MCFG_WD1770x_ADD(WD1770_TAG, XTAL_16MHz/2) + MCFG_WD1770_ADD(WD1770_TAG, XTAL_16MHz/2) MCFG_DEVICE_ADD(C64H156_TAG, C64H156, XTAL_16MHz) MCFG_64H156_BYTE_CALLBACK(WRITELINE(c1571_t, byte_w)) MCFG_FLOPPY_DRIVE_ADD(C64H156_TAG":0", c1571_floppies, "525qd", c1571_t::floppy_formats) @@ -679,7 +679,7 @@ static MACHINE_CONFIG_FRAGMENT( c1571 ) MCFG_MOS6526_PB_OUTPUT_CALLBACK(WRITE8(c1571_t, cia_pb_w)) MCFG_MOS6526_PC_CALLBACK(WRITELINE(c1571_t, cia_pc_w)) - MCFG_WD1770x_ADD(WD1770_TAG, XTAL_16MHz/2) + MCFG_WD1770_ADD(WD1770_TAG, XTAL_16MHz/2) MCFG_DEVICE_ADD(C64H156_TAG, C64H156, XTAL_16MHz) MCFG_64H156_BYTE_CALLBACK(WRITELINE(c1571_t, byte_w)) MCFG_FLOPPY_DRIVE_ADD(C64H156_TAG":0", c1571_floppies, "525qd", c1571_t::floppy_formats) @@ -724,7 +724,7 @@ static MACHINE_CONFIG_FRAGMENT( c1571cr ) //MCFG_MOS5710_ADD(M5710_TAG, XTAL_16MHz/16, 0) - MCFG_WD1770x_ADD(WD1770_TAG, XTAL_16MHz/2) + MCFG_WD1770_ADD(WD1770_TAG, XTAL_16MHz/2) MCFG_DEVICE_ADD(C64H156_TAG, C64H156, XTAL_16MHz) MCFG_64H156_BYTE_CALLBACK(WRITELINE(c1571_t, byte_w)) MCFG_FLOPPY_DRIVE_ADD(C64H156_TAG":0", c1571_floppies, "525qd", c1571_t::floppy_formats) @@ -775,7 +775,7 @@ static MACHINE_CONFIG_FRAGMENT( mini_chief ) MCFG_MOS6526_PB_OUTPUT_CALLBACK(WRITE8(c1571_t, cia_pb_w)) MCFG_MOS6526_PC_CALLBACK(WRITELINE(c1571_t, cia_pc_w)) - MCFG_WD1770x_ADD(WD1770_TAG, XTAL_16MHz/2) + MCFG_WD1770_ADD(WD1770_TAG, XTAL_16MHz/2) MCFG_DEVICE_ADD(C64H156_TAG, C64H156, XTAL_16MHz) MCFG_64H156_BYTE_CALLBACK(WRITELINE(c1571_t, byte_w)) MCFG_FLOPPY_DRIVE_ADD(C64H156_TAG":0", c1571_floppies, "525qd", c1571_t::floppy_formats) diff --git a/src/emu/bus/cbmiec/c1581.c b/src/emu/bus/cbmiec/c1581.c index ce9e661b198..33bc082241e 100644 --- a/src/emu/bus/cbmiec/c1581.c +++ b/src/emu/bus/cbmiec/c1581.c @@ -277,7 +277,7 @@ static MACHINE_CONFIG_FRAGMENT( c1581 ) MCFG_MOS6526_PB_INPUT_CALLBACK(READ8(c1581_t, cia_pb_r)) MCFG_MOS6526_PB_OUTPUT_CALLBACK(WRITE8(c1581_t, cia_pb_w)) - MCFG_WD1772x_ADD(WD1772_TAG, XTAL_16MHz/2) + MCFG_WD1772_ADD(WD1772_TAG, XTAL_16MHz/2) MCFG_FLOPPY_DRIVE_ADD(WD1772_TAG":0", c1581_floppies, "35dd", c1581_t::floppy_formats) MACHINE_CONFIG_END diff --git a/src/emu/bus/cgenie/expansion/floppy.c b/src/emu/bus/cgenie/expansion/floppy.c index 3221067b874..6941ae33ad3 100644 --- a/src/emu/bus/cgenie/expansion/floppy.c +++ b/src/emu/bus/cgenie/expansion/floppy.c @@ -72,7 +72,7 @@ const rom_entry *cgenie_fdc_device::device_rom_region() const static MACHINE_CONFIG_FRAGMENT( cgenie_fdc ) MCFG_TIMER_DRIVER_ADD_PERIODIC("timer", cgenie_fdc_device, timer_callback, attotime::from_msec(25)) - MCFG_FD1793x_ADD("fd1793", XTAL_1MHz) + MCFG_FD1793_ADD("fd1793", XTAL_1MHz) MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(cgenie_fdc_device, intrq_w)) MCFG_FLOPPY_DRIVE_ADD("fd1793:0", cgenie_floppies, "ssdd", cgenie_fdc_device::floppy_formats) diff --git a/src/emu/bus/coco/coco_fdc.c b/src/emu/bus/coco/coco_fdc.c index 9be9039516d..bf165df42f5 100644 --- a/src/emu/bus/coco/coco_fdc.c +++ b/src/emu/bus/coco/coco_fdc.c @@ -154,7 +154,7 @@ WRITE_LINE_MEMBER( coco_fdc_device::fdc_drq_w ) //************************************************************************** static MACHINE_CONFIG_FRAGMENT(coco_fdc) - MCFG_WD1773x_ADD(WD_TAG, XTAL_8MHz) + MCFG_WD1773_ADD(WD_TAG, XTAL_8MHz) MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(coco_fdc_device, fdc_intrq_w)) MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(coco_fdc_device, fdc_drq_w)) @@ -425,7 +425,7 @@ WRITE8_MEMBER(coco_fdc_device::write) //************************************************************************** static MACHINE_CONFIG_FRAGMENT(dragon_fdc) - MCFG_WD2797x_ADD(WD2797_TAG, XTAL_1MHz) + MCFG_WD2797_ADD(WD2797_TAG, XTAL_1MHz) MCFG_FLOPPY_DRIVE_ADD(WD2797_TAG ":0", coco_fdc_floppies, "qd", coco_fdc_device::floppy_formats) MCFG_FLOPPY_DRIVE_ADD(WD2797_TAG ":1", coco_fdc_floppies, "qd", coco_fdc_device::floppy_formats) diff --git a/src/emu/bus/comx35/fdc.c b/src/emu/bus/comx35/fdc.c index 0c50673cc0f..0c83d5bed29 100644 --- a/src/emu/bus/comx35/fdc.c +++ b/src/emu/bus/comx35/fdc.c @@ -95,7 +95,7 @@ SLOT_INTERFACE_END //------------------------------------------------- static MACHINE_CONFIG_FRAGMENT( comx_fd ) - MCFG_WD1770x_ADD(WD1770_TAG, XTAL_8MHz) + MCFG_WD1770_ADD(WD1770_TAG, XTAL_8MHz) MCFG_FLOPPY_DRIVE_ADD(WD1770_TAG":0", comx_fd_floppies, "525sd35t", comx_fd_device::floppy_formats) MCFG_FLOPPY_DRIVE_ADD(WD1770_TAG":1", comx_fd_floppies, NULL, comx_fd_device::floppy_formats) diff --git a/src/emu/bus/econet/e01.c b/src/emu/bus/econet/e01.c index 41b2483c068..bcb9b4b6bae 100644 --- a/src/emu/bus/econet/e01.c +++ b/src/emu/bus/econet/e01.c @@ -250,7 +250,7 @@ static MACHINE_CONFIG_FRAGMENT( e01 ) MCFG_DEVICE_ADD(MC6854_TAG, MC6854, 0) MCFG_MC6854_OUT_IRQ_CB(WRITELINE(e01_device, adlc_irq_w)) MCFG_MC6854_OUT_TXD_CB(WRITELINE(e01_device, econet_data_w)) - MCFG_WD2793x_ADD(WD2793_TAG, XTAL_8MHz/4) + MCFG_WD2793_ADD(WD2793_TAG, XTAL_8MHz/4) 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) diff --git a/src/emu/bus/ep64/exdos.c b/src/emu/bus/ep64/exdos.c index 4cc31ed30b1..f0813ff8d7e 100644 --- a/src/emu/bus/ep64/exdos.c +++ b/src/emu/bus/ep64/exdos.c @@ -102,7 +102,7 @@ SLOT_INTERFACE_END //------------------------------------------------- static MACHINE_CONFIG_FRAGMENT( ep64_exdos ) - MCFG_WD1770x_ADD(WD1770_TAG, XTAL_8MHz) + MCFG_WD1770_ADD(WD1770_TAG, XTAL_8MHz) MCFG_FLOPPY_DRIVE_ADD(WD1770_TAG":0", ep64_exdos_floppies, "35dd", ep64_exdos_device::floppy_formats) MCFG_FLOPPY_DRIVE_ADD(WD1770_TAG":1", ep64_exdos_floppies, NULL, ep64_exdos_device::floppy_formats) diff --git a/src/emu/bus/ieee488/c8280.c b/src/emu/bus/ieee488/c8280.c index 188f7bcbb3a..1dd1c679c5d 100644 --- a/src/emu/bus/ieee488/c8280.c +++ b/src/emu/bus/ieee488/c8280.c @@ -306,7 +306,7 @@ static MACHINE_CONFIG_FRAGMENT( c8280 ) MCFG_CPU_ADD(M6502_FDC_TAG, M6502, XTAL_12MHz/8) MCFG_CPU_PROGRAM_MAP(c8280_fdc_mem) - MCFG_FD1797x_ADD(WD1797_TAG, XTAL_12MHz/6) + MCFG_FD1797_ADD(WD1797_TAG, XTAL_12MHz/6) MCFG_WD_FDC_INTRQ_CALLBACK(INPUTLINE(M6502_FDC_TAG, M6502_IRQ_LINE)) MCFG_WD_FDC_DRQ_CALLBACK(INPUTLINE(M6502_FDC_TAG, M6502_SET_OVERFLOW)) MCFG_FLOPPY_DRIVE_ADD(WD1797_TAG ":0", c8280_floppies, "8dsdd", c8280_t::floppy_formats) diff --git a/src/emu/bus/isa/mc1502_fdc.c b/src/emu/bus/isa/mc1502_fdc.c index a24e487e43c..ada13d1d4ec 100644 --- a/src/emu/bus/isa/mc1502_fdc.c +++ b/src/emu/bus/isa/mc1502_fdc.c @@ -39,7 +39,7 @@ static SLOT_INTERFACE_START( mc1502_floppies ) SLOT_INTERFACE_END static MACHINE_CONFIG_FRAGMENT( mc1502_fdc ) - MCFG_FD1793x_ADD("fdc", XTAL_16MHz / 16) + MCFG_FD1793_ADD("fdc", XTAL_16MHz / 16) 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) diff --git a/src/emu/bus/isa/p1_fdc.c b/src/emu/bus/isa/p1_fdc.c index 80e2ebb77c9..4ba01ed47da 100644 --- a/src/emu/bus/isa/p1_fdc.c +++ b/src/emu/bus/isa/p1_fdc.c @@ -39,7 +39,7 @@ static SLOT_INTERFACE_START( poisk1_floppies ) SLOT_INTERFACE_END static MACHINE_CONFIG_FRAGMENT( fdc_b504 ) - MCFG_FD1793x_ADD("fdc", XTAL_16MHz / 16) + MCFG_FD1793_ADD("fdc", XTAL_16MHz / 16) 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) diff --git a/src/emu/bus/msx_cart/disk.c b/src/emu/bus/msx_cart/disk.c index 44c3db577b5..64bc061ba35 100644 --- a/src/emu/bus/msx_cart/disk.c +++ b/src/emu/bus/msx_cart/disk.c @@ -198,7 +198,7 @@ static MACHINE_CONFIG_FRAGMENT( vy0010 ) // HLT pulled high // SSO/-ENMF + -DDEN + ENP + -5/8 - pulled low // READY inverted in VY-0010 cartridge and pulled low on VY-0010/VY-0011 floppy drive - MCFG_WD2793x_ADD("fdc", XTAL_4MHz / 4) + MCFG_WD2793_ADD("fdc", XTAL_4MHz / 4) MCFG_WD_FDC_FORCE_READY // Single sided 3.5" floppy drive @@ -220,7 +220,7 @@ machine_config_constructor msx_cart_vy0010::device_mconfig_additions() const static MACHINE_CONFIG_FRAGMENT( fsfd1 ) - MCFG_WD2793x_ADD("fdc", XTAL_4MHz / 4) + MCFG_WD2793_ADD("fdc", XTAL_4MHz / 4) // Double sided 3.5" floppy drive MCFG_FLOPPY_DRIVE_ADD("fdc:0", msx_floppies, "35dd", msx_cart_disk::floppy_formats) @@ -262,7 +262,7 @@ machine_config_constructor msx_cart_fsfd1a::device_mconfig_additions() const static MACHINE_CONFIG_FRAGMENT( fscf351 ) - MCFG_MB8877x_ADD("fdc", XTAL_4MHz / 4) + MCFG_MB8877_ADD("fdc", XTAL_4MHz / 4) MCFG_WD_FDC_FORCE_READY // Double sided 3.5" floppy drive diff --git a/src/emu/bus/nasbus/floppy.c b/src/emu/bus/nasbus/floppy.c index e47e67224c5..cf68765a0ae 100644 --- a/src/emu/bus/nasbus/floppy.c +++ b/src/emu/bus/nasbus/floppy.c @@ -39,7 +39,7 @@ SLOT_INTERFACE_END //------------------------------------------------- static MACHINE_CONFIG_FRAGMENT( nascom_fdc ) - MCFG_FD1793x_ADD("fd1793", XTAL_16MHz / 4 / 4) + MCFG_FD1793_ADD("fd1793", XTAL_16MHz / 4 / 4) MCFG_FLOPPY_DRIVE_ADD("fd1793:0", nascom_floppies, "55f", nascom_fdc_device::floppy_formats) MCFG_FLOPPY_DRIVE_ADD("fd1793:1", nascom_floppies, "55f", nascom_fdc_device::floppy_formats) diff --git a/src/emu/bus/oricext/jasmin.c b/src/emu/bus/oricext/jasmin.c index f8ddceddeec..c8fd1d81081 100644 --- a/src/emu/bus/oricext/jasmin.c +++ b/src/emu/bus/oricext/jasmin.c @@ -19,7 +19,7 @@ static SLOT_INTERFACE_START( jasmin_floppies ) SLOT_INTERFACE_END static MACHINE_CONFIG_FRAGMENT( jasmin ) - MCFG_WD1770x_ADD("fdc", XTAL_8MHz) + MCFG_WD1770_ADD("fdc", XTAL_8MHz) MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(oricext_device, irq_w)) MCFG_FLOPPY_DRIVE_ADD("fdc:0", jasmin_floppies, "3dsdd", jasmin_device::floppy_formats) diff --git a/src/emu/bus/oricext/microdisc.c b/src/emu/bus/oricext/microdisc.c index 884cfb9c271..c66adfa555a 100644 --- a/src/emu/bus/oricext/microdisc.c +++ b/src/emu/bus/oricext/microdisc.c @@ -19,7 +19,7 @@ static SLOT_INTERFACE_START( microdisc_floppies ) SLOT_INTERFACE_END static MACHINE_CONFIG_FRAGMENT( microdisc ) - MCFG_FD1793x_ADD("fdc", XTAL_8MHz/8) + MCFG_FD1793_ADD("fdc", XTAL_8MHz/8) MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(microdisc_device, fdc_irq_w)) MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(microdisc_device, fdc_drq_w)) MCFG_WD_FDC_HLD_CALLBACK(WRITELINE(microdisc_device, fdc_hld_w)) diff --git a/src/emu/bus/ql/sandy_superdisk.c b/src/emu/bus/ql/sandy_superdisk.c index 548268edfef..cf334d6db67 100644 --- a/src/emu/bus/ql/sandy_superdisk.c +++ b/src/emu/bus/ql/sandy_superdisk.c @@ -81,7 +81,7 @@ WRITE_LINE_MEMBER( sandy_super_disk_t::busy_w ) //------------------------------------------------- static MACHINE_CONFIG_FRAGMENT( sandy_super_disk ) - MCFG_DEVICE_ADD(WD1772_TAG, WD1772x, 8000000) + MCFG_DEVICE_ADD(WD1772_TAG, WD1772, 8000000) MCFG_FLOPPY_DRIVE_ADD(WD1772_TAG":0", sandy_super_disk_floppies, "35dd", sandy_super_disk_t::floppy_formats) MCFG_FLOPPY_DRIVE_ADD(WD1772_TAG":1", sandy_super_disk_floppies, NULL, sandy_super_disk_t::floppy_formats) diff --git a/src/emu/bus/ql/sandy_superqboard.c b/src/emu/bus/ql/sandy_superqboard.c index 51e338ea76c..3e5558302db 100644 --- a/src/emu/bus/ql/sandy_superqboard.c +++ b/src/emu/bus/ql/sandy_superqboard.c @@ -102,7 +102,7 @@ WRITE_LINE_MEMBER( sandy_superqboard_t::busy_w ) //------------------------------------------------- static MACHINE_CONFIG_FRAGMENT( sandy_superqboard ) - MCFG_DEVICE_ADD(WD1772_TAG, WD1772x, XTAL_16MHz/2) + MCFG_DEVICE_ADD(WD1772_TAG, WD1772, XTAL_16MHz/2) MCFG_FLOPPY_DRIVE_ADD(WD1772_TAG":0", sandy_superqboard_floppies, "35hd", sandy_superqboard_t::floppy_formats) MCFG_FLOPPY_DRIVE_ADD(WD1772_TAG":1", sandy_superqboard_floppies, NULL, sandy_superqboard_t::floppy_formats) diff --git a/src/emu/bus/ql/trumpcard.c b/src/emu/bus/ql/trumpcard.c index 08217f04950..fa77ed23d53 100644 --- a/src/emu/bus/ql/trumpcard.c +++ b/src/emu/bus/ql/trumpcard.c @@ -85,7 +85,7 @@ FLOPPY_FORMATS_END //------------------------------------------------- static MACHINE_CONFIG_FRAGMENT( ql_trump_card ) - MCFG_DEVICE_ADD(WD1772_TAG, WD1772x, 8000000) + MCFG_DEVICE_ADD(WD1772_TAG, WD1772, 8000000) MCFG_FLOPPY_DRIVE_ADD(WD1772_TAG":0", ql_trump_card_floppies, "35dd", ql_trump_card_t::floppy_formats) MCFG_FLOPPY_DRIVE_ADD(WD1772_TAG":1", ql_trump_card_floppies, NULL, ql_trump_card_t::floppy_formats) MACHINE_CONFIG_END diff --git a/src/emu/bus/s100/dj2db.c b/src/emu/bus/s100/dj2db.c index 061a0c07880..f32d32e3eb2 100644 --- a/src/emu/bus/s100/dj2db.c +++ b/src/emu/bus/s100/dj2db.c @@ -104,7 +104,7 @@ static MACHINE_CONFIG_FRAGMENT( s100_dj2db ) MCFG_DEVICE_ADD(BR1941_TAG, COM8116, XTAL_5_0688MHz) MCFG_COM8116_FR_HANDLER(WRITELINE(s100_dj2db_device, fr_w)) - MCFG_MB8866x_ADD(MB8866_TAG, XTAL_10MHz/5) + MCFG_MB8866_ADD(MB8866_TAG, XTAL_10MHz/5) MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(s100_dj2db_device, fdc_intrq_w)) MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(s100_dj2db_device, fdc_drq_w)) diff --git a/src/emu/bus/ti99_peb/bwg.c b/src/emu/bus/ti99_peb/bwg.c index 2ae171b9423..d5504ff2283 100644 --- a/src/emu/bus/ti99_peb/bwg.c +++ b/src/emu/bus/ti99_peb/bwg.c @@ -661,7 +661,7 @@ static SLOT_INTERFACE_START( bwg_floppies ) SLOT_INTERFACE_END MACHINE_CONFIG_FRAGMENT( bwg_fdc ) - MCFG_WD1773x_ADD(FDC_TAG, XTAL_8MHz) + MCFG_WD1773_ADD(FDC_TAG, XTAL_8MHz) MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(snug_bwg_device, fdc_irq_w)) MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(snug_bwg_device, fdc_drq_w)) diff --git a/src/emu/bus/ti99_peb/ti_fdc.c b/src/emu/bus/ti99_peb/ti_fdc.c index fe9d6133108..610832e2539 100644 --- a/src/emu/bus/ti99_peb/ti_fdc.c +++ b/src/emu/bus/ti99_peb/ti_fdc.c @@ -403,7 +403,7 @@ static SLOT_INTERFACE_START( tifdc_floppies ) SLOT_INTERFACE_END MACHINE_CONFIG_FRAGMENT( ti_fdc ) - MCFG_FD1771x_ADD(FDC_TAG, XTAL_1MHz) + MCFG_FD1771_ADD(FDC_TAG, XTAL_1MHz) 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) diff --git a/src/emu/bus/tvc/hbf.c b/src/emu/bus/tvc/hbf.c index 7d87477172e..760226a2cfb 100644 --- a/src/emu/bus/tvc/hbf.c +++ b/src/emu/bus/tvc/hbf.c @@ -23,7 +23,7 @@ static SLOT_INTERFACE_START( tvc_hbf_floppies ) SLOT_INTERFACE_END static MACHINE_CONFIG_FRAGMENT(tvc_hbf) - MCFG_FD1793x_ADD("fdc", XTAL_16MHz / 16) + MCFG_FD1793_ADD("fdc", XTAL_16MHz / 16) MCFG_FLOPPY_DRIVE_ADD("fdc:0", tvc_hbf_floppies, "525qd", tvc_hbf_device::floppy_formats) MCFG_FLOPPY_DRIVE_ADD("fdc:1", tvc_hbf_floppies, "525qd", tvc_hbf_device::floppy_formats) MACHINE_CONFIG_END diff --git a/src/emu/machine/wd_fdc.c b/src/emu/machine/wd_fdc.c index 9052c033bef..755b8ca16be 100644 --- a/src/emu/machine/wd_fdc.c +++ b/src/emu/machine/wd_fdc.c @@ -4,29 +4,29 @@ #include "debugger.h" -const device_type FD1771x = &device_creator<fd1771_t>; -const device_type FD1781x = &device_creator<fd1781_t>; -const device_type FD1791x = &device_creator<fd1791_t>; -const device_type FD1792x = &device_creator<fd1792_t>; -const device_type FD1793x = &device_creator<fd1793_t>; -const device_type KR1818VG93x = &device_creator<kr1818vg93_t>; +const device_type FD1771 = &device_creator<fd1771_t>; +const device_type FD1781 = &device_creator<fd1781_t>; +const device_type FD1791 = &device_creator<fd1791_t>; +const device_type FD1792 = &device_creator<fd1792_t>; +const device_type FD1793 = &device_creator<fd1793_t>; +const device_type KR1818VG93 = &device_creator<kr1818vg93_t>; const device_type FD1794x = &device_creator<fd1794_t>; -const device_type FD1795x = &device_creator<fd1795_t>; -const device_type FD1797x = &device_creator<fd1797_t>; -const device_type MB8866x = &device_creator<mb8866_t>; -const device_type MB8876x = &device_creator<mb8876_t>; -const device_type MB8877x = &device_creator<mb8877_t>; -const device_type FD1761x = &device_creator<fd1761_t>; -const device_type FD1763x = &device_creator<fd1763_t>; -const device_type FD1765x = &device_creator<fd1765_t>; -const device_type FD1767x = &device_creator<fd1767_t>; -const device_type WD2791x = &device_creator<wd2791_t>; -const device_type WD2793x = &device_creator<wd2793_t>; -const device_type WD2795x = &device_creator<wd2795_t>; -const device_type WD2797x = &device_creator<wd2797_t>; -const device_type WD1770x = &device_creator<wd1770_t>; -const device_type WD1772x = &device_creator<wd1772_t>; -const device_type WD1773x = &device_creator<wd1773_t>; +const device_type FD1795 = &device_creator<fd1795_t>; +const device_type FD1797 = &device_creator<fd1797_t>; +const device_type MB8866 = &device_creator<mb8866_t>; +const device_type MB8876 = &device_creator<mb8876_t>; +const device_type MB8877 = &device_creator<mb8877_t>; +const device_type FD1761 = &device_creator<fd1761_t>; +const device_type FD1763 = &device_creator<fd1763_t>; +const device_type FD1765 = &device_creator<fd1765_t>; +const device_type FD1767 = &device_creator<fd1767_t>; +const device_type WD2791 = &device_creator<wd2791_t>; +const device_type WD2793 = &device_creator<wd2793_t>; +const device_type WD2795 = &device_creator<wd2795_t>; +const device_type WD2797 = &device_creator<wd2797_t>; +const device_type WD1770 = &device_creator<wd1770_t>; +const device_type WD1772 = &device_creator<wd1772_t>; +const device_type WD1773 = &device_creator<wd1773_t>; /* Debugging flags. Set to 0 or 1. @@ -2386,7 +2386,7 @@ void wd_fdc_digital_t::digital_pll_t::commit(floppy_image_device *floppy, const write_position = 0; } -fd1771_t::fd1771_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : wd_fdc_analog_t(mconfig, FD1771x, "FD1771", tag, owner, clock, "fd1771", __FILE__) +fd1771_t::fd1771_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : wd_fdc_analog_t(mconfig, FD1771, "FD1771", tag, owner, clock, "fd1771", __FILE__) { const static int fd1771_step_times[4] = { 12000, 12000, 20000, 40000 }; @@ -2411,7 +2411,7 @@ int fd1771_t::calc_sector_size(UINT8 size, UINT8 command) const return size ? size << 4 : 4096; } -fd1781_t::fd1781_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : wd_fdc_analog_t(mconfig, FD1781x, "FD1781", tag, owner, clock, "fd1781", __FILE__) +fd1781_t::fd1781_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : wd_fdc_analog_t(mconfig, FD1781, "FD1781", tag, owner, clock, "fd1781", __FILE__) { const static int fd1781_step_times[4] = { 6000, 12000, 20000, 40000 }; @@ -2439,7 +2439,7 @@ int fd1781_t::calc_sector_size(UINT8 size, UINT8 command) const const int wd_fdc_t::fd179x_step_times[4] = { 6000, 12000, 20000, 30000 }; const int wd_fdc_t::fd176x_step_times[4] = { 12000, 24000, 40000, 60000 }; -fd1791_t::fd1791_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : wd_fdc_analog_t(mconfig, FD1791x, "FD1791", tag, owner, clock, "fd1791", __FILE__) +fd1791_t::fd1791_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : wd_fdc_analog_t(mconfig, FD1791, "FD1791", tag, owner, clock, "fd1791", __FILE__) { step_times = fd179x_step_times; delay_register_commit = 4; @@ -2455,7 +2455,7 @@ fd1791_t::fd1791_t(const machine_config &mconfig, const char *tag, device_t *own nonsticky_immint = false; } -fd1792_t::fd1792_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : wd_fdc_analog_t(mconfig, FD1792x, "FD1792", tag, owner, clock, "fd1792", __FILE__) +fd1792_t::fd1792_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : wd_fdc_analog_t(mconfig, FD1792, "FD1792", tag, owner, clock, "fd1792", __FILE__) { step_times = fd179x_step_times; delay_register_commit = 4; @@ -2471,7 +2471,7 @@ fd1792_t::fd1792_t(const machine_config &mconfig, const char *tag, device_t *own nonsticky_immint = false; } -fd1793_t::fd1793_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : wd_fdc_analog_t(mconfig, FD1793x, "FD1793", tag, owner, clock, "fd1793", __FILE__) +fd1793_t::fd1793_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : wd_fdc_analog_t(mconfig, FD1793, "FD1793", tag, owner, clock, "fd1793", __FILE__) { step_times = fd179x_step_times; delay_register_commit = 4; @@ -2487,7 +2487,7 @@ fd1793_t::fd1793_t(const machine_config &mconfig, const char *tag, device_t *own nonsticky_immint = false; } -kr1818vg93_t::kr1818vg93_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : wd_fdc_analog_t(mconfig, KR1818VG93x, "KR1818VG93", tag, owner, clock, "kr1818vg93", __FILE__) +kr1818vg93_t::kr1818vg93_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : wd_fdc_analog_t(mconfig, KR1818VG93, "KR1818VG93", tag, owner, clock, "kr1818vg93", __FILE__) { step_times = fd179x_step_times; delay_register_commit = 4; @@ -2519,7 +2519,7 @@ fd1794_t::fd1794_t(const machine_config &mconfig, const char *tag, device_t *own nonsticky_immint = false; } -fd1795_t::fd1795_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : wd_fdc_analog_t(mconfig, FD1795x, "FD1795", tag, owner, clock, "fd1795", __FILE__) +fd1795_t::fd1795_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : wd_fdc_analog_t(mconfig, FD1795, "FD1795", tag, owner, clock, "fd1795", __FILE__) { step_times = fd179x_step_times; delay_register_commit = 4; @@ -2543,7 +2543,7 @@ int fd1795_t::calc_sector_size(UINT8 size, UINT8 command) const return 128 << ((size + 1) & 3); } -fd1797_t::fd1797_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : wd_fdc_analog_t(mconfig, FD1797x, "FD1797", tag, owner, clock, "fd1797", __FILE__) +fd1797_t::fd1797_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : wd_fdc_analog_t(mconfig, FD1797, "FD1797", tag, owner, clock, "fd1797", __FILE__) { step_times = fd179x_step_times; delay_register_commit = 4; @@ -2567,7 +2567,7 @@ int fd1797_t::calc_sector_size(UINT8 size, UINT8 command) const return 128 << ((size + 1) & 3); } -mb8866_t::mb8866_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : wd_fdc_analog_t(mconfig, MB8866x, "MB8866", tag, owner, clock, "mb8866", __FILE__) +mb8866_t::mb8866_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : wd_fdc_analog_t(mconfig, MB8866, "MB8866", tag, owner, clock, "mb8866", __FILE__) { step_times = fd179x_step_times; delay_register_commit = 4; @@ -2583,7 +2583,7 @@ mb8866_t::mb8866_t(const machine_config &mconfig, const char *tag, device_t *own nonsticky_immint = false; } -mb8876_t::mb8876_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : wd_fdc_analog_t(mconfig, MB8876x, "MB8876", tag, owner, clock, "mb8876", __FILE__) +mb8876_t::mb8876_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : wd_fdc_analog_t(mconfig, MB8876, "MB8876", tag, owner, clock, "mb8876", __FILE__) { step_times = fd179x_step_times; delay_register_commit = 4; @@ -2599,7 +2599,7 @@ mb8876_t::mb8876_t(const machine_config &mconfig, const char *tag, device_t *own nonsticky_immint = false; } -mb8877_t::mb8877_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : wd_fdc_analog_t(mconfig, MB8877x, "MB8877", tag, owner, clock, "mb8877", __FILE__) +mb8877_t::mb8877_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : wd_fdc_analog_t(mconfig, MB8877, "MB8877", tag, owner, clock, "mb8877", __FILE__) { step_times = fd179x_step_times; delay_register_commit = 4; @@ -2615,7 +2615,7 @@ mb8877_t::mb8877_t(const machine_config &mconfig, const char *tag, device_t *own nonsticky_immint = false; } -fd1761_t::fd1761_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : wd_fdc_analog_t(mconfig, FD1761x, "FD1761", tag, owner, clock, "fd1761", __FILE__) +fd1761_t::fd1761_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : wd_fdc_analog_t(mconfig, FD1761, "FD1761", tag, owner, clock, "fd1761", __FILE__) { step_times = fd176x_step_times; delay_register_commit = 16; @@ -2631,7 +2631,7 @@ fd1761_t::fd1761_t(const machine_config &mconfig, const char *tag, device_t *own nonsticky_immint = false; } -fd1763_t::fd1763_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : wd_fdc_analog_t(mconfig, FD1763x, "FD1763", tag, owner, clock, "fd1763", __FILE__) +fd1763_t::fd1763_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : wd_fdc_analog_t(mconfig, FD1763, "FD1763", tag, owner, clock, "fd1763", __FILE__) { step_times = fd176x_step_times; delay_register_commit = 16; @@ -2647,7 +2647,7 @@ fd1763_t::fd1763_t(const machine_config &mconfig, const char *tag, device_t *own nonsticky_immint = false; } -fd1765_t::fd1765_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : wd_fdc_analog_t(mconfig, FD1765x, "FD1765", tag, owner, clock, "fd1765", __FILE__) +fd1765_t::fd1765_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : wd_fdc_analog_t(mconfig, FD1765, "FD1765", tag, owner, clock, "fd1765", __FILE__) { step_times = fd176x_step_times; delay_register_commit = 16; @@ -2671,7 +2671,7 @@ int fd1765_t::calc_sector_size(UINT8 size, UINT8 command) const return 128 << ((size + 1) & 3); } -fd1767_t::fd1767_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : wd_fdc_analog_t(mconfig, FD1767x, "FD1767", tag, owner, clock, "fd1767", __FILE__) +fd1767_t::fd1767_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : wd_fdc_analog_t(mconfig, FD1767, "FD1767", tag, owner, clock, "fd1767", __FILE__) { step_times = fd179x_step_times; delay_register_commit = 16; @@ -2695,7 +2695,7 @@ int fd1767_t::calc_sector_size(UINT8 size, UINT8 command) const return 128 << ((size + 1) & 3); } -wd2791_t::wd2791_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : wd_fdc_analog_t(mconfig, WD2791x, "WD2791", tag, owner, clock, "wd2791", __FILE__) +wd2791_t::wd2791_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : wd_fdc_analog_t(mconfig, WD2791, "WD2791", tag, owner, clock, "wd2791", __FILE__) { step_times = fd179x_step_times; delay_register_commit = 16; @@ -2711,7 +2711,7 @@ wd2791_t::wd2791_t(const machine_config &mconfig, const char *tag, device_t *own nonsticky_immint = false; } -wd2793_t::wd2793_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : wd_fdc_analog_t(mconfig, WD2793x, "WD2793", tag, owner, clock, "wd2793", __FILE__) +wd2793_t::wd2793_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : wd_fdc_analog_t(mconfig, WD2793, "WD2793", tag, owner, clock, "wd2793", __FILE__) { step_times = fd179x_step_times; delay_register_commit = 16; @@ -2727,7 +2727,7 @@ wd2793_t::wd2793_t(const machine_config &mconfig, const char *tag, device_t *own nonsticky_immint = false; } -wd2795_t::wd2795_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : wd_fdc_analog_t(mconfig, WD2795x, "WD2795", tag, owner, clock, "wd2795", __FILE__) +wd2795_t::wd2795_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : wd_fdc_analog_t(mconfig, WD2795, "WD2795", tag, owner, clock, "wd2795", __FILE__) { step_times = fd179x_step_times; delay_register_commit = 16; @@ -2751,7 +2751,7 @@ int wd2795_t::calc_sector_size(UINT8 size, UINT8 command) const return 128 << ((size + 1) & 3); } -wd2797_t::wd2797_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : wd_fdc_analog_t(mconfig, WD2797x, "WD2797", tag, owner, clock, "wd2797", __FILE__) +wd2797_t::wd2797_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : wd_fdc_analog_t(mconfig, WD2797, "WD2797", tag, owner, clock, "wd2797", __FILE__) { step_times = fd179x_step_times; delay_register_commit = 16; @@ -2775,7 +2775,7 @@ int wd2797_t::calc_sector_size(UINT8 size, UINT8 command) const return 128 << ((size + 1) & 3); } -wd1770_t::wd1770_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : wd_fdc_digital_t(mconfig, WD1770x, "WD1770", tag, owner, clock, "wd1770", __FILE__) +wd1770_t::wd1770_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : wd_fdc_digital_t(mconfig, WD1770, "WD1770", tag, owner, clock, "wd1770", __FILE__) { step_times = wd_digital_step_times; delay_register_commit = 32; @@ -2791,7 +2791,7 @@ wd1770_t::wd1770_t(const machine_config &mconfig, const char *tag, device_t *own nonsticky_immint = false; } -wd1772_t::wd1772_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : wd_fdc_digital_t(mconfig, WD1772x, "WD1772", tag, owner, clock, "wd1772", __FILE__) +wd1772_t::wd1772_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : wd_fdc_digital_t(mconfig, WD1772, "WD1772", tag, owner, clock, "wd1772", __FILE__) { const static int wd1772_step_times[4] = { 12000, 24000, 4000, 6000 }; @@ -2814,7 +2814,7 @@ int wd1772_t::settle_time() const return 30000; } -wd1773_t::wd1773_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : wd_fdc_digital_t(mconfig, WD1773x, "WD1773", tag, owner, clock, "wd1773", __FILE__) +wd1773_t::wd1773_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : wd_fdc_digital_t(mconfig, WD1773, "WD1773", tag, owner, clock, "wd1773", __FILE__) { step_times = wd_digital_step_times; delay_register_commit = 32; diff --git a/src/emu/machine/wd_fdc.h b/src/emu/machine/wd_fdc.h index 8077ec2ec21..fec55348f42 100644 --- a/src/emu/machine/wd_fdc.h +++ b/src/emu/machine/wd_fdc.h @@ -44,74 +44,74 @@ */ -#define MCFG_FD1771x_ADD(_tag, _clock) \ - MCFG_DEVICE_ADD(_tag, FD1771x, _clock) +#define MCFG_FD1771_ADD(_tag, _clock) \ + MCFG_DEVICE_ADD(_tag, FD1771, _clock) -#define MCFG_FD1781x_ADD(_tag, _clock) \ - MCFG_DEVICE_ADD(_tag, FD1781x, _clock) +#define MCFG_FD1781_ADD(_tag, _clock) \ + MCFG_DEVICE_ADD(_tag, FD1781, _clock) -#define MCFG_FD1791x_ADD(_tag, _clock) \ - MCFG_DEVICE_ADD(_tag, FD1791x, _clock) +#define MCFG_FD1791_ADD(_tag, _clock) \ + MCFG_DEVICE_ADD(_tag, FD1791, _clock) -#define MCFG_FD1792x_ADD(_tag, _clock) \ - MCFG_DEVICE_ADD(_tag, FD1792x, _clock) +#define MCFG_FD1792_ADD(_tag, _clock) \ + MCFG_DEVICE_ADD(_tag, FD1792, _clock) -#define MCFG_FD1793x_ADD(_tag, _clock) \ - MCFG_DEVICE_ADD(_tag, FD1793x, _clock) +#define MCFG_FD1793_ADD(_tag, _clock) \ + MCFG_DEVICE_ADD(_tag, FD1793, _clock) -#define MCFG_KR1818VG93x_ADD(_tag, _clock) \ - MCFG_DEVICE_ADD(_tag, KR1818VG93x, _clock) +#define MCFG_KR1818VG93_ADD(_tag, _clock) \ + MCFG_DEVICE_ADD(_tag, KR1818VG93, _clock) #define MCFG_FD1794x_ADD(_tag, _clock) \ MCFG_DEVICE_ADD(_tag, FD1794x, _clock) -#define MCFG_FD1795x_ADD(_tag, _clock) \ - MCFG_DEVICE_ADD(_tag, FD1795x, _clock) +#define MCFG_FD1795_ADD(_tag, _clock) \ + MCFG_DEVICE_ADD(_tag, FD1795, _clock) -#define MCFG_FD1797x_ADD(_tag, _clock) \ - MCFG_DEVICE_ADD(_tag, FD1797x, _clock) +#define MCFG_FD1797_ADD(_tag, _clock) \ + MCFG_DEVICE_ADD(_tag, FD1797, _clock) -#define MCFG_MB8866x_ADD(_tag, _clock) \ - MCFG_DEVICE_ADD(_tag, MB8866x, _clock) +#define MCFG_MB8866_ADD(_tag, _clock) \ + MCFG_DEVICE_ADD(_tag, MB8866, _clock) -#define MCFG_MB8876x_ADD(_tag, _clock) \ - MCFG_DEVICE_ADD(_tag, MB8876x, _clock) +#define MCFG_MB8876_ADD(_tag, _clock) \ + MCFG_DEVICE_ADD(_tag, MB8876, _clock) -#define MCFG_MB8877x_ADD(_tag, _clock) \ - MCFG_DEVICE_ADD(_tag, MB8877x, _clock) +#define MCFG_MB8877_ADD(_tag, _clock) \ + MCFG_DEVICE_ADD(_tag, MB8877, _clock) -#define MCFG_FD1761x_ADD(_tag, _clock) \ - MCFG_DEVICE_ADD(_tag, FD1761x, _clock) +#define MCFG_FD1761_ADD(_tag, _clock) \ + MCFG_DEVICE_ADD(_tag, FD1761, _clock) -#define MCFG_FD1763x_ADD(_tag, _clock) \ - MCFG_DEVICE_ADD(_tag, FD1763x, _clock) +#define MCFG_FD1763_ADD(_tag, _clock) \ + MCFG_DEVICE_ADD(_tag, FD1763, _clock) -#define MCFG_FD1765x_ADD(_tag, _clock) \ - MCFG_DEVICE_ADD(_tag, FD1765x, _clock) +#define MCFG_FD1765_ADD(_tag, _clock) \ + MCFG_DEVICE_ADD(_tag, FD1765, _clock) -#define MCFG_FD1767x_ADD(_tag, _clock) \ - MCFG_DEVICE_ADD(_tag, FD1767x, _clock) +#define MCFG_FD1767_ADD(_tag, _clock) \ + MCFG_DEVICE_ADD(_tag, FD1767, _clock) -#define MCFG_WD2791x_ADD(_tag, _clock) \ - MCFG_DEVICE_ADD(_tag, WD2791x, _clock) +#define MCFG_WD2791_ADD(_tag, _clock) \ + MCFG_DEVICE_ADD(_tag, WD2791, _clock) -#define MCFG_WD2793x_ADD(_tag, _clock) \ - MCFG_DEVICE_ADD(_tag, WD2793x, _clock) +#define MCFG_WD2793_ADD(_tag, _clock) \ + MCFG_DEVICE_ADD(_tag, WD2793, _clock) -#define MCFG_WD2795x_ADD(_tag, _clock) \ - MCFG_DEVICE_ADD(_tag, WD2795x, _clock) +#define MCFG_WD2795_ADD(_tag, _clock) \ + MCFG_DEVICE_ADD(_tag, WD2795, _clock) -#define MCFG_WD2797x_ADD(_tag, _clock) \ - MCFG_DEVICE_ADD(_tag, WD2797x, _clock) +#define MCFG_WD2797_ADD(_tag, _clock) \ + MCFG_DEVICE_ADD(_tag, WD2797, _clock) -#define MCFG_WD1770x_ADD(_tag, _clock) \ - MCFG_DEVICE_ADD(_tag, WD1770x, _clock) +#define MCFG_WD1770_ADD(_tag, _clock) \ + MCFG_DEVICE_ADD(_tag, WD1770, _clock) -#define MCFG_WD1772x_ADD(_tag, _clock) \ - MCFG_DEVICE_ADD(_tag, WD1772x, _clock) +#define MCFG_WD1772_ADD(_tag, _clock) \ + MCFG_DEVICE_ADD(_tag, WD1772, _clock) -#define MCFG_WD1773x_ADD(_tag, _clock) \ - MCFG_DEVICE_ADD(_tag, WD1773x, _clock) +#define MCFG_WD1773_ADD(_tag, _clock) \ + MCFG_DEVICE_ADD(_tag, WD1773, _clock) #define MCFG_WD_FDC_FORCE_READY \ downcast<wd_fdc_t *>(device)->set_force_ready(true); @@ -649,33 +649,33 @@ public: wd1773_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); }; -extern const device_type FD1771x; +extern const device_type FD1771; -extern const device_type FD1781x; +extern const device_type FD1781; -extern const device_type FD1791x; -extern const device_type FD1792x; -extern const device_type FD1793x; -extern const device_type KR1818VG93x; -extern const device_type FD1795x; -extern const device_type FD1797x; +extern const device_type FD1791; +extern const device_type FD1792; +extern const device_type FD1793; +extern const device_type KR1818VG93; +extern const device_type FD1795; +extern const device_type FD1797; -extern const device_type MB8866x; -extern const device_type MB8876x; -extern const device_type MB8877x; +extern const device_type MB8866; +extern const device_type MB8876; +extern const device_type MB8877; -extern const device_type FD1761x; -extern const device_type FD1763x; -extern const device_type FD1765x; -extern const device_type FD1767x; +extern const device_type FD1761; +extern const device_type FD1763; +extern const device_type FD1765; +extern const device_type FD1767; -extern const device_type WD2791x; -extern const device_type WD2793x; -extern const device_type WD2795x; -extern const device_type WD2797x; +extern const device_type WD2791; +extern const device_type WD2793; +extern const device_type WD2795; +extern const device_type WD2797; -extern const device_type WD1770x; -extern const device_type WD1772x; -extern const device_type WD1773x; +extern const device_type WD1770; +extern const device_type WD1772; +extern const device_type WD1773; #endif diff --git a/src/mess/drivers/a310.c b/src/mess/drivers/a310.c index e262865d15c..91018398b42 100644 --- a/src/mess/drivers/a310.c +++ b/src/mess/drivers/a310.c @@ -377,7 +377,7 @@ static MACHINE_CONFIG_START( a310, a310_state ) MCFG_RAM_DEFAULT_SIZE("2M") MCFG_RAM_EXTRA_OPTIONS("512K, 1M, 4M, 8M, 16M") - MCFG_WD1772x_ADD("fdc", 8000000 / 1) // TODO: frequency + MCFG_WD1772_ADD("fdc", 8000000 / 1) // TODO: frequency MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE( a310_state, a310_wd177x_intrq_w)) MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(a310_state, a310_wd177x_drq_w)) MCFG_FLOPPY_DRIVE_ADD("fdc:0", a310_floppies, "35dd", a310_state::floppy_formats) diff --git a/src/mess/drivers/abc1600.c b/src/mess/drivers/abc1600.c index f12862cc3e5..57580466632 100644 --- a/src/mess/drivers/abc1600.c +++ b/src/mess/drivers/abc1600.c @@ -895,7 +895,7 @@ static MACHINE_CONFIG_START( abc1600, abc1600_state ) MCFG_NMC9306_ADD(NMC9306_TAG) MCFG_E0516_ADD(E050_C16PC_TAG, XTAL_32_768kHz) - MCFG_FD1797x_ADD(SAB1797_02P_TAG, XTAL_64MHz/64) + MCFG_FD1797_ADD(SAB1797_02P_TAG, XTAL_64MHz/64) MCFG_WD_FDC_INTRQ_CALLBACK(DEVWRITELINE(Z8536B1_TAG, z8536_device, pb7_w)) MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(abc1600_state, fdc_drq_w)) diff --git a/src/mess/drivers/altos5.c b/src/mess/drivers/altos5.c index c58741feeb1..db9876fc1d0 100644 --- a/src/mess/drivers/altos5.c +++ b/src/mess/drivers/altos5.c @@ -430,7 +430,7 @@ static MACHINE_CONFIG_START( altos5, altos5_state ) MCFG_RS232_CTS_HANDLER(DEVWRITELINE("z80sio", z80dart_device, ctsb_w)) MCFG_TIMER_DRIVER_ADD_PERIODIC("ctc_tick", altos5_state, ctc_tick, attotime::from_hz(XTAL_8MHz / 4)) - MCFG_FD1797x_ADD("fdc", XTAL_8MHz / 8) + MCFG_FD1797_ADD("fdc", XTAL_8MHz / 8) MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(altos5_state, fdc_intrq_w)) MCFG_WD_FDC_DRQ_CALLBACK(DEVWRITELINE("z80dma", z80dma_device, rdy_w)) MCFG_FLOPPY_DRIVE_ADD("fdc:0", altos5_floppies, "525qd", floppy_image_device::default_floppy_formats) diff --git a/src/mess/drivers/ampro.c b/src/mess/drivers/ampro.c index 6e17ad92ffb..8dccc887192 100644 --- a/src/mess/drivers/ampro.c +++ b/src/mess/drivers/ampro.c @@ -179,7 +179,7 @@ static MACHINE_CONFIG_START( ampro, ampro_state ) MCFG_RS232_RXD_HANDLER(DEVWRITELINE("z80dart", z80dart_device, rxa_w)) MCFG_TIMER_DRIVER_ADD_PERIODIC("ctc_tick", ampro_state, ctc_tick, attotime::from_hz(XTAL_16MHz / 8)) - MCFG_WD1772x_ADD("fdc", XTAL_16MHz / 2) + MCFG_WD1772_ADD("fdc", XTAL_16MHz / 2) MCFG_FLOPPY_DRIVE_ADD("fdc:0", ampro_floppies, "525dd", floppy_image_device::default_floppy_formats) MCFG_SOFTWARE_LIST_ADD("flop_list", "ampro") MACHINE_CONFIG_END diff --git a/src/mess/drivers/apf.c b/src/mess/drivers/apf.c index 4b3c4c4da21..c46b7dd3701 100644 --- a/src/mess/drivers/apf.c +++ b/src/mess/drivers/apf.c @@ -560,7 +560,7 @@ static MACHINE_CONFIG_DERIVED( apfimag, apfm1000 ) MCFG_CASSETTE_FORMATS(apf_cassette_formats) MCFG_CASSETTE_DEFAULT_STATE(CASSETTE_STOPPED | CASSETTE_SPEAKER_ENABLED | CASSETTE_MOTOR_DISABLED) - MCFG_FD1771x_ADD("fdc", 1000000) // guess + MCFG_FD1771_ADD("fdc", 1000000) // guess MCFG_FLOPPY_DRIVE_ADD("fdc:0", apf_floppies, "525dd", floppy_image_device::default_floppy_formats) MCFG_FLOPPY_DRIVE_ADD("fdc:1", apf_floppies, "525dd", floppy_image_device::default_floppy_formats) diff --git a/src/mess/drivers/applix.c b/src/mess/drivers/applix.c index c3914a1ced1..752a9b8af2c 100644 --- a/src/mess/drivers/applix.c +++ b/src/mess/drivers/applix.c @@ -884,7 +884,7 @@ static MACHINE_CONFIG_START( applix, applix_state ) MCFG_CASSETTE_ADD("cassette") MCFG_CASSETTE_DEFAULT_STATE(CASSETTE_STOPPED | CASSETTE_MOTOR_ENABLED | CASSETTE_SPEAKER_MUTED) - MCFG_WD1772x_ADD("fdc", XTAL_16MHz / 2) //connected to Z80H clock pin + MCFG_WD1772_ADD("fdc", XTAL_16MHz / 2) //connected to Z80H clock pin MCFG_FLOPPY_DRIVE_ADD("fdc:0", applix_floppies, "35dd", applix_state::floppy_formats) MCFG_FLOPPY_DRIVE_ADD("fdc:1", applix_floppies, "35dd", applix_state::floppy_formats) MCFG_TIMER_DRIVER_ADD_PERIODIC("applix_c", applix_state, cass_timer, attotime::from_hz(100000)) diff --git a/src/mess/drivers/apricot.c b/src/mess/drivers/apricot.c index 0f11ca0d635..943acc251d2 100644 --- a/src/mess/drivers/apricot.c +++ b/src/mess/drivers/apricot.c @@ -466,7 +466,7 @@ static MACHINE_CONFIG_START( apricot, apricot_state ) MCFG_CENTRONICS_OUTPUT_LATCH_ADD("cent_data_out", "centronics") // floppy - MCFG_WD2797x_ADD("ic68", XTAL_4MHz / 2) + MCFG_WD2797_ADD("ic68", XTAL_4MHz / 2) MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(apricot_state, fdc_intrq_w)) MCFG_WD_FDC_DRQ_CALLBACK(DEVWRITELINE("ic71", i8089_device, drq1_w)) MCFG_FLOPPY_DRIVE_ADD("ic68:0", apricot_floppies, "d32w", apricot_state::floppy_formats) diff --git a/src/mess/drivers/apricotf.c b/src/mess/drivers/apricotf.c index 2aa58759f8c..bd9cec58e96 100644 --- a/src/mess/drivers/apricotf.c +++ b/src/mess/drivers/apricotf.c @@ -384,7 +384,7 @@ static MACHINE_CONFIG_START( act_f1, f1_state ) MCFG_CENTRONICS_OUTPUT_LATCH_ADD("cent_data_out", CENTRONICS_TAG) // floppy - MCFG_WD2797x_ADD(WD2797_TAG, XTAL_4MHz / 2 /* ? */) + MCFG_WD2797_ADD(WD2797_TAG, XTAL_4MHz / 2 /* ? */) MCFG_WD_FDC_INTRQ_CALLBACK(INPUTLINE(I8086_TAG, INPUT_LINE_NMI)) MCFG_WD_FDC_DRQ_CALLBACK(INPUTLINE(I8086_TAG, INPUT_LINE_TEST)) diff --git a/src/mess/drivers/apricotp.c b/src/mess/drivers/apricotp.c index 86073ccda98..d9132dfd2bd 100644 --- a/src/mess/drivers/apricotp.c +++ b/src/mess/drivers/apricotp.c @@ -632,7 +632,7 @@ static MACHINE_CONFIG_START( fp, fp_state ) MCFG_Z80SIO0_ADD(Z80SIO0_TAG, 2500000, 0, 0, 0, 0) MCFG_Z80DART_OUT_INT_CB(DEVWRITELINE(I8259A_TAG, pic8259_device, ir4_w)) - MCFG_WD2797x_ADD(WD2797_TAG, 2000000) + MCFG_WD2797_ADD(WD2797_TAG, 2000000) MCFG_WD_FDC_INTRQ_CALLBACK(DEVWRITELINE(I8259A_TAG, pic8259_device, ir1_w)) MCFG_WD_FDC_DRQ_CALLBACK(DEVWRITELINE(I8237_TAG, am9517a_device, dreq1_w)) diff --git a/src/mess/drivers/atarist.c b/src/mess/drivers/atarist.c index a7b56d5dcc9..719433bd0ad 100644 --- a/src/mess/drivers/atarist.c +++ b/src/mess/drivers/atarist.c @@ -2099,7 +2099,7 @@ static MACHINE_CONFIG_START( st, st_state ) // devices - MCFG_WD1772x_ADD(WD1772_TAG, Y2/4) + MCFG_WD1772_ADD(WD1772_TAG, Y2/4) MCFG_WD_FDC_INTRQ_CALLBACK(DEVWRITELINE(MC68901_TAG, mc68901_device, i5_w)) MCFG_DEVCB_INVERT MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(st_state, fdc_drq_w)) MCFG_FLOPPY_DRIVE_ADD(WD1772_TAG ":0", atari_floppies, "35dd", st_state::floppy_formats) @@ -2190,7 +2190,7 @@ static MACHINE_CONFIG_START( megast, megast_state ) // devices MCFG_DEVICE_ADD(RP5C15_TAG, RP5C15, XTAL_32_768kHz) - MCFG_WD1772x_ADD(WD1772_TAG, Y2/4) + MCFG_WD1772_ADD(WD1772_TAG, Y2/4) MCFG_WD_FDC_INTRQ_CALLBACK(DEVWRITELINE(MC68901_TAG, mc68901_device, i5_w)) MCFG_DEVCB_INVERT MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(st_state, fdc_drq_w)) MCFG_FLOPPY_DRIVE_ADD(WD1772_TAG ":0", atari_floppies, "35dd", st_state::floppy_formats) @@ -2288,7 +2288,7 @@ static MACHINE_CONFIG_START( ste, ste_state ) // devices - MCFG_WD1772x_ADD(WD1772_TAG, Y2/4) + MCFG_WD1772_ADD(WD1772_TAG, Y2/4) MCFG_WD_FDC_INTRQ_CALLBACK(DEVWRITELINE(MC68901_TAG, mc68901_device, i5_w)) MCFG_DEVCB_INVERT MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(st_state, fdc_drq_w)) MCFG_FLOPPY_DRIVE_ADD(WD1772_TAG ":0", atari_floppies, "35dd", st_state::floppy_formats) @@ -2401,7 +2401,7 @@ static MACHINE_CONFIG_START( stbook, stbook_state ) MCFG_MC68901_OUT_TDO_CB(WRITELINE(st_state, mfp_tdo_w)) MCFG_MC68901_OUT_SO_CB(DEVWRITELINE(RS232_TAG, rs232_port_device, write_txd)) - MCFG_WD1772x_ADD(WD1772_TAG, U517/2) + MCFG_WD1772_ADD(WD1772_TAG, U517/2) MCFG_WD_FDC_INTRQ_CALLBACK(DEVWRITELINE(MC68901_TAG, mc68901_device, i5_w)) MCFG_DEVCB_INVERT MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(st_state, fdc_drq_w)) MCFG_FLOPPY_DRIVE_ADD(WD1772_TAG ":0", atari_floppies, "35dd", 0, st_state::floppy_formats) diff --git a/src/mess/drivers/b2m.c b/src/mess/drivers/b2m.c index 1c4d9c66546..724dfb4fadf 100644 --- a/src/mess/drivers/b2m.c +++ b/src/mess/drivers/b2m.c @@ -234,7 +234,7 @@ static MACHINE_CONFIG_START( b2m, b2m_state ) /* uart */ MCFG_DEVICE_ADD("uart", I8251, 0) - MCFG_FD1793x_ADD("fd1793", XTAL_8MHz / 8) + MCFG_FD1793_ADD("fd1793", XTAL_8MHz / 8) MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(b2m_state, b2m_fdc_drq)) MCFG_FLOPPY_DRIVE_ADD("fd0", b2m_floppies, "525qd", b2m_state::b2m_floppy_formats) diff --git a/src/mess/drivers/bbc.c b/src/mess/drivers/bbc.c index de7f17dee44..a24561714fe 100644 --- a/src/mess/drivers/bbc.c +++ b/src/mess/drivers/bbc.c @@ -776,7 +776,7 @@ static MACHINE_CONFIG_DERIVED( bbcb, bbca ) MCFG_LEGACY_FLOPPY_2_DRIVES_ADD(bbc_floppy_interface) - MCFG_WD1770x_ADD("wd177x", XTAL_16MHz / 2) + MCFG_WD1770_ADD("wd177x", XTAL_16MHz / 2) MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(bbc_state, bbc_wd177x_intrq_w)) MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(bbc_state, bbc_wd177x_drq_w)) @@ -840,7 +840,7 @@ static MACHINE_CONFIG_DERIVED( bbcb_us, bbca ) MCFG_LEGACY_FLOPPY_2_DRIVES_ADD(bbc_floppy_interface) - MCFG_WD1770x_ADD("wd177x", XTAL_16MHz / 2) + MCFG_WD1770_ADD("wd177x", XTAL_16MHz / 2) MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(bbc_state, bbc_wd177x_intrq_w)) MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(bbc_state, bbc_wd177x_drq_w)) @@ -1001,7 +1001,7 @@ static MACHINE_CONFIG_START( bbcm, bbc_state ) MCFG_VIA6522_IRQ_HANDLER(WRITELINE(bbc_state, bbcb_via_user_irq_w)) /* fdc */ - MCFG_WD1770x_ADD("wd177x", XTAL_16MHz / 2) + MCFG_WD1770_ADD("wd177x", XTAL_16MHz / 2) MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(bbc_state, bbc_wd177x_intrq_w)) MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(bbc_state, bbc_wd177x_drq_w)) @@ -1089,8 +1089,8 @@ static MACHINE_CONFIG_DERIVED( bbcmc, bbcm ) /* fdc */ MCFG_DEVICE_REMOVE("wd177x") -// MCFG_WD1772x_ADD("wd177x", XTAL_16MHz / 2) - MCFG_WD1770x_ADD("wd177x", XTAL_16MHz / 2) +// MCFG_WD1772_ADD("wd177x", XTAL_16MHz / 2) + MCFG_WD1770_ADD("wd177x", XTAL_16MHz / 2) MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(bbc_state, bbc_wd177x_intrq_w)) MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(bbc_state, bbc_wd177x_drq_w)) diff --git a/src/mess/drivers/bigbord2.c b/src/mess/drivers/bigbord2.c index 7131483b3df..c12e0b7832c 100644 --- a/src/mess/drivers/bigbord2.c +++ b/src/mess/drivers/bigbord2.c @@ -584,7 +584,7 @@ static MACHINE_CONFIG_START( bigbord2, bigbord2_state ) // ZC0 = SIO channel B clock, ZC1 = SIO channel A clock MCFG_Z80CTC_ZC2_CB(DEVWRITELINE(Z80CTCB_TAG, z80ctc_device, trg3)) - MCFG_MB8877x_ADD("fdc", XTAL_16MHz / 16) + MCFG_MB8877_ADD("fdc", XTAL_16MHz / 16) MCFG_FLOPPY_DRIVE_ADD("fdc:0", bigbord2_floppies, "525dd", floppy_image_device::default_floppy_formats) MCFG_FLOPPY_DRIVE_ADD("fdc:1", bigbord2_floppies, "525dd", floppy_image_device::default_floppy_formats) diff --git a/src/mess/drivers/bullet.c b/src/mess/drivers/bullet.c index 714b071b135..9b073983797 100644 --- a/src/mess/drivers/bullet.c +++ b/src/mess/drivers/bullet.c @@ -1137,7 +1137,7 @@ static MACHINE_CONFIG_START( bullet, bullet_state ) MCFG_Z80PIO_OUT_PA_CB(DEVWRITE8("cent_data_out", output_latch_device, write)) MCFG_Z80PIO_IN_PB_CB(READ8(bullet_state, pio_pb_r)) - MCFG_MB8877x_ADD(MB8877_TAG, XTAL_16MHz/16) + MCFG_MB8877_ADD(MB8877_TAG, XTAL_16MHz/16) MCFG_WD_FDC_INTRQ_CALLBACK(DEVWRITELINE(Z80DART_TAG, z80dart_device, dcda_w)) MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(bullet_state, fdc_drq_w)) MCFG_FLOPPY_DRIVE_ADD(MB8877_TAG":0", bullet_525_floppies, "525qd", floppy_image_device::default_floppy_formats) @@ -1219,7 +1219,7 @@ static MACHINE_CONFIG_START( bulletf, bulletf_state ) MCFG_Z80PIO_OUT_ARDY_CB(DEVWRITE8("cent_data_out", output_latch_device, write)) MCFG_Z80PIO_OUT_BRDY_CB(WRITELINE(bulletf_state, cstrb_w)) - MCFG_MB8877x_ADD(MB8877_TAG, XTAL_16MHz/16) + MCFG_MB8877_ADD(MB8877_TAG, XTAL_16MHz/16) MCFG_WD_FDC_INTRQ_CALLBACK(DEVWRITELINE(Z80DART_TAG, z80dart_device, rib_w)) MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(bullet_state, fdc_drq_w)) MCFG_FLOPPY_DRIVE_ADD(MB8877_TAG":0", bullet_525_floppies, "525qd", floppy_image_device::default_floppy_formats) diff --git a/src/mess/drivers/bw2.c b/src/mess/drivers/bw2.c index 21565d88333..dc7765e4e6c 100644 --- a/src/mess/drivers/bw2.c +++ b/src/mess/drivers/bw2.c @@ -632,7 +632,7 @@ static MACHINE_CONFIG_START( bw2, bw2_state ) MCFG_RS232_RXD_HANDLER(DEVWRITELINE(I8251_TAG, i8251_device, write_rxd)) MCFG_RS232_DSR_HANDLER(DEVWRITELINE(I8251_TAG, i8251_device, write_dsr)) - MCFG_WD2797x_ADD(WD2797_TAG, XTAL_16MHz/16) + MCFG_WD2797_ADD(WD2797_TAG, XTAL_16MHz/16) MCFG_WD_FDC_INTRQ_CALLBACK(INPUTLINE(Z80_TAG, INPUT_LINE_IRQ0)) MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(bw2_state, fdc_drq_w)) diff --git a/src/mess/drivers/ccs2810.c b/src/mess/drivers/ccs2810.c index fda1decef49..1121a6f2991 100644 --- a/src/mess/drivers/ccs2810.c +++ b/src/mess/drivers/ccs2810.c @@ -354,7 +354,7 @@ static MACHINE_CONFIG_START( ccs2422, ccs_state ) MCFG_GENERIC_TERMINAL_KEYBOARD_CB(WRITE8(ccs_state, kbd_put)) /* Devices */ - MCFG_MB8877x_ADD("fdc", XTAL_16MHz / 8) // UB1793 or MB8877 + MCFG_MB8877_ADD("fdc", XTAL_16MHz / 8) // UB1793 or MB8877 MCFG_FLOPPY_DRIVE_ADD("fdc:0", ccs_floppies, "8sssd", floppy_image_device::default_floppy_formats) MACHINE_CONFIG_END diff --git a/src/mess/drivers/dgn_beta.c b/src/mess/drivers/dgn_beta.c index 31135e6632b..3566313dade 100644 --- a/src/mess/drivers/dgn_beta.c +++ b/src/mess/drivers/dgn_beta.c @@ -368,7 +368,7 @@ static MACHINE_CONFIG_START( dgnbeta, dgn_beta_state ) MCFG_PIA_IRQA_HANDLER(WRITELINE(dgn_beta_state,d_pia2_irq_a)) MCFG_PIA_IRQB_HANDLER(WRITELINE(dgn_beta_state,d_pia2_irq_b)) - MCFG_WD2797x_ADD(FDC_TAG, XTAL_1MHz) + MCFG_WD2797_ADD(FDC_TAG, XTAL_1MHz) MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(dgn_beta_state, dgnbeta_fdc_intrq_w)) MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(dgn_beta_state, dgnbeta_fdc_drq_w)) diff --git a/src/mess/drivers/dragon.c b/src/mess/drivers/dragon.c index 2b22531f63c..61375867d28 100644 --- a/src/mess/drivers/dragon.c +++ b/src/mess/drivers/dragon.c @@ -245,7 +245,7 @@ static MACHINE_CONFIG_DERIVED_CLASS( dgnalpha, dragon_base, dragon_alpha_state ) MCFG_MOS6551_XTAL(XTAL_1_8432MHz) // floppy - MCFG_WD2797x_ADD(WD2797_TAG, XTAL_1MHz) + MCFG_WD2797_ADD(WD2797_TAG, XTAL_1MHz) MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(dragon_alpha_state, fdc_intrq_w)) MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(dragon_alpha_state, fdc_drq_w)) diff --git a/src/mess/drivers/einstein.c b/src/mess/drivers/einstein.c index b0ce919519f..3be299ab83c 100644 --- a/src/mess/drivers/einstein.c +++ b/src/mess/drivers/einstein.c @@ -734,7 +734,7 @@ static MACHINE_CONFIG_START( einstein, einstein_state ) /* uart */ MCFG_DEVICE_ADD(IC_I060, I8251, 0) - MCFG_WD1770x_ADD(IC_I042, XTAL_X002) + MCFG_WD1770_ADD(IC_I042, XTAL_X002) MCFG_FLOPPY_DRIVE_ADD(IC_I042 ":0", einstein_floppies, "525dd", floppy_image_device::default_floppy_formats) MCFG_FLOPPY_DRIVE_ADD(IC_I042 ":1", einstein_floppies, "525dd", floppy_image_device::default_floppy_formats) diff --git a/src/mess/drivers/esq1.c b/src/mess/drivers/esq1.c index 8f960de0d07..3dc7b9535ec 100644 --- a/src/mess/drivers/esq1.c +++ b/src/mess/drivers/esq1.c @@ -625,7 +625,7 @@ static MACHINE_CONFIG_DERIVED(sq80, esq1) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(sq80_map) - MCFG_WD1772x_ADD(WD1772_TAG, 4000000) + MCFG_WD1772_ADD(WD1772_TAG, 4000000) MACHINE_CONFIG_END static INPUT_PORTS_START( esq1 ) diff --git a/src/mess/drivers/esq5505.c b/src/mess/drivers/esq5505.c index af644777eec..f4ec6522e24 100644 --- a/src/mess/drivers/esq5505.c +++ b/src/mess/drivers/esq5505.c @@ -657,7 +657,7 @@ static MACHINE_CONFIG_DERIVED(eps, vfx) MCFG_ESQPANEL_TX_CALLBACK(DEVWRITELINE("duart", mc68681_device, rx_b_w)) MCFG_ESQPANEL_ANALOG_CALLBACK(WRITE16(esq5505_state, analog_w)) - MCFG_WD1772x_ADD("wd1772", 8000000) + MCFG_WD1772_ADD("wd1772", 8000000) MCFG_FLOPPY_DRIVE_ADD("wd1772:0", ensoniq_floppies, "35dd", esq5505_state::floppy_formats) MCFG_DEVICE_ADD("mc68450", HD63450, 0) // MC68450 compatible @@ -674,7 +674,7 @@ static MACHINE_CONFIG_DERIVED(vfxsd, vfx) MCFG_CPU_MODIFY( "maincpu" ) MCFG_CPU_PROGRAM_MAP(vfxsd_map) - MCFG_WD1772x_ADD("wd1772", 8000000) + MCFG_WD1772_ADD("wd1772", 8000000) MCFG_FLOPPY_DRIVE_ADD("wd1772:0", ensoniq_floppies, "35dd", esq5505_state::floppy_formats) MACHINE_CONFIG_END @@ -724,7 +724,7 @@ static MACHINE_CONFIG_START(vfx32, esq5505_state) MCFG_SOUND_ROUTE_EX(6, "pump", 1.0, 6) MCFG_SOUND_ROUTE_EX(7, "pump", 1.0, 7) - MCFG_WD1772x_ADD("wd1772", 8000000) + MCFG_WD1772_ADD("wd1772", 8000000) MCFG_FLOPPY_DRIVE_ADD("wd1772:0", ensoniq_floppies, "35dd", esq5505_state::floppy_formats) MACHINE_CONFIG_END diff --git a/src/mess/drivers/excali64.c b/src/mess/drivers/excali64.c index ef7770a648d..b68d0e1f67e 100644 --- a/src/mess/drivers/excali64.c +++ b/src/mess/drivers/excali64.c @@ -592,7 +592,7 @@ static MACHINE_CONFIG_START( excali64, excali64_state ) /* Devices */ MCFG_CASSETTE_ADD( "cassette" ) - MCFG_WD2793x_ADD("fdc", XTAL_16MHz / 16) + MCFG_WD2793_ADD("fdc", XTAL_16MHz / 16) MCFG_WD_FDC_DRQ_CALLBACK(DEVWRITELINE("dma", z80dma_device, rdy_w)) MCFG_FLOPPY_DRIVE_ADD("fdc:0", excali64_floppies, "drive0", excali64_state::floppy_formats) MCFG_FLOPPY_DRIVE_ADD("fdc:1", excali64_floppies, "drive1", excali64_state::floppy_formats) diff --git a/src/mess/drivers/fm7.c b/src/mess/drivers/fm7.c index f37afdb25e1..2247deec612 100644 --- a/src/mess/drivers/fm7.c +++ b/src/mess/drivers/fm7.c @@ -2095,7 +2095,7 @@ static MACHINE_CONFIG_START( fm7, fm7_state ) MCFG_SOFTWARE_LIST_ADD("cass_list","fm7_cass") - MCFG_MB8877x_ADD("fdc", XTAL_8MHz / 8) + MCFG_MB8877_ADD("fdc", XTAL_8MHz / 8) MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(fm7_state, fm7_fdc_intrq_w)) MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(fm7_state, fm7_fdc_drq_w)) @@ -2151,7 +2151,7 @@ static MACHINE_CONFIG_START( fm8, fm7_state ) MCFG_CASSETTE_DEFAULT_STATE(CASSETTE_STOPPED | CASSETTE_MOTOR_DISABLED | CASSETTE_SPEAKER_ENABLED) MCFG_CASSETTE_INTERFACE("fm7_cass") - MCFG_MB8877x_ADD("fdc", XTAL_8MHz / 8) + MCFG_MB8877_ADD("fdc", XTAL_8MHz / 8) MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(fm7_state, fm7_fdc_intrq_w)) MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(fm7_state, fm7_fdc_drq_w)) @@ -2228,7 +2228,7 @@ static MACHINE_CONFIG_START( fm77av, fm7_state ) MCFG_SOFTWARE_LIST_COMPATIBLE_ADD("cass_list", "fm7_cass") - MCFG_MB8877x_ADD("fdc", XTAL_8MHz / 8) + MCFG_MB8877_ADD("fdc", XTAL_8MHz / 8) MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(fm7_state, fm7_fdc_intrq_w)) MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(fm7_state, fm7_fdc_drq_w)) @@ -2305,7 +2305,7 @@ static MACHINE_CONFIG_START( fm11, fm7_state ) MCFG_CASSETTE_DEFAULT_STATE(CASSETTE_STOPPED | CASSETTE_MOTOR_DISABLED | CASSETTE_SPEAKER_ENABLED) MCFG_CASSETTE_INTERFACE("fm7_cass") - MCFG_MB8877x_ADD("fdc", XTAL_8MHz / 8) + MCFG_MB8877_ADD("fdc", XTAL_8MHz / 8) MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(fm7_state, fm7_fdc_intrq_w)) MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(fm7_state, fm7_fdc_drq_w)) @@ -2358,7 +2358,7 @@ static MACHINE_CONFIG_START( fm16beta, fm7_state ) MCFG_CASSETTE_DEFAULT_STATE(CASSETTE_STOPPED | CASSETTE_MOTOR_DISABLED | CASSETTE_SPEAKER_ENABLED) MCFG_CASSETTE_INTERFACE("fm7_cass") - MCFG_MB8877x_ADD("fdc", XTAL_8MHz / 8) + MCFG_MB8877_ADD("fdc", XTAL_8MHz / 8) MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(fm7_state, fm7_fdc_intrq_w)) MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(fm7_state, fm7_fdc_drq_w)) diff --git a/src/mess/drivers/fmtowns.c b/src/mess/drivers/fmtowns.c index 1b002428d48..fa6235e04d2 100644 --- a/src/mess/drivers/fmtowns.c +++ b/src/mess/drivers/fmtowns.c @@ -2725,7 +2725,7 @@ static MACHINE_CONFIG_FRAGMENT( towns_base ) MCFG_PIC8259_ADD( "pic8259_slave", DEVWRITELINE("pic8259_master", pic8259_device, ir7_w), GND, NULL) - MCFG_MB8877x_ADD("fdc",XTAL_8MHz/4) // clock unknown + MCFG_MB8877_ADD("fdc",XTAL_8MHz/4) // clock unknown MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(towns_state,mb8877a_irq_w)) MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(towns_state,mb8877a_drq_w)) MCFG_FLOPPY_DRIVE_ADD("fdc:0", towns_floppies, "35hd", towns_state::floppy_formats) diff --git a/src/mess/drivers/gimix.c b/src/mess/drivers/gimix.c index 1e6e1a00372..4588f8006a4 100644 --- a/src/mess/drivers/gimix.c +++ b/src/mess/drivers/gimix.c @@ -586,7 +586,7 @@ static MACHINE_CONFIG_START( gimix, gimix_state ) MCFG_PTM6840_IRQ_CB(WRITELINE(gimix_state,irq_w)) // PCB pictures show both the RTC and timer set to generate IRQs (are jumper configurable) /* floppy disks */ - MCFG_FD1797x_ADD("fdc",XTAL_8MHz / 4) + MCFG_FD1797_ADD("fdc",XTAL_8MHz / 4) MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(gimix_state,fdc_irq_w)) MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(gimix_state,fdc_drq_w)) MCFG_WD_FDC_FORCE_READY diff --git a/src/mess/drivers/hec2hrp.c b/src/mess/drivers/hec2hrp.c index e1381d33a63..0553958fcfa 100644 --- a/src/mess/drivers/hec2hrp.c +++ b/src/mess/drivers/hec2hrp.c @@ -570,7 +570,7 @@ static MACHINE_CONFIG_START( hec2mdhrx, hec2hrp_state ) MCFG_MACHINE_START_OVERRIDE(hec2hrp_state,hec2mdhrx) /* Mini Disc */ - MCFG_FD1793x_ADD("wd179x", XTAL_1MHz) + MCFG_FD1793_ADD("wd179x", XTAL_1MHz) MCFG_FLOPPY_DRIVE_ADD("wd179x:0", minidisc_floppies, "dd", hec2hrp_state::minidisc_formats) diff --git a/src/mess/drivers/ht68k.c b/src/mess/drivers/ht68k.c index e8ba7cdcf81..5d4bbafb67a 100644 --- a/src/mess/drivers/ht68k.c +++ b/src/mess/drivers/ht68k.c @@ -137,7 +137,7 @@ static MACHINE_CONFIG_START( ht68k, ht68k_state ) MCFG_RS232_PORT_ADD("rs232", default_rs232_devices, "terminal") MCFG_RS232_RXD_HANDLER(DEVWRITELINE("duart68681", mc68681_device, rx_a_w)) - MCFG_WD1770x_ADD("wd1770", XTAL_8MHz ) + MCFG_WD1770_ADD("wd1770", XTAL_8MHz ) MCFG_FLOPPY_DRIVE_ADD("wd1770:0", ht68k_floppies, "525dd", floppy_image_device::default_floppy_formats) MCFG_FLOPPY_DRIVE_ADD("wd1770:1", ht68k_floppies, "525dd", floppy_image_device::default_floppy_formats) diff --git a/src/mess/drivers/itt3030.c b/src/mess/drivers/itt3030.c index 498a215cc58..9df2e81432b 100644 --- a/src/mess/drivers/itt3030.c +++ b/src/mess/drivers/itt3030.c @@ -777,7 +777,7 @@ static MACHINE_CONFIG_START( itt3030, itt3030_state ) MCFG_DEVICE_ADD("crt5027", CRT5027, XTAL_6MHz) MCFG_TMS9927_CHAR_WIDTH(16) - MCFG_FD1791x_ADD("fdc", XTAL_20MHz / 20) + MCFG_FD1791_ADD("fdc", XTAL_20MHz / 20) MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(itt3030_state, fdcirq_w)) MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(itt3030_state, fdcdrq_w)) MCFG_WD_FDC_HLD_CALLBACK(WRITELINE(itt3030_state, fdchld_w)) diff --git a/src/mess/drivers/jupiter.c b/src/mess/drivers/jupiter.c index fc5df6a5636..1bce61303a6 100644 --- a/src/mess/drivers/jupiter.c +++ b/src/mess/drivers/jupiter.c @@ -225,7 +225,7 @@ static MACHINE_CONFIG_START( jupiter, jupiter2_state ) MCFG_CPU_IO_MAP(jupiter_m6800_io) // devices - MCFG_DEVICE_ADD(INS1771N1_TAG, FD1771x, 1000000) + MCFG_DEVICE_ADD(INS1771N1_TAG, FD1771, 1000000) MCFG_FLOPPY_DRIVE_ADD(INS1771N1_TAG":0", jupiter_floppies, "525ssdd", floppy_image_device::default_floppy_formats) MCFG_FLOPPY_DRIVE_ADD(INS1771N1_TAG":1", jupiter_floppies, NULL, floppy_image_device::default_floppy_formats) @@ -259,7 +259,7 @@ static MACHINE_CONFIG_START( jupiter3, jupiter3_state ) MCFG_PALETTE_ADD_BLACK_AND_WHITE("palette") // devices - MCFG_DEVICE_ADD(INS1771N1_TAG, FD1771x, 1000000) + MCFG_DEVICE_ADD(INS1771N1_TAG, FD1771, 1000000) MCFG_FLOPPY_DRIVE_ADD(INS1771N1_TAG":0", jupiter_floppies, "525ssdd", floppy_image_device::default_floppy_formats) MCFG_FLOPPY_DRIVE_ADD(INS1771N1_TAG":1", jupiter_floppies, NULL, floppy_image_device::default_floppy_formats) diff --git a/src/mess/drivers/kaypro.c b/src/mess/drivers/kaypro.c index 923fb65c0a7..a6a82c0f166 100644 --- a/src/mess/drivers/kaypro.c +++ b/src/mess/drivers/kaypro.c @@ -241,7 +241,7 @@ static MACHINE_CONFIG_START( kayproii, kaypro_state ) MCFG_Z80SIO0_ADD("z80sio", XTAL_20MHz / 8, 0, 0, 0, 0) MCFG_Z80DART_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0)) - MCFG_FD1793x_ADD("fdc", XTAL_20MHz / 20) + MCFG_FD1793_ADD("fdc", XTAL_20MHz / 20) MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(kaypro_state, fdc_intrq_w)) MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(kaypro_state, fdc_drq_w)) MCFG_WD_FDC_FORCE_READY @@ -304,7 +304,7 @@ static MACHINE_CONFIG_START( kaypro2x, kaypro_state ) MCFG_Z80SIO0_ADD("z80sio_2x", XTAL_16MHz / 4, 0, 0, 0, 0) /* extra sio for modem and printer */ MCFG_Z80DART_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0)) MCFG_DEVICE_ADD("brg", COM8116, XTAL_5_0688MHz) // WD1943, SMC8116 - MCFG_FD1793x_ADD("fdc", XTAL_16MHz / 16) + MCFG_FD1793_ADD("fdc", XTAL_16MHz / 16) MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(kaypro_state, fdc_intrq_w)) MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(kaypro_state, fdc_drq_w)) MCFG_WD_FDC_FORCE_READY diff --git a/src/mess/drivers/m20.c b/src/mess/drivers/m20.c index dc4c20ea2b5..b5de310407e 100644 --- a/src/mess/drivers/m20.c +++ b/src/mess/drivers/m20.c @@ -804,7 +804,7 @@ static MACHINE_CONFIG_START( m20, m20_state ) MCFG_PALETTE_ADD_BLACK_AND_WHITE("palette") /* Devices */ - MCFG_FD1797x_ADD("fd1797", 1000000) + MCFG_FD1797_ADD("fd1797", 1000000) MCFG_WD_FDC_INTRQ_CALLBACK(DEVWRITELINE("i8259", pic8259_device, ir0_w)) MCFG_FLOPPY_DRIVE_ADD("fd1797:0", m20_floppies, "5dd", m20_state::floppy_formats) MCFG_FLOPPY_DRIVE_ADD("fd1797:1", m20_floppies, "5dd", m20_state::floppy_formats) diff --git a/src/mess/drivers/mbc200.c b/src/mess/drivers/mbc200.c index 6a7f02e4bb2..5c9ee51937a 100644 --- a/src/mess/drivers/mbc200.c +++ b/src/mess/drivers/mbc200.c @@ -244,7 +244,7 @@ static MACHINE_CONFIG_START( mbc200, mbc200_state ) MCFG_DEVICE_ADD("i8251_1", I8251, 0) // INS8251N MCFG_DEVICE_ADD("i8251_2", I8251, 0) // INS8251A - MCFG_MB8876x_ADD("fdc", XTAL_8MHz / 8) // guess + MCFG_MB8876_ADD("fdc", XTAL_8MHz / 8) // guess MCFG_FLOPPY_DRIVE_ADD("fdc:0", mbc200_floppies, "qd", floppy_image_device::default_floppy_formats) MCFG_FLOPPY_DRIVE_ADD("fdc:1", mbc200_floppies, "qd", floppy_image_device::default_floppy_formats) diff --git a/src/mess/drivers/mbc55x.c b/src/mess/drivers/mbc55x.c index 2ff26f364f6..d5b1c2b7a06 100644 --- a/src/mess/drivers/mbc55x.c +++ b/src/mess/drivers/mbc55x.c @@ -292,7 +292,7 @@ static MACHINE_CONFIG_START( mbc55x, mbc55x_state ) MCFG_MC6845_OUT_HSYNC_CB(WRITELINE(mbc55x_state, vid_vsync_changed)) /* Backing storage */ - MCFG_FD1793x_ADD(FDC_TAG, XTAL_1MHz) + MCFG_FD1793_ADD(FDC_TAG, XTAL_1MHz) MCFG_FLOPPY_DRIVE_ADD(FDC_TAG ":0", mbc55x_floppies, "qd", mbc55x_state::floppy_formats) MCFG_FLOPPY_DRIVE_ADD(FDC_TAG ":1", mbc55x_floppies, "qd", mbc55x_state::floppy_formats) diff --git a/src/mess/drivers/mbee.c b/src/mess/drivers/mbee.c index 681e38a6f4b..7d40de85c95 100644 --- a/src/mess/drivers/mbee.c +++ b/src/mess/drivers/mbee.c @@ -762,7 +762,7 @@ static MACHINE_CONFIG_DERIVED( mbee56, mbeeic ) MCFG_CPU_PROGRAM_MAP(mbee56_mem) MCFG_CPU_IO_MAP(mbee56_io) MCFG_MACHINE_RESET_OVERRIDE(mbee_state, mbee56) - MCFG_WD2793x_ADD("fdc", XTAL_4MHz / 2) + MCFG_WD2793_ADD("fdc", XTAL_4MHz / 2) MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(mbee_state, fdc_intrq_w)) MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(mbee_state, fdc_drq_w)) MCFG_WD_FDC_ENMF_CALLBACK(GND) @@ -784,7 +784,7 @@ static MACHINE_CONFIG_DERIVED( mbee128p, mbeeppc ) MCFG_CPU_PROGRAM_MAP(mbee256_mem) MCFG_CPU_IO_MAP(mbee128_io) MCFG_MACHINE_RESET_OVERRIDE(mbee_state, mbee128) - MCFG_WD2793x_ADD("fdc", XTAL_4MHz / 2) + MCFG_WD2793_ADD("fdc", XTAL_4MHz / 2) MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(mbee_state, fdc_intrq_w)) MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(mbee_state, fdc_drq_w)) MCFG_WD_FDC_ENMF_CALLBACK(GND) diff --git a/src/mess/drivers/mirage.c b/src/mess/drivers/mirage.c index 14b6868c637..dc39d620897 100644 --- a/src/mess/drivers/mirage.c +++ b/src/mess/drivers/mirage.c @@ -229,7 +229,7 @@ static MACHINE_CONFIG_START( mirage, mirage_state ) MCFG_DEVICE_ADD("acia6850", ACIA6850, 0) MCFG_ACIA6850_IRQ_HANDLER(DEVWRITELINE("maincpu", m6809e_device, firq_line)) - MCFG_WD1772x_ADD("wd1772", 8000000) + MCFG_WD1772_ADD("wd1772", 8000000) MCFG_WD_FDC_INTRQ_CALLBACK(INPUTLINE("maincpu", INPUT_LINE_NMI)) MCFG_WD_FDC_DRQ_CALLBACK(INPUTLINE("maincpu", M6809_IRQ_LINE)) diff --git a/src/mess/drivers/ms0515.c b/src/mess/drivers/ms0515.c index fdbf1ba5686..54086c019db 100644 --- a/src/mess/drivers/ms0515.c +++ b/src/mess/drivers/ms0515.c @@ -220,7 +220,7 @@ static MACHINE_CONFIG_START( ms0515, ms0515_state ) MCFG_T11_INITIAL_MODE(0xf2ff) MCFG_CPU_PROGRAM_MAP(ms0515_mem) - MCFG_DEVICE_ADD("vg93", FD1793x, 1000000) + MCFG_DEVICE_ADD("vg93", FD1793, 1000000) MCFG_FLOPPY_DRIVE_ADD("vg93:0", ms0515_floppies, "525qd", floppy_image_device::default_floppy_formats) /* video hardware */ diff --git a/src/mess/drivers/msx.c b/src/mess/drivers/msx.c index 063b022b835..f8d076d2d22 100644 --- a/src/mess/drivers/msx.c +++ b/src/mess/drivers/msx.c @@ -1281,7 +1281,7 @@ static SLOT_INTERFACE_START( msx_floppies ) SLOT_INTERFACE_END static MACHINE_CONFIG_FRAGMENT( msx_fd1793 ) - MCFG_FD1793x_ADD("fdc", XTAL_4MHz / 4) + MCFG_FD1793_ADD("fdc", XTAL_4MHz / 4) MCFG_WD_FDC_FORCE_READY MACHINE_CONFIG_END @@ -1289,19 +1289,19 @@ static MACHINE_CONFIG_FRAGMENT( msx_wd2793_force_ready ) // From NMS8245 schematics: // READY + HLT - pulled high // SSO/-ENMF + -DDEN + ENP + -5/8 - pulled low - MCFG_WD2793x_ADD("fdc", XTAL_4MHz / 4) + MCFG_WD2793_ADD("fdc", XTAL_4MHz / 4) MCFG_WD_FDC_FORCE_READY MACHINE_CONFIG_END static MACHINE_CONFIG_FRAGMENT( msx_wd2793 ) - MCFG_WD2793x_ADD("fdc", XTAL_4MHz / 4) + MCFG_WD2793_ADD("fdc", XTAL_4MHz / 4) MACHINE_CONFIG_END static MACHINE_CONFIG_FRAGMENT( msx_mb8877a ) // From CF-3300 FDC schematic: // READY + HLT - pulled high // -DDEN - pulled low - MCFG_MB8877x_ADD("fdc", XTAL_4MHz / 4) + MCFG_MB8877_ADD("fdc", XTAL_4MHz / 4) MCFG_WD_FDC_FORCE_READY MACHINE_CONFIG_END @@ -1310,7 +1310,7 @@ static MACHINE_CONFIG_FRAGMENT( msx_tc8566af ) MACHINE_CONFIG_END static MACHINE_CONFIG_FRAGMENT( msx_microsol ) - MCFG_WD2793x_ADD("fdc", XTAL_4MHz / 4) + MCFG_WD2793_ADD("fdc", XTAL_4MHz / 4) MCFG_WD_FDC_FORCE_READY MACHINE_CONFIG_END diff --git a/src/mess/drivers/myb3k.c b/src/mess/drivers/myb3k.c index 8c98133d67b..0d467cbdfe1 100644 --- a/src/mess/drivers/myb3k.c +++ b/src/mess/drivers/myb3k.c @@ -269,7 +269,7 @@ static MACHINE_CONFIG_START( myb3k, myb3k_state ) MCFG_MC6845_SHOW_BORDER_AREA(false) MCFG_MC6845_CHAR_WIDTH(8) - MCFG_DEVICE_ADD("fdc", MB8877x, 2000000) // unknown type + MCFG_DEVICE_ADD("fdc", MB8877, 2000000) // unknown type MCFG_FLOPPY_DRIVE_ADD("fdc:0", myb3k_floppies, "8dsdd", floppy_image_device::default_floppy_formats) MCFG_FLOPPY_DRIVE_ADD("fdc:1", myb3k_floppies, "8dsdd", floppy_image_device::default_floppy_formats) MACHINE_CONFIG_END diff --git a/src/mess/drivers/mycom.c b/src/mess/drivers/mycom.c index be5e44bff65..c90bc44c2a6 100644 --- a/src/mess/drivers/mycom.c +++ b/src/mess/drivers/mycom.c @@ -550,7 +550,7 @@ static MACHINE_CONFIG_START( mycom, mycom_state ) /* Devices */ MCFG_MSM5832_ADD("rtc", XTAL_32_768kHz) MCFG_CASSETTE_ADD( "cassette" ) - MCFG_FD1771x_ADD("fdc", XTAL_16MHz / 16) + MCFG_FD1771_ADD("fdc", XTAL_16MHz / 16) MCFG_FLOPPY_DRIVE_ADD("fdc:0", mycom_floppies, "525sd", floppy_image_device::default_floppy_formats) MCFG_FLOPPY_DRIVE_ADD("fdc:1", mycom_floppies, "525sd", floppy_image_device::default_floppy_formats) diff --git a/src/mess/drivers/mz2000.c b/src/mess/drivers/mz2000.c index 7f86fd940a0..f12c3e309b1 100644 --- a/src/mess/drivers/mz2000.c +++ b/src/mess/drivers/mz2000.c @@ -833,7 +833,7 @@ static MACHINE_CONFIG_START( mz2000, mz2000_state ) MCFG_PIT8253_CLK1(31250) /* needed by "Art Magic" to boot */ MCFG_PIT8253_CLK2(31250) - MCFG_MB8877x_ADD("mb8877a", XTAL_1MHz) + MCFG_MB8877_ADD("mb8877a", XTAL_1MHz) MCFG_FLOPPY_DRIVE_ADD("mb8877a:0", mz2000_floppies, "dd", mz2000_state::floppy_formats) MCFG_FLOPPY_DRIVE_ADD("mb8877a:1", mz2000_floppies, "dd", mz2000_state::floppy_formats) diff --git a/src/mess/drivers/mz2500.c b/src/mess/drivers/mz2500.c index a7112dc8c78..6d904bd5bbd 100644 --- a/src/mess/drivers/mz2500.c +++ b/src/mess/drivers/mz2500.c @@ -2108,7 +2108,7 @@ static MACHINE_CONFIG_START( mz2500, mz2500_state ) MCFG_PIT8253_CLK2(16) //CH2, used by Super MZ demo / The Black Onyx and a few others (TODO: timing of this) MCFG_PIT8253_OUT2_HANDLER(DEVWRITELINE("pit", pit8253_device, write_clk1)) - MCFG_MB8877x_ADD("mb8877a", XTAL_1MHz) + MCFG_MB8877_ADD("mb8877a", XTAL_1MHz) MCFG_FLOPPY_DRIVE_ADD("mb8877a:0", mz2500_floppies, "dd", floppy_image_device::default_floppy_formats) MCFG_FLOPPY_DRIVE_ADD("mb8877a:1", mz2500_floppies, "dd", floppy_image_device::default_floppy_formats) diff --git a/src/mess/drivers/ngen.c b/src/mess/drivers/ngen.c index 487b9e0c4ae..9050da436a8 100644 --- a/src/mess/drivers/ngen.c +++ b/src/mess/drivers/ngen.c @@ -916,7 +916,7 @@ static MACHINE_CONFIG_START( ngen, ngen_state ) MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE(ngen_state,timer_clk_out)) // floppy disk / hard disk module (WD2797 FDC, WD1010 HDC, plus an 8253 timer for each) - MCFG_WD2797x_ADD("fdc", XTAL_20MHz / 20) + MCFG_WD2797_ADD("fdc", XTAL_20MHz / 20) MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(ngen_state,fdc_irq_w)) MCFG_WD_FDC_DRQ_CALLBACK(DEVWRITELINE("maincpu",i80186_cpu_device,drq1_w)) MCFG_WD_FDC_FORCE_READY @@ -1026,7 +1026,7 @@ static MACHINE_CONFIG_START( ngen386, ngen386_state ) MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE(ngen_state,timer_clk_out)) // floppy disk / hard disk module (WD2797 FDC, WD1010 HDC, plus an 8253 timer for each) - MCFG_WD2797x_ADD("fdc", XTAL_20MHz / 20) + MCFG_WD2797_ADD("fdc", XTAL_20MHz / 20) MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(ngen_state,fdc_irq_w)) // MCFG_WD_FDC_DRQ_CALLBACK(DEVWRITELINE("i386cpu",i80186_cpu_device,drq1_w)) MCFG_WD_FDC_FORCE_READY diff --git a/src/mess/drivers/oric.c b/src/mess/drivers/oric.c index deda51ee0c5..5ef4b1a19de 100644 --- a/src/mess/drivers/oric.c +++ b/src/mess/drivers/oric.c @@ -847,7 +847,7 @@ static MACHINE_CONFIG_DERIVED_CLASS( telstrat, oric, telestrat_state ) MCFG_VIA6522_IRQ_HANDLER(WRITELINE(telestrat_state, via2_irq_w)) /* microdisc */ - MCFG_FD1793x_ADD("fdc", XTAL_8MHz/8) + MCFG_FD1793_ADD("fdc", XTAL_8MHz/8) MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(telestrat_state, fdc_irq_w)) MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(telestrat_state, fdc_drq_w)) MCFG_WD_FDC_HLD_CALLBACK(WRITELINE(telestrat_state, fdc_hld_w)) diff --git a/src/mess/drivers/orion.c b/src/mess/drivers/orion.c index 40752d62d3d..ac3d9ab8430 100644 --- a/src/mess/drivers/orion.c +++ b/src/mess/drivers/orion.c @@ -123,7 +123,7 @@ static MACHINE_CONFIG_START( orion128, orion_state ) MCFG_SOFTWARE_LIST_ADD("cass_list", "orion_cass") - MCFG_FD1793x_ADD("fd1793", XTAL_8MHz / 8) + MCFG_FD1793_ADD("fd1793", XTAL_8MHz / 8) MCFG_FLOPPY_DRIVE_ADD("fd0", orion_floppies, "525qd", orion_state::orion_floppy_formats) MCFG_FLOPPY_DRIVE_ADD("fd1", orion_floppies, "525qd", orion_state::orion_floppy_formats) @@ -202,7 +202,7 @@ static MACHINE_CONFIG_START( orionz80, orion_state ) MCFG_SOFTWARE_LIST_ADD("cass_list", "orion_cass") - MCFG_FD1793x_ADD("fd1793", XTAL_8MHz / 8) + MCFG_FD1793_ADD("fd1793", XTAL_8MHz / 8) MCFG_FLOPPY_DRIVE_ADD("fd0", orion_floppies, "525qd", orion_state::orion_floppy_formats) MCFG_FLOPPY_DRIVE_ADD("fd1", orion_floppies, "525qd", orion_state::orion_floppy_formats) @@ -277,7 +277,7 @@ static MACHINE_CONFIG_START( orionpro, orion_state ) MCFG_SOFTWARE_LIST_ADD("cass_list", "orion_cass") - MCFG_FD1793x_ADD("fd1793", XTAL_8MHz / 8) + MCFG_FD1793_ADD("fd1793", XTAL_8MHz / 8) MCFG_FLOPPY_DRIVE_ADD("fd0", orion_floppies, "525qd", orion_state::orion_floppy_formats) MCFG_FLOPPY_DRIVE_ADD("fd1", orion_floppies, "525qd", orion_state::orion_floppy_formats) diff --git a/src/mess/drivers/osbexec.c b/src/mess/drivers/osbexec.c index 04479245194..e5889c40fe2 100644 --- a/src/mess/drivers/osbexec.c +++ b/src/mess/drivers/osbexec.c @@ -558,7 +558,7 @@ static MACHINE_CONFIG_START( osbexec, osbexec_state ) MCFG_Z80SIO2_ADD("sio", MAIN_CLOCK/6, 0, 0, 0, 0) - MCFG_DEVICE_ADD("mb8877", MB8877x, MAIN_CLOCK/24) + MCFG_DEVICE_ADD("mb8877", MB8877, MAIN_CLOCK/24) MCFG_WD_FDC_INTRQ_CALLBACK(DEVWRITELINE("pia_1", pia6821_device, cb1_w)) MCFG_FLOPPY_DRIVE_ADD("mb8877:0", osborne2_floppies, "525ssdd", floppy_image_device::default_floppy_formats) MCFG_FLOPPY_DRIVE_ADD("mb8877:1", osborne2_floppies, "525ssdd", floppy_image_device::default_floppy_formats) diff --git a/src/mess/drivers/osborne1.c b/src/mess/drivers/osborne1.c index 2dfb9d67f05..4910ee5e0cc 100644 --- a/src/mess/drivers/osborne1.c +++ b/src/mess/drivers/osborne1.c @@ -221,7 +221,7 @@ static MACHINE_CONFIG_START( osborne1, osborne1_state ) MCFG_PIA_CB2_HANDLER(WRITELINE(osborne1_state, video_pia_out_cb2_dummy)) MCFG_PIA_IRQA_HANDLER(WRITELINE(osborne1_state, video_pia_irq_a_func)) - MCFG_DEVICE_ADD("mb8877", MB8877x, MAIN_CLOCK/16) + MCFG_DEVICE_ADD("mb8877", MB8877, MAIN_CLOCK/16) MCFG_WD_FDC_FORCE_READY MCFG_FLOPPY_DRIVE_ADD("mb8877:0", osborne1_floppies, "525ssdd", floppy_image_device::default_floppy_formats) MCFG_FLOPPY_DRIVE_ADD("mb8877:1", osborne1_floppies, "525ssdd", floppy_image_device::default_floppy_formats) diff --git a/src/mess/drivers/partner.c b/src/mess/drivers/partner.c index 27ed71a4c43..224f17fc2a3 100644 --- a/src/mess/drivers/partner.c +++ b/src/mess/drivers/partner.c @@ -212,7 +212,7 @@ static MACHINE_CONFIG_START( partner, partner_state ) MCFG_SOFTWARE_LIST_ADD("cass_list","partner_cass") - MCFG_FD1793x_ADD("wd1793", XTAL_16MHz / 16) + MCFG_FD1793_ADD("wd1793", XTAL_16MHz / 16) MCFG_WD_FDC_DRQ_CALLBACK(DEVWRITELINE("dma8257", i8257_device, dreq0_w)) MCFG_FLOPPY_DRIVE_ADD("wd1793:0", partner_floppies, "525qd", partner_state::floppy_formats) MCFG_FLOPPY_DRIVE_ADD("wd1793:1", partner_floppies, "525qd", partner_state::floppy_formats) diff --git a/src/mess/drivers/pcd.c b/src/mess/drivers/pcd.c index 3460beb278e..691c8b3e324 100644 --- a/src/mess/drivers/pcd.c +++ b/src/mess/drivers/pcd.c @@ -469,7 +469,7 @@ static MACHINE_CONFIG_START( pcd, pcd_state ) MCFG_NVRAM_ADD_1FILL("nvram") // floppy disk controller - MCFG_WD2793x_ADD("fdc", XTAL_16MHz / 8) + MCFG_WD2793_ADD("fdc", XTAL_16MHz / 8) MCFG_WD_FDC_INTRQ_CALLBACK(DEVWRITELINE("pic1", pic8259_device, ir6_w)) MCFG_WD_FDC_DRQ_CALLBACK(DEVWRITELINE("maincpu", i80186_cpu_device, drq1_w)) MCFG_WD_FDC_ENMF_CALLBACK(GND) diff --git a/src/mess/drivers/pk8020.c b/src/mess/drivers/pk8020.c index 49d8faec173..1b8e83ef527 100644 --- a/src/mess/drivers/pk8020.c +++ b/src/mess/drivers/pk8020.c @@ -215,7 +215,7 @@ static MACHINE_CONFIG_START( pk8020, pk8020_state ) MCFG_DEVICE_ADD("rs232", I8251, 0) MCFG_DEVICE_ADD("lan", I8251, 0) - MCFG_FD1793x_ADD("wd1793", XTAL_20MHz / 20) + MCFG_FD1793_ADD("wd1793", XTAL_20MHz / 20) MCFG_FLOPPY_DRIVE_ADD("wd1793:0", pk8020_floppies, "qd", pk8020_state::floppy_formats) MCFG_FLOPPY_DRIVE_ADD("wd1793:1", pk8020_floppies, "qd", pk8020_state::floppy_formats) diff --git a/src/mess/drivers/pt68k4.c b/src/mess/drivers/pt68k4.c index 34dcd687d47..0546a94c4fa 100644 --- a/src/mess/drivers/pt68k4.c +++ b/src/mess/drivers/pt68k4.c @@ -397,7 +397,7 @@ static MACHINE_CONFIG_START( pt68k2, pt68k4_state ) MCFG_M48T02_ADD(TIMEKEEPER_TAG) - MCFG_WD1772x_ADD(WDFDC_TAG, XTAL_16MHz / 2) + MCFG_WD1772_ADD(WDFDC_TAG, XTAL_16MHz / 2) MCFG_FLOPPY_DRIVE_ADD(WDFDC_TAG":0", pt68k_floppies, "525dd", pt68k4_state::floppy_formats) MCFG_FLOPPY_DRIVE_ADD(WDFDC_TAG":1", pt68k_floppies, "525dd", pt68k4_state::floppy_formats) diff --git a/src/mess/drivers/pulsar.c b/src/mess/drivers/pulsar.c index a8f5f17c9a8..609e17013e8 100644 --- a/src/mess/drivers/pulsar.c +++ b/src/mess/drivers/pulsar.c @@ -247,7 +247,7 @@ static MACHINE_CONFIG_START( pulsar, pulsar_state ) MCFG_COM8116_FR_HANDLER(WRITELINE(pulsar_state, fr_w)) MCFG_COM8116_FT_HANDLER(WRITELINE(pulsar_state, ft_w)) - MCFG_FD1797x_ADD("fdc", XTAL_4MHz / 2) + MCFG_FD1797_ADD("fdc", XTAL_4MHz / 2) MCFG_FLOPPY_DRIVE_ADD("fdc:0", pulsar_floppies, "525dd", floppy_image_device::default_floppy_formats) MACHINE_CONFIG_END diff --git a/src/mess/drivers/rainbow.c b/src/mess/drivers/rainbow.c index 9930b42ff22..a403e40ef9d 100644 --- a/src/mess/drivers/rainbow.c +++ b/src/mess/drivers/rainbow.c @@ -2312,7 +2312,7 @@ MCFG_VT_CHARGEN("chargen") MCFG_VT_VIDEO_RAM_CALLBACK(READ8(rainbow_state, read_video_ram_r)) MCFG_VT_VIDEO_CLEAR_VIDEO_INTERRUPT_CALLBACK(WRITELINE(rainbow_state, clear_video_interrupt)) -MCFG_FD1793x_ADD(FD1793_TAG, XTAL_24_0734MHz / 24) // no separate 1 Mhz quartz +MCFG_FD1793_ADD(FD1793_TAG, XTAL_24_0734MHz / 24) // no separate 1 Mhz quartz //MCFG_WD_FDC_FORCE_READY MCFG_FLOPPY_DRIVE_ADD(FD1793_TAG ":0", rainbow_floppies, "525qd0", rainbow_state::floppy_formats) MCFG_FLOPPY_DRIVE_ADD(FD1793_TAG ":1", rainbow_floppies, "525qd1", rainbow_state::floppy_formats) diff --git a/src/mess/drivers/rc759.c b/src/mess/drivers/rc759.c index 405817cfb5b..bcbab8bad8b 100644 --- a/src/mess/drivers/rc759.c +++ b/src/mess/drivers/rc759.c @@ -304,7 +304,7 @@ static MACHINE_CONFIG_START( rc759, rc759_state ) MCFG_I8255_OUT_PORTC_CB(WRITE8(rc759_state, ppi_portc_w)) // floppy disk controller - MCFG_WD2797x_ADD("fdc", 1000000) + MCFG_WD2797_ADD("fdc", 1000000) MCFG_WD_FDC_INTRQ_CALLBACK(DEVWRITELINE("pic", pic8259_device, ir0_w)) MCFG_WD_FDC_DRQ_CALLBACK(DEVWRITELINE("maincpu", i80186_cpu_device, drq1_w)) diff --git a/src/mess/drivers/rm380z.c b/src/mess/drivers/rm380z.c index e14d6586a59..5c9ee061081 100644 --- a/src/mess/drivers/rm380z.c +++ b/src/mess/drivers/rm380z.c @@ -151,7 +151,7 @@ static MACHINE_CONFIG_START( rm380z, rm380z_state ) MCFG_RAM_DEFAULT_SIZE("56K") /* floppy disk */ - MCFG_FD1771x_ADD("wd1771", XTAL_1MHz) + MCFG_FD1771_ADD("wd1771", XTAL_1MHz) MCFG_FLOPPY_DRIVE_ADD("wd1771:0", rm380z_floppies, "sssd", floppy_image_device::default_floppy_formats) MCFG_FLOPPY_DRIVE_ADD("wd1771:1", rm380z_floppies, "sssd", floppy_image_device::default_floppy_formats) diff --git a/src/mess/drivers/rmnimbus.c b/src/mess/drivers/rmnimbus.c index 4236521a9cc..94a34ff7b6f 100644 --- a/src/mess/drivers/rmnimbus.c +++ b/src/mess/drivers/rmnimbus.c @@ -123,7 +123,7 @@ static MACHINE_CONFIG_START( nimbus, rmnimbus_state ) MCFG_PALETTE_ADD("palette", 16) /* Backing storage */ - MCFG_WD2793x_ADD(FDC_TAG, 1000000) + MCFG_WD2793_ADD(FDC_TAG, 1000000) MCFG_WD_FDC_FORCE_READY MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(rmnimbus_state,nimbus_fdc_intrq_w)) MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(rmnimbus_state,nimbus_fdc_drq_w)) diff --git a/src/mess/drivers/samcoupe.c b/src/mess/drivers/samcoupe.c index 5e417004795..7c96130e3a7 100644 --- a/src/mess/drivers/samcoupe.c +++ b/src/mess/drivers/samcoupe.c @@ -560,7 +560,7 @@ static MACHINE_CONFIG_START( samcoupe, samcoupe_state ) MCFG_SOFTWARE_LIST_ADD("cass_list","samcoupe_cass") - MCFG_WD1772x_ADD("wd1772", SAMCOUPE_XTAL_X1/3) + MCFG_WD1772_ADD("wd1772", SAMCOUPE_XTAL_X1/3) MCFG_FLOPPY_DRIVE_ADD("wd1772:0", samcoupe_floppies, "35dd", samcoupe_state::floppy_formats) MCFG_FLOPPY_DRIVE_ADD("wd1772:1", samcoupe_floppies, "35dd", samcoupe_state::floppy_formats) MCFG_SOFTWARE_LIST_ADD("flop_list","samcoupe_flop") diff --git a/src/mess/drivers/sbrain.c b/src/mess/drivers/sbrain.c index 4de6abe4f83..8c2660f3d88 100644 --- a/src/mess/drivers/sbrain.c +++ b/src/mess/drivers/sbrain.c @@ -357,7 +357,7 @@ static MACHINE_CONFIG_START( sbrain, sbrain_state ) MCFG_COM8116_FR_HANDLER(WRITELINE(sbrain_state, fr_w)) MCFG_COM8116_FT_HANDLER(WRITELINE(sbrain_state, ft_w)) - MCFG_FD1791x_ADD("fdc", XTAL_16MHz / 16) + MCFG_FD1791_ADD("fdc", XTAL_16MHz / 16) MCFG_FLOPPY_DRIVE_ADD("fdc:0", sbrain_floppies, "525dd", floppy_image_device::default_floppy_formats) MCFG_FLOPPY_DRIVE_ADD("fdc:1", sbrain_floppies, "525dd", floppy_image_device::default_floppy_formats) MACHINE_CONFIG_END diff --git a/src/mess/drivers/slicer.c b/src/mess/drivers/slicer.c index 8af9b1a609b..ee5327ff006 100644 --- a/src/mess/drivers/slicer.c +++ b/src/mess/drivers/slicer.c @@ -113,7 +113,7 @@ static MACHINE_CONFIG_START( slicer, slicer_state ) MCFG_RS232_PORT_ADD("rs232_2", default_rs232_devices, NULL) MCFG_RS232_RXD_HANDLER(DEVWRITELINE("sc2681", mc68681_device, rx_b_w)) - MCFG_FD1797x_ADD("fdc", XTAL_16MHz/2/8) + MCFG_FD1797_ADD("fdc", XTAL_16MHz/2/8) MCFG_WD_FDC_INTRQ_CALLBACK(DEVWRITELINE("maincpu", i80186_cpu_device, int1_w)) MCFG_WD_FDC_DRQ_CALLBACK(DEVWRITELINE("maincpu", i80186_cpu_device, drq0_w)) MCFG_FLOPPY_DRIVE_ADD("fdc:0", slicer_floppies, "525dd", floppy_image_device::default_floppy_formats) diff --git a/src/mess/drivers/smc777.c b/src/mess/drivers/smc777.c index 3408d590cc5..92523d7d569 100644 --- a/src/mess/drivers/smc777.c +++ b/src/mess/drivers/smc777.c @@ -1043,7 +1043,7 @@ static MACHINE_CONFIG_START( smc777, smc777_state ) MCFG_MC6845_CHAR_WIDTH(8) // floppy controller - MCFG_MB8876x_ADD("fdc", XTAL_1MHz) + MCFG_MB8876_ADD("fdc", XTAL_1MHz) MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(smc777_state, fdc_intrq_w)) MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(smc777_state, fdc_drq_w)) diff --git a/src/mess/drivers/special.c b/src/mess/drivers/special.c index 72263f3d18e..e424042e466 100644 --- a/src/mess/drivers/special.c +++ b/src/mess/drivers/special.c @@ -456,7 +456,7 @@ static MACHINE_CONFIG_DERIVED( specimx, special ) MCFG_I8255_IN_PORTC_CB(READ8(special_state, specialist_8255_portc_r)) MCFG_I8255_OUT_PORTC_CB(WRITE8(special_state, specialist_8255_portc_w)) - MCFG_FD1793x_ADD("fd1793", XTAL_8MHz / 8) + MCFG_FD1793_ADD("fd1793", XTAL_8MHz / 8) MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(special_state, fdc_drq)) MCFG_FLOPPY_DRIVE_ADD("fd0", specimx_floppies, "525qd", special_state::specimx_floppy_formats) MCFG_FLOPPY_DRIVE_ADD("fd1", specimx_floppies, "525qd", special_state::specimx_floppy_formats) @@ -509,7 +509,7 @@ static MACHINE_CONFIG_START( erik, special_state ) MCFG_I8255_IN_PORTC_CB(READ8(special_state, specialist_8255_portc_r)) MCFG_I8255_OUT_PORTC_CB(WRITE8(special_state, specialist_8255_portc_w)) - MCFG_FD1793x_ADD("fd1793", XTAL_8MHz / 8) + MCFG_FD1793_ADD("fd1793", XTAL_8MHz / 8) MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(special_state, fdc_drq)) MCFG_FLOPPY_DRIVE_ADD("fd0", specimx_floppies, "525qd", special_state::specimx_floppy_formats) MCFG_FLOPPY_DRIVE_ADD("fd1", specimx_floppies, "525qd", special_state::specimx_floppy_formats) diff --git a/src/mess/drivers/super6.c b/src/mess/drivers/super6.c index 43e4fd3063d..0a6e9b90b67 100644 --- a/src/mess/drivers/super6.c +++ b/src/mess/drivers/super6.c @@ -505,7 +505,7 @@ static MACHINE_CONFIG_START( super6, super6_state ) MCFG_DEVICE_ADD(Z80PIO_TAG, Z80PIO, XTAL_24MHz/4) MCFG_Z80PIO_OUT_INT_CB(INPUTLINE(Z80_TAG, INPUT_LINE_IRQ0)) - MCFG_WD2793x_ADD(WD2793_TAG, 1000000) + MCFG_WD2793_ADD(WD2793_TAG, 1000000) MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(super6_state, fdc_intrq_w)) MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(super6_state, fdc_drq_w)) diff --git a/src/mess/drivers/super80.c b/src/mess/drivers/super80.c index 74943211ce5..2cf1e75c8e8 100644 --- a/src/mess/drivers/super80.c +++ b/src/mess/drivers/super80.c @@ -837,7 +837,7 @@ static MACHINE_CONFIG_DERIVED( super80r, super80v ) MCFG_Z80DMA_IN_IORQ_CB(READ8(super80_state, io_read_byte)) MCFG_Z80DMA_OUT_IORQ_CB(WRITE8(super80_state, io_write_byte)) - MCFG_WD2793x_ADD("fdc", XTAL_2MHz) + MCFG_WD2793_ADD("fdc", XTAL_2MHz) MCFG_WD_FDC_DRQ_CALLBACK(DEVWRITELINE("dma", z80dma_device, rdy_w)) MCFG_FLOPPY_DRIVE_ADD("fdc:0", super80_floppies, "525dd", floppy_image_device::default_floppy_formats) MCFG_FLOPPY_DRIVE_ADD("fdc:1", super80_floppies, "525dd", floppy_image_device::default_floppy_formats) diff --git a/src/mess/drivers/svi318.c b/src/mess/drivers/svi318.c index 147252b2cb1..e09a8bf7daf 100644 --- a/src/mess/drivers/svi318.c +++ b/src/mess/drivers/svi318.c @@ -310,7 +310,7 @@ static MACHINE_CONFIG_START( svi318, svi318_state ) MCFG_SOFTWARE_LIST_ADD("cass_list", "svi318_cass") - MCFG_FD1793x_ADD("wd179x", XTAL_1MHz) + MCFG_FD1793_ADD("wd179x", XTAL_1MHz) MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(svi318_state, fdc_intrq_w)) MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(svi318_state, fdc_drq_w)) @@ -439,7 +439,7 @@ static MACHINE_CONFIG_START( svi328_806, svi318_state ) MCFG_SOFTWARE_LIST_ADD("cass_list", "svi318_cass") - MCFG_FD1793x_ADD("wd179x", XTAL_1MHz) + MCFG_FD1793_ADD("wd179x", XTAL_1MHz) MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(svi318_state, fdc_intrq_w)) MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(svi318_state, fdc_drq_w)) diff --git a/src/mess/drivers/swtpc09.c b/src/mess/drivers/swtpc09.c index df533c1f3f4..c45666f860c 100644 --- a/src/mess/drivers/swtpc09.c +++ b/src/mess/drivers/swtpc09.c @@ -127,7 +127,7 @@ static MACHINE_CONFIG_START( swtpc09, swtpc09_state ) MCFG_DEVICE_ADD("acia_clock", CLOCK, 153600) MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE(swtpc09_state, write_acia_clock)) - MCFG_FD1793x_ADD("fdc", XTAL_1MHz) + MCFG_FD1793_ADD("fdc", XTAL_1MHz) MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(swtpc09_state, fdc_intrq_w)) MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(swtpc09_state, fdc_drq_w)) @@ -168,7 +168,7 @@ static MACHINE_CONFIG_START( swtpc09i, swtpc09_state ) MCFG_DEVICE_ADD("acia_clock", CLOCK, 153600) MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE(swtpc09_state, write_acia_clock)) - MCFG_FD1793x_ADD("fdc", XTAL_1MHz) + MCFG_FD1793_ADD("fdc", XTAL_1MHz) MCFG_FLOPPY_DRIVE_ADD("fdc:0", swtpc09_floppies, "dd", swtpc09_state::floppy_formats) MCFG_FLOPPY_DRIVE_ADD("fdc:1", swtpc09_floppies, "dd", swtpc09_state::floppy_formats) @@ -218,7 +218,7 @@ static MACHINE_CONFIG_START( swtpc09d3, swtpc09_state ) MCFG_DEVICE_ADD("acia_clock", CLOCK, 153600) MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE(swtpc09_state, write_acia_clock)) - MCFG_FD1793x_ADD("fdc", XTAL_1MHz) + MCFG_FD1793_ADD("fdc", XTAL_1MHz) MCFG_FLOPPY_DRIVE_ADD("fdc:0", swtpc09_floppies, "dd", swtpc09_state::floppy_formats) MCFG_FLOPPY_DRIVE_ADD("fdc:1", swtpc09_floppies, "dd", swtpc09_state::floppy_formats) diff --git a/src/mess/drivers/tavernie.c b/src/mess/drivers/tavernie.c index beba6c63099..06a4efcbfc8 100644 --- a/src/mess/drivers/tavernie.c +++ b/src/mess/drivers/tavernie.c @@ -371,7 +371,7 @@ static MACHINE_CONFIG_DERIVED( ivg09, cpu09 ) MCFG_PIA_WRITEPA_HANDLER(WRITE8(tavernie_state, pa_ivg_w)) MCFG_PIA_CB2_HANDLER(DEVWRITELINE("beeper", beep_device, set_state)) - MCFG_FD1795x_ADD("fdc", XTAL_8MHz / 8) + MCFG_FD1795_ADD("fdc", XTAL_8MHz / 8) MCFG_FLOPPY_DRIVE_ADD("fdc:0", ifd09_floppies, "525dd", floppy_image_device::default_floppy_formats) MACHINE_CONFIG_END diff --git a/src/mess/drivers/tdv2324.c b/src/mess/drivers/tdv2324.c index 09a69054036..2597c11dd85 100644 --- a/src/mess/drivers/tdv2324.c +++ b/src/mess/drivers/tdv2324.c @@ -287,7 +287,7 @@ static MACHINE_CONFIG_START( tdv2324, tdv2324_state ) MCFG_Z80SIO2_ADD(MK3887N4_TAG, 8000000/2, 0, 0, 0, 0) - MCFG_FD1797x_ADD(FD1797PL02_TAG, 8000000/4) + MCFG_FD1797_ADD(FD1797PL02_TAG, 8000000/4) MCFG_FLOPPY_DRIVE_ADD(FD1797PL02_TAG":0", tdv2324_floppies, "8dsdd", floppy_image_device::default_floppy_formats) MCFG_FLOPPY_DRIVE_ADD(FD1797PL02_TAG":1", tdv2324_floppies, "8dsdd", floppy_image_device::default_floppy_formats) diff --git a/src/mess/drivers/thomson.c b/src/mess/drivers/thomson.c index f68b45762f6..663dbaf3140 100644 --- a/src/mess/drivers/thomson.c +++ b/src/mess/drivers/thomson.c @@ -661,7 +661,7 @@ static MACHINE_CONFIG_START( to7, thomson_state ) /* floppy */ MCFG_DEVICE_ADD("mc6843", MC6843, 0) - MCFG_WD2793x_ADD("wd2793", XTAL_1MHz) + MCFG_WD2793_ADD("wd2793", XTAL_1MHz) MCFG_FLOPPY_DRIVE_ADD("wd2793:0", cd90_640_floppies, "dd", thomson_state::cd90_640_formats) MCFG_FLOPPY_DRIVE_ADD("wd2793:1", cd90_640_floppies, "dd", thomson_state::cd90_640_formats) diff --git a/src/mess/drivers/tiki100.c b/src/mess/drivers/tiki100.c index ccc25745e70..b10d277eab5 100644 --- a/src/mess/drivers/tiki100.c +++ b/src/mess/drivers/tiki100.c @@ -676,7 +676,7 @@ static MACHINE_CONFIG_START( tiki100, tiki100_state ) MCFG_TIMER_DRIVER_ADD_PERIODIC("ctc", tiki100_state, ctc_tick, attotime::from_hz(XTAL_8MHz/4)) - MCFG_FD1797x_ADD(FD1797_TAG, XTAL_8MHz/8) // FD1767PL-02 or FD1797-PL + MCFG_FD1797_ADD(FD1797_TAG, XTAL_8MHz/8) // FD1767PL-02 or FD1797-PL MCFG_FLOPPY_DRIVE_ADD(FD1797_TAG":0", tiki100_floppies, "525qd", tiki100_state::floppy_formats) MCFG_FLOPPY_DRIVE_ADD(FD1797_TAG":1", tiki100_floppies, "525qd", tiki100_state::floppy_formats) diff --git a/src/mess/drivers/trs80.c b/src/mess/drivers/trs80.c index cccffe4f349..629b13e1467 100644 --- a/src/mess/drivers/trs80.c +++ b/src/mess/drivers/trs80.c @@ -600,7 +600,7 @@ static MACHINE_CONFIG_DERIVED( model1, trs80 ) // model I, level II MCFG_QUICKLOAD_ADD("quickload", trs80_state, trs80_cmd, "cmd", 0.5) - MCFG_FD1793x_ADD("fdc", XTAL_1MHz) // todo: should be fd1771 + MCFG_FD1793_ADD("fdc", XTAL_1MHz) // todo: should be fd1771 MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(trs80_state,trs80_fdc_intrq_w)) MCFG_FLOPPY_DRIVE_ADD("fdc:0", trs80_floppies, "sssd", trs80_state::floppy_formats) diff --git a/src/mess/drivers/trs80m2.c b/src/mess/drivers/trs80m2.c index 4d18448d9c3..3698a937458 100644 --- a/src/mess/drivers/trs80m2.c +++ b/src/mess/drivers/trs80m2.c @@ -722,7 +722,7 @@ static MACHINE_CONFIG_START( trs80m2, trs80m2_state ) MCFG_MC6845_OUT_VSYNC_CB(WRITELINE(trs80m2_state, vsync_w)) // devices - MCFG_FD1791x_ADD(FD1791_TAG, XTAL_8MHz/4) + MCFG_FD1791_ADD(FD1791_TAG, XTAL_8MHz/4) MCFG_WD_FDC_INTRQ_CALLBACK(DEVWRITE8(Z80PIO_TAG, z80pio_device, pa_w)) MCFG_WD_FDC_DRQ_CALLBACK(DEVWRITELINE(Z80DMA_TAG, z80dma_device, rdy_w)) MCFG_FLOPPY_DRIVE_ADD(FD1791_TAG":0", trs80m2_floppies, "8dsdd", floppy_image_device::default_floppy_formats) @@ -812,7 +812,7 @@ static MACHINE_CONFIG_START( trs80m16, trs80m16_state ) MCFG_MC6845_OUT_VSYNC_CB(WRITELINE(trs80m2_state, vsync_w)) // devices - MCFG_FD1791x_ADD(FD1791_TAG, XTAL_8MHz/4) + MCFG_FD1791_ADD(FD1791_TAG, XTAL_8MHz/4) MCFG_WD_FDC_INTRQ_CALLBACK(DEVWRITE8(Z80PIO_TAG, z80pio_device, pa_w)) MCFG_WD_FDC_DRQ_CALLBACK(DEVWRITELINE(Z80DMA_TAG, z80dma_device, rdy_w)) MCFG_FLOPPY_DRIVE_ADD(FD1791_TAG":0", trs80m2_floppies, "8dsdd", floppy_image_device::default_floppy_formats) diff --git a/src/mess/drivers/ts802.c b/src/mess/drivers/ts802.c index 89e1bb79679..0c8dea9a3ca 100644 --- a/src/mess/drivers/ts802.c +++ b/src/mess/drivers/ts802.c @@ -211,7 +211,7 @@ static MACHINE_CONFIG_START( ts802, ts802_state ) MCFG_DEVICE_ADD("z80ctc", Z80CTC, XTAL_16MHz / 4) MCFG_Z80CTC_INTR_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0)) - MCFG_FD1793x_ADD("fdc", XTAL_4MHz / 2) // unknown clock + MCFG_FD1793_ADD("fdc", XTAL_4MHz / 2) // unknown clock MCFG_FLOPPY_DRIVE_ADD("fdc:0", ts802_floppies, "525dd", floppy_image_device::default_floppy_formats) MACHINE_CONFIG_END diff --git a/src/mess/drivers/unixpc.c b/src/mess/drivers/unixpc.c index 3b8be7c72e6..87899d29dcf 100644 --- a/src/mess/drivers/unixpc.c +++ b/src/mess/drivers/unixpc.c @@ -208,7 +208,7 @@ static MACHINE_CONFIG_START( unixpc, unixpc_state ) MCFG_RAM_EXTRA_OPTIONS("2M") // floppy - MCFG_DEVICE_ADD("wd2797", WD2797x, 1000000) + MCFG_DEVICE_ADD("wd2797", WD2797, 1000000) MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(unixpc_state, wd2797_intrq_w)) MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(unixpc_state, wd2797_drq_w)) MCFG_FLOPPY_DRIVE_ADD("wd2797:0", unixpc_floppies, "525dd", floppy_image_device::default_floppy_formats) diff --git a/src/mess/drivers/v1050.c b/src/mess/drivers/v1050.c index 71b1d06018d..09cd375fc23 100644 --- a/src/mess/drivers/v1050.c +++ b/src/mess/drivers/v1050.c @@ -1091,7 +1091,7 @@ static MACHINE_CONFIG_START( v1050, v1050_state ) MCFG_DEVICE_ADD(CLOCK_SIO_TAG, CLOCK, XTAL_16MHz/4) MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE(v1050_state, write_sio_clock)) - MCFG_MB8877x_ADD(MB8877_TAG, XTAL_16MHz/16) + MCFG_MB8877_ADD(MB8877_TAG, XTAL_16MHz/16) MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(v1050_state, fdc_intrq_w)) MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(v1050_state, fdc_drq_w)) MCFG_FLOPPY_DRIVE_ADD(MB8877_TAG":0", v1050_floppies, "525qd", floppy_image_device::default_floppy_formats) diff --git a/src/mess/drivers/v6809.c b/src/mess/drivers/v6809.c index 36ef0a7663e..be3572e17b7 100644 --- a/src/mess/drivers/v6809.c +++ b/src/mess/drivers/v6809.c @@ -358,7 +358,7 @@ static MACHINE_CONFIG_START( v6809, v6809_state ) MCFG_MM58274C_MODE24(0) // 12 hour MCFG_MM58274C_DAY1(1) // monday - MCFG_MB8876x_ADD("fdc", XTAL_16MHz / 16) + MCFG_MB8876_ADD("fdc", XTAL_16MHz / 16) MCFG_FLOPPY_DRIVE_ADD("fdc:0", v6809_floppies, "525dd", floppy_image_device::default_floppy_formats) MACHINE_CONFIG_END diff --git a/src/mess/drivers/vector06.c b/src/mess/drivers/vector06.c index 444692617a5..b283c590f51 100644 --- a/src/mess/drivers/vector06.c +++ b/src/mess/drivers/vector06.c @@ -171,7 +171,7 @@ static MACHINE_CONFIG_START( vector06, vector06_state ) MCFG_CASSETTE_ADD("cassette") MCFG_CASSETTE_DEFAULT_STATE(CASSETTE_STOPPED | CASSETTE_MOTOR_ENABLED | CASSETTE_SPEAKER_ENABLED) - MCFG_FD1793x_ADD("wd1793", XTAL_1MHz) + MCFG_FD1793_ADD("wd1793", XTAL_1MHz) MCFG_FLOPPY_DRIVE_ADD("wd1793:0", vector06_floppies, "qd", vector06_state::floppy_formats) MCFG_FLOPPY_DRIVE_ADD("wd1793:1", vector06_floppies, "qd", vector06_state::floppy_formats) diff --git a/src/mess/drivers/vixen.c b/src/mess/drivers/vixen.c index 9e7eabdb57c..bc6f0230bf4 100644 --- a/src/mess/drivers/vixen.c +++ b/src/mess/drivers/vixen.c @@ -790,7 +790,7 @@ static MACHINE_CONFIG_START( vixen, vixen_state ) MCFG_RS232_RXD_HANDLER(DEVWRITELINE(P8251A_TAG, i8251_device, write_rxd)) MCFG_RS232_DSR_HANDLER(DEVWRITELINE(P8251A_TAG, i8251_device, write_dsr)) - MCFG_FD1797x_ADD(FDC1797_TAG, XTAL_23_9616MHz/24) + MCFG_FD1797_ADD(FDC1797_TAG, XTAL_23_9616MHz/24) MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(vixen_state, fdc_intrq_w)) MCFG_FLOPPY_DRIVE_ADD(FDC1797_TAG":0", vixen_floppies, "525dd", floppy_image_device::default_floppy_formats) MCFG_FLOPPY_DRIVE_ADD(FDC1797_TAG":1", vixen_floppies, "525dd", floppy_image_device::default_floppy_formats) diff --git a/src/mess/drivers/wicat.c b/src/mess/drivers/wicat.c index b556c83cda9..534bc3b5de5 100644 --- a/src/mess/drivers/wicat.c +++ b/src/mess/drivers/wicat.c @@ -895,7 +895,7 @@ static MACHINE_CONFIG_START( wicat, wicat_state ) MCFG_CPU_ADD("wd1kcpu",N8X300,XTAL_8MHz) MCFG_CPU_PROGRAM_MAP(wicat_wd1000_mem) MCFG_CPU_IO_MAP(wicat_wd1000_io) - MCFG_FD1795x_ADD("fdc",XTAL_8MHz) + MCFG_FD1795_ADD("fdc",XTAL_8MHz) MACHINE_CONFIG_END diff --git a/src/mess/drivers/x1.c b/src/mess/drivers/x1.c index 753783ff436..41e11b4e876 100644 --- a/src/mess/drivers/x1.c +++ b/src/mess/drivers/x1.c @@ -2483,7 +2483,7 @@ static MACHINE_CONFIG_START( x1, x1_state ) MCFG_VIDEO_START_OVERRIDE(x1_state,x1) - MCFG_MB8877x_ADD("fdc", MAIN_CLOCK / 16) + MCFG_MB8877_ADD("fdc", MAIN_CLOCK / 16) MCFG_FLOPPY_DRIVE_ADD("fdc:0", x1_floppies, "dd", x1_state::floppy_formats) MCFG_FLOPPY_DRIVE_ADD("fdc:1", x1_floppies, "dd", x1_state::floppy_formats) diff --git a/src/mess/drivers/x1twin.c b/src/mess/drivers/x1twin.c index c6a14a5ac36..ee9841d1ae4 100644 --- a/src/mess/drivers/x1twin.c +++ b/src/mess/drivers/x1twin.c @@ -457,7 +457,7 @@ static MACHINE_CONFIG_START( x1twin, x1twin_state ) MCFG_VIDEO_START_OVERRIDE(x1twin_state,x1) - MCFG_MB8877x_ADD("fdc", MAIN_CLOCK / 16) + MCFG_MB8877_ADD("fdc", MAIN_CLOCK / 16) MCFG_FLOPPY_DRIVE_ADD("fdc:0", x1_floppies, "dd", x1_state::floppy_formats) MCFG_FLOPPY_DRIVE_ADD("fdc:1", x1_floppies, "dd", x1_state::floppy_formats) diff --git a/src/mess/drivers/xerox820.c b/src/mess/drivers/xerox820.c index bb832463abe..3ff558b09db 100644 --- a/src/mess/drivers/xerox820.c +++ b/src/mess/drivers/xerox820.c @@ -571,7 +571,7 @@ static MACHINE_CONFIG_START( xerox820, xerox820_state ) MCFG_Z80CTC_ZC2_CB(DEVWRITELINE(Z80CTC_TAG, z80ctc_device, trg3)) //MCFG_TIMER_DRIVER_ADD_PERIODIC("ctc", xerox820_state, ctc_tick, attotime::from_hz(XTAL_20MHz/8)) - MCFG_FD1771x_ADD(FD1771_TAG, XTAL_20MHz/20) + MCFG_FD1771_ADD(FD1771_TAG, XTAL_20MHz/20) MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(xerox820_state, fdc_intrq_w)) MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(xerox820_state, fdc_drq_w)) MCFG_FLOPPY_DRIVE_ADD(FD1771_TAG":0", xerox820_floppies, "sa400", floppy_image_device::default_floppy_formats) @@ -658,7 +658,7 @@ static MACHINE_CONFIG_START( xerox820ii, xerox820ii_state ) MCFG_Z80CTC_ZC2_CB(DEVWRITELINE(Z80CTC_TAG, z80ctc_device, trg3)) //MCFG_TIMER_DRIVER_ADD_PERIODIC("ctc", xerox820_state, ctc_tick, attotime::from_hz(XTAL_16MHz/4)) - MCFG_FD1797x_ADD(FD1797_TAG, XTAL_16MHz/8) + MCFG_FD1797_ADD(FD1797_TAG, XTAL_16MHz/8) MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(xerox820_state, fdc_intrq_w)) MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(xerox820_state, fdc_drq_w)) MCFG_FLOPPY_DRIVE_ADD(FD1797_TAG":0", xerox820_floppies, "sa450", floppy_image_device::default_floppy_formats) diff --git a/src/mess/drivers/xor100.c b/src/mess/drivers/xor100.c index b45d095d94c..e3c596d61a9 100644 --- a/src/mess/drivers/xor100.c +++ b/src/mess/drivers/xor100.c @@ -552,7 +552,7 @@ static MACHINE_CONFIG_START( xor100, xor100_state ) MCFG_Z80CTC_ZC1_CB(WRITELINE(xor100_state, ctc_z1_w)) MCFG_Z80CTC_ZC2_CB(WRITELINE(xor100_state, ctc_z2_w)) - MCFG_FD1795x_ADD(WD1795_TAG, XTAL_8MHz/4) + MCFG_FD1795_ADD(WD1795_TAG, XTAL_8MHz/4) MCFG_FLOPPY_DRIVE_ADD(WD1795_TAG":0", xor100_floppies, "8ssdd", floppy_image_device::default_floppy_formats) MCFG_FLOPPY_DRIVE_ADD(WD1795_TAG":1", xor100_floppies, "8ssdd", floppy_image_device::default_floppy_formats) MCFG_FLOPPY_DRIVE_ADD(WD1795_TAG":2", xor100_floppies, NULL, floppy_image_device::default_floppy_formats) diff --git a/src/mess/drivers/z100.c b/src/mess/drivers/z100.c index 56b1ebb5b99..cf60317f96c 100644 --- a/src/mess/drivers/z100.c +++ b/src/mess/drivers/z100.c @@ -697,7 +697,7 @@ static MACHINE_CONFIG_START( z100, z100_state ) MCFG_DEVICE_ADD("pia1", PIA6821, 0) - MCFG_FD1797x_ADD("z207_fdc", XTAL_1MHz) + MCFG_FD1797_ADD("z207_fdc", XTAL_1MHz) MCFG_FLOPPY_DRIVE_ADD("z207_fdc:0", z100_floppies, "dd", floppy_image_device::default_floppy_formats) MCFG_FLOPPY_DRIVE_ADD("z207_fdc:1", z100_floppies, "dd", floppy_image_device::default_floppy_formats) diff --git a/src/mess/drivers/z80ne.c b/src/mess/drivers/z80ne.c index 019c9ef4364..e135a03197e 100644 --- a/src/mess/drivers/z80ne.c +++ b/src/mess/drivers/z80ne.c @@ -528,7 +528,7 @@ static MACHINE_CONFIG_START( z80netf, z80ne_state ) // AG = GND, GM2 = GND, GM1 = GND, GM0 = GND, CSS = GND // other lines not connected - MCFG_FD1771x_ADD("wd1771", XTAL_2MHz / 2) + MCFG_FD1771_ADD("wd1771", XTAL_2MHz / 2) MCFG_FLOPPY_DRIVE_ADD("wd1771:0", z80ne_floppies, "sssd", z80ne_state::floppy_formats) MCFG_FLOPPY_DRIVE_ADD("wd1771:1", z80ne_floppies, "sssd", z80ne_state::floppy_formats) MCFG_FLOPPY_DRIVE_ADD("wd1771:2", z80ne_floppies, NULL, z80ne_state::floppy_formats) diff --git a/src/mess/drivers/zorba.c b/src/mess/drivers/zorba.c index 149fa10004a..be61e42f06e 100644 --- a/src/mess/drivers/zorba.c +++ b/src/mess/drivers/zorba.c @@ -400,7 +400,7 @@ static MACHINE_CONFIG_START( zorba, zorba_state ) MCFG_I8275_DRAW_CHARACTER_CALLBACK_OWNER(zorba_state, zorba_update_chr) MCFG_I8275_DRQ_CALLBACK(DEVWRITELINE("dma", z80dma_device, rdy_w)) MCFG_I8275_IRQ_CALLBACK(WRITELINE(zorba_state, irq0_w)) - MCFG_FD1793x_ADD("fdc", XTAL_24MHz / 24) + MCFG_FD1793_ADD("fdc", XTAL_24MHz / 24) MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(zorba_state, fdc_intrq_w)) MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(zorba_state, fdc_drq_w)) //MCFG_WD_FDC_FORCE_READY diff --git a/src/mess/machine/beta.c b/src/mess/machine/beta.c index 6774281e26a..ef9ec771805 100644 --- a/src/mess/machine/beta.c +++ b/src/mess/machine/beta.c @@ -182,7 +182,7 @@ static SLOT_INTERFACE_START( beta_disk_floppies ) SLOT_INTERFACE_END static MACHINE_CONFIG_FRAGMENT( beta_disk ) - MCFG_KR1818VG93x_ADD("wd179x", XTAL_8MHz / 8) + MCFG_KR1818VG93_ADD("wd179x", XTAL_8MHz / 8) MCFG_FLOPPY_DRIVE_ADD("wd179x:0", beta_disk_floppies, "drive0", beta_disk_device::floppy_formats) MCFG_FLOPPY_DRIVE_ADD("wd179x:1", beta_disk_floppies, "drive1", beta_disk_device::floppy_formats) MCFG_FLOPPY_DRIVE_ADD("wd179x:2", beta_disk_floppies, "drive2", beta_disk_device::floppy_formats) |