Changeset ca56afa in mainline for uspace/lib/c/include

Timestamp:

2011-02-25T09:46:23Z (15 years ago)

Author:

Matus Dekanek <smekideki@…>

Branches:

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

Children:

d493ac17

Parents:

15b0432 (diff), a80849c (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 with /usb/development

Location:

uspace/lib/c/include

Files:

• devman.h (modified) (1 diff)
• errno.h (modified) (1 diff)
• ipc/devman.h (modified) (2 diffs)
• l18n/langs.h (added)

uspace/lib/c/include/devman.h

@@ -45 +45 @@
 
 extern int devman_driver_register(const char *, async_client_conn_t);
-extern int devman_child_device_register(const char *, match_id_list_t *,
+extern int devman_add_function(const char *, fun_type_t, match_id_list_t *,
     devman_handle_t, devman_handle_t *);
 

uspace/lib/c/include/errno.h

@@ -62 +62 @@
 #define ESTALL (-301)
 
+/** Empty resource (no data). */
+#define EEMPTY (-302)
+
 /** An API function is called while another blocking function is in progress. */
 #define EINPROGRESS  (-10036)

uspace/lib/c/include/ipc/devman.h

@@ -42 +42 @@
 
 typedef sysarg_t devman_handle_t;
+
+typedef enum {
+        /** Invalid value for debugging purposes */
+        fun_invalid = 0,
+        /** Function to which child devices attach */
+        fun_inner,
+        /** Fuction exported to external clients (leaf function) */
+        fun_exposed
+} fun_type_t;
 
 /** Ids of device models used for device-to-driver matching.
@@ -127 +136 @@
 typedef enum {
         DEVMAN_DRIVER_REGISTER = IPC_FIRST_USER_METHOD,
-        DEVMAN_ADD_CHILD_DEVICE,
+        DEVMAN_ADD_FUNCTION,
         DEVMAN_ADD_MATCH_ID,
         DEVMAN_ADD_DEVICE_TO_CLASS