Changes in uspace/srv/devman/devman.h [b72efe8:422722e] in mainline

File:

• uspace/srv/devman/devman.h (modified) (12 diffs)

uspace/srv/devman/devman.h

@@ -1 +1 @@
 /*
  * Copyright (c) 2010 Lenka Trochtova
+ * Copyright (c) 2011 Jiri Svoboda
  * All rights reserved.
  *
@@ -41 +42 @@
 #include <adt/hash_table.h>
 #include <ipc/devman.h>
-#include <ipc/devmap.h>
+#include <ipc/loc.h>
 #include <fibril_synch.h>
 #include <atomic.h>
@@ -53 +54 @@
 #define DEVICE_BUCKETS 256
 
-#define DEVMAP_CLASS_NAMESPACE "class"
-#define DEVMAP_DEVICE_NAMESPACE "devices"
-#define DEVMAP_SEPARATOR '\\'
+#define LOC_DEVICE_NAMESPACE "devices"
+#define LOC_SEPARATOR '\\'
 
 struct dev_node;
@@ -62 +62 @@
 struct fun_node;
 typedef struct fun_node fun_node_t;
+
+typedef struct {
+        fibril_mutex_t mutex;
+        struct driver *driver;
+} client_t;
 
 typedef enum {
@@ -155 +160 @@
         /** Name of the function, assigned by the device driver */
         char *name;
+        /** Function type */
+        fun_type_t ftype;
         
         /** Full path and name of the device in device hierarchy */
@@ -170 +177 @@
         match_id_list_t match_ids;
         
-        /** List of device classes to which this device function belongs. */
-        list_t classes;
-        /** Devmap handle if the device function is registered by devmap. */
-        devmap_handle_t devmap_handle;
+        /** Service ID if the device function is registered with loc. */
+        service_id_t service_id;
         
         /**
@@ -181 +186 @@
         
         /**
-         * Used by the hash table of functions indexed by devmap device handles.
-         */
-        link_t devmap_fun;
+         * Used by the hash table of functions indexed by service IDs.
+         */
+        link_t loc_fun;
 };
 
@@ -208 +213 @@
         
         /**
-         * Hash table of devices registered by devmapper, indexed by devmap
-         * handles.
-         */
-        hash_table_t devmap_functions;
+         * Hash table of services registered with location service, indexed by
+         * service IDs.
+         */
+        hash_table_t loc_functions;
 } dev_tree_t;
-
-typedef struct dev_class {
-        /** The name of the class. */
-        const char *name;
-        
-        /**
-         * Pointer to the previous and next class in the list of registered
-         * classes.
-         */
-        link_t link;
-        
-        /**
-         * List of dev_class_info structures - one for each device registered by
-         * this class.
-         */
-        list_t devices;
-        
-        /**
-         * Default base name for the device within the class, might be overrided
-         * by the driver.
-         */
-        const char *base_dev_name;
-        
-        /** Unique numerical identifier of the newly added device. */
-        size_t curr_dev_idx;
-        /** Synchronize access to the list of devices in this class. */
-        fibril_mutex_t mutex;
-} dev_class_t;
-
-/**
- * Provides n-to-m mapping between function nodes and classes - each function
- * can register in an arbitrary number of classes and each class can contain
- * an arbitrary number of device functions.
- */
-typedef struct dev_class_info {
-        /** The class. */
-        dev_class_t *dev_class;
-        /** The device. */
-        fun_node_t *fun;
-        
-        /**
-         * Pointer to the previous and next class info in the list of devices
-         * registered by the class.
-         */
-        link_t link;
-        
-        /**
-         * Pointer to the previous and next class info in the list of classes
-         * by which the device is registered.
-         */
-        link_t dev_classes;
-        
-        /** The name of the device function within the class. */
-        char *dev_name;
-        /** The handle of the device by device mapper in the class namespace. */
-        devmap_handle_t devmap_handle;
-        
-        /**
-         * Link in the hash table of devices registered by the devmapper using
-         * their class names.
-         */
-        link_t devmap_link;
-} dev_class_info_t;
-
-/** The list of device classes. */
-typedef struct class_list {
-        /** List of classes. */
-        list_t classes;
-        
-        /**
-         * Hash table of devices registered by devmapper using their class name,
-         * indexed by devmap handles.
-         */
-        hash_table_t devmap_functions;
-        
-        /** Fibril mutex for list of classes. */
-        fibril_rwlock_t rwlock;
-} class_list_t;
 
 /* Match ids and scores */
@@ -313 +240 @@
 extern void add_driver(driver_list_t *, driver_t *);
 extern void attach_driver(dev_node_t *, driver_t *);
-extern void add_device(async_sess_t *, driver_t *, dev_node_t *, dev_tree_t *);
+extern void add_device(driver_t *, dev_node_t *, dev_tree_t *);
 extern bool start_driver(driver_t *);
 
@@ -331 +258 @@
 extern dev_node_t *find_dev_node(dev_tree_t *tree, devman_handle_t handle);
 extern dev_node_t *find_dev_function(dev_node_t *, const char *);
+extern int dev_get_functions(dev_tree_t *tree, dev_node_t *, devman_handle_t *,
+    size_t, size_t *);
 
 extern fun_node_t *create_fun_node(void);
@@ -339 +268 @@
 extern fun_node_t *find_fun_node_by_path(dev_tree_t *, char *);
 extern fun_node_t *find_fun_node_in_device(dev_node_t *, const char *);
-extern fun_node_t *find_fun_node_by_class(class_list_t *, const char *, const char *);
 
 /* Device tree */
@@ -347 +275 @@
 extern bool insert_dev_node(dev_tree_t *, dev_node_t *, fun_node_t *);
 extern bool insert_fun_node(dev_tree_t *, fun_node_t *, char *, dev_node_t *);
-
-/* Device classes */
-
-extern dev_class_t *create_dev_class(void);
-extern dev_class_info_t *create_dev_class_info(void);
-extern size_t get_new_class_dev_idx(dev_class_t *);
-extern char *create_dev_name_for_class(dev_class_t *, const char *);
-extern dev_class_info_t *add_function_to_class(fun_node_t *, dev_class_t *,
-    const char *);
-
-extern void init_class_list(class_list_t *);
-
-extern dev_class_t *get_dev_class(class_list_t *, char *);
-extern dev_class_t *find_dev_class_no_lock(class_list_t *, const char *);
-extern dev_class_info_t *find_dev_in_class(dev_class_t *, const char *);
-extern void add_dev_class_no_lock(class_list_t *, dev_class_t *);
-
-/* Devmap devices */
-
-extern void devmap_register_tree_function(fun_node_t *, dev_tree_t *);
-
-extern fun_node_t *find_devmap_tree_function(dev_tree_t *, devmap_handle_t);
-extern fun_node_t *find_devmap_class_function(class_list_t *, devmap_handle_t);
-
-extern void class_add_devmap_function(class_list_t *, dev_class_info_t *);
-extern void tree_add_devmap_function(dev_tree_t *, fun_node_t *);
+extern void remove_fun_node(dev_tree_t *, fun_node_t *);
+
+/* Loc services */
+
+extern void loc_register_tree_function(fun_node_t *, dev_tree_t *);
+
+extern fun_node_t *find_loc_tree_function(dev_tree_t *, service_id_t);
+
+extern void tree_add_loc_function(dev_tree_t *, fun_node_t *);
 
 #endif