From 4bb3984c834a7571114211d9786b3a651cf81e0c Mon Sep 17 00:00:00 2001 From: Miodrag Milanovic Date: Tue, 27 Nov 2012 10:12:36 +0000 Subject: [PATCH] Set interface name to scsi harddisks so they can be mounted as softlist items (no whatsnew) Fixed mac harddisk list to use new interface Also added interface for scsi cdrom, but named it "cdrom" since medium is always same. --- hash/mac_hdd.xml | 18 +++++++++--------- src/emu/machine/nscsi_cd.c | 2 +- src/emu/machine/nscsi_hd.c | 2 +- src/emu/machine/scsicd.c | 2 +- src/emu/machine/scsihd.c | 4 +++- src/emu/machine/scsihd.h | 4 +++- 6 files changed, 18 insertions(+), 14 deletions(-) diff --git a/hash/mac_hdd.xml b/hash/mac_hdd.xml index e53908dc77f..acacc8781a0 100644 --- a/hash/mac_hdd.xml +++ b/hash/mac_hdd.xml @@ -5,7 +5,7 @@ System Software 6.0.8 1988 Apple - + @@ -15,7 +15,7 @@ System Software 7.0 1991 Apple - + @@ -25,7 +25,7 @@ System Software 7.0.1 1991 Apple - + @@ -35,7 +35,7 @@ System Software 7.1.1 1993 Apple - + @@ -45,7 +45,7 @@ System Software 7.5 1994 Apple - + @@ -55,7 +55,7 @@ System Software 7.5.3 Revision 2 1996 Apple - + @@ -65,7 +65,7 @@ System Software 7.5.5 1996 Apple - + @@ -75,7 +75,7 @@ System Software 7.6 1997 Apple - + @@ -85,7 +85,7 @@ System Software 7.6.1 1997 Apple - + diff --git a/src/emu/machine/nscsi_cd.c b/src/emu/machine/nscsi_cd.c index 048928555d7..3b2b73b2420 100644 --- a/src/emu/machine/nscsi_cd.c +++ b/src/emu/machine/nscsi_cd.c @@ -23,7 +23,7 @@ void nscsi_cdrom_device::device_reset() cur_lba = -1; } -cdrom_interface nscsi_cdrom_device::cd_intf = { 0, 0 }; +cdrom_interface nscsi_cdrom_device::cd_intf = { "cdrom", NULL }; static MACHINE_CONFIG_FRAGMENT(scsi_cdrom) MCFG_CDROM_ADD("image", nscsi_cdrom_device::cd_intf) diff --git a/src/emu/machine/nscsi_hd.c b/src/emu/machine/nscsi_hd.c index 4138cc96127..6b2d7f1c2e2 100644 --- a/src/emu/machine/nscsi_hd.c +++ b/src/emu/machine/nscsi_hd.c @@ -28,7 +28,7 @@ void nscsi_harddisk_device::device_reset() cur_lba = -1; } -harddisk_interface nscsi_harddisk_device::hd_intf = { 0, 0 }; +harddisk_interface nscsi_harddisk_device::hd_intf = { NULL, NULL, "scsi_hdd", NULL }; static MACHINE_CONFIG_FRAGMENT(scsi_harddisk) MCFG_HARDDISK_CONFIG_ADD("image", nscsi_harddisk_device::hd_intf) diff --git a/src/emu/machine/scsicd.c b/src/emu/machine/scsicd.c index 1498dda4039..89d2d16818a 100644 --- a/src/emu/machine/scsicd.c +++ b/src/emu/machine/scsicd.c @@ -64,7 +64,7 @@ void scsicd_device::device_reset() play_err_flag = 0; } -cdrom_interface scsicd_device::cd_intf = { 0, 0 }; +cdrom_interface scsicd_device::cd_intf = { "cdrom", NULL }; static MACHINE_CONFIG_FRAGMENT(scsi_cdrom) MCFG_CDROM_ADD("image", scsicd_device::cd_intf) diff --git a/src/emu/machine/scsihd.c b/src/emu/machine/scsihd.c index 1dadc75eaeb..22661219479 100644 --- a/src/emu/machine/scsihd.c +++ b/src/emu/machine/scsihd.c @@ -52,8 +52,10 @@ void scsihd_device::device_reset() } } +harddisk_interface scsihd_device::hd_intf = { NULL, NULL, "scsi_hdd", NULL }; + static MACHINE_CONFIG_FRAGMENT(scsi_harddisk) - MCFG_HARDDISK_ADD("image") + MCFG_HARDDISK_CONFIG_ADD("image", scsihd_device::hd_intf) MACHINE_CONFIG_END machine_config_constructor scsihd_device::device_mconfig_additions() const diff --git a/src/emu/machine/scsihd.h b/src/emu/machine/scsihd.h index ee48788e807..acb15bdecbe 100644 --- a/src/emu/machine/scsihd.h +++ b/src/emu/machine/scsihd.h @@ -24,7 +24,9 @@ public: virtual void WriteData( UINT8 *data, int dataLength ); virtual void ReadData( UINT8 *data, int dataLength ); virtual int GetSectorBytes(); - + + static struct harddisk_interface hd_intf; + protected: // device-level overrides virtual void device_start();