[v2] r4271 - in trunk/coreboot-v2/src: devices include/device

Author: myles
Date: 2009-05-12 15:43:34 +0200 (Tue, 12 May 2009)
New Revision: 4271

Modified:
   trunk/coreboot-v2/src/devices/device.c
   trunk/coreboot-v2/src/include/device/device.h
Log:
Use the debugging functions to print out the tree and resources.

Signed-off-by: Myles Watson 
Acked-by: Carl-Daniel Hailfinger

Modified: trunk/coreboot-v2/src/devices/device.c
===================================================================
--- trunk/coreboot-v2/src/devices/device.c	2009-05-11 22:45:35 UTC (rev 4270)
+++ trunk/coreboot-v2/src/devices/device.c	2009-05-12 13:43:34 UTC (rev 4271)
@@ -618,6 +618,12 @@
    unsigned subordinate;
    printk_info("Enumerating buses...\n");
    root = &dev_root;
+
+	show_all_devs(BIOS_DEBUG, "Before Phase 3.");
+	printk_debug("Compare with tree...\n");
+
+	show_devs_tree(root, BIOS_DEBUG, 0, 0);
+
    if (root->chip_ops && root->chip_ops->enable_dev) {
    	root->chip_ops->enable_dev(root);
    }
@@ -651,6 +657,9 @@
    printk_info("Allocating resources...\n");

root = &dev_root;
+
+	print_resource_tree(root, BIOS_DEBUG, "Original.");
+
    if (!root->ops || !root->ops->read_resources) {
    	printk_err("dev_root missing read_resources\n");
    	return;
@@ -664,6 +673,8 @@
    root->ops->read_resources(root);
    printk_info("Done reading resources.\n");

+	print_resource_tree(root, BIOS_DEBUG, "After reading.");
+
    /* Get the resources */
    io  = &root->resource[0];
    mem = &root->resource[1];
@@ -681,6 +692,7 @@
 #if CONFIG_CONSOLE_VGA == 1
    /* Allocate the VGA I/O resource.. */
    allocate_vga_resource();
+	print_resource_tree(root, BIOS_DEBUG, "After VGA.");
 #endif

/* Store the computed resource allocations into device registers ... */
@@ -691,6 +703,7 @@
    mem->flags |= IORESOURCE_STORED;
    report_resource_stored(root, mem, "");
 #endif
+	print_resource_tree(root, BIOS_DEBUG, "After assigning values.");

printk_info("Done allocating resources.\n");
 }
@@ -737,5 +750,6 @@
    	}
    }
    printk_info("Devices initialized\n");
+	show_all_devs(BIOS_DEBUG, "After init.");
 }

Modified: trunk/coreboot-v2/src/include/device/device.h
===================================================================
--- trunk/coreboot-v2/src/include/device/device.h	2009-05-11 22:45:35 UTC (rev 4270)
+++ trunk/coreboot-v2/src/include/device/device.h	2009-05-12 13:43:34 UTC (rev 4271)
@@ -126,7 +126,6 @@
 device_t dev_find_slot_on_smbus (unsigned int bus, unsigned int addr);

/* Debug functions */
-void resource_tree(struct device * root, int debug_level, int depth);
 void print_resource_tree(struct device * root, int debug_level,
    		 const char *msg);
 void show_devs_tree(struct device *dev, int debug_level, int depth, int linknum);