Skip to content
Snippets Groups Projects
Commit 7177e27e authored by John Hodge's avatar John Hodge
Browse files

Kernel - Misc cleanup in PCI

- Oops, forgot the modules header
parent 19930d5a
Branches
Tags
No related merge requests found
...@@ -150,8 +150,9 @@ int PCI_ScanBus(int BusID, int bFill) ...@@ -150,8 +150,9 @@ int PCI_ScanBus(int BusID, int bFill)
if(devInfo.oc == PCI_OC_PCIBRIDGE) if(devInfo.oc == PCI_OC_PCIBRIDGE)
{ {
#if LIST_DEVICES #if LIST_DEVICES
Log_Log("PCI", "Bridge @ %i,%i:%i (0x%x:0x%x)", if( !bFill )
BusID, dev, fcn, devInfo.vendor, devInfo.device); Log_Log("PCI", "Bridge @ %i,%i:%i (0x%x:0x%x)",
BusID, dev, fcn, devInfo.vendor, devInfo.device);
#endif #endif
//TODO: Handle PCI-PCI Bridges //TODO: Handle PCI-PCI Bridges
//PCI_ScanBus(devInfo.???, bFill); //PCI_ScanBus(devInfo.???, bFill);
...@@ -160,8 +161,9 @@ int PCI_ScanBus(int BusID, int bFill) ...@@ -160,8 +161,9 @@ int PCI_ScanBus(int BusID, int bFill)
else else
{ {
#if LIST_DEVICES #if LIST_DEVICES
Log_Log("PCI", "Device %i,%i:%i %04x => 0x%04x:0x%04x", if( !bFill )
BusID, dev, fcn, devInfo.oc, devInfo.vendor, devInfo.device); Log_Log("PCI", "Device %i,%i:%i %04x => 0x%04x:0x%04x",
BusID, dev, fcn, devInfo.oc, devInfo.vendor, devInfo.device);
#endif #endif
} }
......
...@@ -114,10 +114,10 @@ typedef struct sModuleLoader ...@@ -114,10 +114,10 @@ typedef struct sModuleLoader
extern int Module_RegisterLoader(tModuleLoader *Loader); 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 * \param Name Module name to initialise
* \return -1 on not existing, 0 if the module initialised (or if it was already initialised) * \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 #endif
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment