diff options
Diffstat (limited to 'src/emu/bus')
-rw-r--r-- | src/emu/bus/a1bus/a1cassette.c | 3 | ||||
-rw-r--r-- | src/emu/bus/a2bus/a2corvus.c | 12 | ||||
-rw-r--r-- | src/emu/bus/a2bus/a2diskii.c | 8 | ||||
-rw-r--r-- | src/emu/bus/adamnet/ddp.c | 3 | ||||
-rw-r--r-- | src/emu/bus/bml3/bml3mp1802.c | 5 | ||||
-rw-r--r-- | src/emu/bus/bml3/bml3mp1805.c | 5 | ||||
-rw-r--r-- | src/emu/bus/coco/coco_fdc.c | 8 | ||||
-rw-r--r-- | src/emu/bus/ieee488/c8050.c | 16 | ||||
-rw-r--r-- | src/emu/bus/ieee488/hardbox.c | 12 | ||||
-rw-r--r-- | src/emu/bus/ieee488/softbox.c | 13 | ||||
-rw-r--r-- | src/emu/bus/pet/c2n.c | 3 | ||||
-rw-r--r-- | src/emu/bus/scsi/scsicd.c | 5 | ||||
-rw-r--r-- | src/emu/bus/scsi/scsicd.h | 2 | ||||
-rw-r--r-- | src/emu/bus/scsi/scsihd.c | 5 | ||||
-rw-r--r-- | src/emu/bus/scsi/scsihd.h | 2 | ||||
-rw-r--r-- | src/emu/bus/ti99_peb/peribox.c | 74 |
16 files changed, 97 insertions, 79 deletions
diff --git a/src/emu/bus/a1bus/a1cassette.c b/src/emu/bus/a1bus/a1cassette.c index 0b7e53a5bea..33f781229a8 100644 --- a/src/emu/bus/a1bus/a1cassette.c +++ b/src/emu/bus/a1bus/a1cassette.c @@ -27,8 +27,7 @@ static const cassette_interface apple1_cassette_interface = cassette_default_formats, NULL, (cassette_state)(CASSETTE_STOPPED), - "apple1_cass", - NULL + "apple1_cass" }; MACHINE_CONFIG_FRAGMENT( cassette ) diff --git a/src/emu/bus/a2bus/a2corvus.c b/src/emu/bus/a2bus/a2corvus.c index 783e6fe7054..44a0ae8c0b3 100644 --- a/src/emu/bus/a2bus/a2corvus.c +++ b/src/emu/bus/a2bus/a2corvus.c @@ -57,10 +57,14 @@ const device_type A2BUS_CORVUS = &device_creator<a2bus_corvus_device>; static MACHINE_CONFIG_FRAGMENT(corvus) MCFG_DEVICE_ADD(CORVUS_HD_TAG, CORVUS_HDC, 0) - MCFG_HARDDISK_CONFIG_ADD("harddisk1", corvus_hdc_t::hd_intf) - MCFG_HARDDISK_CONFIG_ADD("harddisk2", corvus_hdc_t::hd_intf) - MCFG_HARDDISK_CONFIG_ADD("harddisk3", corvus_hdc_t::hd_intf) - MCFG_HARDDISK_CONFIG_ADD("harddisk4", corvus_hdc_t::hd_intf) + MCFG_HARDDISK_ADD("harddisk1") + MCFG_HARDDISK_INTERFACE("corvus_hdd") + MCFG_HARDDISK_ADD("harddisk2") + MCFG_HARDDISK_INTERFACE("corvus_hdd") + MCFG_HARDDISK_ADD("harddisk3") + MCFG_HARDDISK_INTERFACE("corvus_hdd") + MCFG_HARDDISK_ADD("harddisk4") + MCFG_HARDDISK_INTERFACE("corvus_hdd") MACHINE_CONFIG_END ROM_START( corvus ) diff --git a/src/emu/bus/a2bus/a2diskii.c b/src/emu/bus/a2bus/a2diskii.c index 5f0bcd11f87..b896acc2fda 100644 --- a/src/emu/bus/a2bus/a2diskii.c +++ b/src/emu/bus/a2bus/a2diskii.c @@ -41,15 +41,9 @@ const applefdc_interface fdc_interface = static const floppy_interface floppy_interface = { - DEVCB_NULL, - DEVCB_NULL, - DEVCB_NULL, - DEVCB_NULL, - DEVCB_NULL, FLOPPY_STANDARD_5_25_DSHD, LEGACY_FLOPPY_OPTIONS_NAME(apple2), - "floppy_5_25", - NULL + "floppy_5_25" }; MACHINE_CONFIG_FRAGMENT( diskii ) diff --git a/src/emu/bus/adamnet/ddp.c b/src/emu/bus/adamnet/ddp.c index 8755d266f5e..5cc71853953 100644 --- a/src/emu/bus/adamnet/ddp.c +++ b/src/emu/bus/adamnet/ddp.c @@ -88,8 +88,7 @@ static const cassette_interface adam_cassette_interface = coleco_adam_cassette_formats, &adam_cassette_options, (cassette_state)(CASSETTE_PLAY | CASSETTE_MOTOR_DISABLED | CASSETTE_SPEAKER_MUTED), - "adam_cass", - NULL + "adam_cass" }; diff --git a/src/emu/bus/bml3/bml3mp1802.c b/src/emu/bus/bml3/bml3mp1802.c index be953016fc4..fb00f9d7acd 100644 --- a/src/emu/bus/bml3/bml3mp1802.c +++ b/src/emu/bus/bml3/bml3mp1802.c @@ -23,11 +23,6 @@ const device_type BML3BUS_MP1802 = &device_creator<bml3bus_mp1802_device>; static const floppy_interface bml3_mp1802_floppy_interface = { - DEVCB_NULL, - DEVCB_NULL, - DEVCB_NULL, - DEVCB_NULL, - DEVCB_NULL, FLOPPY_STANDARD_5_25_DSDD, LEGACY_FLOPPY_OPTIONS_NAME(default), NULL diff --git a/src/emu/bus/bml3/bml3mp1805.c b/src/emu/bus/bml3/bml3mp1805.c index 7b679d4881c..225a48d254f 100644 --- a/src/emu/bus/bml3/bml3mp1805.c +++ b/src/emu/bus/bml3/bml3mp1805.c @@ -23,11 +23,6 @@ const device_type BML3BUS_MP1805 = &device_creator<bml3bus_mp1805_device>; static const floppy_interface bml3_mp1805_floppy_interface = { - DEVCB_NULL, - DEVCB_NULL, - DEVCB_NULL, - DEVCB_NULL, - DEVCB_NULL, FLOPPY_STANDARD_3_SSDD, LEGACY_FLOPPY_OPTIONS_NAME(default), NULL diff --git a/src/emu/bus/coco/coco_fdc.c b/src/emu/bus/coco/coco_fdc.c index 305622c5873..190ca2585e4 100644 --- a/src/emu/bus/coco/coco_fdc.c +++ b/src/emu/bus/coco/coco_fdc.c @@ -94,15 +94,9 @@ static const floppy_interface coco_floppy_interface = { - DEVCB_NULL, - DEVCB_NULL, - DEVCB_NULL, - DEVCB_NULL, - DEVCB_NULL, FLOPPY_STANDARD_5_25_DSHD, LEGACY_FLOPPY_OPTIONS_NAME(coco), - "floppy_5_25", - NULL + "floppy_5_25" }; diff --git a/src/emu/bus/ieee488/c8050.c b/src/emu/bus/ieee488/c8050.c index 262b70aa693..22cf3eda78f 100644 --- a/src/emu/bus/ieee488/c8050.c +++ b/src/emu/bus/ieee488/c8050.c @@ -684,15 +684,9 @@ LEGACY_FLOPPY_OPTIONS_END static const floppy_interface c8050_floppy_interface = { - DEVCB_NULL, - DEVCB_NULL, - DEVCB_NULL, - DEVCB_NULL, - DEVCB_NULL, FLOPPY_STANDARD_5_25_SSDD, LEGACY_FLOPPY_OPTIONS_NAME(c8050), - "floppy_5_25", - NULL + "floppy_5_25" }; @@ -702,15 +696,9 @@ static const floppy_interface c8050_floppy_interface = static const floppy_interface c8250_floppy_interface = { - DEVCB_NULL, - DEVCB_NULL, - DEVCB_NULL, - DEVCB_NULL, - DEVCB_NULL, FLOPPY_STANDARD_5_25_DSQD, LEGACY_FLOPPY_OPTIONS_NAME(c8250), - "floppy_5_25", - NULL + "floppy_5_25" }; diff --git a/src/emu/bus/ieee488/hardbox.c b/src/emu/bus/ieee488/hardbox.c index 9564c870b9d..ce6ff83557f 100644 --- a/src/emu/bus/ieee488/hardbox.c +++ b/src/emu/bus/ieee488/hardbox.c @@ -286,10 +286,14 @@ static MACHINE_CONFIG_FRAGMENT( hardbox ) MCFG_I8255_OUT_PORTC_CB(WRITE8(hardbox_device, ppi1_pc_w)) MCFG_DEVICE_ADD(CORVUS_HDC_TAG, CORVUS_HDC, 0) - MCFG_HARDDISK_CONFIG_ADD("harddisk1", corvus_hdc_t::hd_intf) - MCFG_HARDDISK_CONFIG_ADD("harddisk2", corvus_hdc_t::hd_intf) - MCFG_HARDDISK_CONFIG_ADD("harddisk3", corvus_hdc_t::hd_intf) - MCFG_HARDDISK_CONFIG_ADD("harddisk4", corvus_hdc_t::hd_intf) + MCFG_HARDDISK_ADD("harddisk1") + MCFG_HARDDISK_INTERFACE("corvus_hdd") + MCFG_HARDDISK_ADD("harddisk2") + MCFG_HARDDISK_INTERFACE("corvus_hdd") + MCFG_HARDDISK_ADD("harddisk3") + MCFG_HARDDISK_INTERFACE("corvus_hdd") + MCFG_HARDDISK_ADD("harddisk4") + MCFG_HARDDISK_INTERFACE("corvus_hdd") MACHINE_CONFIG_END diff --git a/src/emu/bus/ieee488/softbox.c b/src/emu/bus/ieee488/softbox.c index 2d129e3979e..09c2d30f03a 100644 --- a/src/emu/bus/ieee488/softbox.c +++ b/src/emu/bus/ieee488/softbox.c @@ -264,11 +264,14 @@ static MACHINE_CONFIG_FRAGMENT( softbox ) MCFG_COM8116_FT_HANDLER(DEVWRITELINE(I8251_TAG, i8251_device, write_txc)) MCFG_DEVICE_ADD(CORVUS_HDC_TAG, CORVUS_HDC, 0) - MCFG_HARDDISK_CONFIG_ADD("harddisk1", corvus_hdc_t::hd_intf) - MCFG_HARDDISK_CONFIG_ADD("harddisk2", corvus_hdc_t::hd_intf) - MCFG_HARDDISK_CONFIG_ADD("harddisk3", corvus_hdc_t::hd_intf) - MCFG_HARDDISK_CONFIG_ADD("harddisk4", corvus_hdc_t::hd_intf) - + MCFG_HARDDISK_ADD("harddisk1") + MCFG_HARDDISK_INTERFACE("corvus_hdd") + MCFG_HARDDISK_ADD("harddisk2") + MCFG_HARDDISK_INTERFACE("corvus_hdd") + MCFG_HARDDISK_ADD("harddisk3") + MCFG_HARDDISK_INTERFACE("corvus_hdd") + MCFG_HARDDISK_ADD("harddisk4") + MCFG_HARDDISK_INTERFACE("corvus_hdd") //MCFG_IMI7000_BUS_ADD("imi5000h", NULL, NULL, NULL) MACHINE_CONFIG_END diff --git a/src/emu/bus/pet/c2n.c b/src/emu/bus/pet/c2n.c index ad139e7730d..64b4e40ffed 100644 --- a/src/emu/bus/pet/c2n.c +++ b/src/emu/bus/pet/c2n.c @@ -31,8 +31,7 @@ const cassette_interface cbm_cassette_interface = cbm_cassette_formats, NULL, (cassette_state) (CASSETTE_STOPPED | CASSETTE_MOTOR_DISABLED | CASSETTE_SPEAKER_MUTED), - "cbm_cass", - NULL + "cbm_cass" }; diff --git a/src/emu/bus/scsi/scsicd.c b/src/emu/bus/scsi/scsicd.c index 0ae5b97dce6..fb1f1cafbd2 100644 --- a/src/emu/bus/scsi/scsicd.c +++ b/src/emu/bus/scsi/scsicd.c @@ -29,10 +29,9 @@ void scsicd_device::device_start() scsihle_device::device_start(); } -cdrom_interface scsicd_device::cd_intf = { "cdrom", NULL }; - static MACHINE_CONFIG_FRAGMENT(scsi_cdrom) - MCFG_CDROM_ADD("image", scsicd_device::cd_intf) + MCFG_CDROM_ADD("image") + MCFG_CDROM_INTERFACE("cdrom") MCFG_SOUND_ADD("cdda", CDDA, 0) MACHINE_CONFIG_END diff --git a/src/emu/bus/scsi/scsicd.h b/src/emu/bus/scsi/scsicd.h index 67e10df2572..e8de6d4b080 100644 --- a/src/emu/bus/scsi/scsicd.h +++ b/src/emu/bus/scsi/scsicd.h @@ -21,8 +21,6 @@ public: scsicd_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); virtual machine_config_constructor device_mconfig_additions() const; - static struct cdrom_interface cd_intf; - protected: virtual void device_start(); }; diff --git a/src/emu/bus/scsi/scsihd.c b/src/emu/bus/scsi/scsihd.c index 637dacfcab9..3534146999a 100644 --- a/src/emu/bus/scsi/scsihd.c +++ b/src/emu/bus/scsi/scsihd.c @@ -28,10 +28,9 @@ void scsihd_device::device_start() scsihle_device::device_start(); } -harddisk_interface scsihd_device::hd_intf = { "scsi_hdd", NULL }; - static MACHINE_CONFIG_FRAGMENT(scsi_harddisk) - MCFG_HARDDISK_CONFIG_ADD("image", scsihd_device::hd_intf) + MCFG_HARDDISK_ADD("image") + MCFG_HARDDISK_INTERFACE("scsi_hdd") MACHINE_CONFIG_END machine_config_constructor scsihd_device::device_mconfig_additions() const diff --git a/src/emu/bus/scsi/scsihd.h b/src/emu/bus/scsi/scsihd.h index de64e099c4b..6b6362480a3 100644 --- a/src/emu/bus/scsi/scsihd.h +++ b/src/emu/bus/scsi/scsihd.h @@ -21,8 +21,6 @@ public: scsihd_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); virtual machine_config_constructor device_mconfig_additions() const; - static struct harddisk_interface hd_intf; - protected: virtual void device_start(); }; diff --git a/src/emu/bus/ti99_peb/peribox.c b/src/emu/bus/ti99_peb/peribox.c index 32434090b19..63f3c93b135 100644 --- a/src/emu/bus/ti99_peb/peribox.c +++ b/src/emu/bus/ti99_peb/peribox.c @@ -225,15 +225,9 @@ CRUCLK* 51||52 DBIN // TODO: Connect other lines (think about how to propagate to the controller) static const floppy_interface ti99_4_floppy_interface = { - DEVCB_DEVICE_LINE_MEMBER( DEVICE_SELF_OWNER, peribox_device, indexhole ), // Index hole (floppy out, line) - DEVCB_NULL, // Motor (floppy in, line) - DEVCB_NULL, // Track 0 (out, line) - DEVCB_NULL, // Write protect (out, line) - DEVCB_NULL, // Ready (out, line) FLOPPY_STANDARD_5_25_DSHD, // type LEGACY_FLOPPY_OPTIONS_NAME(ti99), // image formats - NULL, // interface - NULL // display info + NULL // interface }; peribox_device::peribox_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) @@ -457,7 +451,19 @@ MACHINE_CONFIG_FRAGMENT( peribox_device ) MCFG_PERIBOX_SLOT_ADD( PEBSLOT7, peribox_slot7 ) MCFG_PERIBOX_SLOT_ADD( PEBSLOT8, peribox_slot8 ) - MCFG_LEGACY_FLOPPY_4_DRIVES_ADD(ti99_4_floppy_interface) + MCFG_DEVICE_ADD(FLOPPY_0, LEGACY_FLOPPY, 0) + MCFG_DEVICE_CONFIG(ti99_4_floppy_interface) + MCFG_LEGACY_FLOPPY_IDX_CB(WRITELINE(peribox_device, indexhole)) + MCFG_DEVICE_ADD(FLOPPY_1, LEGACY_FLOPPY, 0) + MCFG_DEVICE_CONFIG(ti99_4_floppy_interface) + MCFG_LEGACY_FLOPPY_IDX_CB(WRITELINE(peribox_device, indexhole)) + MCFG_DEVICE_ADD(FLOPPY_2, LEGACY_FLOPPY, 0) + MCFG_DEVICE_CONFIG(ti99_4_floppy_interface) + MCFG_LEGACY_FLOPPY_IDX_CB(WRITELINE(peribox_device, indexhole)) + MCFG_DEVICE_ADD(FLOPPY_3, LEGACY_FLOPPY, 0) + MCFG_DEVICE_CONFIG(ti99_4_floppy_interface) + MCFG_LEGACY_FLOPPY_IDX_CB(WRITELINE(peribox_device, indexhole)) + MCFG_MFMHD_3_DRIVES_ADD() MACHINE_CONFIG_END @@ -512,7 +518,18 @@ MACHINE_CONFIG_FRAGMENT( peribox_gen_device ) MCFG_PERIBOX_SLOT_ADD( PEBSLOT7, peribox_slot7nobwg ) MCFG_PERIBOX_SLOT_ADD( PEBSLOT8, peribox_slot8nobwg ) - MCFG_LEGACY_FLOPPY_4_DRIVES_ADD(ti99_4_floppy_interface) + MCFG_DEVICE_ADD(FLOPPY_0, LEGACY_FLOPPY, 0) + MCFG_DEVICE_CONFIG(ti99_4_floppy_interface) + MCFG_LEGACY_FLOPPY_IDX_CB(WRITELINE(peribox_device, indexhole)) + MCFG_DEVICE_ADD(FLOPPY_1, LEGACY_FLOPPY, 0) + MCFG_DEVICE_CONFIG(ti99_4_floppy_interface) + MCFG_LEGACY_FLOPPY_IDX_CB(WRITELINE(peribox_device, indexhole)) + MCFG_DEVICE_ADD(FLOPPY_2, LEGACY_FLOPPY, 0) + MCFG_DEVICE_CONFIG(ti99_4_floppy_interface) + MCFG_LEGACY_FLOPPY_IDX_CB(WRITELINE(peribox_device, indexhole)) + MCFG_DEVICE_ADD(FLOPPY_3, LEGACY_FLOPPY, 0) + MCFG_DEVICE_CONFIG(ti99_4_floppy_interface) + MCFG_LEGACY_FLOPPY_IDX_CB(WRITELINE(peribox_device, indexhole)) MCFG_MFMHD_3_DRIVES_ADD() MACHINE_CONFIG_END @@ -554,7 +571,18 @@ MACHINE_CONFIG_FRAGMENT( peribox_998_device ) MCFG_PERIBOX_SLOT_ADD( PEBSLOT7, peribox_slot998 ) MCFG_PERIBOX_SLOT_ADD( PEBSLOT8, peribox_slot8nobwg ) - MCFG_LEGACY_FLOPPY_4_DRIVES_ADD(ti99_4_floppy_interface) + MCFG_DEVICE_ADD(FLOPPY_0, LEGACY_FLOPPY, 0) + MCFG_DEVICE_CONFIG(ti99_4_floppy_interface) + MCFG_LEGACY_FLOPPY_IDX_CB(WRITELINE(peribox_device, indexhole)) + MCFG_DEVICE_ADD(FLOPPY_1, LEGACY_FLOPPY, 0) + MCFG_DEVICE_CONFIG(ti99_4_floppy_interface) + MCFG_LEGACY_FLOPPY_IDX_CB(WRITELINE(peribox_device, indexhole)) + MCFG_DEVICE_ADD(FLOPPY_2, LEGACY_FLOPPY, 0) + MCFG_DEVICE_CONFIG(ti99_4_floppy_interface) + MCFG_LEGACY_FLOPPY_IDX_CB(WRITELINE(peribox_device, indexhole)) + MCFG_DEVICE_ADD(FLOPPY_3, LEGACY_FLOPPY, 0) + MCFG_DEVICE_CONFIG(ti99_4_floppy_interface) + MCFG_LEGACY_FLOPPY_IDX_CB(WRITELINE(peribox_device, indexhole)) MCFG_MFMHD_3_DRIVES_ADD() MACHINE_CONFIG_END @@ -597,7 +625,18 @@ MACHINE_CONFIG_FRAGMENT( peribox_sg_device ) MCFG_PERIBOX_SLOT_ADD( PEBSLOT7, peribox_slot7 ) MCFG_PERIBOX_SLOT_ADD( PEBSLOT8, peribox_slot7 ) - MCFG_LEGACY_FLOPPY_4_DRIVES_ADD(ti99_4_floppy_interface) + MCFG_DEVICE_ADD(FLOPPY_0, LEGACY_FLOPPY, 0) + MCFG_DEVICE_CONFIG(ti99_4_floppy_interface) + MCFG_LEGACY_FLOPPY_IDX_CB(WRITELINE(peribox_device, indexhole)) + MCFG_DEVICE_ADD(FLOPPY_1, LEGACY_FLOPPY, 0) + MCFG_DEVICE_CONFIG(ti99_4_floppy_interface) + MCFG_LEGACY_FLOPPY_IDX_CB(WRITELINE(peribox_device, indexhole)) + MCFG_DEVICE_ADD(FLOPPY_2, LEGACY_FLOPPY, 0) + MCFG_DEVICE_CONFIG(ti99_4_floppy_interface) + MCFG_LEGACY_FLOPPY_IDX_CB(WRITELINE(peribox_device, indexhole)) + MCFG_DEVICE_ADD(FLOPPY_3, LEGACY_FLOPPY, 0) + MCFG_DEVICE_CONFIG(ti99_4_floppy_interface) + MCFG_LEGACY_FLOPPY_IDX_CB(WRITELINE(peribox_device, indexhole)) MCFG_MFMHD_3_DRIVES_ADD() MACHINE_CONFIG_END @@ -627,7 +666,18 @@ MACHINE_CONFIG_FRAGMENT( peribox_ev_device ) MCFG_PERIBOX_SLOT_ADD( PEBSLOT7, peribox_slot7 ) MCFG_PERIBOX_SLOT_ADD( PEBSLOT8, peribox_slot8 ) - MCFG_LEGACY_FLOPPY_4_DRIVES_ADD(ti99_4_floppy_interface) + MCFG_DEVICE_ADD(FLOPPY_0, LEGACY_FLOPPY, 0) + MCFG_DEVICE_CONFIG(ti99_4_floppy_interface) + MCFG_LEGACY_FLOPPY_IDX_CB(WRITELINE(peribox_device, indexhole)) + MCFG_DEVICE_ADD(FLOPPY_1, LEGACY_FLOPPY, 0) + MCFG_DEVICE_CONFIG(ti99_4_floppy_interface) + MCFG_LEGACY_FLOPPY_IDX_CB(WRITELINE(peribox_device, indexhole)) + MCFG_DEVICE_ADD(FLOPPY_2, LEGACY_FLOPPY, 0) + MCFG_DEVICE_CONFIG(ti99_4_floppy_interface) + MCFG_LEGACY_FLOPPY_IDX_CB(WRITELINE(peribox_device, indexhole)) + MCFG_DEVICE_ADD(FLOPPY_3, LEGACY_FLOPPY, 0) + MCFG_DEVICE_CONFIG(ti99_4_floppy_interface) + MCFG_LEGACY_FLOPPY_IDX_CB(WRITELINE(peribox_device, indexhole)) MCFG_MFMHD_3_DRIVES_ADD() MACHINE_CONFIG_END |