From: John Hodge <tpg@mutabah.net>
Date: Thu, 28 Jul 2011 13:12:21 +0000 (+0800)
Subject: Kernel - Misc cleanup in PCI
X-Git-Tag: rel0.10~25
X-Git-Url: https://git.ucc.asn.au/?a=commitdiff_plain;h=7177e27ebe90ae180a0c645f319f39c89f07373b;p=tpg%2Facess2.git

Kernel - Misc cleanup in PCI

- Oops, forgot the modules header
---

diff --git a/Kernel/drv/pci.c b/Kernel/drv/pci.c
index 1a555d78..2e107a79 100644
--- a/Kernel/drv/pci.c
+++ b/Kernel/drv/pci.c
@@ -150,8 +150,9 @@ int PCI_ScanBus(int BusID, int bFill)
 			if(devInfo.oc == PCI_OC_PCIBRIDGE)
 			{
 				#if LIST_DEVICES
-				Log_Log("PCI", "Bridge @ %i,%i:%i (0x%x:0x%x)",
-					BusID, dev, fcn, devInfo.vendor, devInfo.device);
+				if( !bFill )
+					Log_Log("PCI", "Bridge @ %i,%i:%i (0x%x:0x%x)",
+						BusID, dev, fcn, devInfo.vendor, devInfo.device);
 				#endif
 				//TODO: Handle PCI-PCI Bridges
 				//PCI_ScanBus(devInfo.???, bFill);
@@ -160,8 +161,9 @@ int PCI_ScanBus(int BusID, int bFill)
 			else
 			{
 				#if LIST_DEVICES
-				Log_Log("PCI", "Device %i,%i:%i %04x => 0x%04x:0x%04x",
-					BusID, dev, fcn, devInfo.oc, devInfo.vendor, devInfo.device);
+				if( !bFill )
+					Log_Log("PCI", "Device %i,%i:%i %04x => 0x%04x:0x%04x",
+						BusID, dev, fcn, devInfo.oc, devInfo.vendor, devInfo.device);
 				#endif
 			}
 			
diff --git a/Kernel/include/modules.h b/Kernel/include/modules.h
index 0c576750..d7281336 100644
--- a/Kernel/include/modules.h
+++ b/Kernel/include/modules.h
@@ -114,10 +114,10 @@ typedef struct sModuleLoader
 extern int	Module_RegisterLoader(tModuleLoader *Loader);
 
 /**
- * \brief Initialise a named builtin module
+ * \brief Initialises (if needed) a named module
  * \param Name	Module name to initialise
  * \return -1 on not existing, 0 if the module initialised (or if it was already initialised)
  */
-extern int	Modules_InitialiseBuiltin(const char *Name);
+extern int	Module_EnsureLoaded(const char *Name);
 
 #endif