From patchwork Wed Jul 1 01:20:35 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Snow X-Patchwork-Id: 489838 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 82CCC14090B for ; Wed, 1 Jul 2015 11:23:26 +1000 (AEST) Received: from localhost ([::1]:49274 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZA6kG-0006C9-Fj for incoming@patchwork.ozlabs.org; Tue, 30 Jun 2015 21:23:24 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54259) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZA6hs-0001Tw-Pk for qemu-devel@nongnu.org; Tue, 30 Jun 2015 21:20:58 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZA6hr-00088d-3g for qemu-devel@nongnu.org; Tue, 30 Jun 2015 21:20:56 -0400 Received: from mx1.redhat.com ([209.132.183.28]:45511) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZA6hn-00085u-FJ; Tue, 30 Jun 2015 21:20:51 -0400 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (Postfix) with ESMTPS id 292B28F26C; Wed, 1 Jul 2015 01:20:51 +0000 (UTC) Received: from scv.usersys.redhat.com (dhcp-17-29.bos.redhat.com [10.18.17.29]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id t611KkUd022276; Tue, 30 Jun 2015 21:20:50 -0400 From: John Snow To: qemu-block@nongnu.org Date: Tue, 30 Jun 2015 21:20:35 -0400 Message-Id: <1435713640-12362-6-git-send-email-jsnow@redhat.com> In-Reply-To: <1435713640-12362-1-git-send-email-jsnow@redhat.com> References: <1435713640-12362-1-git-send-email-jsnow@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: kwolf@redhat.com, John Snow , armbru@redhat.com, qemu-devel@nongnu.org Subject: [Qemu-devel] [RFC 05/10] fdc: refactor pick_geometry X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Lessen the number of parameters it takes. Signed-off-by: John Snow --- hw/block/fdc.c | 39 +++++++++++++++------------------------ 1 file changed, 15 insertions(+), 24 deletions(-) diff --git a/hw/block/fdc.c b/hw/block/fdc.c index be6bf25..4004b98 100644 --- a/hw/block/fdc.c +++ b/hw/block/fdc.c @@ -243,22 +243,20 @@ static void fd_recalibrate(FDrive *drv) static FDriveType get_default_drive_type(FDrive *drv); -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, int *nb_heads) { + BlockBackend *blk = drv->blk; const FDFormat *parse; uint64_t nb_sectors, size; int i, first_match, match; /* Pick a default drive type if there's no media inserted AND we have * not yet announced our drive type to the CMOS. */ - if (!blk_is_inserted(blk) && drive_in == FDRIVE_DRV_NONE) { + if (!blk_is_inserted(blk) && drv->drive == FDRIVE_DRV_NONE) { for (i = 0; ; i++) { parse = &fd_formats[i]; if ((parse->drive == FDRIVE_DRV_NONE) || - (parse->drive == *drive)) { + (parse->drive == get_default_drive_type(drv))) { break; } } @@ -273,8 +271,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) { @@ -297,40 +295,33 @@ static void pick_geometry(BlockBackend *blk, int *nb_heads, out: *nb_heads = parse->max_head + 1; - *max_track = parse->max_track; - *last_sect = parse->last_sect; - *drive = parse->drive; - *rate = parse->rate; + drv->max_track = parse->max_track; + drv->last_sect = parse->last_sect; + drv->drive = parse->drive; + drv->media_rate = parse->rate; } /* Revalidate a disk drive after a disk change */ static void fd_revalidate(FDrive *drv) { - int nb_heads, max_track, last_sect, ro; - FDriveType drive = get_default_drive_type(drv); - FDriveRate rate; + int nb_heads = -1; 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, &nb_heads); if (!blk_is_inserted(drv->blk)) { 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"); + drv->max_track, drv->last_sect, + drv->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;