From 6aed83b39c100ea9d7abf0c963f0866b0f0a9361 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Axel=20D=C3=B6rfler?= <axeld@pinc-software.de>
Date: Mon, 10 May 2004 13:26:42 +0000
Subject: [PATCH] Removed all references of pnp_bus.h (its contents are now
 temporarily included in device_manager.h). Fixed some comments. Removed
 realpath() from probe.c for now - mechanism will be changed, and that
 prevented it from being built as part of the kernel; it's currently not
 functional.

git-svn-id: file:///srv/svn/repos/haiku/trunk/current@7489 a95241bf-73f2-0310-859d-f6bbb57e9c96
---
 src/kernel/core/device_manager/attributes.c   | 1 -
 src/kernel/core/device_manager/probe.c        | 4 +++-
 src/kernel/core/device_manager/registration.c | 2 +-
 src/kernel/core/device_manager/root_node.c    | 2 +-
 src/kernel/core/device_manager/scan.c         | 1 -
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/kernel/core/device_manager/attributes.c b/src/kernel/core/device_manager/attributes.c
index 935941cc37..2a5171566c 100644
--- a/src/kernel/core/device_manager/attributes.c
+++ b/src/kernel/core/device_manager/attributes.c
@@ -11,7 +11,6 @@
 
 #include "device_manager_private.h"
 #include "dl_list.h"
-#include <pnp_bus.h>
 
 #include <TypeConstants.h>
 
diff --git a/src/kernel/core/device_manager/probe.c b/src/kernel/core/device_manager/probe.c
index a4b78cdebd..398dd70ef1 100644
--- a/src/kernel/core/device_manager/probe.c
+++ b/src/kernel/core/device_manager/probe.c
@@ -78,7 +78,9 @@ status_t notify_probe_by_file(pnp_node_info *node, const char *consumer_name)
 		goto err;
 	}
 
-	module_name = pnp_boot_safe_realpath(consumer_name, resolved_path);
+	// ToDo: do something about this; realpath() doesn't exist in the kernel!
+	//module_name = pnp_boot_safe_realpath(consumer_name, resolved_path);
+	module_name = NULL;
 	if (module_name == NULL) {
 		// broken link or something
 		dprintf("Cannot resolve driver file name: %s\n", consumer_name);
diff --git a/src/kernel/core/device_manager/registration.c b/src/kernel/core/device_manager/registration.c
index 9d5a7ff10a..c3db95259a 100644
--- a/src/kernel/core/device_manager/registration.c
+++ b/src/kernel/core/device_manager/registration.c
@@ -98,7 +98,7 @@ is_device_redetected(pnp_node_info *node, pnp_node_info *parent, bool *redetecte
 	{
 		char *connection, *device_identifier;
 
-		// get connection and devide id of us...
+		// get our connection and device id...
 		if (pnp_expand_pattern_attr(node, PNP_DRIVER_CONNECTION, &connection) != B_OK)
 			connection = strdup("");
 
diff --git a/src/kernel/core/device_manager/root_node.c b/src/kernel/core/device_manager/root_node.c
index dbfc7d5e61..82f3056f11 100644
--- a/src/kernel/core/device_manager/root_node.c
+++ b/src/kernel/core/device_manager/root_node.c
@@ -55,7 +55,7 @@ pnp_root_init_root(void)
 		{ PNP_DRIVER_DRIVER, B_STRING_TYPE, { string: PNP_ROOT_MODULE_NAME }},
 		{ PNP_DRIVER_TYPE, B_STRING_TYPE, { string: PNP_ROOT_TYPE_NAME }},
 
-		// well - connection is actually pointless as there is on other root node
+		// well - connection is actually pointless as there is no other root node
 		{ PNP_DRIVER_CONNECTION, B_STRING_TYPE, { string: "pnp_root" }},
 		{ PNP_DRIVER_DEVICE_IDENTIFIER, B_STRING_TYPE, { string: "pnp_root" }},
 
diff --git a/src/kernel/core/device_manager/scan.c b/src/kernel/core/device_manager/scan.c
index 9bcb0191f7..9d902531a3 100644
--- a/src/kernel/core/device_manager/scan.c
+++ b/src/kernel/core/device_manager/scan.c
@@ -17,7 +17,6 @@
 
 
 #include "device_manager_private.h"
-#include "pnp_bus.h"
 
 #include <KernelExport.h>
 #include <string.h>