From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1JqsSd-0004MX-3E for qemu-devel@nongnu.org; Tue, 29 Apr 2008 12:13:43 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1JqsSc-0004ME-BN for qemu-devel@nongnu.org; Tue, 29 Apr 2008 12:13:42 -0400 Received: from [199.232.76.173] (port=43389 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1JqsSc-0004MB-78 for qemu-devel@nongnu.org; Tue, 29 Apr 2008 12:13:42 -0400 Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1JqsSb-0004Wm-D8 for qemu-devel@nongnu.org; Tue, 29 Apr 2008 12:13:42 -0400 Received: from cvs.savannah.gnu.org ([199.232.41.69]) by sv.gnu.org with esmtp (Exim 4.63) (envelope-from ) id 1JqsSX-0002QX-5c for qemu-devel@nongnu.org; Tue, 29 Apr 2008 16:13:37 +0000 Received: from blueswir1 by cvs.savannah.gnu.org with local (Exim 4.63) (envelope-from ) id 1JqsSW-0002QS-Ru for qemu-devel@nongnu.org; Tue, 29 Apr 2008 16:13:37 +0000 MIME-Version: 1.0 Errors-To: blueswir1 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit From: Blue Swirl Message-Id: Date: Tue, 29 Apr 2008 16:13:36 +0000 Subject: [Qemu-devel] [4282] FDC fix 2/10 (Herv?\195?\169 Poussineau): Reply-To: qemu-devel@nongnu.org List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Revision: 4282 http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=4282 Author: blueswir1 Date: 2008-04-29 16:13:36 +0000 (Tue, 29 Apr 2008) Log Message: ----------- FDC fix 2/10 (Herv?\195?\169 Poussineau): - Extract seeking to next sector handling in a function. Add a sector seek in PIO read and write modes Modified Paths: -------------- trunk/hw/fdc.c Modified: trunk/hw/fdc.c =================================================================== --- trunk/hw/fdc.c 2008-04-29 16:12:30 UTC (rev 4281) +++ trunk/hw/fdc.c 2008-04-29 16:13:36 UTC (rev 4282) @@ -974,6 +974,40 @@ #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) */ static void fdctrl_stop_transfer (fdctrl_t *fdctrl, uint8_t status0, uint8_t status1, uint8_t status2) @@ -1196,35 +1230,8 @@ rel_pos = fdctrl->data_pos % FD_SECTOR_LEN; if (rel_pos == 0) { /* Seek to next sector */ - FLOPPY_DPRINTF("seek to next sector (%d %02x %02x => %d) (%d)\n", - 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; - } - } 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++; - } + if (!fdctrl_seek_to_next_sect(fdctrl, cur_drv)) + break; } } end_transfer: @@ -1250,7 +1257,7 @@ { fdrive_t *cur_drv; uint32_t retval = 0; - int pos, len; + int pos; cur_drv = get_cur_drv(fdctrl); fdctrl->state &= ~FD_CTRL_SLEEP; @@ -1262,9 +1269,12 @@ if (FD_STATE(fdctrl->data_state) == FD_STATE_DATA) { pos %= FD_SECTOR_LEN; if (pos == 0) { - len = fdctrl->data_len - fdctrl->data_pos; - if (len > FD_SECTOR_LEN) - len = FD_SECTOR_LEN; + if (fdctrl->data_pos != 0) + if (!fdctrl_seek_to_next_sect(fdctrl, cur_drv)) { + 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); } } @@ -1707,6 +1717,11 @@ if (fdctrl->data_pos % FD_SECTOR_LEN == (FD_SECTOR_LEN - 1) || fdctrl->data_pos == fdctrl->data_len) { 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 * then from status mode to command mode