svn commit: r223370 - head/sys/dev/acpica

[Jung-uk Kim]

On Tuesday 21 June 2011 03:29 pm, John Baldwin wrote:
> Author: jhb
> Date: Tue Jun 21 19:29:27 2011
> New Revision: 223370
> URL: http://svn.freebsd.org/changeset/base/223370
>
> Log:
>   Use AcpiWalkResources() to parse the resource list from _CRS
> rather than using a home-rolled loop.  While here, add support for
> 64-bit address range resources.

This broke build with ACPI_DEBUG.  The attached patch should fix it.

>   Silence on:	acpi@ (older version)

Sorry, I am quite busy at $work recently. :-(

Jung-uk Kim
-------------- next part --------------
Index: sys/dev/acpica/acpi_resource.c
===================================================================
--- sys/dev/acpica/acpi_resource.c	(revision 223372)
+++ sys/dev/acpica/acpi_resource.c	(working copy)
@@ -343,22 +343,23 @@ acpi_parse_resource(ACPI_RESOURCE *res, void *cont
 	if (res->Data.Address.MinAddressFixed == ACPI_ADDRESS_FIXED &&
 	    res->Data.Address.MaxAddressFixed == ACPI_ADDRESS_FIXED) {
 	    if (res->Data.Address.ResourceType == ACPI_MEMORY_RANGE) {
-		ACPI_DEBUG_PRINT((ACPI_DB_RESOURCES, "%s/Memory 0x%x/%d\n",
-		    name, min, length));
+		ACPI_DEBUG_PRINT((ACPI_DB_RESOURCES, "%s/Memory 0x%jx/%ju\n",
+		    name, (uintmax_t)min, (uintmax_t)length));
 		set->set_memory(dev, arc->context, min, length);
 	    } else {
-		ACPI_DEBUG_PRINT((ACPI_DB_RESOURCES, "%s/IO 0x%x/%d\n", name,
-		    min, length));
+		ACPI_DEBUG_PRINT((ACPI_DB_RESOURCES, "%s/IO 0x%jx/%ju\n", name,
+		    (uintmax_t)min, (uintmax_t)length));
 		set->set_ioport(dev, arc->context, min, length);
 	    }
 	} else {
 	    if (res->Data.Address32.ResourceType == ACPI_MEMORY_RANGE) {
-		ACPI_DEBUG_PRINT((ACPI_DB_RESOURCES, "%s/Memory 0x%x-0x%x/%d\n",
-		    name, min, max, length));
+		ACPI_DEBUG_PRINT((ACPI_DB_RESOURCES,
+		    "%s/Memory 0x%jx-0x%jx/%ju\n", name, (uintmax_t)min,
+		    (uintmax_t)max, (uintmax_t)length));
 		set->set_memoryrange(dev, arc->context, min, max, length, gran);
 	    } else {
-		ACPI_DEBUG_PRINT((ACPI_DB_RESOURCES, "%s/IO 0x%x-0x%x/%d\n",
-		    name, min, max, length));
+		ACPI_DEBUG_PRINT((ACPI_DB_RESOURCES, "%s/IO 0x%jx-0x%jx/%ju\n",
+		    name, (uintmax_t)min, (uintmax_t)max, (uintmax_t)length));
 		set->set_iorange(dev, arc->context, min, max, length, gran);
 	    }
 	}