Author: ward Date: 2007-09-26 16:24:52 +0200 (Wed, 26 Sep 2007) New Revision: 501
Modified: LinuxBIOSv3/device/device.c LinuxBIOSv3/include/device/device.h LinuxBIOSv3/lib/stage2.c Log:
Correct typo, fix stage2 code documentation, add dtsname printing to differentiate between identically named objects during boot.
Signed-off-by: Carl-Daniel Hailfinger c-d.hailfinger.devel.2006@gmx.net Acked-by: Ronald G. Minnich rminnich@gmail.com
Modified: LinuxBIOSv3/device/device.c =================================================================== --- LinuxBIOSv3/device/device.c 2007-09-25 00:22:18 UTC (rev 500) +++ LinuxBIOSv3/device/device.c 2007-09-26 14:24:52 UTC (rev 501) @@ -260,8 +260,10 @@ for (curdev = bus->children; curdev; curdev = curdev->sibling) { unsigned int links; int i; - printk(BIOS_SPEW, "%s: %s(%s) have_resources %d enabled %d\n", + printk(BIOS_SPEW, + "%s: %s(%s) dtsname %s have_resources %d enabled %d\n", __func__, bus->dev->dtsname, dev_path(bus->dev), + curdev->dtsname, curdev->have_resources, curdev->enabled); if (curdev->have_resources) { continue;
Modified: LinuxBIOSv3/include/device/device.h =================================================================== --- LinuxBIOSv3/include/device/device.h 2007-09-25 00:22:18 UTC (rev 500) +++ LinuxBIOSv3/include/device/device.h 2007-09-26 14:24:52 UTC (rev 501) @@ -212,7 +212,7 @@ struct resource resource[MAX_RESOURCES]; unsigned int resources;
- /* link are (down sream) buses attached to the device, usually a leaf + /* link are (downstream) buses attached to the device, usually a leaf * device with no children have 0 buses attached and a bridge has 1 bus */ struct bus link[MAX_LINKS];
Modified: LinuxBIOSv3/lib/stage2.c =================================================================== --- LinuxBIOSv3/lib/stage2.c 2007-09-25 00:22:18 UTC (rev 500) +++ LinuxBIOSv3/lib/stage2.c 2007-09-26 14:24:52 UTC (rev 501) @@ -31,8 +31,9 @@ /** * Main function of the DRAM part of LinuxBIOS. * - * LinuxBIOS is divided into pre-DRAM part and DRAM part. The phases before - * this part are phase 0 and phase 1. This part contains phases x through y. + * LinuxBIOS is divided into pre-DRAM part and DRAM part. The stages before + * this part are stage 0 and stage 1. This part contains stage 2, which + * consists of phases 1 through 6. * * Device Enumeration: in the dev_enumerate() phase. * @@ -53,6 +54,7 @@
post_code(0x20);
+ /* TODO: Explain why we use printk here although it is impossible */ printk(BIOS_NOTICE, console_test);
dev_init();