summaryrefslogtreecommitdiffstatshomepage
path: root/src/emu/machine
diff options
context:
space:
mode:
Diffstat (limited to 'src/emu/machine')
-rw-r--r--src/emu/machine/scsicd.c2
-rw-r--r--src/emu/machine/scsihd.c4
2 files changed, 4 insertions, 2 deletions
diff --git a/src/emu/machine/scsicd.c b/src/emu/machine/scsicd.c
index 41008469e02..d467bcae744 100644
--- a/src/emu/machine/scsicd.c
+++ b/src/emu/machine/scsicd.c
@@ -696,7 +696,7 @@ static void scsicd_alloc_instance( SCSIInstance *scsiInstance, const char *diskr
#ifdef MESS
/* TODO: get rid of this ifdef MESS section */
- our_this->cdrom = mess_cd_get_cdrom_file( device_list_find_by_tag( Machine->config->devicelist, CDROM, "cdrom" ) );
+ our_this->cdrom = mess_cd_get_cdrom_file( device_list_find_by_tag( Machine->config->devicelist, CDROM, diskregion ) );
#else
our_this->cdrom = cdrom_open(get_disk_handle( diskregion ));
diff --git a/src/emu/machine/scsihd.c b/src/emu/machine/scsihd.c
index 67fa2cfbffe..1a857b385c3 100644
--- a/src/emu/machine/scsihd.c
+++ b/src/emu/machine/scsihd.c
@@ -10,6 +10,7 @@
#ifdef MESS
#include "devices/harddriv.h"
+#include "deprecat.h"
#endif
#include "scsihd.h"
@@ -236,7 +237,8 @@ static void scsihd_alloc_instance( SCSIInstance *scsiInstance, const char *diskr
state_save_register_item( tag, 0, our_this->blocks );
#ifdef MESS
- our_this->disk = mess_hd_get_hard_disk_file_by_number( diskregion );
+ /* TODO: get rid of this ifdef MESS section */
+ our_this->disk = mess_hd_get_hard_disk_file( device_list_find_by_tag( Machine->config->devicelist, HARDDISK, diskregion ) );
#else
our_this->disk = hard_disk_open(get_disk_handle( diskregion ));