diff --git a/src/kernel/core/device_manager/device_manager_private.h b/src/kernel/core/device_manager/device_manager_private.h index c701eeb172..e7c670dec6 100644 --- a/src/kernel/core/device_manager/device_manager_private.h +++ b/src/kernel/core/device_manager/device_manager_private.h @@ -2,6 +2,8 @@ ** Copyright 2002-04, Thomas Kurschel. All rights reserved. ** Distributed under the terms of the OpenBeOS License. */ +#ifndef DEVICE_MANAGER_PRIVATE +#define DEVICE_MANAGER_PRIVATE /* Part of Device Manager @@ -122,44 +124,39 @@ int pnp_fs_emulation_nesting; // attributes.c -pnp_node_attr_info *pnp_find_attr_nolock( pnp_node_handle node, const char *name, - bool recursive, type_code type ); -status_t pnp_get_attr_uint8( pnp_node_handle node, const char *name, - uint8 *value, bool recursive ); -status_t pnp_get_attr_uint8_nolock( pnp_node_handle node, const char *name, - uint8 *value, bool recursive ); -status_t pnp_get_attr_uint16( pnp_node_handle node, const char *name, - uint16 *value, bool recursive ); -status_t pnp_get_attr_uint16_nolock( pnp_node_handle node, const char *name, - uint16 *value, bool recursive ); -status_t pnp_get_attr_uint32( pnp_node_handle node, const char *name, - uint32 *value, bool recursive ); -status_t pnp_get_attr_uint32_nolock( pnp_node_handle node, const char *name, - uint32 *value, bool recursive ); -status_t pnp_get_attr_uint64( pnp_node_handle node, const char *name, - uint64 *value, bool recursive ); -status_t pnp_get_attr_uint64_nolock( pnp_node_handle node, const char *name, - uint64 *value, bool recursive ); -status_t pnp_get_attr_string( pnp_node_handle node, const char *name, - char **value, bool recursive ); -status_t pnp_get_attr_string_nolock( pnp_node_handle node, const char *name, - const char **value, bool recursive ); -status_t pnp_get_attr_raw( pnp_node_handle node, const char *name, - void **data, size_t *len, bool recursive ); -status_t pnp_get_attr_raw_nolock( pnp_node_handle node, const char *name, - const void **data, size_t *len, bool recursive ); -void pnp_free_node_attr( pnp_node_attr_info *attr ); -status_t pnp_duplicate_node_attr( - const pnp_node_attr *src, pnp_node_attr_info **dest_out ); -status_t pnp_get_next_attr( - pnp_node_handle node, pnp_node_attr_handle *attr ); -status_t pnp_release_attr( - pnp_node_handle node, pnp_node_attr_handle attr ); -status_t pnp_retrieve_attr( - pnp_node_attr_handle attr, const pnp_node_attr **attr_content ); -status_t pnp_write_attr( - pnp_node_handle node, const pnp_node_attr *attr ); -void pnp_remove_attr_int( pnp_node_handle node, pnp_node_attr_info *attr ); +pnp_node_attr_info *pnp_find_attr_nolock(pnp_node_handle node, const char *name, + bool recursive, type_code type); +status_t pnp_get_attr_uint8(pnp_node_handle node, const char *name, + uint8 *value, bool recursive); +status_t pnp_get_attr_uint8_nolock(pnp_node_handle node, const char *name, + uint8 *value, bool recursive); +status_t pnp_get_attr_uint16(pnp_node_handle node, const char *name, + uint16 *value, bool recursive); +status_t pnp_get_attr_uint16_nolock(pnp_node_handle node, const char *name, + uint16 *value, bool recursive); +status_t pnp_get_attr_uint32(pnp_node_handle node, const char *name, + uint32 *value, bool recursive); +status_t pnp_get_attr_uint32_nolock(pnp_node_handle node, const char *name, + uint32 *value, bool recursive); +status_t pnp_get_attr_uint64(pnp_node_handle node, const char *name, + uint64 *value, bool recursive); +status_t pnp_get_attr_uint64_nolock(pnp_node_handle node, const char *name, + uint64 *value, bool recursive); +status_t pnp_get_attr_string(pnp_node_handle node, const char *name, + char **value, bool recursive); +status_t pnp_get_attr_string_nolock(pnp_node_handle node, const char *name, + const char **value, bool recursive); +status_t pnp_get_attr_raw(pnp_node_handle node, const char *name, + void **data, size_t *len, bool recursive); +status_t pnp_get_attr_raw_nolock(pnp_node_handle node, const char *name, + const void **data, size_t *len, bool recursive); +void pnp_free_node_attr(pnp_node_attr_info *attr); +status_t pnp_duplicate_node_attr(const pnp_node_attr *src, pnp_node_attr_info **dest_out); +status_t pnp_get_next_attr(pnp_node_handle node, pnp_node_attr_handle *attr); +status_t pnp_release_attr(pnp_node_handle node, pnp_node_attr_handle attr); +status_t pnp_retrieve_attr(pnp_node_attr_handle attr, const pnp_node_attr **attr_content); +status_t pnp_write_attr(pnp_node_handle node, const pnp_node_attr *attr); +void pnp_remove_attr_int(pnp_node_handle node, pnp_node_attr_info *attr); status_t pnp_remove_attr(pnp_node_handle node, const char *name); @@ -177,79 +174,75 @@ struct dirent *pnp_boot_safe_readdir( DIR *dirp ); // driver_loader.c -status_t pnp_load_driver( pnp_node_handle node, void *user_cookie, - pnp_driver_info **interface, void **cookie ); -status_t pnp_unload_driver( pnp_node_handle node ); -void pnp_unblock_load( pnp_node_info *node ); -void pnp_load_driver_automatically( pnp_node_info *node, bool after_rescan ); -void pnp_unload_driver_automatically( pnp_node_info *node, bool before_rescan ); +status_t pnp_load_driver(pnp_node_handle node, void *user_cookie, + pnp_driver_info **interface, void **cookie); +status_t pnp_unload_driver(pnp_node_handle node); +void pnp_unblock_load(pnp_node_info *node); +void pnp_load_driver_automatically(pnp_node_info *node, bool after_rescan); +void pnp_unload_driver_automatically(pnp_node_info *node, bool before_rescan); // id_generator.c -int32 pnp_create_id( const char *name ); -status_t pnp_free_id( const char *name, uint32 id ); +int32 pnp_create_id(const char *name); +status_t pnp_free_id(const char *name, uint32 id); // io_resources.c -status_t pnp_acquire_io_resources( - io_resource *resources, io_resource_handle *handles ); -status_t pnp_release_io_resources( const io_resource_handle *handles ); -void pnp_assign_io_resources( pnp_node_info *node, const io_resource_handle *handles ); -void pnp_release_node_resources( pnp_node_info *node ); +status_t pnp_acquire_io_resources(io_resource *resources, io_resource_handle *handles); +status_t pnp_release_io_resources(const io_resource_handle *handles); +void pnp_assign_io_resources(pnp_node_info *node, const io_resource_handle *handles); +void pnp_release_node_resources(pnp_node_info *node); // nodes.c -status_t pnp_alloc_node( - const pnp_node_attr *attrs, const io_resource_handle *resources, - pnp_node_info **new_node ); -void pnp_create_node_links( pnp_node_info *node, pnp_node_info *parent ); -void pnp_add_node_ref( pnp_node_info *node ); -void pnp_remove_node_ref( pnp_node_info *node ); +status_t pnp_alloc_node(const pnp_node_attr *attrs, const io_resource_handle *resources, + pnp_node_info **new_node); +void pnp_create_node_links(pnp_node_info *node, pnp_node_info *parent); +void pnp_add_node_ref(pnp_node_info *node); +void pnp_remove_node_ref(pnp_node_info *node); void pnp_remove_node_ref_nolock(pnp_node_info *node); -pnp_node_handle pnp_find_device( pnp_node_handle parent, const pnp_node_attr *attrs ); -pnp_node_handle pnp_get_parent( pnp_node_handle node ); +pnp_node_handle pnp_find_device(pnp_node_handle parent, const pnp_node_attr *attrs); +pnp_node_handle pnp_get_parent(pnp_node_handle node); // notifications.c -status_t pnp_notify_probe_by_module( pnp_node_info *node, - const char *consumer_name ); -void pnp_notify_unregistration( pnp_node_info *notify_list ); -void pnp_start_hook_call( pnp_node_info *node ); -void pnp_start_hook_call_nolock( pnp_node_info *node ); -void pnp_finish_hook_call( pnp_node_info *node ); -void pnp_finish_hook_call_nolock( pnp_node_info *node ); +status_t pnp_notify_probe_by_module(pnp_node_info *node, + const char *consumer_name); +void pnp_notify_unregistration(pnp_node_info *notify_list); +void pnp_start_hook_call(pnp_node_info *node); +void pnp_start_hook_call_nolock(pnp_node_info *node); +void pnp_finish_hook_call(pnp_node_info *node); +void pnp_finish_hook_call_nolock(pnp_node_info *node); // patterns.c -status_t pnp_expand_pattern( pnp_node_info *node, - const char *pattern, char *dest, char *buffer, size_t *term_array, - int *num_parts ); -status_t pnp_expand_pattern_attr( pnp_node_info *node, const char *attr_name, - char **expanded ); +status_t pnp_expand_pattern(pnp_node_info *node, const char *pattern, + char *dest, char *buffer, size_t *term_array, int *num_parts); +status_t pnp_expand_pattern_attr(pnp_node_info *node, const char *attr_name, + char **expanded); // probe.c -status_t pnp_notify_fixed_consumers( pnp_node_handle node ); -status_t pnp_notify_dynamic_consumers( pnp_node_info *node ); +status_t pnp_notify_fixed_consumers(pnp_node_handle node); +status_t pnp_notify_dynamic_consumers(pnp_node_info *node); // registration.c -status_t pnp_register_device( - pnp_node_handle parent, const pnp_node_attr *attrs, - const io_resource_handle *resources, pnp_node_handle *node ); -status_t pnp_unregister_device( pnp_node_handle node ); -void pnp_unregister_node_rec( pnp_node_info *node, pnp_node_info **dependency_list ); -void pnp_unref_unregistered_nodes( pnp_node_info *node_list ); -void pnp_defer_probing_of_children_nolock( pnp_node_info *node ); -void pnp_defer_probing_of_children( pnp_node_info *node ); -void pnp_probe_waiting_children_nolock( pnp_node_info *node ); -void pnp_probe_waiting_children( pnp_node_info *node ); +status_t pnp_register_device(pnp_node_handle parent, const pnp_node_attr *attrs, + const io_resource_handle *resources, pnp_node_handle *node); +status_t pnp_unregister_device(pnp_node_handle node); +void pnp_unregister_node_rec(pnp_node_info *node, pnp_node_info **dependency_list); +void pnp_unref_unregistered_nodes(pnp_node_info *node_list); +void pnp_defer_probing_of_children_nolock(pnp_node_info *node); +void pnp_defer_probing_of_children(pnp_node_info *node); +void pnp_probe_waiting_children_nolock(pnp_node_info *node); +void pnp_probe_waiting_children(pnp_node_info *node); // root_node.c @@ -259,8 +252,9 @@ extern void pnp_root_rescan_root(void); // scan.c -status_t pnp_rescan( pnp_node_handle node, uint depth ); -status_t pnp_rescan_int( pnp_node_info *node, uint depth, - bool ignore_fixed_consumers ); -status_t pnp_initial_scan( pnp_node_info *node ); +status_t pnp_rescan(pnp_node_handle node, uint depth); +status_t pnp_rescan_int(pnp_node_info *node, uint depth, + bool ignore_fixed_consumers); +status_t pnp_initial_scan(pnp_node_info *node); +#endif /* DEVICE_MANAGER_PRIVATE_H */