summaryrefslogtreecommitdiffstatshomepage
path: root/src/mess/machine
diff options
context:
space:
mode:
Diffstat (limited to 'src/mess/machine')
-rw-r--r--src/mess/machine/abc_hdc.c6
-rw-r--r--src/mess/machine/abc_xebec.c6
-rw-r--r--src/mess/machine/bebox.c4
-rw-r--r--src/mess/machine/d9060.c6
-rw-r--r--src/mess/machine/e01.c6
-rw-r--r--src/mess/machine/fm_scsi.c3
-rw-r--r--src/mess/machine/lux4105.c4
-rw-r--r--src/mess/machine/mb89352.c3
-rw-r--r--src/mess/machine/ncr5380.c3
-rw-r--r--src/mess/machine/scsibus.c3
-rw-r--r--src/mess/machine/x68k_scsiext.c28
11 files changed, 38 insertions, 34 deletions
diff --git a/src/mess/machine/abc_hdc.c b/src/mess/machine/abc_hdc.c
index 3241f07abc9..4acbb0ab8d4 100644
--- a/src/mess/machine/abc_hdc.c
+++ b/src/mess/machine/abc_hdc.c
@@ -90,9 +90,9 @@ static const z80_daisy_config daisy_chain[] =
static const SCSIConfigTable sasi_dev_table =
{
- 1,
+ 1, /* 1 SCSI device */
{
- { SCSI_ID_0, "harddisk0" }
+ { "harddisk0" }
}
};
@@ -121,7 +121,7 @@ static MACHINE_CONFIG_FRAGMENT( abc_hdc )
MCFG_CPU_CONFIG(daisy_chain)
MCFG_SCSIBUS_ADD(SASIBUS_TAG, sasi_intf)
- MCFG_DEVICE_ADD("harddisk0", SCSIHD, 0)
+ MCFG_SCSIDEV_ADD("harddisk0", SCSIHD, SCSI_ID_0)
MACHINE_CONFIG_END
diff --git a/src/mess/machine/abc_xebec.c b/src/mess/machine/abc_xebec.c
index 80b995c65fd..9688eb5ec4e 100644
--- a/src/mess/machine/abc_xebec.c
+++ b/src/mess/machine/abc_xebec.c
@@ -83,9 +83,9 @@ static const z80_daisy_config daisy_chain[] =
static const SCSIConfigTable sasi_dev_table =
{
- 1,
+ 1, /* 1 SCSI device */
{
- { SCSI_ID_0, "harddisk0" }
+ { "harddisk0" }
}
};
@@ -114,7 +114,7 @@ static MACHINE_CONFIG_FRAGMENT( abc_xebec )
MCFG_CPU_CONFIG(daisy_chain)
MCFG_SCSIBUS_ADD(SASIBUS_TAG, sasi_intf)
- MCFG_DEVICE_ADD("harddisk0", SCSIHD, 0)
+ MCFG_SCSIDEV_ADD("harddisk0", SCSIHD, SCSI_ID_0)
MACHINE_CONFIG_END
diff --git a/src/mess/machine/bebox.c b/src/mess/machine/bebox.c
index 3e7200e17c0..3e6e022952b 100644
--- a/src/mess/machine/bebox.c
+++ b/src/mess/machine/bebox.c
@@ -994,8 +994,8 @@ static const SCSIConfigTable dev_table =
{
2, /* 2 SCSI devices */
{
- { SCSI_ID_0, "harddisk1" }, /* SCSI ID 0, using HD 0, HD */
- { SCSI_ID_3, "cdrom" } /* SCSI ID 3, using CHD 0, CD-ROM */
+ { "harddisk1" },
+ { "cdrom" }
}
};
diff --git a/src/mess/machine/d9060.c b/src/mess/machine/d9060.c
index 3d6f720ca1d..04efee53579 100644
--- a/src/mess/machine/d9060.c
+++ b/src/mess/machine/d9060.c
@@ -145,9 +145,9 @@ ADDRESS_MAP_END
static const SCSIConfigTable sasi_dev_table =
{
- 1,
+ 1, /* 1 SCSI device */
{
- { SCSI_ID_0, "harddisk0" }
+ { "harddisk0" }
}
};
@@ -473,7 +473,7 @@ static MACHINE_CONFIG_FRAGMENT( d9060 )
MCFG_VIA6522_ADD(M6522_TAG, XTAL_4MHz/4, via_intf)
MCFG_SCSIBUS_ADD(SASIBUS_TAG, sasi_intf)
- MCFG_DEVICE_ADD("harddisk0", SCSIHD, 0)
+ MCFG_SCSIDEV_ADD("harddisk0", SCSIHD, SCSI_ID_0)
MACHINE_CONFIG_END
diff --git a/src/mess/machine/e01.c b/src/mess/machine/e01.c
index df6ed750491..8b54f8b4236 100644
--- a/src/mess/machine/e01.c
+++ b/src/mess/machine/e01.c
@@ -264,9 +264,9 @@ static const wd17xx_interface fdc_intf =
static const SCSIConfigTable scsi_dev_table =
{
- 1,
+ 1, /* 1 SCSI device */
{
- { SCSI_ID_0, "harddisk0" }
+ { "harddisk0" }
}
};
@@ -357,7 +357,7 @@ static MACHINE_CONFIG_FRAGMENT( e01 )
MCFG_CENTRONICS_PRINTER_ADD(CENTRONICS_TAG, e01_centronics_intf)
MCFG_SCSIBUS_ADD(SCSIBUS_TAG, scsi_intf)
- MCFG_DEVICE_ADD("harddisk0", SCSIHD, 0)
+ MCFG_SCSIDEV_ADD("harddisk0", SCSIHD, SCSI_ID_0)
// internal ram
MCFG_RAM_ADD(RAM_TAG)
diff --git a/src/mess/machine/fm_scsi.c b/src/mess/machine/fm_scsi.c
index 765d8884e43..388738e3f64 100644
--- a/src/mess/machine/fm_scsi.c
+++ b/src/mess/machine/fm_scsi.c
@@ -78,7 +78,8 @@ void fmscsi_device::device_start()
// initialise SCSI devices, if any present
for(x=0;x<scsidevs->devs_present;x++)
{
- m_SCSIdevices[scsidevs->devices[x].scsiID] = machine().device<scsidev_device>( scsidevs->devices[x].tag );
+ scsidev_device *device = machine().device<scsidev_device>( scsidevs->devices[x].tag );
+ m_SCSIdevices[device->GetDeviceID()] = device;
}
// allocate read timer
diff --git a/src/mess/machine/lux4105.c b/src/mess/machine/lux4105.c
index 4891fa17d6f..6d6b3ed04af 100644
--- a/src/mess/machine/lux4105.c
+++ b/src/mess/machine/lux4105.c
@@ -32,9 +32,9 @@ const device_type LUXOR_4105 = &device_creator<luxor_4105_device>;
static const SCSIConfigTable sasi_dev_table =
{
- 1,
+ 1, /* 1 SCSI device */
{
- { SCSI_ID_0, "harddisk0" }
+ { "harddisk0" }
}
};
diff --git a/src/mess/machine/mb89352.c b/src/mess/machine/mb89352.c
index 619bfd23b1e..6b054db62b0 100644
--- a/src/mess/machine/mb89352.c
+++ b/src/mess/machine/mb89352.c
@@ -160,7 +160,8 @@ void mb89352_device::device_start()
// try to open the devices
for (i = 0; i < scsidevs->devs_present; i++)
{
- m_SCSIdevices[scsidevs->devices[i].scsiID] = machine().device<scsidev_device>( scsidevs->devices[i].tag );
+ scsidev_device *device = machine().device<scsidev_device>( scsidevs->devices[i].tag );
+ m_SCSIdevices[device->GetDeviceID()] = device;
}
}
diff --git a/src/mess/machine/ncr5380.c b/src/mess/machine/ncr5380.c
index 7589631a161..dd750bf8432 100644
--- a/src/mess/machine/ncr5380.c
+++ b/src/mess/machine/ncr5380.c
@@ -127,7 +127,8 @@ void ncr5380_device::device_start()
// try to open the devices
for (i = 0; i < scsidevs->devs_present; i++)
{
- m_scsi_devices[scsidevs->devices[i].scsiID] = machine().device<scsidev_device>( scsidevs->devices[i].tag );
+ scsidev_device *device = machine().device<scsidev_device>( scsidevs->devices[i].tag );
+ m_scsi_devices[device->GetDeviceID()] = device;
}
}
diff --git a/src/mess/machine/scsibus.c b/src/mess/machine/scsibus.c
index 986cdb017b7..d98036f7f87 100644
--- a/src/mess/machine/scsibus.c
+++ b/src/mess/machine/scsibus.c
@@ -948,7 +948,8 @@ void init_scsibus(device_t *device, int sectorbytes)
for (devno = 0; devno < scsidevs->devs_present; devno++)
{
LOG(1,"SCSIBUS:init devno=%d \n",devno);
- bus->devices[scsidevs->devices[devno].scsiID] = device->machine().device<scsidev_device>( scsidevs->devices[devno].tag );
+ scsidev_device *scsidev = device->machine().device<scsidev_device>( scsidevs->devices[devno].tag );
+ bus->devices[scsidev->GetDeviceID()] = scsidev;
}
bus->sectorbytes = sectorbytes;
diff --git a/src/mess/machine/x68k_scsiext.c b/src/mess/machine/x68k_scsiext.c
index f30a6c55662..a278f175a4e 100644
--- a/src/mess/machine/x68k_scsiext.c
+++ b/src/mess/machine/x68k_scsiext.c
@@ -21,13 +21,13 @@ static const SCSIConfigTable x68k_scsiext_devtable =
{
7, /* 7 SCSI devices */
{
- { SCSI_ID_0, ":exp:cz6bs1:extharddisk0" },
- { SCSI_ID_1, ":exp:cz6bs1:extharddisk1" },
- { SCSI_ID_2, ":exp:cz6bs1:extharddisk2" },
- { SCSI_ID_3, ":exp:cz6bs1:extharddisk3" },
- { SCSI_ID_4, ":exp:cz6bs1:extharddisk4" },
- { SCSI_ID_5, ":exp:cz6bs1:extharddisk5" },
- { SCSI_ID_6, ":exp:cz6bs1:extharddisk6" },
+ { ":exp:cz6bs1:extharddisk0" },
+ { ":exp:cz6bs1:extharddisk1" },
+ { ":exp:cz6bs1:extharddisk2" },
+ { ":exp:cz6bs1:extharddisk3" },
+ { ":exp:cz6bs1:extharddisk4" },
+ { ":exp:cz6bs1:extharddisk5" },
+ { ":exp:cz6bs1:extharddisk6" },
}
};
@@ -55,13 +55,13 @@ const rom_entry *x68k_scsiext_device::device_rom_region() const
// device machine config
static MACHINE_CONFIG_FRAGMENT( x68k_scsiext )
MCFG_MB89352A_ADD("mb89352_ext",x68k_scsiext_intf)
- MCFG_DEVICE_ADD("extharddisk0", SCSIHD, 0)
- MCFG_DEVICE_ADD("extharddisk1", SCSIHD, 0)
- MCFG_DEVICE_ADD("extharddisk2", SCSIHD, 0)
- MCFG_DEVICE_ADD("extharddisk3", SCSIHD, 0)
- MCFG_DEVICE_ADD("extharddisk4", SCSIHD, 0)
- MCFG_DEVICE_ADD("extharddisk5", SCSIHD, 0)
- MCFG_DEVICE_ADD("extharddisk6", SCSIHD, 0)
+ MCFG_SCSIDEV_ADD("extharddisk0", SCSIHD, SCSI_ID_0)
+ MCFG_SCSIDEV_ADD("extharddisk1", SCSIHD, SCSI_ID_1)
+ MCFG_SCSIDEV_ADD("extharddisk2", SCSIHD, SCSI_ID_2)
+ MCFG_SCSIDEV_ADD("extharddisk3", SCSIHD, SCSI_ID_3)
+ MCFG_SCSIDEV_ADD("extharddisk4", SCSIHD, SCSI_ID_4)
+ MCFG_SCSIDEV_ADD("extharddisk5", SCSIHD, SCSI_ID_5)
+ MCFG_SCSIDEV_ADD("extharddisk6", SCSIHD, SCSI_ID_6)
MACHINE_CONFIG_END
machine_config_constructor x68k_scsiext_device::device_mconfig_additions() const