From owner-freebsd-alpha@FreeBSD.ORG Thu Nov 6 15:20:11 2003 Return-Path: Delivered-To: freebsd-alpha@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id EC24416A4CE for ; Thu, 6 Nov 2003 15:20:10 -0800 (PST) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6596F43FF5 for ; Thu, 6 Nov 2003 15:20:09 -0800 (PST) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.9/8.12.9) with ESMTP id hA6NK9FY040423 for ; Thu, 6 Nov 2003 15:20:09 -0800 (PST) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.9/8.12.9/Submit) id hA6NK9M4040422; Thu, 6 Nov 2003 15:20:09 -0800 (PST) (envelope-from gnats) Resent-Date: Thu, 6 Nov 2003 15:20:09 -0800 (PST) Resent-Message-Id: <200311062320.hA6NK9M4040422@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-alpha@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Oliver Lehmann Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7CC7616A4CE; Thu, 6 Nov 2003 15:17:02 -0800 (PST) Received: from kartoffel.salatschuessel.net (pD9520D2A.dip.t-dialin.net [217.82.13.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id E3F5643FF2; Thu, 6 Nov 2003 15:16:53 -0800 (PST) (envelope-from olivleh1@kartoffel.salatschuessel.net) Received: from kartoffel.salatschuessel.net (localhost [127.0.0.1]) hA6NGqSx027401; Fri, 7 Nov 2003 00:16:53 +0100 (CET) (envelope-from olivleh1@kartoffel.salatschuessel.net) Received: (from olivleh1@localhost)hA6NGqE1027400; Fri, 7 Nov 2003 00:16:52 +0100 (CET) (envelope-from olivleh1) Message-Id: <200311062316.hA6NGqE1027400@kartoffel.salatschuessel.net> Date: Fri, 7 Nov 2003 00:16:52 +0100 (CET) From: Oliver Lehmann To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 cc: Oliver Lehmann Subject: alpha/59026: re-add Floppy-Dtectection-Support for FreeBSD/alpha X-BeenThere: freebsd-alpha@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: Oliver Lehmann List-Id: Porting FreeBSD to the Alpha List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 06 Nov 2003 23:20:11 -0000 >Number: 59026 >Category: alpha >Synopsis: re-add Floppy-Dtectection-Support for FreeBSD/alpha >Confidential: no >Severity: non-critical >Priority: high >Responsible: freebsd-alpha >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Thu Nov 06 15:20:08 PST 2003 >Closed-Date: >Last-Modified: >Originator: Oliver Lehmann >Release: FreeBSD 4.9-RC i386 >Organization: >Environment: FreeBSD 5.1-p10 alpha (patch is made against HEAD file) >Description: To get back a working and floppydrive detection on FreeBSD/alpha: I moved in fd_probe() if (fd->type == FDT_NONE && (fd->fdu == 0 || fd->fdu == 1)) { out of the #if defined(__i386__) || defined(__amd64__) block and created an #else section (like it allready was in RELENG_4!) where the fd->type is set to 144 by force. Why not just re-create the #else block? Why moving the if statement out of the #ifdef block? Doing it that way, it's still possible to set hint.fd.0.flags for example to 3 (720KB Floppy), and only set the 1.44M type as a fallback when flags is NULL (FDT_NONE) which means in that case, hint.fd.0.flags isn't defined. (Because we don't query the "BIOS" as we do it for x86 to get the info what kind of floppy is attached to fdc.) before: orm0: