80486DX2-66/86Box-fork
1
0
Fork 0
Code Issues Pull Requests Activity

Fixed some bugs in cdrom.c.

Browse Source
This commit is contained in:
OBattler
2018-03-17 22:22:01 +01:00
parent a59dc8e436
commit f2460dc534
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/cdrom/cdrom.c
View File

@@ -9,7 +9,7 @@
* Implementation of the CD-ROM drive with SCSI(-like) * Implementation of the CD-ROM drive with SCSI(-like)
* commands, for both ATAPI and SCSI usage. * commands, for both ATAPI and SCSI usage.
* *
* Version: @(#)cdrom.c 1.0.36 2018/03/16 * Version: @(#)cdrom.c 1.0.37 2018/03/17
* *
* Author: Miran Grca, <mgrca8@gmail.com> * Author: Miran Grca, <mgrca8@gmail.com>
* *
@@ -453,7 +453,6 @@ void cdrom_init(int id, int cdb_len_setting)
return; return;
if (!cdrom[id]) if (!cdrom[id])
cdrom[id] = (cdrom_t *) malloc(sizeof(cdrom_t)); cdrom[id] = (cdrom_t *) malloc(sizeof(cdrom_t));
pclog(NULL); /* Trigger segfault so we can backtrace. */
dev = cdrom[id]; dev = cdrom[id];
memset(dev, 0, sizeof(cdrom_t)); memset(dev, 0, sizeof(cdrom_t));
dev->requested_blocks = 1; dev->requested_blocks = 1;
@@ -3262,10 +3261,11 @@ cdrom_hard_reset(void)
if (cdrom_drives[c].bus_type) { if (cdrom_drives[c].bus_type) {
cdrom_log("CDROM global_reset drive=%d host=%02x\n", c, cdrom_drives[c].host_drive); cdrom_log("CDROM global_reset drive=%d host=%02x\n", c, cdrom_drives[c].host_drive);
SCSIReset(cdrom_drives[c].scsi_device_id, cdrom_drives[c].scsi_device_lun);
if (!cdrom[c]) if (!cdrom[c])
cdrom[c] = (cdrom_t *) malloc(sizeof(cdrom_t)); cdrom[c] = (cdrom_t *) malloc(sizeof(cdrom_t));
SCSIReset(cdrom_drives[c].scsi_device_id, cdrom_drives[c].scsi_device_lun);
if (cdrom_drives[c].host_drive == 200) { if (cdrom_drives[c].host_drive == 200) {
image_open(c, cdrom_image[c].image_path); image_open(c, cdrom_image[c].image_path);
image_reset(c); image_reset(c);