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

Timestamp:

2010-05-21T07:50:04Z (14 years ago)

Author:

Lenka Trochtova <trochtova.lenka@…>

Branches:

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

Children:

d51ee2b

Parents:

cf8cc36 (diff), 15b592b (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 (rev. 451)

File:

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

uspace/srv/devman/devman.h

@@ -37 +37 @@
 #include <bool.h>
 #include <dirent.h>
-#include <string.h>
+#include <str.h>
 #include <adt/list.h>
 #include <ipc/ipc.h>
@@ -145 +145 @@
 int get_match_score(driver_t *drv, node_t *dev);
 
-bool parse_match_ids(const char *buf, match_id_list_t *ids);
+bool parse_match_ids(char *buf, match_id_list_t *ids);
 bool read_match_ids(const char *conf_path, match_id_list_t *ids);
-char * read_id(const char **buf) ;
+char * read_match_id(char **buf);
+char * read_id(const char **buf);
 
 // Drivers
@@ -165 +166 @@
 }
 
-driver_t * create_driver();
+driver_t * create_driver(void);
 bool get_driver_info(const char *base_path, const char *name, driver_t *drv);
 int lookup_available_drivers(driver_list_t *drivers_list, const char *dir_path);