From owner-cvs-all@FreeBSD.ORG Wed Jul 28 22:35:50 2004 Return-Path: Delivered-To: cvs-all@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 51C8316A4CE; Wed, 28 Jul 2004 22:35:50 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 47E6443D75; Wed, 28 Jul 2004 22:35:50 +0000 (GMT) (envelope-from njl@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i6SMZfog014441; Wed, 28 Jul 2004 22:35:41 GMT (envelope-from njl@repoman.freebsd.org) Received: (from njl@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i6SMZfdU014440; Wed, 28 Jul 2004 22:35:41 GMT (envelope-from njl) Message-Id: <200407282235.i6SMZfdU014440@repoman.freebsd.org> From: Nate Lawson Date: Wed, 28 Jul 2004 22:35:41 +0000 (UTC) To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org X-FreeBSD-CVS-Branch: HEAD Subject: cvs commit: src/sys/dev/fdc fdc_acpi.c X-BeenThere: cvs-all@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: CVS commit messages for the entire tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 28 Jul 2004 22:35:50 -0000 njl 2004-07-28 22:35:41 UTC FreeBSD src repository Modified files: sys/dev/fdc fdc_acpi.c Log: Fix ACPI floppy enumeration for three types of divergent behavior. * Some systems have _FDE and child floppy devices, but no _FDI. This seems to be compatible with the standard. Don't error out if there is no _FDI. Instead, continue on to the next device. The normal fd probe will take care of this device. * Some systems have _FDE but no child devices in AML. For these, add a second pass that compares the results of _FDE to the presence of devices. If not present, add the missing device. * Some BIOS authors didn't read the spec. They use tape drive values for all fdc(4) devices. Since this isn't grossly incompatible with the required boolean value, use them. They also define the _FDE items as a package instead of buffer. Regenerate the buffer from the package if it is present. Tested by: tjr, marcel Revision Changes Path 1.2 +90 -40 src/sys/dev/fdc/fdc_acpi.c