Module Name: src
Committed By: matt
Date: Sat May 28 05:25:39 UTC 2011
Modified Files:
src/sys/arch/powerpc/booke/dev: cpunode.c
Log Message:
Move debug printfs higher.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/powerpc/booke/dev/cpunode.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/arch/powerpc/booke/dev/cpunode.c
diff -u src/sys/arch/powerpc/booke/dev/cpunode.c:1.4 src/sys/arch/powerpc/booke/dev/cpunode.c:1.5
--- src/sys/arch/powerpc/booke/dev/cpunode.c:1.4 Wed Feb 16 18:45:33 2011
+++ src/sys/arch/powerpc/booke/dev/cpunode.c Sat May 28 05:25:39 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: cpunode.c,v 1.4 2011/02/16 18:45:33 matt Exp $ */
+/* $NetBSD: cpunode.c,v 1.5 2011/05/28 05:25:39 matt Exp $ */
/*-
* Copyright (c) 2010, 2011 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -36,7 +36,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cpunode.c,v 1.4 2011/02/16 18:45:33 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpunode.c,v 1.5 2011/05/28 05:25:39 matt Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -110,6 +110,19 @@
for (u_int childmask = 1; cnl->cnl_name != NULL; cnl++) {
bool inclusive = true;
bool found = (cnl->cnl_ids[0] == 0);
+
+#if DEBUG > 1
+ aprint_normal_dev(self, "dev=%s[%u], addr=%x@%x",
+ cnl->cnl_name, cnl->cnl_instance, cnl->cnl_size,
+ cnl->cnl_addr);
+ if (cnl->cnl_nintr > 0) {
+ aprint_normal(", intrs=%u", cnl->cnl_intrs[0]);
+ for (u_int i = 1; i < cnl->cnl_nintr; i++)
+ aprint_normal(",%u", cnl->cnl_intrs[i]);
+ }
+ aprint_normal("\n");
+#endif
+
for (u_int i = 0;
!found
&& i < __arraycount(cnl->cnl_ids)
@@ -141,17 +154,6 @@
cna.cna_childmask = childmask;
cna.cna_locs = *cnl;
-#if DEBUG > 1
- aprint_normal_dev(self, "dev=%s[%u], addr=%x@%x",
- cnl->cnl_name, cnl->cnl_instance, cnl->cnl_size,
- cnl->cnl_addr);
- if (cnl->cnl_nintr > 0) {
- aprint_normal(", intrs=%u", cnl->cnl_intrs[0]);
- for (u_int i = 1; i < cnl->cnl_nintr; i++)
- aprint_normal(",%u", cnl->cnl_intrs[i]);
- }
- aprint_normal("\n");
-#endif
(void)config_found_sm_loc(self, "cpunode", NULL, &cna,
cpunode_print, NULL);
childmask <<= 1;
