proxmox-mirrors/qemu
1
0
Fork 0
mirror of https://git.proxmox.com/git/qemu synced 2025-07-27 09:39:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

FDC fix 2/10 (Hervé Poussineau):

Browse Source 
- Extract seeking to next sector handling in a function. Add a sector seek in PIO read and write modes


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@4282 c046a42c-6fe2-441c-8c8c-71466251a162
This commit is contained in:
blueswir1 2008-04-29 16:13:36 +00:00
parent 678803abe6
commit 746d6de7fe
1 changed files with 48 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

79
hw/fdc.c
View File

@ -974,6 +974,40 @@ static void fdctrl_unimplemented (fdctrl_t *fdctrl, int direction)
#endif #endif
} }
/* Seek to next sector */
static int fdctrl_seek_to_next_sect (fdctrl_t *fdctrl, fdrive_t *cur_drv)
{
FLOPPY_DPRINTF("seek to next sector (%d %02x %02x => %d)\n",
cur_drv->head, cur_drv->track, cur_drv->sect,
fd_sector(cur_drv));
/* XXX: cur_drv->sect >= cur_drv->last_sect should be an
error in fact */
if (cur_drv->sect >= cur_drv->last_sect ||
cur_drv->sect == fdctrl->eot) {
cur_drv->sect = 1;
if (FD_MULTI_TRACK(fdctrl->data_state)) {
if (cur_drv->head == 0 &&
(cur_drv->flags & FDISK_DBL_SIDES) != 0) {
cur_drv->head = 1;
} else {
cur_drv->head = 0;
cur_drv->track++;
if ((cur_drv->flags & FDISK_DBL_SIDES) == 0)
return 0;
}
} else {
cur_drv->track++;
return 0;
}
FLOPPY_DPRINTF("seek to next track (%d %02x %02x => %d)\n",
cur_drv->head, cur_drv->track,
cur_drv->sect, fd_sector(cur_drv));
} else {
cur_drv->sect++;
}
return 1;
}
/* Callback for transfer end (stop or abort) */ /* Callback for transfer end (stop or abort) */
static void fdctrl_stop_transfer (fdctrl_t *fdctrl, uint8_t status0, static void fdctrl_stop_transfer (fdctrl_t *fdctrl, uint8_t status0,
uint8_t status1, uint8_t status2) uint8_t status1, uint8_t status2)
@ -1196,36 +1230,9 @@ static int fdctrl_transfer_handler (void *opaque, int nchan,
rel_pos = fdctrl->data_pos % FD_SECTOR_LEN; rel_pos = fdctrl->data_pos % FD_SECTOR_LEN;
if (rel_pos == 0) { if (rel_pos == 0) {
/* Seek to next sector */ /* Seek to next sector */
FLOPPY_DPRINTF("seek to next sector (%d %02x %02x => %d) (%d)\n", if (!fdctrl_seek_to_next_sect(fdctrl, cur_drv))
cur_drv->head, cur_drv->track, cur_drv->sect,
fd_sector(cur_drv),
fdctrl->data_pos - len);
/* XXX: cur_drv->sect >= cur_drv->last_sect should be an
error in fact */
if (cur_drv->sect >= cur_drv->last_sect ||
cur_drv->sect == fdctrl->eot) {
cur_drv->sect = 1;
if (FD_MULTI_TRACK(fdctrl->data_state)) {
if (cur_drv->head == 0 &&
(cur_drv->flags & FDISK_DBL_SIDES) != 0) {
cur_drv->head = 1;
} else {
cur_drv->head = 0;
cur_drv->track++;
if ((cur_drv->flags & FDISK_DBL_SIDES) == 0)
break; break;
} }
} else {
cur_drv->track++;
break;
}
FLOPPY_DPRINTF("seek to next track (%d %02x %02x => %d)\n",
cur_drv->head, cur_drv->track,
cur_drv->sect, fd_sector(cur_drv));
} else {
cur_drv->sect++;
}
}
} }
end_transfer: end_transfer:
len = fdctrl->data_pos - start_pos; len = fdctrl->data_pos - start_pos;
@ -1250,7 +1257,7 @@ static uint32_t fdctrl_read_data (fdctrl_t *fdctrl)
{ {
fdrive_t *cur_drv; fdrive_t *cur_drv;
uint32_t retval = 0; uint32_t retval = 0;
int pos, len; int pos;
cur_drv = get_cur_drv(fdctrl); cur_drv = get_cur_drv(fdctrl);
fdctrl->state &= ~FD_CTRL_SLEEP; fdctrl->state &= ~FD_CTRL_SLEEP;
@ -1262,9 +1269,12 @@ static uint32_t fdctrl_read_data (fdctrl_t *fdctrl)
if (FD_STATE(fdctrl->data_state) == FD_STATE_DATA) { if (FD_STATE(fdctrl->data_state) == FD_STATE_DATA) {
pos %= FD_SECTOR_LEN; pos %= FD_SECTOR_LEN;
if (pos == 0) { if (pos == 0) {
len = fdctrl->data_len - fdctrl->data_pos; if (fdctrl->data_pos != 0)
if (len > FD_SECTOR_LEN) if (!fdctrl_seek_to_next_sect(fdctrl, cur_drv)) {
len = FD_SECTOR_LEN; FLOPPY_DPRINTF("error seeking to next sector %d\n",
fd_sector(cur_drv));
return 0;
}
bdrv_read(cur_drv->bs, fd_sector(cur_drv), fdctrl->fifo, 1); bdrv_read(cur_drv->bs, fd_sector(cur_drv), fdctrl->fifo, 1);
} }
} }
@ -1707,6 +1717,11 @@ static void fdctrl_write_data (fdctrl_t *fdctrl, uint32_t value)
if (fdctrl->data_pos % FD_SECTOR_LEN == (FD_SECTOR_LEN - 1) || if (fdctrl->data_pos % FD_SECTOR_LEN == (FD_SECTOR_LEN - 1) ||
fdctrl->data_pos == fdctrl->data_len) { fdctrl->data_pos == fdctrl->data_len) {
bdrv_write(cur_drv->bs, fd_sector(cur_drv), fdctrl->fifo, 1); bdrv_write(cur_drv->bs, fd_sector(cur_drv), fdctrl->fifo, 1);
if (!fdctrl_seek_to_next_sect(fdctrl, cur_drv)) {
FLOPPY_DPRINTF("error seeking to next sector %d\n",
fd_sector(cur_drv));
return;
}
} }
/* Switch from transfer mode to status mode /* Switch from transfer mode to status mode
* then from status mode to command mode * then from status mode to command mode