Changeset b5e68c8 in mainline for uspace/srv/devman/devman.h


Ignore:
Timestamp:
2011-05-12T16:49:44Z (14 years ago)
Author:
Jakub Jermar <jakub@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
f36787d7
Parents:
e80329d6 (diff), 750636a (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge mainline changes.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • uspace/srv/devman/devman.h

    re80329d6 rb5e68c8  
    4040#include <adt/list.h>
    4141#include <adt/hash_table.h>
    42 #include <ipc/ipc.h>
    4342#include <ipc/devman.h>
    4443#include <ipc/devmap.h>
    … …  
    5756#define DEVMAP_SEPARATOR '\\'
    5857
    59 struct node;
    60 typedef struct node node_t;
     58struct dev_node;
     59typedef struct dev_node dev_node_t;
     60
     61struct fun_node;
     62typedef struct fun_node fun_node_t;
    6163
    6264typedef enum {
    … …  
    8688       
    8789        /** Phone asociated with this driver. */
    88         ipcarg_t phone;
     90        int phone;
    8991        /** Name of the device driver. */
    9092        char *name;
    … …  
    118120} device_state_t;
    119121
    120 /** Representation of a node in the device tree. */
    121 struct node {
     122/** Device node in the device tree. */
     123struct dev_node {
    122124        /** The global unique identifier of the device. */
    123         device_handle_t handle;
    124         /** The name of the device specified by its parent. */
    125         char *name;
    126        
    127         /**
    128          * Full path and name of the device in device hierarchi (i. e. in full
    129          * path in device tree).
    130          */
    131         char *pathname;
    132        
    133         /** The node of the parent device. */
    134         node_t *parent;
    135        
    136         /**
    137          * Pointers to previous and next child devices in the linked list of
    138          * parent device's node.
    139          */
    140         link_t sibling;
    141        
    142         /** List of child device nodes. */
    143         link_t children;
    144         /** List of device ids for device-to-driver matching. */
    145         match_id_list_t match_ids;
     125        devman_handle_t handle;
     126       
     127        /** (Parent) function the device is attached to. */
     128        fun_node_t *pfun;
     129       
     130        /** List of device functions. */
     131        link_t functions;
    146132        /** Driver of this device. */
    147133        driver_t *drv;
    148134        /** The state of the device. */
    149135        device_state_t state;
    150         /**
    151          * Pointer to the previous and next device in the list of devices
    152          * owned by one driver.
    153          */
     136        /** Link to list of devices owned by driver (driver_t.devices) */
    154137        link_t driver_devices;
    155138       
    156         /** The list of device classes to which this device belongs. */
     139        /**
     140         * Used by the hash table of devices indexed by devman device handles.
     141         */
     142        link_t devman_dev;
     143       
     144        /**
     145         * Whether this device was already passed to the driver.
     146         */
     147        bool passed_to_driver;
     148};
     149
     150/** Function node in the device tree. */
     151struct fun_node {
     152        /** The global unique identifier of the function */
     153        devman_handle_t handle;
     154        /** Name of the function, assigned by the device driver */
     155        char *name;
     156       
     157        /** Full path and name of the device in device hierarchy */
     158        char *pathname;
     159       
     160        /** Device which this function belongs to */
     161        dev_node_t *dev;
     162       
     163        /** Link to list of functions in the device (ddf_dev_t.functions) */
     164        link_t dev_functions;
     165       
     166        /** Child device node (if any attached). */
     167        dev_node_t *child;
     168        /** List of device ids for device-to-driver matching. */
     169        match_id_list_t match_ids;
     170       
     171        /** The list of device classes to which this device function belongs. */
    157172        link_t classes;
    158         /** Devmap handle if the device is registered by devmapper. */
    159         dev_handle_t devmap_handle;
    160        
    161         /**
    162          * Used by the hash table of devices indexed by devman device handles.
    163          */
    164         link_t devman_link;
    165        
    166         /**
    167          * Used by the hash table of devices indexed by devmap device handles.
    168          */
    169         link_t devmap_link;
     173        /** Devmap handle if the device function is registered by devmap. */
     174        devmap_handle_t devmap_handle;
     175       
     176        /**
     177         * Used by the hash table of functions indexed by devman device handles.
     178         */
     179        link_t devman_fun;
     180       
     181        /**
     182         * Used by the hash table of functions indexed by devmap device handles.
     183         */
     184        link_t devmap_fun;
    170185};
     186
    171187
    172188/** Represents device tree. */
    173189typedef struct dev_tree {
    174190        /** Root device node. */
    175         node_t *root_node;
     191        fun_node_t *root_node;
    176192       
    177193        /**
    … …  
    179195         * manner.
    180196         */
    181         device_handle_t current_handle;
     197        devman_handle_t current_handle;
    182198       
    183199        /** Synchronize access to the device tree. */
    … …  
    187203        hash_table_t devman_devices;
    188204       
     205        /** Hash table of all devices indexed by devman handles. */
     206        hash_table_t devman_functions;
     207       
    189208        /**
    190209         * Hash table of devices registered by devmapper, indexed by devmap
    191210         * handles.
    192211         */
    193         hash_table_t devmap_devices;
     212        hash_table_t devmap_functions;
    194213} dev_tree_t;
    195214
    … …  
    223242
    224243/**
    225  * Provides n-to-m mapping between device nodes and classes - each device may
    226  * be register to the arbitrary number of classes and each class may contain
    227  * the arbitrary number of devices.
     244 * Provides n-to-m mapping between function nodes and classes - each function
     245 * can register in an arbitrary number of classes and each class can contain
     246 * an arbitrary number of device functions.
    228247 */
    229248typedef struct dev_class_info {
    … …  
    231250        dev_class_t *dev_class;
    232251        /** The device. */
    233         node_t *dev;
     252        fun_node_t *fun;
    234253       
    235254        /**
    … …  
    245264        link_t dev_classes;
    246265       
    247         /** The name of the device within the class. */
     266        /** The name of the device function within the class. */
    248267        char *dev_name;
    249268        /** The handle of the device by device mapper in the class namespace. */
    250         dev_handle_t devmap_handle;
     269        devmap_handle_t devmap_handle;
    251270       
    252271        /**
    … …  
    266285         * indexed by devmap handles.
    267286         */
    268         hash_table_t devmap_devices;
     287        hash_table_t devmap_functions;
    269288       
    270289        /** Fibril mutex for list of classes. */
    … …  
    274293/* Match ids and scores */
    275294
    276 extern int get_match_score(driver_t *, node_t *);
     295extern int get_match_score(driver_t *, dev_node_t *);
    277296
    278297extern bool parse_match_ids(char *, match_id_list_t *);
    … …  
    288307extern int lookup_available_drivers(driver_list_t *, const char *);
    289308
    290 extern driver_t *find_best_match_driver(driver_list_t *, node_t *);
    291 extern bool assign_driver(node_t *, driver_list_t *, dev_tree_t *);
     309extern driver_t *find_best_match_driver(driver_list_t *, dev_node_t *);
     310extern bool assign_driver(dev_node_t *, driver_list_t *, dev_tree_t *);
    292311
    293312extern void add_driver(driver_list_t *, driver_t *);
    294 extern void attach_driver(node_t *, driver_t *);
    295 extern void add_device(int, driver_t *, node_t *, dev_tree_t *);
     313extern void attach_driver(dev_node_t *, driver_t *);
     314extern void add_device(int, driver_t *, dev_node_t *, dev_tree_t *);
    296315extern bool start_driver(driver_t *);
    297316
    298317extern driver_t *find_driver(driver_list_t *, const char *);
    299 extern void set_driver_phone(driver_t *, ipcarg_t);
    300318extern void initialize_running_driver(driver_t *, dev_tree_t *);
    301319
    … …  
    306324/* Device nodes */
    307325
    308 extern node_t *create_dev_node(void);
    309 extern void delete_dev_node(node_t *node);
    310 extern node_t *find_dev_node_no_lock(dev_tree_t *tree,
    311     device_handle_t handle);
    312 extern node_t *find_dev_node(dev_tree_t *tree, device_handle_t handle);
    313 extern node_t *find_dev_node_by_path(dev_tree_t *, char *);
    314 extern node_t *find_node_child(node_t *, const char *);
     326extern dev_node_t *create_dev_node(void);
     327extern void delete_dev_node(dev_node_t *node);
     328extern dev_node_t *find_dev_node_no_lock(dev_tree_t *tree,
     329    devman_handle_t handle);
     330extern dev_node_t *find_dev_node(dev_tree_t *tree, devman_handle_t handle);
     331extern dev_node_t *find_dev_function(dev_node_t *, const char *);
     332
     333extern fun_node_t *create_fun_node(void);
     334extern void delete_fun_node(fun_node_t *);
     335extern fun_node_t *find_fun_node_no_lock(dev_tree_t *tree,
     336    devman_handle_t handle);
     337extern fun_node_t *find_fun_node(dev_tree_t *tree, devman_handle_t handle);
     338extern fun_node_t *find_fun_node_by_path(dev_tree_t *, char *);
     339extern fun_node_t *find_fun_node_in_device(dev_node_t *, const char *);
     340extern fun_node_t *find_fun_node_by_class(class_list_t *, const char *, const char *);
    315341
    316342/* Device tree */
    317343
    318344extern bool init_device_tree(dev_tree_t *, driver_list_t *);
    319 extern bool create_root_node(dev_tree_t *);
    320 extern bool insert_dev_node(dev_tree_t *, node_t *, char *, node_t *);
     345extern bool create_root_nodes(dev_tree_t *);
     346extern bool insert_dev_node(dev_tree_t *, dev_node_t *, fun_node_t *);
     347extern bool insert_fun_node(dev_tree_t *, fun_node_t *, char *, dev_node_t *);
    321348
    322349/* Device classes */
    … …  
    326353extern size_t get_new_class_dev_idx(dev_class_t *);
    327354extern char *create_dev_name_for_class(dev_class_t *, const char *);
    328 extern dev_class_info_t *add_device_to_class(node_t *, dev_class_t *,
     355extern dev_class_info_t *add_function_to_class(fun_node_t *, dev_class_t *,
    329356    const char *);
    330357
    … …  
    333360extern dev_class_t *get_dev_class(class_list_t *, char *);
    334361extern dev_class_t *find_dev_class_no_lock(class_list_t *, const char *);
     362extern dev_class_info_t *find_dev_in_class(dev_class_t *, const char *);
    335363extern void add_dev_class_no_lock(class_list_t *, dev_class_t *);
    336364
    337365/* Devmap devices */
    338366
    339 extern node_t *find_devmap_tree_device(dev_tree_t *, dev_handle_t);
    340 extern node_t *find_devmap_class_device(class_list_t *, dev_handle_t);
    341 
    342 extern void class_add_devmap_device(class_list_t *, dev_class_info_t *);
    343 extern void tree_add_devmap_device(dev_tree_t *, node_t *);
     367extern void devmap_register_tree_function(fun_node_t *, dev_tree_t *);
     368
     369extern fun_node_t *find_devmap_tree_function(dev_tree_t *, devmap_handle_t);
     370extern fun_node_t *find_devmap_class_function(class_list_t *, devmap_handle_t);
     371
     372extern void class_add_devmap_function(class_list_t *, dev_class_info_t *);
     373extern void tree_add_devmap_function(dev_tree_t *, fun_node_t *);
    344374
    345375#endif
Note: See TracChangeset for help on using the changeset viewer.