CVS commit: src/sys/dev/acpi

[Jukka Ruohonen]

Module Name:    src
Committed By:   jruoho
Date:           Wed Aug 11 10:44:07 UTC 2010

Modified Files:
        src/sys/dev/acpi: acpi_cpu_cstate.c acpi_cpu_pstate.c

Log Message:
Pretty printing.


To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/sys/dev/acpi/acpi_cpu_cstate.c
cvs rdiff -u -r1.7 -r1.8 src/sys/dev/acpi/acpi_cpu_pstate.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_cpu_cstate.c
diff -u src/sys/dev/acpi/acpi_cpu_cstate.c:1.21 src/sys/dev/acpi/acpi_cpu_cstate.c:1.22
--- src/sys/dev/acpi/acpi_cpu_cstate.c:1.21	Tue Aug 10 05:22:07 2010
+++ src/sys/dev/acpi/acpi_cpu_cstate.c	Wed Aug 11 10:44:07 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_cpu_cstate.c,v 1.21 2010/08/10 05:22:07 jruoho Exp $ */
+/* $NetBSD: acpi_cpu_cstate.c,v 1.22 2010/08/11 10:44:07 jruoho Exp $ */
 
 /*-
  * Copyright (c) 2010 Jukka Ruohonen <jruoho...@iki.fi>
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_cpu_cstate.c,v 1.21 2010/08/10 05:22:07 jruoho Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_cpu_cstate.c,v 1.22 2010/08/11 10:44:07 jruoho Exp $");
 
 #include <sys/param.h>
 #include <sys/cpu.h>
@@ -126,7 +126,7 @@
 		switch (cs->cs_method) {
 
 		case ACPICPU_C_STATE_HALT:
-			str = "HALT";
+			str = "HLT";
 			break;
 
 		case ACPICPU_C_STATE_FFH:
@@ -134,14 +134,14 @@
 			break;
 
 		case ACPICPU_C_STATE_SYSIO:
-			str = "SYSIO";
+			str = "I/O";
 			break;
 
 		default:
 			panic("NOTREACHED");
 		}
 
-		aprint_debug_dev(sc->sc_dev, "C%d: %5s, "
+		aprint_debug_dev(sc->sc_dev, "C%d: %3s, "
 		    "lat %3u us, pow %5u mW, addr 0x%06x, flags 0x%02x\n",
 		    i, str, cs->cs_latency, cs->cs_power,
 		    (uint32_t)cs->cs_addr, cs->cs_flags);

Index: src/sys/dev/acpi/acpi_cpu_pstate.c
diff -u src/sys/dev/acpi/acpi_cpu_pstate.c:1.7 src/sys/dev/acpi/acpi_cpu_pstate.c:1.8
--- src/sys/dev/acpi/acpi_cpu_pstate.c:1.7	Tue Aug 10 02:42:05 2010
+++ src/sys/dev/acpi/acpi_cpu_pstate.c	Wed Aug 11 10:44:07 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_cpu_pstate.c,v 1.7 2010/08/10 02:42:05 jruoho Exp $ */
+/* $NetBSD: acpi_cpu_pstate.c,v 1.8 2010/08/11 10:44:07 jruoho Exp $ */
 
 /*-
  * Copyright (c) 2010 Jukka Ruohonen <jruoho...@iki.fi>
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_cpu_pstate.c,v 1.7 2010/08/10 02:42:05 jruoho Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_cpu_pstate.c,v 1.8 2010/08/11 10:44:07 jruoho Exp $");
 
 #include <sys/param.h>
 #include <sys/evcnt.h>
@@ -105,7 +105,7 @@
 	const char *str;
 	uint32_t i;
 
-	str = (method != ACPI_ADR_SPACE_SYSTEM_IO) ? "FFH" : "SYSIO";
+	str = (method != ACPI_ADR_SPACE_SYSTEM_IO) ? "FFH" : "I/O";
 
 	for (i = 0; i < sc->sc_pstate_count; i++) {
 
@@ -114,7 +114,7 @@
 		if (ps->ps_freq == 0)
 			continue;
 
-		aprint_debug_dev(sc->sc_dev, "P%d: %5s, "
+		aprint_debug_dev(sc->sc_dev, "P%d: %3s, "
 		    "lat %3u us, pow %5u mW, %4u MHz\n",
 		    i, str, ps->ps_latency, ps->ps_power, ps->ps_freq);
 	}