From d1eeba86f000200827df92cfaae35be776d6be1d Mon Sep 17 00:00:00 2001 From: Myles Watson Date: Mon, 17 Nov 2008 19:18:36 +0000 Subject: [PATCH] This patch clarifies/fixes some debug output. Signed-off-by: Myles Watson Acked-by: Myles Watson git-svn-id: svn://coreboot.org/repository/coreboot-v3@1039 f3766cd6-281f-0410-b1cd-43a5c92072e9 --- device/device.c | 6 ++---- northbridge/amd/k8/util.c | 7 ++++--- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/device/device.c b/device/device.c index a56eacf45d..e33fe8f057 100644 --- a/device/device.c +++ b/device/device.c @@ -1095,11 +1095,9 @@ void show_devs_tree(struct device *dev, int debug_level, int depth, int linknum) 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) diff --git a/northbridge/amd/k8/util.c b/northbridge/amd/k8/util.c index d2625f7512..0cbadfacae 100644 --- a/northbridge/amd/k8/util.c +++ b/northbridge/amd/k8/util.c @@ -127,10 +127,11 @@ void showdram(int level, u8 which, u32 base, u32 lim) 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"); } /**