[coreboot] r1039 - in coreboot-v3: device northbridge/amd/k8

[svn at coreboot.org]

Author: myles
Date: 2008-11-17 20:18:36 +0100 (Mon, 17 Nov 2008)
New Revision: 1039

Modified:
   coreboot-v3/device/device.c
   coreboot-v3/northbridge/amd/k8/util.c
Log:
This patch clarifies/fixes some debug output.

Signed-off-by: Myles Watson <mylesgw at gmail.com>
Acked-by: Myles Watson <mylesgw at gmail.com>


Modified: coreboot-v3/device/device.c
===================================================================
--- coreboot-v3/device/device.c	2008-11-17 17:53:14 UTC (rev 1038)
+++ coreboot-v3/device/device.c	2008-11-17 19:18:36 UTC (rev 1039)
@@ -1095,11 +1095,9 @@
 	for (i = 0; i < depth; i++)
 		depth_str[i] = ' ';
 	depth_str[i] = '\0';
-	printk(debug_level, "%s%s(%s): enabled %d have_resources %d devfn %x\n",
+	printk(debug_level, "%s%s(%s): enabled %d, %d resources\n",
 	       depth_str, dev->dtsname, dev_path(dev), dev->enabled,
-	       dev->have_resources,
-	       dev->path.type == DEVICE_PATH_PCI ? dev->path.pci.devfn :
-		dev->path.type == DEVICE_PATH_PNP ? dev->path.pnp.device : 0xff);
+	       dev->resources);
 	for (i = 0; i < dev->links; i++) {
 		for (sibling = dev->link[i].children; sibling;
 		     sibling = sibling->sibling)

Modified: coreboot-v3/northbridge/amd/k8/util.c
===================================================================
--- coreboot-v3/northbridge/amd/k8/util.c	2008-11-17 17:53:14 UTC (rev 1038)
+++ coreboot-v3/northbridge/amd/k8/util.c	2008-11-17 19:18:36 UTC (rev 1039)
@@ -127,10 +127,11 @@
 void showconfig(int level, u8 which, u32 reg)
 {
 	/* Don't use node() and link() here. */
-	printk(level, "CONFIG(%02x)%02x-%02x ->(%d,%d),%s %s CE %d\n",
-	       which, BITS(reg, 24, 0xff), BITS(reg, 16, 0xff),
+	printk(level, "CONFIG(%02x)%02x-%02x ->(%d,%d),%s %s (%s numbers)\n",
+	       which, BITS(reg, 16, 0xff), BITS(reg, 24, 0xff),
 	       BITS(reg, 4, 0x7), BITS(reg, 8, 0x3),
-	       re(reg), we(reg), BITS(reg, 2, 0x1));
+	       re(reg), we(reg), 
+	       BITS(reg, 2, 0x1)?"dev":"bus");
 }
 
 /**