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

Fixed IDE sector advancement, fixes #4012.

Browse Source
This commit is contained in:
OBattler
2024-01-09 23:49:09 +01:00
parent 25b04d84ba
commit ce342400eb
1 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/disk/hdc_ide.c
View File

@@ -734,19 +734,25 @@ ide_get_sector(ide_t *ide)
static void static void
ide_next_sector(ide_t *ide) ide_next_sector(ide_t *ide)
{ {
uint32_t sector = ide->tf->sector;
uint32_t head = ide->tf->head;
if (ide->tf->lba) if (ide->tf->lba)
ide->lba_addr++; ide->lba_addr++;
else { else {
ide->tf->sector++; sector++;
if ((ide->tf->sector == 0) || (ide->tf->sector == (ide->cfg_spt + 1))) { if ((sector == 0) || (sector == (ide->cfg_spt + 1))) {
ide->tf->sector = 1; sector = 1;
ide->tf->head++; head++;
if ((ide->tf->head == 0) || (ide->head == ide->cfg_hpc)) { if (head == ide->cfg_hpc) {
ide->tf->head = 0; head = 0;
ide->tf->cylinder++; ide->tf->cylinder++;
} }
} }
} }
ide->tf->sector = sector & 0xff;
ide->tf->head = head & 0x0f;
} }
static void static void
@@ -1411,8 +1417,7 @@ ide_write_devctl(UNUSED(uint16_t addr), uint8_t val, void *priv)
old = dev->devctl; old = dev->devctl;
dev->devctl = val; dev->devctl = val;
// if (!(val & 0x02) && (old & 0x02)) if (!(val & 0x02) && (old & 0x02))
if ((old ^ val) & 0x02)
ide_irq_update(ide_boards[ide->board], 1); ide_irq_update(ide_boards[ide->board], 1);
} }