diff options
| -rw-r--r-- | hw/fdc.c | 10 | ||||
| -rw-r--r-- | tests/fdc-test.c | 6 |
2 files changed, 10 insertions, 6 deletions
diff --git a/hw/fdc.c b/hw/fdc.c index a9a2a2a10a..525ba20194 100644 --- a/hw/fdc.c +++ b/hw/fdc.c @@ -1149,10 +1149,14 @@ static void fdctrl_stop_transfer(FDCtrl *fdctrl, uint8_t status0, uint8_t status1, uint8_t status2) { FDrive *cur_drv; - cur_drv = get_cur_drv(fdctrl); - fdctrl->status0 = status0 | FD_SR0_SEEK | (cur_drv->head << 2) | - GET_CUR_DRV(fdctrl); + + fdctrl->status0 &= ~(FD_SR0_DS0 | FD_SR0_DS1 | FD_SR0_HEAD); + fdctrl->status0 |= GET_CUR_DRV(fdctrl); + if (cur_drv->head) { + fdctrl->status0 |= FD_SR0_HEAD; + } + fdctrl->status0 |= status0; FLOPPY_DPRINTF("transfer status: %02x %02x %02x (%02x)\n", status0, status1, status2, fdctrl->status0); diff --git a/tests/fdc-test.c b/tests/fdc-test.c index 4649e3fedb..1156112028 100644 --- a/tests/fdc-test.c +++ b/tests/fdc-test.c @@ -154,7 +154,7 @@ static uint8_t send_read_command(void) } st0 = floppy_recv(); - if (st0 != 0x60) { + if (st0 != 0x40) { ret = 1; } @@ -398,7 +398,7 @@ static void test_read_no_dma_1(void) outb(FLOPPY_BASE + reg_dor, inb(FLOPPY_BASE + reg_dor) & ~0x08); send_seek(0); - ret = send_read_no_dma_command(1, 0x24); /* FIXME: should be 0x04 */ + ret = send_read_no_dma_command(1, 0x04); g_assert(ret == 0); } @@ -408,7 +408,7 @@ static void test_read_no_dma_18(void) outb(FLOPPY_BASE + reg_dor, inb(FLOPPY_BASE + reg_dor) & ~0x08); send_seek(0); - ret = send_read_no_dma_command(18, 0x24); /* FIXME: should be 0x04 */ + ret = send_read_no_dma_command(18, 0x04); g_assert(ret == 0); } |