提交 c5139bd9 编写于 作者: H Hervé Poussineau 提交者: Kevin Wolf

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: NHervé Poussineau <hpoussin@reactos.org>
Signed-off-by: NKevin Wolf <kwolf@redhat.com>
上级 d497d534
...@@ -1123,11 +1123,13 @@ static int fdctrl_seek_to_next_sect(FDCtrl *fdctrl, FDrive *cur_drv) ...@@ -1123,11 +1123,13 @@ static int fdctrl_seek_to_next_sect(FDCtrl *fdctrl, FDrive *cur_drv)
} else { } else {
new_head = 0; new_head = 0;
new_track++; new_track++;
fdctrl->status0 |= FD_SR0_SEEK;
if ((cur_drv->flags & FDISK_DBL_SIDES) == 0) { if ((cur_drv->flags & FDISK_DBL_SIDES) == 0) {
ret = 0; ret = 0;
} }
} }
} else { } else {
fdctrl->status0 |= FD_SR0_SEEK;
new_track++; new_track++;
ret = 0; ret = 0;
} }
...@@ -1458,7 +1460,7 @@ static uint32_t fdctrl_read_data(FDCtrl *fdctrl) ...@@ -1458,7 +1460,7 @@ static uint32_t fdctrl_read_data(FDCtrl *fdctrl)
* then from status mode to command mode * then from status mode to command mode
*/ */
if (fdctrl->msr & FD_MSR_NONDMA) { if (fdctrl->msr & FD_MSR_NONDMA) {
fdctrl_stop_transfer(fdctrl, FD_SR0_SEEK, 0x00, 0x00); fdctrl_stop_transfer(fdctrl, 0x00, 0x00, 0x00);
} else { } else {
fdctrl_reset_fifo(fdctrl); fdctrl_reset_fifo(fdctrl);
fdctrl_reset_irq(fdctrl); fdctrl_reset_irq(fdctrl);
...@@ -1922,7 +1924,7 @@ static void fdctrl_write_data(FDCtrl *fdctrl, uint32_t value) ...@@ -1922,7 +1924,7 @@ static void fdctrl_write_data(FDCtrl *fdctrl, uint32_t value)
* then from status mode to command mode * then from status mode to command mode
*/ */
if (fdctrl->data_pos == fdctrl->data_len) if (fdctrl->data_pos == fdctrl->data_len)
fdctrl_stop_transfer(fdctrl, FD_SR0_SEEK, 0x00, 0x00); fdctrl_stop_transfer(fdctrl, 0x00, 0x00, 0x00);
return; return;
} }
if (fdctrl->data_pos == 0) { if (fdctrl->data_pos == 0) {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册