Kernel - Misc cleanup in PCI

- Oops, forgot the modules header

diff --git a/Kernel/drv/pci.c b/Kernel/drv/pci.c
index 1a555d7..2e107a7 100644 (file)
--- 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)\r
                        {\r
                                #if LIST_DEVICES\r
-                               Log_Log("PCI", "Bridge @ %i,%i:%i (0x%x:0x%x)",\r
-                                       BusID, dev, fcn, devInfo.vendor, devInfo.device);\r
+                               if( !bFill )\r
+                                       Log_Log("PCI", "Bridge @ %i,%i:%i (0x%x:0x%x)",\r
+                                               BusID, dev, fcn, devInfo.vendor, devInfo.device);\r
                                #endif\r
                                //TODO: Handle PCI-PCI Bridges\r
                                //PCI_ScanBus(devInfo.???, bFill);\r
@@ -160,8 +161,9 @@ int PCI_ScanBus(int BusID, int bFill)
                        else\r
                        {\r
                                #if LIST_DEVICES\r
-                               Log_Log("PCI", "Device %i,%i:%i %04x => 0x%04x:0x%04x",\r
-                                       BusID, dev, fcn, devInfo.oc, devInfo.vendor, devInfo.device);\r
+                               if( !bFill )\r
+                                       Log_Log("PCI", "Device %i,%i:%i %04x => 0x%04x:0x%04x",\r
+                                               BusID, dev, fcn, devInfo.oc, devInfo.vendor, devInfo.device);\r
                                #endif\r
                        }\r
                        \r

diff --git a/Kernel/include/modules.h b/Kernel/include/modules.h
index 0c57675..d728133 100644 (file)
--- 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