Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/dev/acpi Format string cosmetics (mainly from %d to %u).
details: https://anonhg.NetBSD.org/src/rev/f5c3f60eb815
branches: trunk
changeset: 752632:f5c3f60eb815
user: jruoho <jruoho%NetBSD.org@localhost>
date: Tue Mar 02 18:44:46 2010 +0000
description:
Format string cosmetics (mainly from %d to %u).
diffstat:
sys/dev/acpi/acpi.c | 10 +++++-----
sys/dev/acpi/acpi_ec.c | 6 +++---
sys/dev/acpi/acpi_madt.c | 12 ++++++------
sys/dev/acpi/acpi_powerres.c | 12 ++++++------
sys/dev/acpi/acpi_resource.c | 30 +++++++++++++++---------------
sys/dev/acpi/aiboost.c | 8 ++++----
sys/dev/acpi/atk0110.c | 6 +++---
sys/dev/acpi/dalb_acpi.c | 6 +++---
sys/dev/acpi/fdc_acpi.c | 10 +++++-----
sys/dev/acpi/sony_acpi.c | 8 ++++----
10 files changed, 54 insertions(+), 54 deletions(-)
diffs (truncated from 462 to 300 lines):
diff -r 0291f5bf15e8 -r f5c3f60eb815 sys/dev/acpi/acpi.c
--- a/sys/dev/acpi/acpi.c Tue Mar 02 18:00:24 2010 +0000
+++ b/sys/dev/acpi/acpi.c Tue Mar 02 18:44:46 2010 +0000
@@ -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;
}
diff -r 0291f5bf15e8 -r f5c3f60eb815 sys/dev/acpi/acpi_ec.c
--- a/sys/dev/acpi/acpi_ec.c Tue Mar 02 18:00:24 2010 +0000
+++ b/sys/dev/acpi/acpi_ec.c Tue Mar 02 18:44:46 2010 +0000
@@ -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 <joerg%NetBSD.org@localhost>.
@@ -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;
}
diff -r 0291f5bf15e8 -r f5c3f60eb815 sys/dev/acpi/acpi_madt.c
--- a/sys/dev/acpi/acpi_madt.c Tue Mar 02 18:00:24 2010 +0000
+++ b/sys/dev/acpi/acpi_madt.c Tue Mar 02 18:44:46 2010 +0000
@@ -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;
diff -r 0291f5bf15e8 -r f5c3f60eb815 sys/dev/acpi/acpi_powerres.c
--- a/sys/dev/acpi/acpi_powerres.c Tue Mar 02 18:00:24 2010 +0000
+++ b/sys/dev/acpi/acpi_powerres.c Tue Mar 02 18:44:46 2010 +0000
@@ -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;
}
diff -r 0291f5bf15e8 -r f5c3f60eb815 sys/dev/acpi/acpi_resource.c
--- a/sys/dev/acpi/acpi_resource.c Tue Mar 02 18:00:24 2010 +0000
+++ b/sys/dev/acpi/acpi_resource.c Tue Mar 02 18:44:46 2010 +0000
@@ -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;
}
Home |
Main Index |
Thread Index |
Old Index