From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53751) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a65Is-0000AT-3r for qemu-devel@nongnu.org; Mon, 07 Dec 2015 18:34:47 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1a65Iq-0006PL-Ve for qemu-devel@nongnu.org; Mon, 07 Dec 2015 18:34:45 -0500 From: John Snow Date: Mon, 7 Dec 2015 18:34:27 -0500 Message-Id: <1449531275-30362-3-git-send-email-jsnow@redhat.com> In-Reply-To: <1449531275-30362-1-git-send-email-jsnow@redhat.com> References: <1449531275-30362-1-git-send-email-jsnow@redhat.com> Subject: [Qemu-devel] [PATCH for-2.6 v2 02/10] fdc: refactor pick_geometry List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-block@nongnu.org Cc: kwolf@redhat.com, John Snow , armbru@redhat.com, qemu-devel@nongnu.org Modify this function to operate directly on FDrive objects instead of unpacking and passing all of those parameters manually. Helps reduce complexity in each caller, and reduces the number of args. Signed-off-by: John Snow --- hw/block/fdc.c | 54 +++++++++++++++++++++++------------------------------- 1 file changed, 23 insertions(+), 31 deletions(-) diff --git a/hw/block/fdc.c b/hw/block/fdc.c index 246b631..09bb63d 100644 --- a/hw/block/fdc.c +++ b/hw/block/fdc.c @@ -241,11 +241,9 @@ static void fd_recalibrate(FDrive *drv) fd_seek(drv, 0, 0, 1, 1); } -static void pick_geometry(BlockBackend *blk, int *nb_heads, - int *max_track, int *last_sect, - FDriveType drive_in, FDriveType *drive, - FDriveRate *rate) +static void pick_geometry(FDrive *drv) { + BlockBackend *blk = drv->blk; const FDFormat *parse; uint64_t nb_sectors, size; int i, first_match, match; @@ -258,8 +256,8 @@ static void pick_geometry(BlockBackend *blk, int *nb_heads, if (parse->drive == FDRIVE_DRV_NONE) { break; } - if (drive_in == parse->drive || - drive_in == FDRIVE_DRV_NONE) { + if (drv->drive == parse->drive || + drv->drive == FDRIVE_DRV_NONE) { size = (parse->max_head + 1) * parse->max_track * parse->last_sect; if (nb_sectors == size) { @@ -279,41 +277,35 @@ static void pick_geometry(BlockBackend *blk, int *nb_heads, } parse = &fd_formats[match]; } - *nb_heads = parse->max_head + 1; - *max_track = parse->max_track; - *last_sect = parse->last_sect; - *drive = parse->drive; - *rate = parse->rate; + + if (parse->max_head == 0) { + drv->flags &= ~FDISK_DBL_SIDES; + } else { + drv->flags |= FDISK_DBL_SIDES; + } + drv->max_track = parse->max_track; + drv->last_sect = parse->last_sect; + drv->drive = parse->drive; + drv->media_rate = parse->rate; + + if (drv->media_inserted) { + FLOPPY_DPRINTF("Floppy disk (%d h %d t %d s) %s\n", + parse->max_head + 1, + drv->max_track, drv->last_sect, + drv->ro ? "ro" : "rw"); + } } /* Revalidate a disk drive after a disk change */ static void fd_revalidate(FDrive *drv) { - int nb_heads, max_track, last_sect, ro; - FDriveType drive; - FDriveRate rate; - FLOPPY_DPRINTF("revalidate\n"); if (drv->blk != NULL) { - ro = blk_is_read_only(drv->blk); - pick_geometry(drv->blk, &nb_heads, &max_track, - &last_sect, drv->drive, &drive, &rate); + drv->ro = blk_is_read_only(drv->blk); + pick_geometry(drv); if (!drv->media_inserted) { FLOPPY_DPRINTF("No disk in drive\n"); - } else { - FLOPPY_DPRINTF("Floppy disk (%d h %d t %d s) %s\n", nb_heads, - max_track, last_sect, ro ? "ro" : "rw"); } - if (nb_heads == 1) { - drv->flags &= ~FDISK_DBL_SIDES; - } else { - drv->flags |= FDISK_DBL_SIDES; - } - drv->max_track = max_track; - drv->last_sect = last_sect; - drv->ro = ro; - drv->drive = drive; - drv->media_rate = rate; } else { FLOPPY_DPRINTF("No drive connected\n"); drv->last_sect = 0; -- 2.4.3