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

Timestamp:

2011-08-18T20:27:26Z (13 years ago)

Author:

Petr Koupy <petr.koupy@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

921b84f

Parents:

1f44b056 (diff), ef7052ec (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:

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

uspace/srv/devman/devman.h

@@ -1 +1 @@
 /*
  * Copyright (c) 2010 Lenka Trochtova
+ * Copyright (c) 2011 Jiri Svoboda
  * All rights reserved.
  *
@@ -154 +155 @@
         /** 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 */
@@ -265 +268 @@
 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 *);
+extern void remove_fun_node(dev_tree_t *, fun_node_t *);
 
 /* Loc services */