From aeed8cc78ea9e64e8efe0c02749c616ddbb8c06e Mon Sep 17 00:00:00 2001 From: marcel Date: Mon, 23 Dec 2002 03:48:59 +0000 Subject: 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. While here, remove redundant parenthesis and reindent the debug print to avoid long lines. --- sys/dev/acpica/acpi_resource.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'sys/dev/acpica/acpi_resource.c') diff --git a/sys/dev/acpica/acpi_resource.c b/sys/dev/acpica/acpi_resource.c index 20200fc..9dc0e3c 100644 --- a/sys/dev/acpica/acpi_resource.c +++ b/sys/dev/acpica/acpi_resource.c @@ -238,10 +238,10 @@ acpi_parse_resources(device_t dev, ACPI_HANDLE handle, struct acpi_parse_resourc "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 @@ acpi_parse_resources(device_t dev, ACPI_HANDLE handle, struct acpi_parse_resourc "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; } -- cgit v1.1