Module Name: src Committed By: jruoho Date: Tue Mar 2 18:44:47 UTC 2010
Modified Files: src/sys/dev/acpi: acpi.c acpi_ec.c acpi_madt.c acpi_powerres.c acpi_resource.c aiboost.c atk0110.c dalb_acpi.c fdc_acpi.c sony_acpi.c Log Message: Format string cosmetics (mainly from %d to %u). To generate a diff of this commit: cvs rdiff -u -r1.149 -r1.150 src/sys/dev/acpi/acpi.c cvs rdiff -u -r1.60 -r1.61 src/sys/dev/acpi/acpi_ec.c cvs rdiff -u -r1.19 -r1.20 src/sys/dev/acpi/acpi_madt.c cvs rdiff -u -r1.9 -r1.10 src/sys/dev/acpi/acpi_powerres.c cvs rdiff -u -r1.30 -r1.31 src/sys/dev/acpi/acpi_resource.c cvs rdiff -u -r1.28 -r1.29 src/sys/dev/acpi/aiboost.c cvs rdiff -u -r1.5 -r1.6 src/sys/dev/acpi/atk0110.c cvs rdiff -u -r1.7 -r1.8 src/sys/dev/acpi/dalb_acpi.c cvs rdiff -u -r1.36 -r1.37 src/sys/dev/acpi/fdc_acpi.c cvs rdiff -u -r1.13 -r1.14 src/sys/dev/acpi/sony_acpi.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/sys/dev/acpi/acpi.c diff -u src/sys/dev/acpi/acpi.c:1.149 src/sys/dev/acpi/acpi.c:1.150 --- src/sys/dev/acpi/acpi.c:1.149 Wed Feb 24 22:37:56 2010 +++ src/sys/dev/acpi/acpi.c Tue Mar 2 18:44:46 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: acpi.c,v 1.149 2010/02/24 22:37:56 dyoung Exp $ */ +/* $NetBSD: acpi.c,v 1.150 2010/03/02 18:44:46 jruoho Exp $ */ /*- * Copyright (c) 2003, 2007 The NetBSD Foundation, Inc. @@ -70,7 +70,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: acpi.c,v 1.149 2010/02/24 22:37:56 dyoung Exp $"); +__KERNEL_RCSID(0, "$NetBSD: acpi.c,v 1.150 2010/03/02 18:44:46 jruoho Exp $"); #include "opt_acpi.h" #include "opt_pcifixup.h" @@ -515,7 +515,7 @@ sc->sc_sleepstate = ACPI_STATE_S0; /* Show SCI interrupt. */ - aprint_verbose_dev(self, "SCI interrupting at int %d\n", + aprint_verbose_dev(self, "SCI interrupting at int %u\n", AcpiGbl_FADT.SciInterrupt); /* @@ -976,7 +976,7 @@ aprint_normal("buffer %p ", obj->Buffer.Pointer); break; default: - aprint_normal("type %d ",obj->Type); + aprint_normal("type %u ",obj->Type); break; } ACPI_FREE(buf.Pointer); @@ -1638,7 +1638,7 @@ resn->Length = resp->Length; break; default: - printf("acpi_allocate_resources: res=%d\n", resc->Type); + printf("acpi_allocate_resources: res=%u\n", resc->Type); rv = AE_BAD_DATA; goto out2; } Index: src/sys/dev/acpi/acpi_ec.c diff -u src/sys/dev/acpi/acpi_ec.c:1.60 src/sys/dev/acpi/acpi_ec.c:1.61 --- src/sys/dev/acpi/acpi_ec.c:1.60 Wed Feb 24 22:37:56 2010 +++ src/sys/dev/acpi/acpi_ec.c Tue Mar 2 18:44:46 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: acpi_ec.c,v 1.60 2010/02/24 22:37:56 dyoung Exp $ */ +/* $NetBSD: acpi_ec.c,v 1.61 2010/03/02 18:44:46 jruoho Exp $ */ /*- * Copyright (c) 2007 Joerg Sonnenberger <jo...@netbsd.org>. @@ -59,7 +59,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: acpi_ec.c,v 1.60 2010/02/24 22:37:56 dyoung Exp $"); +__KERNEL_RCSID(0, "$NetBSD: acpi_ec.c,v 1.61 2010/03/02 18:44:46 jruoho Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -190,7 +190,7 @@ if (ecdt->Control.BitWidth != 8 || ecdt->Data.BitWidth != 8) { aprint_error_dev(parent, - "ECDT register width invalid (%d/%d)\n", + "ECDT register width invalid (%u/%u)\n", ecdt->Control.BitWidth, ecdt->Data.BitWidth); return false; } Index: src/sys/dev/acpi/acpi_madt.c diff -u src/sys/dev/acpi/acpi_madt.c:1.19 src/sys/dev/acpi/acpi_madt.c:1.20 --- src/sys/dev/acpi/acpi_madt.c:1.19 Mon Jan 7 06:04:07 2008 +++ src/sys/dev/acpi/acpi_madt.c Tue Mar 2 18:44:47 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: acpi_madt.c,v 1.19 2008/01/07 06:04:07 tnn Exp $ */ +/* $NetBSD: acpi_madt.c,v 1.20 2010/03/02 18:44:47 jruoho Exp $ */ /* * Copyright (c) 2003 Wasabi Systems, Inc. @@ -36,7 +36,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: acpi_madt.c,v 1.19 2008/01/07 06:04:07 tnn Exp $"); +__KERNEL_RCSID(0, "$NetBSD: acpi_madt.c,v 1.20 2010/03/02 18:44:47 jruoho Exp $"); #include <sys/param.h> #include <sys/ioctl.h> @@ -131,14 +131,14 @@ static void acpi_print_lapic_ovr(ACPI_MADT_LOCAL_APIC_OVERRIDE *p) { - printf("lapic addr override: 0x%llx\n", (unsigned long long)p->Address); + printf("lapic addr override: 0x%"PRIx64"\n", p->Address); } static void acpi_print_iosapic(ACPI_MADT_IO_SAPIC *p) { - printf("iosapic: sapid %u address 0x%llx int vector base 0x%x\n", - p->Id, (unsigned long long)p->Address, p->GlobalIrqBase); + printf("iosapic: sapid %u address 0x%"PRIx64" int vector base 0x%x\n", + p->Id, p->Address, p->GlobalIrqBase); } static void @@ -223,7 +223,7 @@ acpi_print_platint((void *)hdrp); break; default: - printf("Unknown MADT entry type %d\n", hdrp->Type); + printf("Unknown MADT entry type %u\n", hdrp->Type); break; } return AE_OK; Index: src/sys/dev/acpi/acpi_powerres.c diff -u src/sys/dev/acpi/acpi_powerres.c:1.9 src/sys/dev/acpi/acpi_powerres.c:1.10 --- src/sys/dev/acpi/acpi_powerres.c:1.9 Mon Jan 18 18:36:50 2010 +++ src/sys/dev/acpi/acpi_powerres.c Tue Mar 2 18:44:47 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: acpi_powerres.c,v 1.9 2010/01/18 18:36:50 jruoho Exp $ */ +/* $NetBSD: acpi_powerres.c,v 1.10 2010/03/02 18:44:47 jruoho Exp $ */ /*- * Copyright (c) 2001 Michael Smith @@ -29,7 +29,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: acpi_powerres.c,v 1.9 2010/01/18 18:36:50 jruoho Exp $"); +__KERNEL_RCSID(0, "$NetBSD: acpi_powerres.c,v 1.10 2010/03/02 18:44:47 jruoho Exp $"); #include <sys/param.h> #include <sys/kernel.h> @@ -395,7 +395,7 @@ } reslist_object = (ACPI_OBJECT *)reslist_buffer.Pointer; if (reslist_object->Type != ACPI_TYPE_PACKAGE) { - ACPI_DEBUG_PRINT((ACPI_DB_OBJECTS, "resource list is not ACPI_TYPE_PACKAGE (%d)\n", + ACPI_DEBUG_PRINT((ACPI_DB_OBJECTS, "resource list is not ACPI_TYPE_PACKAGE (%u)\n", reslist_object->Type)); status = AE_TYPE; goto out; @@ -423,7 +423,7 @@ */ if (reslist_object != NULL) { ACPI_DEBUG_PRINT((ACPI_DB_OBJECTS, - "referencing %d new resources\n", + "referencing %u new resources\n", reslist_object->Package.Count)); acpi_foreach_package_object(reslist_object, acpi_pwr_reference_resource, pc); @@ -554,9 +554,9 @@ status = acpi_eval_integer(rp->ap_resource, "_STA", &cur); if (ACPI_FAILURE(status)) { ACPI_DEBUG_PRINT((ACPI_DB_OBJECTS, - "can't get status of %s - %d\n", + "can't get status of %s - %s\n", acpi_name(rp->ap_resource), - status)); + AcpiFormatException(status))); /* XXX is this correct? Always switch if in doubt? */ continue; } Index: src/sys/dev/acpi/acpi_resource.c diff -u src/sys/dev/acpi/acpi_resource.c:1.30 src/sys/dev/acpi/acpi_resource.c:1.31 --- src/sys/dev/acpi/acpi_resource.c:1.30 Wed Sep 16 10:47:54 2009 +++ src/sys/dev/acpi/acpi_resource.c Tue Mar 2 18:44:47 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: acpi_resource.c,v 1.30 2009/09/16 10:47:54 mlelstv Exp $ */ +/* $NetBSD: acpi_resource.c,v 1.31 2010/03/02 18:44:47 jruoho Exp $ */ /* * Copyright 2001 Wasabi Systems, Inc. @@ -67,7 +67,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: acpi_resource.c,v 1.30 2009/09/16 10:47:54 mlelstv Exp $"); +__KERNEL_RCSID(0, "$NetBSD: acpi_resource.c,v 1.31 2010/03/02 18:44:47 jruoho Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -102,7 +102,7 @@ switch (res->Type) { case ACPI_RESOURCE_TYPE_FIXED_IO: ACPI_DEBUG_PRINT((ACPI_DB_RESOURCES, - "FixedIo 0x%x/%d\n", + "FixedIo 0x%x/%u\n", res->Data.FixedIo.Address, res->Data.FixedIo.AddressLength)); if (ops->ioport) @@ -115,7 +115,7 @@ if (res->Data.Io.Minimum == res->Data.Io.Maximum) { ACPI_DEBUG_PRINT((ACPI_DB_RESOURCES, - "Io 0x%x/%d\n", + "Io 0x%x/%u\n", res->Data.Io.Minimum, res->Data.Io.AddressLength)); if (ops->ioport) @@ -124,7 +124,7 @@ res->Data.Io.AddressLength); } else { ACPI_DEBUG_PRINT((ACPI_DB_RESOURCES, - "Io 0x%x-0x%x/%d\n", + "Io 0x%x-0x%x/%u\n", res->Data.Io.Minimum, res->Data.Io.Maximum, res->Data.Io.AddressLength)); @@ -139,7 +139,7 @@ case ACPI_RESOURCE_TYPE_FIXED_MEMORY32: ACPI_DEBUG_PRINT((ACPI_DB_RESOURCES, - "FixedMemory32 0x%x/%d\n", + "FixedMemory32 0x%x/%u\n", res->Data.FixedMemory32.Address, res->Data.FixedMemory32.AddressLength)); if (ops->memory) @@ -152,7 +152,7 @@ if (res->Data.Memory32.Minimum == res->Data.Memory32.Maximum) { ACPI_DEBUG_PRINT((ACPI_DB_RESOURCES, - "Memory32 0x%x/%d\n", + "Memory32 0x%x/%u\n", res->Data.Memory32.Minimum, res->Data.Memory32.AddressLength)); if (ops->memory) @@ -161,7 +161,7 @@ res->Data.Memory32.AddressLength); } else { ACPI_DEBUG_PRINT((ACPI_DB_RESOURCES, - "Memory32 0x%x-0x%x/%d\n", + "Memory32 0x%x-0x%x/%u\n", res->Data.Memory32.Minimum, res->Data.Memory32.Maximum, res->Data.Memory32.AddressLength)); @@ -178,7 +178,7 @@ if (res->Data.Memory24.Minimum == res->Data.Memory24.Maximum) { ACPI_DEBUG_PRINT((ACPI_DB_RESOURCES, - "Memory24 0x%x/%d\n", + "Memory24 0x%x/%u\n", res->Data.Memory24.Minimum, res->Data.Memory24.AddressLength)); if (ops->memory) @@ -187,7 +187,7 @@ res->Data.Memory24.AddressLength); } else { ACPI_DEBUG_PRINT((ACPI_DB_RESOURCES, - "Memory24 0x%x-0x%x/%d\n", + "Memory24 0x%x-0x%x/%u\n", res->Data.Memory24.Minimum, res->Data.Memory24.Maximum, res->Data.Memory24.AddressLength)); @@ -203,7 +203,7 @@ case ACPI_RESOURCE_TYPE_IRQ: for (i = 0; i < res->Data.Irq.InterruptCount; i++) { ACPI_DEBUG_PRINT((ACPI_DB_RESOURCES, - "IRQ %d\n", + "IRQ %u\n", res->Data.Irq.Interrupts[i])); if (ops->irq) (*ops->irq)(arg->dev, arg->context, @@ -215,7 +215,7 @@ case ACPI_RESOURCE_TYPE_DMA: for (i = 0; i < res->Data.Dma.ChannelCount; i++) { ACPI_DEBUG_PRINT((ACPI_DB_RESOURCES, - "DRQ %d\n", + "DRQ %u\n", res->Data.Dma.Channels[i])); if (ops->drq) (*ops->drq)(arg->dev, arg->context, @@ -225,7 +225,7 @@ case ACPI_RESOURCE_TYPE_START_DEPENDENT: ACPI_DEBUG_PRINT((ACPI_DB_RESOURCES, - "Start dependant functions: %d\n", + "Start dependant functions: %u\n", res->Data.StartDpf.CompatibilityPriority)); if (ops->start_dep) (*ops->start_dep)(arg->dev, arg->context, @@ -304,7 +304,7 @@ } for (i = 0; i < res->Data.ExtendedIrq.InterruptCount; i++) { ACPI_DEBUG_PRINT((ACPI_DB_RESOURCES, - "ExtIRQ %d\n", + "ExtIRQ %u\n", res->Data.ExtendedIrq.Interrupts[i])); if (ops->irq) (*ops->irq)(arg->dev, arg->context, @@ -325,7 +325,7 @@ default: ACPI_DEBUG_PRINT((ACPI_DB_RESOURCES, - "Unknown resource type: %d\n", res->Type)); + "Unknown resource type: %u\n", res->Type)); break; } Index: src/sys/dev/acpi/aiboost.c diff -u src/sys/dev/acpi/aiboost.c:1.28 src/sys/dev/acpi/aiboost.c:1.29 --- src/sys/dev/acpi/aiboost.c:1.28 Thu Feb 18 13:52:33 2010 +++ src/sys/dev/acpi/aiboost.c Tue Mar 2 18:44:47 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: aiboost.c,v 1.28 2010/02/18 13:52:33 pgoyette Exp $ */ +/* $NetBSD: aiboost.c,v 1.29 2010/03/02 18:44:47 jruoho Exp $ */ /*- * Copyright (c) 2007 Juan Romero Pardines @@ -28,7 +28,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: aiboost.c,v 1.28 2010/02/18 13:52:33 pgoyette Exp $"); +__KERNEL_RCSID(0, "$NetBSD: aiboost.c,v 1.29 2010/03/02 18:44:47 jruoho Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -363,9 +363,9 @@ DPRINTF(("elem[%d]->Type = %x\n", i+1, elem->Type)); if (elem->Type == ACPI_TYPE_PACKAGE && elem->Package.Elements[0].Type == ACPI_TYPE_INTEGER) { - DPRINTF((" subelem->Type = %x, %d\n", + DPRINTF((" subelem->Type = %x, %"PRIu64"\n", elem->Package.Elements[0].Type, - (int)elem->Package.Elements[0].Integer.Value)); + elem->Package.Elements[0].Integer.Value)); } } #endif Index: src/sys/dev/acpi/atk0110.c diff -u src/sys/dev/acpi/atk0110.c:1.5 src/sys/dev/acpi/atk0110.c:1.6 --- src/sys/dev/acpi/atk0110.c:1.5 Sun Feb 14 23:06:58 2010 +++ src/sys/dev/acpi/atk0110.c Tue Mar 2 18:44:47 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: atk0110.c,v 1.5 2010/02/14 23:06:58 pgoyette Exp $ */ +/* $NetBSD: atk0110.c,v 1.6 2010/03/02 18:44:47 jruoho Exp $ */ /* $OpenBSD: atk0110.c,v 1.1 2009/07/23 01:38:16 cnst Exp $ */ /* @@ -18,7 +18,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: atk0110.c,v 1.5 2010/02/14 23:06:58 pgoyette Exp $"); +__KERNEL_RCSID(0, "$NetBSD: atk0110.c,v 1.6 2010/03/02 18:44:47 jruoho Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -220,7 +220,7 @@ /* acpica5 automatically evaluates the referenced package */ if(o[0].Type != ACPI_TYPE_PACKAGE) { aprint_error_dev(self, - "%s: %i: not a package: %i type\n", + "%s: %i: not a package: %u type\n", name, i, o[0].Type); continue; } Index: src/sys/dev/acpi/dalb_acpi.c diff -u src/sys/dev/acpi/dalb_acpi.c:1.7 src/sys/dev/acpi/dalb_acpi.c:1.8 --- src/sys/dev/acpi/dalb_acpi.c:1.7 Wed Feb 24 22:37:56 2010 +++ src/sys/dev/acpi/dalb_acpi.c Tue Mar 2 18:44:47 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: dalb_acpi.c,v 1.7 2010/02/24 22:37:56 dyoung Exp $ */ +/* $NetBSD: dalb_acpi.c,v 1.8 2010/03/02 18:44:47 jruoho Exp $ */ /*- * Copyright (c) 2008 Christoph Egger <ceg...@netbsd.org> @@ -27,7 +27,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: dalb_acpi.c,v 1.7 2010/02/24 22:37:56 dyoung Exp $"); +__KERNEL_RCSID(0, "$NetBSD: dalb_acpi.c,v 1.8 2010/03/02 18:44:47 jruoho Exp $"); /* * Direct Application Launch Button: @@ -136,7 +136,7 @@ obj = (ACPI_OBJECT *)ret.Pointer; if (obj->Type != ACPI_TYPE_BUFFER) { sc->sc_usageid = DALB_ID_INVALID; - aprint_debug_dev(dev, "invalid ACPI type: %d\n", obj->Type); + aprint_debug_dev(dev, "invalid ACPI type: %u\n", obj->Type); goto out; } Index: src/sys/dev/acpi/fdc_acpi.c diff -u src/sys/dev/acpi/fdc_acpi.c:1.36 src/sys/dev/acpi/fdc_acpi.c:1.37 --- src/sys/dev/acpi/fdc_acpi.c:1.36 Wed Sep 16 10:47:55 2009 +++ src/sys/dev/acpi/fdc_acpi.c Tue Mar 2 18:44:47 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: fdc_acpi.c,v 1.36 2009/09/16 10:47:55 mlelstv Exp $ */ +/* $NetBSD: fdc_acpi.c,v 1.37 2010/03/02 18:44:47 jruoho Exp $ */ /* * Copyright (c) 2002 Jared D. McNeill <jmcne...@invisible.ca> @@ -31,7 +31,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: fdc_acpi.c,v 1.36 2009/09/16 10:47:55 mlelstv Exp $"); +__KERNEL_RCSID(0, "$NetBSD: fdc_acpi.c,v 1.37 2010/03/02 18:44:47 jruoho Exp $"); #include "rnd.h" @@ -249,13 +249,13 @@ } fde = (ACPI_OBJECT *)abuf.Pointer; if (fde->Type != ACPI_TYPE_BUFFER) { - aprint_error_dev(sc->sc_dev, "expected BUFFER, got %d\n", + aprint_error_dev(sc->sc_dev, "expected BUFFER, got %u\n", fde->Type); goto out; } if (fde->Buffer.Length < 5 * sizeof(UINT32)) { aprint_error_dev(sc->sc_dev, - "expected buffer len of %lu, got %d\n", + "expected buffer len of %lu, got %u\n", (unsigned long)(5 * sizeof(UINT32)), fde->Buffer.Length); goto out; } @@ -316,7 +316,7 @@ fdi = (ACPI_OBJECT *)abuf.Pointer; if (fdi->Type != ACPI_TYPE_PACKAGE) { aprint_error_dev(sc->sc_dev, - "expected PACKAGE, got %d\n", fdi->Type); + "expected PACKAGE, got %u\n", fdi->Type); goto out; } e = fdi->Package.Elements; Index: src/sys/dev/acpi/sony_acpi.c diff -u src/sys/dev/acpi/sony_acpi.c:1.13 src/sys/dev/acpi/sony_acpi.c:1.14 --- src/sys/dev/acpi/sony_acpi.c:1.13 Wed Feb 24 22:37:56 2010 +++ src/sys/dev/acpi/sony_acpi.c Tue Mar 2 18:44:47 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: sony_acpi.c,v 1.13 2010/02/24 22:37:56 dyoung Exp $ */ +/* $NetBSD: sony_acpi.c,v 1.14 2010/03/02 18:44:47 jruoho Exp $ */ /*- * Copyright (c) 2005 The NetBSD Foundation, Inc. @@ -29,7 +29,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: sony_acpi.c,v 1.13 2010/02/24 22:37:56 dyoung Exp $"); +__KERNEL_RCSID(0, "$NetBSD: sony_acpi.c,v 1.14 2010/03/02 18:44:47 jruoho Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -292,14 +292,14 @@ ACPI_DEVICE_NOTIFY, sony_acpi_notify_handler, self); if (ACPI_FAILURE(rv)) aprint_error_dev(self, - "couldn't install notify handler (%d)\n", rv); + "couldn't install notify handler (%u)\n", rv); /* Install sysctl handler */ rv = AcpiWalkNamespace(ACPI_TYPE_METHOD, sc->sc_node->ad_handle, 1, sony_walk_cb, sc, NULL); #ifdef DIAGNOSTIC if (ACPI_FAILURE(rv)) - aprint_error_dev(self, "Cannot walk ACPI namespace (%d)\n", + aprint_error_dev(self, "Cannot walk ACPI namespace (%u)\n", rv); #endif