Some MESS specific changes

This commit is contained in:
Wilbert Pol 2008-08-17 15:02:15 +00:00
parent 3297ac117d
commit ab1030258c
4 changed files with 7 additions and 5 deletions

View File

@ -10,6 +10,7 @@
#include "sound/cdda.h"
#ifdef MESS
#include "devices/chd_cd.h"
#include "deprecat.h"
#endif
#include "scsicd.h"
@ -694,7 +695,8 @@ static void scsicd_alloc_instance( SCSIInstance *scsiInstance, const char *diskr
state_save_register_item( tag, 0, our_this->play_err_flag );
#ifdef MESS
our_this->cdrom = mess_cd_get_cdrom_file_by_number( diskregion );
/* 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" ) );
#else
our_this->cdrom = cdrom_open(get_disk_handle( diskregion ));

View File

@ -2569,7 +2569,7 @@ static MACHINE_RESET( stv )
cpunum_set_clock(machine, 1, MASTER_CLOCK_320/2);
cpunum_set_clock(machine, 2, MASTER_CLOCK_320/5);
stvcd_reset();
stvcd_reset(machine);
}

View File

@ -203,7 +203,7 @@ static TIMER_CALLBACK( sector_cb )
}
// global functions
void stvcd_reset(void)
void stvcd_reset(running_machine *machine)
{
INT32 i, j;
@ -259,7 +259,7 @@ void stvcd_reset(void)
}
#ifdef MESS
cdrom = mess_cd_get_cdrom_file_by_number(0);
cdrom = mess_cd_get_cdrom_file(device_list_find_by_tag( machine->config->devicelist, CDROM, "cdrom" ));
#else
cdrom = cdrom_open(get_disk_handle("cdrom"));
#endif

View File

@ -9,7 +9,7 @@
#ifndef __STVCD_H__
#define __STVCD_H__
void stvcd_reset(void);
void stvcd_reset(running_machine* machine);
void stvcd_exit(running_machine* machine);
READ32_HANDLER( stvcd_r );