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

@@ -1,7 +1,7 @@
 /*
-** Copyright 2004, Axel Dörfler, [email protected]. All rights reserved.
+ * Copyright 2004-2005, Axel Dörfler, [email protected]. All rights reserved.
-** Distributed under the terms of the Haiku License.
+ * Distributed under the terms of the MIT License.
-*/
+ */
 #ifndef _KERNEL_DEVICE_MANAGER_H
 #define _KERNEL_DEVICE_MANAGER_H
 
@@ -10,38 +10,40 @@
 #include <device_manager.h>
 
 
-// info about a PnP node
+typedef struct device_node_info device_node_info;
-typedef struct pnp_node_info {
+
-	struct pnp_node_info *prev, *next;
+// info about a device node
-	struct pnp_node_info *children_prev, *children_next;
+struct device_node_info {
-	struct pnp_node_info *notify_prev, *notify_next;
+	device_node_info	*prev, *next;
-	struct pnp_node_info *parent;
+	device_node_info	*siblings_prev, *siblings_next;
-	struct pnp_node_info *children;
+	device_node_info	*notify_prev, *notify_next;
-	int ref_count;				// reference count; see registration.c
+	device_node_info	*parent;
-	pnp_driver_info *driver;
+	device_node_info	*children;
-	void *cookie;
+	int32				ref_count;			// reference count; see registration.c
-	bool registered;			// true, if device is officially existent
+	driver_module_info	*driver;
-	bool init_finished;			// true, if publish_device has been completed
+	void				*cookie;
-								// (sync with loader_lock)
+	bool				registered;			// true, if device is officially existent
-	bool blocked_by_rescan;		// true, if device is blocked because of rescan
+	bool				init_finished;		// true, if publish_device has been completed
-	bool verifying;				// true, if driver is being verified by rescan
+											// (sync with loader_lock)
-	bool redetected;			// true, if driver was redetected during rescan
+	bool				blocked_by_rescan;	// true, if device is blocked because of rescan
-	int num_waiting_hooks;		// number of waiting hook calls
+	bool				verifying;			// true, if driver is being verified by rescan
-	sem_id hook_sem;			// sem for waiting hook calls
+	bool				redetected;			// true, if driver was redetected during rescan
-	int load_block_count;		// load-block nest count
+	int32				num_waiting_hooks;	// number of waiting hook calls
-	int num_blocked_loads;		// number of waiting load calls
+	sem_id				hook_sem;			// sem for waiting hook calls
-	sem_id load_block_sem;		// sem for waiting load calls
+	int32				load_block_count;	// load-block nest count
-	int load_count;				// # of finished load_driver() calls
+	int32				num_blocked_loads;	// number of waiting load calls
-	int loading;				// # of active (un)load_driver() calls
+	sem_id				load_block_sem;		// sem for waiting load calls
-	uint rescan_depth;			// > 0 if scanning is active
+	int32				load_count;			// # of finished load_driver() calls
-	struct pnp_node_attr_info *attributes;	// list of attributes
+	int32				loading;			// # of active (un)load_driver() calls
-	uint num_io_resources;		// number of I/O resources
+	uint32				rescan_depth;		// > 0 if scanning is active
-	io_resource_handle *io_resources; // array of I/O resource (NULL-terminated)
+	struct device_attr_info *attributes;	// list of attributes
-	int defer_probing; 			// > 0 defer probing for consumers of children
+	uint32				num_io_resources;	// number of I/O resources
-	bool automatically_loaded;	// loaded automatically because PNP_DRIVER_ALWAYS_LOADED
+	io_resource_handle	*io_resources;		// array of I/O resource (NULL-terminated)
-	struct pnp_node_info *unprobed_children; // list of un-probed children
+	int32				defer_probing; 		// > 0 defer probing for consumers of children
-	struct pnp_node_info *unprobed_prev, *unprobed_next; // link for unprobed_children
+	bool				automatically_loaded;	// loaded automatically because PNP_DRIVER_ALWAYS_LOADED
-} pnp_node_info;
+	device_node_info	*unprobed_children; // list of un-probed children
+	device_node_info	*unprobed_prev, *unprobed_next; // link for unprobed_children
+};
 
 
 struct kernel_args;