Fork us on GitHub Follow us on Facebook Follow us on Twitter

Changeset 45f04f8 in mainline for uspace/srv/devman/devman.h


Ignore:
Timestamp:
2010-11-18T18:23:43Z (11 years ago)
Author:
Jakub Jermar <jakub@…>
Branches:
lfn, master
Children:
3f0a7971, a7811f17, cb569e6
Parents:
51a268f (diff), c63e70c (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 changes that aim to do a better job in differentiating between
dev_handle_t and device_handle_t, respectively, by renaming these types to
devmap_handle_t and devman_handle_t, respectively.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • uspace/srv/devman/devman.h

    r51a268f r45f04f8  
    121121struct node {
    122122        /** The global unique identifier of the device. */
    123         device_handle_t handle;
     123        devman_handle_t handle;
    124124        /** The name of the device specified by its parent. */
    125125        char *name;
     
    157157        link_t classes;
    158158        /** Devmap handle if the device is registered by devmapper. */
    159         dev_handle_t devmap_handle;
     159        devmap_handle_t devmap_handle;
    160160       
    161161        /**
     
    179179         * manner.
    180180         */
    181         device_handle_t current_handle;
     181        devman_handle_t current_handle;
    182182       
    183183        /** Synchronize access to the device tree. */
     
    248248        char *dev_name;
    249249        /** The handle of the device by device mapper in the class namespace. */
    250         dev_handle_t devmap_handle;
     250        devmap_handle_t devmap_handle;
    251251       
    252252        /**
     
    309309extern void delete_dev_node(node_t *node);
    310310extern 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);
     311    devman_handle_t handle);
     312extern node_t *find_dev_node(dev_tree_t *tree, devman_handle_t handle);
    313313extern node_t *find_dev_node_by_path(dev_tree_t *, char *);
    314314extern node_t *find_node_child(node_t *, const char *);
     
    337337/* Devmap devices */
    338338
    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);
     339extern node_t *find_devmap_tree_device(dev_tree_t *, devmap_handle_t);
     340extern node_t *find_devmap_class_device(class_list_t *, devmap_handle_t);
    341341
    342342extern void class_add_devmap_device(class_list_t *, dev_class_info_t *);
Note: See TracChangeset for help on using the changeset viewer.