From aedf4f4358a1ed73fafa0e230ca2c4fde9ad903e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Axel=20D=C3=B6rfler?= Date: Tue, 11 Jan 2005 23:23:20 +0000 Subject: [PATCH] Changes because of renaming various data structures (pnp_node -> device_node, ...). Also renamed children_next|prev to siblings_next|prev as I was confused by the former. git-svn-id: file:///srv/svn/repos/haiku/trunk/current@10671 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- headers/private/kernel/kdevice_manager.h | 72 ++++++++++++------------ 1 file changed, 37 insertions(+), 35 deletions(-) diff --git a/headers/private/kernel/kdevice_manager.h b/headers/private/kernel/kdevice_manager.h index a704d23c7a..5b7107b868 100644 --- a/headers/private/kernel/kdevice_manager.h +++ b/headers/private/kernel/kdevice_manager.h @@ -1,7 +1,7 @@ /* -** Copyright 2004, Axel Dörfler, axeld@pinc-software.de. All rights reserved. -** Distributed under the terms of the Haiku License. -*/ + * Copyright 2004-2005, Axel Dörfler, axeld@pinc-software.de. All rights reserved. + * Distributed under the terms of the MIT License. + */ #ifndef _KERNEL_DEVICE_MANAGER_H #define _KERNEL_DEVICE_MANAGER_H @@ -10,38 +10,40 @@ #include -// 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; +typedef struct device_node_info device_node_info; + +// info about a device node +struct device_node_info { + device_node_info *prev, *next; + device_node_info *siblings_prev, *siblings_next; + device_node_info *notify_prev, *notify_next; + device_node_info *parent; + device_node_info *children; + int32 ref_count; // reference count; see registration.c + driver_module_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 + int32 num_waiting_hooks; // number of waiting hook calls + sem_id hook_sem; // sem for waiting hook calls + int32 load_block_count; // load-block nest count + int32 num_blocked_loads; // number of waiting load calls + sem_id load_block_sem; // sem for waiting load calls + int32 load_count; // # of finished load_driver() calls + int32 loading; // # of active (un)load_driver() calls + uint32 rescan_depth; // > 0 if scanning is active + struct device_attr_info *attributes; // list of attributes + uint32 num_io_resources; // number of I/O resources + io_resource_handle *io_resources; // array of I/O resource (NULL-terminated) + int32 defer_probing; // > 0 defer probing for consumers of children + bool automatically_loaded; // loaded automatically because PNP_DRIVER_ALWAYS_LOADED + device_node_info *unprobed_children; // list of un-probed children + device_node_info *unprobed_prev, *unprobed_next; // link for unprobed_children +}; struct kernel_args;