[prev in list] [next in list] [prev in thread] [next in thread] 

List:       openbsd-tech
Subject:    slight prettying of acpicpu output
From:       "John L. Scarfone" <johns () sunshine ! scarfone ! net>
Date:       2010-06-26 18:06:08
Message-ID: 20100626180608.GA18047 () sunshine ! scarfone ! net
[Download RAW message or body]

This changes the dmesg on one acpi enabled machine:

 acpiprt3 at acpi0: bus -1 (MPCI)
-acpicpu0 at acpi0acpicpu0: struck PSS entry, core frequency equals  last
-acpicpu0: struck PSS entry, core frequency equals  last
+acpicpu0 at acpi0
+acpicpu0: struck PSS entry, core frequency equals last
+acpicpu0: struck PSS entry, core frequency equals last
 acpicpu0: invalid _PSS length
-: C2
+acpicpu0: C2
 acpipwrres0 at acpi0: PADA

~~~~

Index: acpicpu.c
===================================================================
RCS file: /cvs/src/sys/dev/acpi/acpicpu.c,v
retrieving revision 1.56
diff -N -u -p acpicpu.c
--- acpicpu.c	29 Aug 2009 11:01:15 -0000	1.56
+++ acpicpu.c	26 Jun 2010 17:49:05 -0000
@@ -348,6 +348,8 @@ acpicpu_attach(struct device *parent, struct device *s
 		sc->sc_pblk_addr, sc->sc_pblk_len, sc->sc_duty_off,
 		sc->sc_duty_wid, sc->sc_acpi->sc_fadt->pstate_cnt,
 		CPU_MAXSTATE(sc));
+#else
+	printf("\n");
 #endif
 
 	/* Get C-States from _CST or FADT */
@@ -423,7 +425,7 @@ acpicpu_attach(struct device *parent, struct device *s
 	 * ACPI CPU provides.
 	 */
 	if (!SLIST_EMPTY(&sc->sc_cstates)) {
-		printf(":");
+		printf("%s:", DEVNAME(sc));
 
 		i = 0;
 		SLIST_FOREACH(cx, &sc->sc_cstates, link) {
@@ -448,7 +450,10 @@ acpicpu_attach(struct device *parent, struct device *s
 
 	if (!(sc->sc_flags & (FLAGS_NOPSS | FLAGS_NOPCT)) ||
 	    !(sc->sc_flags & FLAGS_NOPSS)) {
-		printf("%c ", SLIST_EMPTY(&sc->sc_cstates) ? ':' : ',');
+		if (SLIST_EMPTY(&sc->sc_cstates))
+			printf("%s: ", DEVNAME(sc));
+		else
+			printf(", ");
 
 		/*
 		 * If acpicpu is itself providing the capability to transition
@@ -584,7 +589,7 @@ acpicpu_getpss(struct acpicpu_softc *sc)
 		 */
 		if (cf == sc->sc_pss[c].pss_core_freq) {
 			printf("%s: struck PSS entry, core frequency equals "
-			    " last\n", sc->sc_dev.dv_xname);
+			    "last\n", sc->sc_dev.dv_xname);
 			continue;
 		}

[prev in list] [next in list] [prev in thread] [next in thread]