break;
}
if( mod ) {
- Warning("[MOD ] Circular dependency detected");
+ Log_Warning("Module", "Circular dependency detected");
LEAVE_RET('i', -1);
}
break;
}
if( i == giNumBuiltinModules ) {
- Warning("[MOD ] Dependency '%s' for module '%s' failed");
+ Log_Warning("Module", "Dependency '%s' for module '%s' failed");
return -1;
}
// All Dependencies OK? Initialise
StartupPrint(Module->Name);
- Log("[MOD ] Initialising %p '%s' v%i.%i...",
+ Log_Log("Module", "Initialising %p '%s' v%i.%i...",
Module, Module->Name,
Module->Version >> 8, Module->Version & 0xFF
);
switch(ret)
{
case MODULE_ERR_MISC:
- Warning("[MOD ] Unable to load, reason: Miscelanious");
+ Log_Warning("Module", "Unable to load, reason: Miscelanious");
break;
case MODULE_ERR_NOTNEEDED:
- Warning("[MOD ] Unable to load, reason: Module not needed (probably hardware not found)");
+ Log_Warning("Module", "Unable to load, reason: Module not needed");
break;
case MODULE_ERR_MALLOC:
- Warning("[MOD ] Unable to load, reason: Error in malloc/realloc/calloc, probably not good");
+ Log_Warning("Module", "Unable to load, reason: Error in malloc/realloc/calloc, probably not good");
break;
default:
- Warning("[MOD ] Unable to load reason - Unknown code %i", ret);
+ Log_Warning("Module", "Unable to load reason - Unknown code %i", ret);
break;
}
LEAVE_RET('i', ret);
// Error check
if(base == NULL) {
- Warning("Module_LoadFile: Unable to load '%s'", Path);
+ Log_Warning("Module", "Module_LoadFile - Unable to load '%s'", Path);
return 0;
}
// Unknown module type?, return error
Binary_Unload(base);
#if USE_EDI
- Warning("Module_LoadFile: Module has neither a Module Info struct, nor an EDI entrypoint");
+ Log_Warning("Module", "Module '%s' has neither a Module Info struct, nor an EDI entrypoint", Path);
#else
- Warning("Module_LoadFile: Module does not have a Module Info struct");
+ Log_Warning("Module", "Module '%s' does not have a Module Info struct", Path);
#endif
return 0;
}
// Check magic number
if(info->Magic != MODULE_MAGIC)
{
- Warning("Module_LoadFile: Module's magic value is invalid (0x%x != 0x%x)", info->Magic, MODULE_MAGIC);
+ Log_Warning("Module", "Module's magic value is invalid (0x%x != 0x%x)", info->Magic, MODULE_MAGIC);
return 0;
}
// Check Architecture
if(info->Arch != MODULE_ARCH_ID)
{
- Warning("Module_LoadFile: Module is for a different architecture");
+ Log_Warning("Module", "Module is for a different architecture");
return 0;
}
return 0;
}
- Log("Initialising %p '%s' v%i.%i...",
+ Log_Log("Module", "Initialising %p '%s' v%i.%i...",
info,
info->Name,
info->Version>>8, info->Version & 0xFF
{
// Check if the module is loaded
if( !Module_IsLoaded(*names) ) {
- Warning("Module `%s' requires `%s', which is not loaded\n", Info->Name, *names);
+ Log_Warning("Module", "Module `%s' requires `%s', which is not loaded\n", Info->Name, *names);
return 0;
}
}