From patchwork Wed Feb 17 18:25:32 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roman Kagan X-Patchwork-Id: 584280 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 0AA651401CA for ; Thu, 18 Feb 2016 05:26:59 +1100 (AEDT) Received: from localhost ([::1]:60434 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aW6oT-0005JA-1O for incoming@patchwork.ozlabs.org; Wed, 17 Feb 2016 13:26:57 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54796) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aW6nk-00048i-5T for qemu-devel@nongnu.org; Wed, 17 Feb 2016 13:26:13 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aW6nf-0001y9-R0 for qemu-devel@nongnu.org; Wed, 17 Feb 2016 13:26:12 -0500 Received: from mailhub.sw.ru ([195.214.232.25]:27248 helo=relay.sw.ru) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aW6nf-0001xz-Cd for qemu-devel@nongnu.org; Wed, 17 Feb 2016 13:26:07 -0500 Received: from rkaganb.sw.ru ([10.30.3.95]) by relay.sw.ru (8.13.4/8.13.4) with ESMTP id u1HIPpZf032169; Wed, 17 Feb 2016 21:25:59 +0300 (MSK) From: Roman Kagan To: qemu-devel@nongnu.org Date: Wed, 17 Feb 2016 21:25:32 +0300 Message-Id: <1455733533-12030-4-git-send-email-rkagan@virtuozzo.com> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1455733533-12030-1-git-send-email-rkagan@virtuozzo.com> References: <1455733533-12030-1-git-send-email-rkagan@virtuozzo.com> X-detected-operating-system: by eggs.gnu.org: OpenBSD 3.x X-Received-From: 195.214.232.25 Cc: "Michael S. Tsirkin" , Laszlo Ersek , Kevin O'Connor , Roman Kagan , Igor Mammedov , Marcel Apfelbaum , Denis Lunev , John Snow Subject: [Qemu-devel] [PATCH v8 3/4] fdc: add function to determine drive chs limits 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 When populating ACPI objects for floppy drives one needs to provide the maximum values for cylinder, sector, and head number the drive supports. This patch adds a function that iterates through the array of predefined floppy drive formats and returns the maximum values of c, h, s, out of those matching the given floppy drive type. Signed-off-by: Roman Kagan Cc: Igor Mammedov Cc: "Michael S. Tsirkin" Cc: Marcel Apfelbaum Cc: John Snow Cc: Laszlo Ersek Cc: Kevin O'Connor Reviewed-by: John Snow --- changes since v7: - use drive max c,h,s rather than the current diskette geometry hw/block/fdc.c | 23 +++++++++++++++++++++++ include/hw/block/fdc.h | 2 ++ 2 files changed, 25 insertions(+) diff --git a/hw/block/fdc.c b/hw/block/fdc.c index 9838d21..fc3aef9 100644 --- a/hw/block/fdc.c +++ b/hw/block/fdc.c @@ -2557,6 +2557,29 @@ FloppyDriveType isa_fdc_get_drive_type(ISADevice *fdc, int i) return isa->state.drives[i].drive; } +void isa_fdc_get_drive_max_chs(FloppyDriveType type, + uint8_t *maxc, uint8_t *maxh, uint8_t *maxs) +{ + const FDFormat *fdf; + + *maxc = *maxh = *maxs = 0; + for (fdf = fd_formats; fdf->drive != FLOPPY_DRIVE_TYPE_NONE; fdf++) { + if (fdf->drive != type) { + continue; + } + if (*maxc < fdf->max_track) { + *maxc = fdf->max_track; + } + if (*maxh < fdf->max_head) { + *maxh = fdf->max_head; + } + if (*maxs < fdf->last_sect) { + *maxs = fdf->last_sect; + } + } + (*maxc)--; +} + static const VMStateDescription vmstate_isa_fdc ={ .name = "fdc", .version_id = 2, diff --git a/include/hw/block/fdc.h b/include/hw/block/fdc.h index adce14f..1749dab 100644 --- a/include/hw/block/fdc.h +++ b/include/hw/block/fdc.h @@ -15,5 +15,7 @@ void sun4m_fdctrl_init(qemu_irq irq, hwaddr io_base, DriveInfo **fds, qemu_irq *fdc_tc); FloppyDriveType isa_fdc_get_drive_type(ISADevice *fdc, int i); +void isa_fdc_get_drive_max_chs(FloppyDriveType type, + uint8_t *maxc, uint8_t *maxh, uint8_t *maxs); #endif