diff options
Diffstat (limited to 'src/mess/drivers')
-rw-r--r-- | src/mess/drivers/abc1600.c | 2 | ||||
-rw-r--r-- | src/mess/drivers/bebox.c | 4 | ||||
-rw-r--r-- | src/mess/drivers/bullet.c | 6 | ||||
-rw-r--r-- | src/mess/drivers/fmtowns.c | 22 | ||||
-rw-r--r-- | src/mess/drivers/ip20.c | 8 | ||||
-rw-r--r-- | src/mess/drivers/ip22.c | 10 | ||||
-rw-r--r-- | src/mess/drivers/mac.c | 42 | ||||
-rw-r--r-- | src/mess/drivers/rmnimbus.c | 18 | ||||
-rw-r--r-- | src/mess/drivers/v1050.c | 6 | ||||
-rw-r--r-- | src/mess/drivers/x68k.c | 58 |
10 files changed, 89 insertions, 87 deletions
diff --git a/src/mess/drivers/abc1600.c b/src/mess/drivers/abc1600.c index 846a4744a0c..ec2cd182a81 100644 --- a/src/mess/drivers/abc1600.c +++ b/src/mess/drivers/abc1600.c @@ -1932,7 +1932,7 @@ static MACHINE_CONFIG_START( abc1600, abc1600_state ) MCFG_E0516_ADD(E050_C16PC_TAG, XTAL_32_768kHz) MCFG_FD1797_ADD(SAB1797_02P_TAG, fdc_intf) MCFG_LEGACY_FLOPPY_DRIVE_ADD(FLOPPY_0, abc1600_floppy_interface) - MCFG_DEVICE_ADD("harddisk0", SCSIHD, 0) + MCFG_SCSIDEV_ADD("harddisk0", SCSIHD, SCSI_ID_0) MCFG_ABC99_ADD(abc99_intf) MCFG_S1410_ADD() diff --git a/src/mess/drivers/bebox.c b/src/mess/drivers/bebox.c index 24b1aeb48e6..c7fed540789 100644 --- a/src/mess/drivers/bebox.c +++ b/src/mess/drivers/bebox.c @@ -154,8 +154,8 @@ static MACHINE_CONFIG_START( bebox, bebox_state ) MCFG_FUJITSU_29F016A_ADD("flash") - MCFG_DEVICE_ADD("harddisk1", SCSIHD, 0) - MCFG_DEVICE_ADD("cdrom", SCSICD, 0) + MCFG_SCSIDEV_ADD("harddisk1", SCSIHD, SCSI_ID_0) + MCFG_SCSIDEV_ADD("cdrom", SCSICD, SCSI_ID_3) MCFG_IDE_CONTROLLER_ADD( "ide", bebox_ide_interrupt, ide_image_devices, "hdd", NULL, false ) /* FIXME */ diff --git a/src/mess/drivers/bullet.c b/src/mess/drivers/bullet.c index 12fc73c28a0..45ee2a08ec0 100644 --- a/src/mess/drivers/bullet.c +++ b/src/mess/drivers/bullet.c @@ -1026,9 +1026,9 @@ static const wd17xx_interface bulletf_fdc_intf = static const SCSIConfigTable scsi_dev_table = { - 1, + 1, /* 1 SCSI device */ { - { SCSI_ID_0, "harddisk0" } + { "harddisk0" } } }; @@ -1215,7 +1215,7 @@ static MACHINE_CONFIG_START( bulletf, bulletf_state ) MCFG_CENTRONICS_PRINTER_ADD(CENTRONICS_TAG, standard_centronics) MCFG_SERIAL_TERMINAL_ADD(TERMINAL_TAG, terminal_intf, 4800) MCFG_SCSIBUS_ADD(SCSIBUS_TAG, scsi_intf) - MCFG_DEVICE_ADD("harddisk0", SCSIHD, 0) + MCFG_SCSIDEV_ADD("harddisk0", SCSIHD, SCSI_ID_0) // software lists MCFG_SOFTWARE_LIST_ADD("flop_list", "wmbullet") diff --git a/src/mess/drivers/fmtowns.c b/src/mess/drivers/fmtowns.c index dd172bbf55d..f6f57893f97 100644 --- a/src/mess/drivers/fmtowns.c +++ b/src/mess/drivers/fmtowns.c @@ -2627,13 +2627,13 @@ static const rf5c68_interface rf5c68_intf = static const SCSIConfigTable towns_scsi_devtable = { - 5, /* 5 SCSI devices */ + 5, /* 5 SCSI devices */ { - { SCSI_ID_0, "harddisk0" }, - { SCSI_ID_1, "harddisk1" }, - { SCSI_ID_2, "harddisk2" }, - { SCSI_ID_3, "harddisk3" }, - { SCSI_ID_4, "harddisk4" }, + { "harddisk0" }, + { "harddisk1" }, + { "harddisk2" }, + { "harddisk3" }, + { "harddisk4" }, } }; @@ -2721,11 +2721,11 @@ static MACHINE_CONFIG_FRAGMENT( towns_base ) MCFG_CDROM_ADD("cdrom",towns_cdrom) - MCFG_DEVICE_ADD("harddisk0", SCSIHD, 0) - MCFG_DEVICE_ADD("harddisk1", SCSIHD, 0) - MCFG_DEVICE_ADD("harddisk2", SCSIHD, 0) - MCFG_DEVICE_ADD("harddisk3", SCSIHD, 0) - MCFG_DEVICE_ADD("harddisk4", SCSIHD, 0) + MCFG_SCSIDEV_ADD("harddisk0", SCSIHD, SCSI_ID_0) + MCFG_SCSIDEV_ADD("harddisk1", SCSIHD, SCSI_ID_1) + MCFG_SCSIDEV_ADD("harddisk2", SCSIHD, SCSI_ID_2) + MCFG_SCSIDEV_ADD("harddisk3", SCSIHD, SCSI_ID_3) + MCFG_SCSIDEV_ADD("harddisk4", SCSIHD, SCSI_ID_4) MCFG_FMSCSI_ADD("scsi",towns_scsi_config) MCFG_UPD71071_ADD("dma_1",towns_dma_config) diff --git a/src/mess/drivers/ip20.c b/src/mess/drivers/ip20.c index 60250f65004..7734f3bfe84 100644 --- a/src/mess/drivers/ip20.c +++ b/src/mess/drivers/ip20.c @@ -483,8 +483,10 @@ static void scsi_irq(running_machine &machine, int state) static const SCSIConfigTable dev_table = { - 1, /* 1 SCSI device */ - { { SCSI_ID_6, "cdrom" } } /* SCSI ID 6, CD-ROM */ + 1, /* 1 SCSI device */ + { + { "cdrom" } + } }; static const struct WD33C93interface scsi_intf = @@ -613,7 +615,7 @@ static MACHINE_CONFIG_START( ip204415, ip20_state ) MCFG_SCC8530_ADD("scc", 7000000, line_cb_t()) - MCFG_DEVICE_ADD("cdrom", SCSICD, 0) + MCFG_SCSIDEV_ADD("cdrom", SCSICD, SCSI_ID_6) MCFG_EEPROM_ADD("eeprom", eeprom_interface_93C56) MACHINE_CONFIG_END diff --git a/src/mess/drivers/ip22.c b/src/mess/drivers/ip22.c index 1aad2211fa5..cec6378622f 100644 --- a/src/mess/drivers/ip22.c +++ b/src/mess/drivers/ip22.c @@ -1497,10 +1497,10 @@ static void scsi_irq(running_machine &machine, int state) static const SCSIConfigTable dev_table = { - 2, /* 1 SCSI device */ + 2, /* 2 SCSI devices */ { - { SCSI_ID_1, "harddisk1" }, - { SCSI_ID_4, "cdrom" } /* SCSI ID 4, using CD 0, and it's a CD-ROM */ + { "harddisk1" }, + { "cdrom" } } }; @@ -1691,8 +1691,8 @@ static MACHINE_CONFIG_START( ip225015, ip22_state ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0) - MCFG_DEVICE_ADD("cdrom", SCSICD, 0) - MCFG_DEVICE_ADD("harddisk1", SCSIHD, 0) + MCFG_SCSIDEV_ADD("cdrom", SCSICD, SCSI_ID_4) + MCFG_SCSIDEV_ADD("harddisk1", SCSIHD, SCSI_ID_1) MACHINE_CONFIG_END static MACHINE_CONFIG_DERIVED( ip224613, ip225015 ) diff --git a/src/mess/drivers/mac.c b/src/mess/drivers/mac.c index 315f6330330..0b18c157de5 100644 --- a/src/mess/drivers/mac.c +++ b/src/mess/drivers/mac.c @@ -816,10 +816,10 @@ static const applefdc_interface mac_iwm_interface = static const SCSIConfigTable dev_table = { - 2, /* 2 SCSI devices */ + 2, /* 2 SCSI devices */ { - { SCSI_ID_6, "harddisk1" }, /* SCSI ID 6, using harddisk1 */ - { SCSI_ID_5, "harddisk2" } /* SCSI ID 5, using harddisk2 */ + { "harddisk1" }, + { "harddisk2" } } }; @@ -941,8 +941,8 @@ static MACHINE_CONFIG_DERIVED( macplus, mac512ke ) MCFG_NCR5380_ADD("ncr5380", C7M, macplus_5380intf) - MCFG_DEVICE_ADD("harddisk1", SCSIHD, 0) - MCFG_DEVICE_ADD("harddisk2", SCSIHD, 0) + MCFG_SCSIDEV_ADD("harddisk1", SCSIHD, SCSI_ID_6) + MCFG_SCSIDEV_ADD("harddisk2", SCSIHD, SCSI_ID_5) MCFG_LEGACY_FLOPPY_SONY_2_DRIVES_MODIFY(mac_floppy_interface) @@ -1006,8 +1006,8 @@ static MACHINE_CONFIG_START( macprtb, mac_state ) MCFG_SCC8530_ADD("scc", C7M, line_cb_t(FUNC(mac_state::set_scc_interrupt), static_cast<mac_state *>(owner))) MCFG_VIA6522_ADD("via6522_0", 783360, mac_via6522_intf) - MCFG_DEVICE_ADD("harddisk1", SCSIHD, 0) - MCFG_DEVICE_ADD("harddisk2", SCSIHD, 0) + MCFG_SCSIDEV_ADD("harddisk1", SCSIHD, SCSI_ID_6) + MCFG_SCSIDEV_ADD("harddisk2", SCSIHD, SCSI_ID_5) /* internal ram */ MCFG_RAM_ADD(RAM_TAG) @@ -1054,8 +1054,8 @@ static MACHINE_CONFIG_START( macii, mac_state ) MCFG_VIA6522_ADD("via6522_0", C7M/10, mac_via6522_adb_intf) MCFG_VIA6522_ADD("via6522_1", C7M/10, mac_via6522_2_intf) - MCFG_DEVICE_ADD("harddisk1", SCSIHD, 0) - MCFG_DEVICE_ADD("harddisk2", SCSIHD, 0) + MCFG_SCSIDEV_ADD("harddisk1", SCSIHD, SCSI_ID_6) + MCFG_SCSIDEV_ADD("harddisk2", SCSIHD, SCSI_ID_5) /* internal ram */ MCFG_RAM_ADD(RAM_TAG) @@ -1105,8 +1105,8 @@ static MACHINE_CONFIG_START( maciifx, mac_state ) MCFG_VIA6522_ADD("via6522_0", C7M/10, mac_via6522_adb_intf) - MCFG_DEVICE_ADD("harddisk1", SCSIHD, 0) - MCFG_DEVICE_ADD("harddisk2", SCSIHD, 0) + MCFG_SCSIDEV_ADD("harddisk1", SCSIHD, SCSI_ID_6) + MCFG_SCSIDEV_ADD("harddisk2", SCSIHD, SCSI_ID_5) /* internal ram */ MCFG_RAM_ADD(RAM_TAG) @@ -1304,8 +1304,8 @@ static MACHINE_CONFIG_START( macse30, mac_state ) MCFG_VIA6522_ADD("via6522_0", 783360, mac_via6522_adb_intf) MCFG_VIA6522_ADD("via6522_1", 783360, mac_via6522_2_intf) - MCFG_DEVICE_ADD("harddisk1", SCSIHD, 0) - MCFG_DEVICE_ADD("harddisk2", SCSIHD, 0) + MCFG_SCSIDEV_ADD("harddisk1", SCSIHD, SCSI_ID_6) + MCFG_SCSIDEV_ADD("harddisk2", SCSIHD, SCSI_ID_5) /* internal ram */ MCFG_RAM_ADD(RAM_TAG) @@ -1355,8 +1355,8 @@ static MACHINE_CONFIG_START( macpb140, mac_state ) MCFG_VIA6522_ADD("via6522_0", 783360, mac_via6522_adb_intf) MCFG_VIA6522_ADD("via6522_1", 783360, mac_via6522_2_intf) - MCFG_DEVICE_ADD("harddisk1", SCSIHD, 0) - MCFG_DEVICE_ADD("harddisk2", SCSIHD, 0) + MCFG_SCSIDEV_ADD("harddisk1", SCSIHD, SCSI_ID_6) + MCFG_SCSIDEV_ADD("harddisk2", SCSIHD, SCSI_ID_5) /* internal ram */ MCFG_RAM_ADD(RAM_TAG) @@ -1426,8 +1426,8 @@ static MACHINE_CONFIG_START( macpb160, mac_state ) MCFG_VIA6522_ADD("via6522_0", 783360, mac_via6522_adb_intf) MCFG_VIA6522_ADD("via6522_1", 783360, mac_via6522_2_intf) - MCFG_DEVICE_ADD("harddisk1", SCSIHD, 0) - MCFG_DEVICE_ADD("harddisk2", SCSIHD, 0) + MCFG_SCSIDEV_ADD("harddisk1", SCSIHD, SCSI_ID_6) + MCFG_SCSIDEV_ADD("harddisk2", SCSIHD, SCSI_ID_5) /* internal ram */ MCFG_RAM_ADD(RAM_TAG) @@ -1597,8 +1597,8 @@ static MACHINE_CONFIG_START( pwrmac, mac_state ) MCFG_VIA6522_ADD("via6522_0", 783360, mac_via6522_adb_intf) MCFG_VIA6522_ADD("via6522_1", 783360, mac_via6522_2_intf) - MCFG_DEVICE_ADD("harddisk1", SCSIHD, 0) - MCFG_DEVICE_ADD("harddisk2", SCSIHD, 0) + MCFG_SCSIDEV_ADD("harddisk1", SCSIHD, SCSI_ID_6) + MCFG_SCSIDEV_ADD("harddisk2", SCSIHD, SCSI_ID_5) /* internal ram */ MCFG_RAM_ADD(RAM_TAG) @@ -1649,8 +1649,8 @@ static MACHINE_CONFIG_START( macqd700, mac_state ) MCFG_NCR539X_ADD(MAC_539X_1_TAG, C7M, mac_539x_intf) - MCFG_DEVICE_ADD("harddisk1", SCSIHD, 0) - MCFG_DEVICE_ADD("harddisk2", SCSIHD, 0) + MCFG_SCSIDEV_ADD("harddisk1", SCSIHD, SCSI_ID_6) + MCFG_SCSIDEV_ADD("harddisk2", SCSIHD, SCSI_ID_5) /* internal ram */ MCFG_RAM_ADD(RAM_TAG) diff --git a/src/mess/drivers/rmnimbus.c b/src/mess/drivers/rmnimbus.c index e7295c87482..0e5eb1bad55 100644 --- a/src/mess/drivers/rmnimbus.c +++ b/src/mess/drivers/rmnimbus.c @@ -80,12 +80,12 @@ static const msm5205_interface msm5205_config = static const SCSIConfigTable nimbus_scsi_dev_table = { - 4, /* 4 SCSI devices */ + 4, /* 4 SCSI devices */ { - { SCSI_ID_0, HARDDISK0_TAG }, - { SCSI_ID_1, HARDDISK1_TAG }, - { SCSI_ID_2, HARDDISK2_TAG }, - { SCSI_ID_3, HARDDISK3_TAG }, + { HARDDISK0_TAG }, + { HARDDISK1_TAG }, + { HARDDISK2_TAG }, + { HARDDISK3_TAG }, } }; @@ -334,10 +334,10 @@ static MACHINE_CONFIG_START( nimbus, rmnimbus_state ) MCFG_WD2793_ADD(FDC_TAG, nimbus_wd17xx_interface ) MCFG_LEGACY_FLOPPY_4_DRIVES_ADD(nimbus_floppy_interface) - MCFG_DEVICE_ADD(HARDDISK0_TAG, SCSIHD, 0) - MCFG_DEVICE_ADD(HARDDISK1_TAG, SCSIHD, 0) - MCFG_DEVICE_ADD(HARDDISK2_TAG, SCSIHD, 0) - MCFG_DEVICE_ADD(HARDDISK3_TAG, SCSIHD, 0) + MCFG_SCSIDEV_ADD(HARDDISK0_TAG, SCSIHD, SCSI_ID_0) + MCFG_SCSIDEV_ADD(HARDDISK1_TAG, SCSIHD, SCSI_ID_1) + MCFG_SCSIDEV_ADD(HARDDISK2_TAG, SCSIHD, SCSI_ID_2) + MCFG_SCSIDEV_ADD(HARDDISK3_TAG, SCSIHD, SCSI_ID_3) MCFG_SCSIBUS_ADD(SCSIBUS_TAG, scsibus_config) MCFG_RAM_ADD(RAM_TAG) diff --git a/src/mess/drivers/v1050.c b/src/mess/drivers/v1050.c index c33f6bec171..8d8ad44e08d 100644 --- a/src/mess/drivers/v1050.c +++ b/src/mess/drivers/v1050.c @@ -991,9 +991,9 @@ static const floppy_interface v1050_floppy_interface = static const SCSIConfigTable sasi_dev_table = { - 1, + 1, /* 1 SCSI device */ { - { SCSI_ID_0, "harddisk0" } + { "harddisk0" } } }; @@ -1123,7 +1123,7 @@ static MACHINE_CONFIG_START( v1050, v1050_state ) MCFG_SCSIBUS_ADD(SASIBUS_TAG, sasi_intf) MCFG_TIMER_ADD(TIMER_ACK_TAG, sasi_ack_tick) MCFG_TIMER_ADD(TIMER_RST_TAG, sasi_rst_tick) - MCFG_DEVICE_ADD("harddisk0", SCSIHD, 0) + MCFG_SCSIDEV_ADD("harddisk0", SCSIHD, SCSI_ID_0) // keyboard MCFG_V1050_KEYBOARD_ADD() diff --git a/src/mess/drivers/x68k.c b/src/mess/drivers/x68k.c index 4f5a44dbcae..d863a37ee82 100644 --- a/src/mess/drivers/x68k.c +++ b/src/mess/drivers/x68k.c @@ -2531,15 +2531,15 @@ static const floppy_interface x68k_floppy_interface = static const SCSIConfigTable x68k_scsi_devtable = { - 7, /* 7 SCSI devices */ + 7, /* 7 SCSI devices */ { - { SCSI_ID_0, "harddisk0" }, - { SCSI_ID_1, "harddisk1" }, - { SCSI_ID_2, "harddisk2" }, - { SCSI_ID_3, "harddisk3" }, - { SCSI_ID_4, "harddisk4" }, - { SCSI_ID_5, "harddisk5" }, - { SCSI_ID_6, "harddisk6" }, + { "harddisk0" }, + { "harddisk1" }, + { "harddisk2" }, + { "harddisk3" }, + { "harddisk4" }, + { "harddisk5" }, + { "harddisk6" }, } }; @@ -2834,13 +2834,13 @@ static MACHINE_CONFIG_START( x68ksupr, x68k_state ) MCFG_CPU_PROGRAM_MAP(x68kxvi_map) MCFG_MB89352A_ADD("mb89352_int",x68k_scsi_intf) - MCFG_DEVICE_ADD("harddisk0", SCSIHD, 0) - MCFG_DEVICE_ADD("harddisk1", SCSIHD, 0) - MCFG_DEVICE_ADD("harddisk2", SCSIHD, 0) - MCFG_DEVICE_ADD("harddisk3", SCSIHD, 0) - MCFG_DEVICE_ADD("harddisk4", SCSIHD, 0) - MCFG_DEVICE_ADD("harddisk5", SCSIHD, 0) - MCFG_DEVICE_ADD("harddisk6", SCSIHD, 0) + MCFG_SCSIDEV_ADD("harddisk0", SCSIHD, SCSI_ID_0) + MCFG_SCSIDEV_ADD("harddisk1", SCSIHD, SCSI_ID_1) + MCFG_SCSIDEV_ADD("harddisk2", SCSIHD, SCSI_ID_2) + MCFG_SCSIDEV_ADD("harddisk3", SCSIHD, SCSI_ID_3) + MCFG_SCSIDEV_ADD("harddisk4", SCSIHD, SCSI_ID_4) + MCFG_SCSIDEV_ADD("harddisk5", SCSIHD, SCSI_ID_5) + MCFG_SCSIDEV_ADD("harddisk6", SCSIHD, SCSI_ID_6) MACHINE_CONFIG_END static MACHINE_CONFIG_START( x68kxvi, x68k_state ) @@ -2854,13 +2854,13 @@ static MACHINE_CONFIG_START( x68kxvi, x68k_state ) MCFG_CPU_PROGRAM_MAP(x68kxvi_map) MCFG_MB89352A_ADD("mb89352_int",x68k_scsi_intf) - MCFG_DEVICE_ADD("harddisk0", SCSIHD, 0) - MCFG_DEVICE_ADD("harddisk1", SCSIHD, 0) - MCFG_DEVICE_ADD("harddisk2", SCSIHD, 0) - MCFG_DEVICE_ADD("harddisk3", SCSIHD, 0) - MCFG_DEVICE_ADD("harddisk4", SCSIHD, 0) - MCFG_DEVICE_ADD("harddisk5", SCSIHD, 0) - MCFG_DEVICE_ADD("harddisk6", SCSIHD, 0) + MCFG_SCSIDEV_ADD("harddisk0", SCSIHD, SCSI_ID_0) + MCFG_SCSIDEV_ADD("harddisk1", SCSIHD, SCSI_ID_1) + MCFG_SCSIDEV_ADD("harddisk2", SCSIHD, SCSI_ID_2) + MCFG_SCSIDEV_ADD("harddisk3", SCSIHD, SCSI_ID_3) + MCFG_SCSIDEV_ADD("harddisk4", SCSIHD, SCSI_ID_4) + MCFG_SCSIDEV_ADD("harddisk5", SCSIHD, SCSI_ID_5) + MCFG_SCSIDEV_ADD("harddisk6", SCSIHD, SCSI_ID_6) MACHINE_CONFIG_END static MACHINE_CONFIG_START( x68030, x68k_state ) @@ -2875,13 +2875,13 @@ static MACHINE_CONFIG_START( x68030, x68k_state ) MCFG_NVRAM_ADD_0FILL("nvram32") MCFG_MB89352A_ADD("mb89352_int",x68k_scsi_intf) - MCFG_DEVICE_ADD("harddisk0", SCSIHD, 0) - MCFG_DEVICE_ADD("harddisk1", SCSIHD, 0) - MCFG_DEVICE_ADD("harddisk2", SCSIHD, 0) - MCFG_DEVICE_ADD("harddisk3", SCSIHD, 0) - MCFG_DEVICE_ADD("harddisk4", SCSIHD, 0) - MCFG_DEVICE_ADD("harddisk5", SCSIHD, 0) - MCFG_DEVICE_ADD("harddisk6", SCSIHD, 0) + MCFG_SCSIDEV_ADD("harddisk0", SCSIHD, SCSI_ID_0) + MCFG_SCSIDEV_ADD("harddisk1", SCSIHD, SCSI_ID_1) + MCFG_SCSIDEV_ADD("harddisk2", SCSIHD, SCSI_ID_2) + MCFG_SCSIDEV_ADD("harddisk3", SCSIHD, SCSI_ID_3) + MCFG_SCSIDEV_ADD("harddisk4", SCSIHD, SCSI_ID_4) + MCFG_SCSIDEV_ADD("harddisk5", SCSIHD, SCSI_ID_5) + MCFG_SCSIDEV_ADD("harddisk6", SCSIHD, SCSI_ID_6) MACHINE_CONFIG_END ROM_START( x68000 ) |