diff --git a/src/kernel/core/device_manager/device_manager_private.h b/src/kernel/core/device_manager/device_manager_private.h index e7c670dec6..76f68167de 100644 --- a/src/kernel/core/device_manager/device_manager_private.h +++ b/src/kernel/core/device_manager/device_manager_private.h @@ -1,6 +1,6 @@ /* ** Copyright 2002-04, Thomas Kurschel. All rights reserved. -** Distributed under the terms of the OpenBeOS License. +** Distributed under the terms of the Haiku License. */ #ifndef DEVICE_MANAGER_PRIVATE #define DEVICE_MANAGER_PRIVATE @@ -10,7 +10,7 @@ Internal header. */ -#include +#include #include #include @@ -42,40 +42,6 @@ typedef struct id_generator { } id_generator; -// info about a PnP node -typedef struct pnp_node_info { - struct pnp_node_info *prev, *next; - struct pnp_node_info *children_prev, *children_next; - struct pnp_node_info *notify_prev, *notify_next; - struct pnp_node_info *parent; - struct pnp_node_info *children; - int ref_count; // reference count; see registration.c - pnp_driver_info *driver; - void *cookie; - bool registered; // true, if device is officially existent - bool init_finished; // true, if publish_device has been completed - // (sync with loader_lock) - bool blocked_by_rescan; // true, if device is blocked because of rescan - bool verifying; // true, if driver is being verified by rescan - bool redetected; // true, if driver was redetected during rescan - int num_waiting_hooks; // number of waiting hook calls - sem_id hook_sem; // sem for waiting hook calls - int load_block_count; // load-block nest count - int num_blocked_loads; // number of waiting load calls - sem_id load_block_sem; // sem for waiting load calls - int load_count; // # of finished load_driver() calls - int loading; // # of active (un)load_driver() calls - uint rescan_depth; // > 0 if scanning is active - struct pnp_node_attr_info *attributes; // list of attributes - uint num_io_resources; // number of I/O resources - io_resource_handle *io_resources; // array of I/O resource (NULL-terminated) - int defer_probing; // > 0 defer probing for consumers of children - bool automatically_loaded; // loaded automatically because PNP_DRIVER_ALWAYS_LOADED - struct pnp_node_info *unprobed_children; // list of un-probed children - struct pnp_node_info *unprobed_prev, *unprobed_next; // link for unprobed_children -} pnp_node_info; - - // info about a node attribute typedef struct pnp_node_attr_info { struct pnp_node_attr_info *prev, *next;