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
This commit is contained in:
@@ -11,7 +11,6 @@
|
|||||||
|
|
||||||
#include "device_manager_private.h"
|
#include "device_manager_private.h"
|
||||||
#include "dl_list.h"
|
#include "dl_list.h"
|
||||||
#include <pnp_bus.h>
|
|
||||||
|
|
||||||
#include <TypeConstants.h>
|
#include <TypeConstants.h>
|
||||||
|
|
||||||
|
|||||||
@@ -78,7 +78,9 @@ status_t notify_probe_by_file(pnp_node_info *node, const char *consumer_name)
|
|||||||
goto err;
|
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) {
|
if (module_name == NULL) {
|
||||||
// broken link or something
|
// broken link or something
|
||||||
dprintf("Cannot resolve driver file name: %s\n", consumer_name);
|
dprintf("Cannot resolve driver file name: %s\n", consumer_name);
|
||||||
|
|||||||
@@ -98,7 +98,7 @@ is_device_redetected(pnp_node_info *node, pnp_node_info *parent, bool *redetecte
|
|||||||
{
|
{
|
||||||
char *connection, *device_identifier;
|
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)
|
if (pnp_expand_pattern_attr(node, PNP_DRIVER_CONNECTION, &connection) != B_OK)
|
||||||
connection = strdup("");
|
connection = strdup("");
|
||||||
|
|
||||||
|
|||||||
@@ -55,7 +55,7 @@ pnp_root_init_root(void)
|
|||||||
{ PNP_DRIVER_DRIVER, B_STRING_TYPE, { string: PNP_ROOT_MODULE_NAME }},
|
{ PNP_DRIVER_DRIVER, B_STRING_TYPE, { string: PNP_ROOT_MODULE_NAME }},
|
||||||
{ PNP_DRIVER_TYPE, B_STRING_TYPE, { string: PNP_ROOT_TYPE_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_CONNECTION, B_STRING_TYPE, { string: "pnp_root" }},
|
||||||
{ PNP_DRIVER_DEVICE_IDENTIFIER, B_STRING_TYPE, { string: "pnp_root" }},
|
{ PNP_DRIVER_DEVICE_IDENTIFIER, B_STRING_TYPE, { string: "pnp_root" }},
|
||||||
|
|
||||||
|
|||||||
@@ -17,7 +17,6 @@
|
|||||||
|
|
||||||
|
|
||||||
#include "device_manager_private.h"
|
#include "device_manager_private.h"
|
||||||
#include "pnp_bus.h"
|
|
||||||
|
|
||||||
#include <KernelExport.h>
|
#include <KernelExport.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
|||||||
Reference in New Issue
Block a user