Merge remote-tracking branch 'upstream/master' into stable

Author: web-flow

ide.cpp

@@ -160,14 +160,11 @@ void ide_get_regs(ide_config *ide)
 
 void ide_set_regs(ide_config *ide)
 {
-	if (!(ide->regs.status & (ATA_STATUS_BSY | ATA_STATUS_ERR))) ide->regs.status |= ATA_STATUS_DSC;
-
-	// For ATAPI (packet) devices, status bit 4 is the SERVICE bit, not DSC. We never run
-	// overlapped commands, so SERVICE must read 0. Force it low for CD drives, matching 86Box
-	// ide_status() which masks DSC out of every ATAPI status read (hdc_ide.c). Win9x ESDI_506
-	// otherwise reads the permanent bit-4 as "overlapped-command SERVICE pending", rejects the
-	// channel, and the device fails to start (Device Manager Code 10).
-	if (ide->drive[ide->regs.drv].cd) ide->regs.status &= ~ATA_STATUS_DSC;
+	// Auto-assert DSC for non-CD drives only; let each ATAPI command set its own status.
+	if (!ide->drive[ide->regs.drv].cd && !(ide->regs.status & (ATA_STATUS_BSY | ATA_STATUS_ERR)))
+	{
+		ide->regs.status |= ATA_STATUS_DSC;
+	}
 
 	uint8_t data[12] =
 	{
@@ -1016,7 +1013,8 @@ void ide_io(int num, int req)
 		else if (ide->state == IDE_STATE_WAIT_PKT_RD)
 		{
 			if (ide->regs.pkt_cnt) cdrom_read(ide);
-			else cdrom_reply(ide, 0);
+			// A successful data-phase completion must report GOOD, not UNIT ATTENTION.
+			else cdrom_reply(ide, 0, 0, 0, false);
 		}
 		else if (ide->state == IDE_STATE_WAIT_PKT_MODE)
 		{
@@ -1049,7 +1047,8 @@ void ide_io(int num, int req)
 
 		ide_get_regs(ide);
 		ide->regs.head = 0;
-		ide->regs.error = 0;
+		// ATAPI posts diagnostic code 01h after a bus reset; an ATA HDD posts 0.
+		ide->regs.error = ide->drive[ide->regs.drv].cd ? 1 : 0;
 		ide->regs.sector = 1;
 		ide->regs.sector_count = 1;
 		ide->regs.cylinder = (!ide->drive[ide->regs.drv].present) ? 0xFFFF : ide->drive[ide->regs.drv].cd ? 0xEB14 : 0x0000;

ide_cdrom.cpp

@@ -1579,11 +1579,14 @@ int cdrom_handle_cmd(ide_config *ide)
 		ide->regs.sector_count = 1;
 		ide->regs.cylinder = 0xEB14;
 		ide->regs.head = 0;
+		// ATAPI diagnostic code 01h after DEVICE RESET.
+		ide->regs.error = 1;
 		ide->regs.io_size = 0;
-		ide->regs.status = ATA_STATUS_RDY | ATA_STATUS_DSC;
+		// Present status 0x00 (no DRDY/DSC), matching real ATAPI HW; routes OAKCDROM to signature detect.
+		ide->regs.status = 0;
 		ide_set_regs(ide);
 		break;
-	
+
 		case 0xEF: // set features
 		switch(ide->regs.features)
 		{

support/3do/3do.cpp

@@ -52,7 +52,28 @@ void p3do_poll()
 	}
 }
 
-static char buf[1024];
+static char buf[2048];
+
+static void p3do_get_save_without_disk(char *path)
+{
+	char *p1, *p2;
+
+	if ((p1 = strstr(path, "disc")) != 0 || (p1 = strstr(path, "Disc")) != 0 || (p1 = strstr(path, "DISC")) != 0 ||
+		(p1 = strstr(path, "disk")) != 0 || (p1 = strstr(path, "Disk")) != 0 || (p1 = strstr(path, "DISK")) != 0)
+	{
+		p2 = p1 + 4;
+
+		if (p1 > path && *(--p1) == '(') p1--;
+		if (p1 > path && *(--p1) == ' ') p1--;
+		if (*p2 == ' ') p2++;
+		if ((*p2 >= '0' && *p2 <= '9') || (*p2 >= 'a' && *p2 <= 'f') || (*p2 >= 'A' && *p2 <= 'F')) {
+			p2++;
+			if (*p2 == ')') p2++;
+			p1++;
+			strcpy(p1, p2);
+		}
+	}
+}
 
 static void p3do_mount_save(const char *filename)
 {
@@ -61,6 +82,7 @@ static void p3do_mount_save(const char *filename)
 	if (strlen(filename))
 	{
 		FileGenerateSavePath(filename, buf);
+		p3do_get_save_without_disk(buf);
 #ifdef P3DO_DEBUG
 		printf("Saturn save filename = %s\n", buf);
 #endif // P3DO_DEBUG
@@ -96,7 +118,7 @@ void p3do_set_image(int num, const char *filename)
 	p3docdd.Unload();
 	p3docdd.Reset();
 
-	int same_game = *filename && *last_dir && !strncmp(last_dir, filename, strlen(last_dir));
+	int same_game = 0;//*filename && *last_dir && !strncmp(last_dir, filename, strlen(last_dir));
 	strcpy(last_dir, filename);
 	char *p = strrchr(last_dir, '/');
 	if (p) *p = 0;