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

wizzomafizzo · wizzomafizzo · commit 2efecd00a520 · 2026-06-20T12:47:15.000+08:00
diff --git a/ide.cpp b/ide.cpp
@@ -162,6 +162,13 @@ 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;
+
 	uint8_t data[12] =
 	{
 		(uint8_t)((ide->drive[ide->regs.drv].cd) ? 0x80 : ide->regs.io_size),

Original file line number	Diff line number	Diff line change
`@@ -162,6 +162,13 @@ void ide_set_regs(ide_config *ide)`
`162`	`162`	`{`
`163`	`163`	`if (!(ide->regs.status & (ATA_STATUS_BSY \| ATA_STATUS_ERR))) ide->regs.status \|= ATA_STATUS_DSC;`
`164`	`164`
	`165`	`+ // For ATAPI (packet) devices, status bit 4 is the SERVICE bit, not DSC. We never run`
	`166`	`+ // overlapped commands, so SERVICE must read 0. Force it low for CD drives, matching 86Box`
	`167`	`+ // ide_status() which masks DSC out of every ATAPI status read (hdc_ide.c). Win9x ESDI_506`
	`168`	`+ // otherwise reads the permanent bit-4 as "overlapped-command SERVICE pending", rejects the`
	`169`	`+ // channel, and the device fails to start (Device Manager Code 10).`
	`170`	`+ if (ide->drive[ide->regs.drv].cd) ide->regs.status &= ~ATA_STATUS_DSC;`
	`171`	`+`
`165`	`172`	`uint8_t data[12] =`
`166`	`173`	`{`
`167`	`174`	`(uint8_t)((ide->drive[ide->regs.drv].cd) ? 0x80 : ide->regs.io_size),`