From 762472641ee5faa91578599a01351b1d8db58ed1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Axel=20D=C3=B6rfler?= Date: Sun, 20 Jul 2008 13:52:15 +0000 Subject: [PATCH] * Added the generic device bus manager module to the built-in module list; now it can actually be used (that should have been part of an earlier commit, but didn't break the build this time). * dump_modules() must use kprintf() instead of dprintf(). git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@26522 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/system/kernel/module.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/system/kernel/module.cpp b/src/system/kernel/module.cpp index 4f0fc555aa..6f14a4e9c9 100644 --- a/src/system/kernel/module.cpp +++ b/src/system/kernel/module.cpp @@ -52,6 +52,7 @@ */ extern module_info gDeviceManagerModule; extern module_info gDeviceRootModule; +extern module_info gDeviceGenericModule; extern module_info gFrameBufferConsoleModule; // file systems @@ -61,6 +62,7 @@ extern module_info gDeviceFileSystem; static module_info* sBuiltInModules[] = { &gDeviceManagerModule, &gDeviceRootModule, + &gDeviceGenericModule, &gFrameBufferConsoleModule, &gRootFileSystem, @@ -1170,19 +1172,19 @@ dump_modules(int argc, char** argv) struct module* module; hash_rewind(sModulesHash, &iterator); - dprintf("-- known modules:\n"); + kprintf("-- known modules:\n"); while ((module = (struct module*)hash_next(sModulesHash, &iterator)) != NULL) { - dprintf("%p: \"%s\", \"%s\" (%ld), refcount = %ld, state = %d, mimage = %p\n", + kprintf("%p: \"%s\", \"%s\" (%ld), refcount = %ld, state = %d, mimage = %p\n", module, module->name, module->file, module->offset, module->ref_count, module->state, module->module_image); } hash_rewind(sModuleImagesHash, &iterator); - dprintf("\n-- loaded module images:\n"); + kprintf("\n-- loaded module images:\n"); while ((image = (struct module_image*)hash_next(sModuleImagesHash, &iterator)) != NULL) { - dprintf("%p: \"%s\" (image_id = %ld), info = %p, refcount = %ld, %s\n", image, + kprintf("%p: \"%s\" (image_id = %ld), info = %p, refcount = %ld, %s\n", image, image->path, image->image, image->info, image->ref_count, image->keep_loaded ? "keep loaded" : "can be unloaded"); }