From owner-p4-projects  Sun Dec 22 19:22:54 2002
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 4864F37B405; Sun, 22 Dec 2002 19:22:52 -0800 (PST)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id D321537B401
	for <perforce@freebsd.org>; Sun, 22 Dec 2002 19:22:51 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 8963F43EF1
	for <perforce@freebsd.org>; Sun, 22 Dec 2002 19:22:51 -0800 (PST)
	(envelope-from marcel@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gBN3Mpfh084084
	for <perforce@freebsd.org>; Sun, 22 Dec 2002 19:22:51 -0800 (PST)
	(envelope-from marcel@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gBN3MpPo084081
	for perforce@freebsd.org; Sun, 22 Dec 2002 19:22:51 -0800 (PST)
Date: Sun, 22 Dec 2002 19:22:51 -0800 (PST)
Message-Id: <200212230322.gBN3MpPo084081@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f
From: Marcel Moolenaar <marcel@FreeBSD.org>
Subject: PERFORCE change 22647 for review
To: Perforce Change Reviews <perforce@freebsd.org>
Sender: owner-p4-projects@FreeBSD.ORG
Precedence: bulk
List-ID: <p4-projects.FreeBSD.ORG>
List-Archive: <http://docs.freebsd.org/mail/> (Web Archive)
List-Help: <mailto:majordomo@FreeBSD.ORG?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo@FreeBSD.ORG?subject=subscribe%20p4-projects>
List-Unsubscribe: <mailto:majordomo@FreeBSD.ORG?subject=unsubscribe%20p4-projects>
X-Loop: FreeBSD.ORG

http://perforce.freebsd.org/chv.cgi?CH=22647

Change 22647 by marcel@marcel_nfs on 2002/12/22 19:22:20

	Fix a De Morgan bug: If we only expect a memory range OR an
	I/O port range, then we should ignore a resource if it's NOT
	a memory range AND NOT an I/O port range.
	The OR in the condition caused us to ignore perfectly valid
	memory addresses and consequently left us we sio(4) devices
	without I/O port AND without memory addresses.
	
	While here, remove redundant parenthesis and reindent the
	debug print.

Affected files ...

.. //depot/projects/ia64/sys/dev/acpica/acpi_resource.c#6 edit

Differences ...

==== //depot/projects/ia64/sys/dev/acpica/acpi_resource.c#6 (text+ko) ====

@@ -238,10 +238,10 @@
 				     "IO" : "Memory"));
 		break;
 	    }
-	    if ((res->Data.Address32.ResourceType != ACPI_MEMORY_RANGE) ||
-		(res->Data.Address32.ResourceType != ACPI_IO_RANGE)) {
-		ACPI_DEBUG_PRINT((ACPI_DB_RESOURCES, 
-				  "ignored Address32 for non-memory, non-I/O\n"));
+	    if (res->Data.Address32.ResourceType != ACPI_MEMORY_RANGE &&
+		res->Data.Address32.ResourceType != ACPI_IO_RANGE) {
+		ACPI_DEBUG_PRINT((ACPI_DB_RESOURCES,
+			"ignored Address32 for non-memory, non-I/O\n"));
 		break;
 	    }
 
@@ -296,10 +296,10 @@
 				     "IO" : "Memory"));
 		break;
 	    }
-	    if ((res->Data.Address16.ResourceType != ACPI_MEMORY_RANGE) ||
-		(res->Data.Address16.ResourceType != ACPI_IO_RANGE)) {
-		ACPI_DEBUG_PRINT((ACPI_DB_RESOURCES, 
-				  "ignored Address16 for non-memory, non-I/O\n"));
+	    if (res->Data.Address16.ResourceType != ACPI_MEMORY_RANGE &&
+		res->Data.Address16.ResourceType != ACPI_IO_RANGE) {
+		ACPI_DEBUG_PRINT((ACPI_DB_RESOURCES,
+			"ignored Address16 for non-memory, non-I/O\n"));
 		break;
 	    }
 

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe p4-projects" in the body of the message