diff options
| author | Hervé Poussineau <hpoussin@reactos.org> | 2012-09-20 22:50:17 +0200 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2012-11-14 18:19:22 +0100 |
| commit | c5139bd9a9d78053a4da5047deb34e478a52d669 (patch) | |
| tree | 882b2b0378b62de76dd33065770246077dd11153 | |
| parent | d497d53497070322e04796a9958e551d88c9f3a9 (diff) | |
| download | qemu-c5139bd9a9d78053a4da5047deb34e478a52d669.zip qemu-c5139bd9a9d78053a4da5047deb34e478a52d669.tar.gz qemu-c5139bd9a9d78053a4da5047deb34e478a52d669.tar.bz2 | |
fdc: fix FD_SR0_SEEK for non-DMA transfers and multi sectors transfers
On non-DMA transfers, fdctrl_stop_transfer() used to set FD_SR0_SEEK
no matter if there actually was a seek or not. This is obviously wrong.
fdctrl_seek_to_next_sect() has this information because it performs
the seek itself.
Signed-off-by: Hervé Poussineau <hpoussin@reactos.org>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
| -rw-r--r-- | hw/fdc.c | 6 |
1 files changed, 4 insertions, 2 deletions
@@ -1123,11 +1123,13 @@ static int fdctrl_seek_to_next_sect(FDCtrl *fdctrl, FDrive *cur_drv) } else { new_head = 0; new_track++; + fdctrl->status0 |= FD_SR0_SEEK; if ((cur_drv->flags & FDISK_DBL_SIDES) == 0) { ret = 0; } } } else { + fdctrl->status0 |= FD_SR0_SEEK; new_track++; ret = 0; } @@ -1458,7 +1460,7 @@ static uint32_t fdctrl_read_data(FDCtrl *fdctrl) * then from status mode to command mode */ if (fdctrl->msr & FD_MSR_NONDMA) { - fdctrl_stop_transfer(fdctrl, FD_SR0_SEEK, 0x00, 0x00); + fdctrl_stop_transfer(fdctrl, 0x00, 0x00, 0x00); } else { fdctrl_reset_fifo(fdctrl); fdctrl_reset_irq(fdctrl); @@ -1922,7 +1924,7 @@ static void fdctrl_write_data(FDCtrl *fdctrl, uint32_t value) * then from status mode to command mode */ if (fdctrl->data_pos == fdctrl->data_len) - fdctrl_stop_transfer(fdctrl, FD_SR0_SEEK, 0x00, 0x00); + fdctrl_stop_transfer(fdctrl, 0x00, 0x00, 0x00); return; } if (fdctrl->data_pos == 0) { |