i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* The device manager must use kprintf() when printing out stuff in the KDL.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@27987 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2008-10-12 00:03:05 +00:00
parent ac6b0fc9d2
commit 5c2e513005
1 changed files with 11 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/system/kernel/device_manager/device_manager.cpp
+11 -15
View File
@@ -230,7 +230,7 @@ static void
put_level(int32 level) put_level(int32 level)
{ {
while (level-- > 0) while (level-- > 0)
dprintf(" "); kprintf(" ");
} }
@@ -241,31 +241,31 @@ dump_attribute(device_attr* attr, int32 level)
return; return;
put_level(level + 2); put_level(level + 2);
dprintf("\"%s\" : ", attr->name); kprintf("\"%s\" : ", attr->name);
switch (attr->type) { switch (attr->type) {
case B_STRING_TYPE: case B_STRING_TYPE:
dprintf("string : \"%s\"", attr->value.string); kprintf("string : \"%s\"", attr->value.string);
break; break;
case B_INT8_TYPE: case B_INT8_TYPE:
case B_UINT8_TYPE: case B_UINT8_TYPE:
dprintf("uint8 : %u (%#x)", attr->value.ui8, attr->value.ui8); kprintf("uint8 : %u (%#x)", attr->value.ui8, attr->value.ui8);
break; break;
case B_INT16_TYPE: case B_INT16_TYPE:
case B_UINT16_TYPE: case B_UINT16_TYPE:
dprintf("uint16 : %u (%#x)", attr->value.ui16, attr->value.ui16); kprintf("uint16 : %u (%#x)", attr->value.ui16, attr->value.ui16);
break; break;
case B_INT32_TYPE: case B_INT32_TYPE:
case B_UINT32_TYPE: case B_UINT32_TYPE:
dprintf("uint32 : %lu (%#lx)", attr->value.ui32, attr->value.ui32); kprintf("uint32 : %lu (%#lx)", attr->value.ui32, attr->value.ui32);
break; break;
case B_INT64_TYPE: case B_INT64_TYPE:
case B_UINT64_TYPE: case B_UINT64_TYPE:
dprintf("uint64 : %Lu (%#Lx)", attr->value.ui64, attr->value.ui64); kprintf("uint64 : %Lu (%#Lx)", attr->value.ui64, attr->value.ui64);
break; break;
default: default:
dprintf("raw data"); kprintf("raw data");
} }
dprintf("\n"); kprintf("\n");
} }
@@ -2126,7 +2126,7 @@ void
device_node::Dump(int32 level) device_node::Dump(int32 level)
{ {
put_level(level); put_level(level);
dprintf("(%ld) @%p \"%s\" (ref %ld, init %ld, module %p, data %p)\n", level, kprintf("(%ld) @%p \"%s\" (ref %ld, init %ld, module %p, data %p)\n", level,
this, ModuleName(), fRefCount, fInitialized, DriverModule(), this, ModuleName(), fRefCount, fInitialized, DriverModule(),
DriverData()); DriverData());
@@ -2139,7 +2139,7 @@ device_node::Dump(int32 level)
while (deviceIterator.HasNext()) { while (deviceIterator.HasNext()) {
Device* device = deviceIterator.Next(); Device* device = deviceIterator.Next();
put_level(level); put_level(level);
dprintf("device: %s, %p\n", device->ModuleName(), device->Data()); kprintf("device: %s, %p\n", device->ModuleName(), device->Data());
} }
NodeList::ConstIterator iterator = Children().GetIterator(); NodeList::ConstIterator iterator = Children().GetIterator();
@@ -2232,10 +2232,6 @@ device_manager_init(struct kernel_args* args)
recursive_lock_init(&sLock, "device manager"); recursive_lock_init(&sLock, "device manager");
init_node_tree(); init_node_tree();
#ifdef TRACE_DEVICE_MANAGER
sRootNode->Dump();
#endif
register_generic_syscall(DEVICE_MANAGER_SYSCALLS, control_device_manager, register_generic_syscall(DEVICE_MANAGER_SYSCALLS, control_device_manager,
1, 0); 1, 0);