Changeset 8ff0bd2 in mainline for uspace/lib/c/include/ipc/devman.h

Timestamp:

2011-09-04T11:30:58Z (13 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

03bc76a

Parents:

d2c67e7 (diff), deac215e (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/lib/c/include/ipc/devman.h (modified) (6 diffs)

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

@@ -72 +72 @@
  */
 typedef struct match_id_list {
-        link_t ids;
+        list_t ids;
 } match_id_list_t;
 
@@ -95 +95 @@
 {
         match_id_t *mid = NULL;
-        link_t *link = ids->ids.next;
+        link_t *link = ids->ids.head.next;
         
-        while (link != &ids->ids) {
+        while (link != &ids->ids.head) {
                 mid = list_get_instance(link, match_id_t,link);
                 if (mid->score < id->score) {
                         break;
-                }       
+                }
                 link = link->next;
         }
@@ -118 +118 @@
         match_id_t *id;
         
-        while(!list_empty(&ids->ids)) {
-                link = ids->ids.next;
-                list_remove(link);              
+        while (!list_empty(&ids->ids)) {
+                link = list_first(&ids->ids);
+                list_remove(link);
                 id = list_get_instance(link, match_id_t, link);
-                delete_match_id(id);            
-        }       
+                delete_match_id(id);
+        }
 }
 
@@ -130 +130 @@
         DEVMAN_CLIENT,
         DEVMAN_CONNECT_TO_DEVICE,
-        DEVMAN_CONNECT_FROM_DEVMAP,
+        DEVMAN_CONNECT_FROM_LOC,
         DEVMAN_CONNECT_TO_PARENTS_DEVICE
 } devman_interface_t;
@@ -138 +138 @@
         DEVMAN_ADD_FUNCTION,
         DEVMAN_ADD_MATCH_ID,
-        DEVMAN_ADD_DEVICE_TO_CLASS
-
+        DEVMAN_ADD_DEVICE_TO_CATEGORY,
+        DEVMAN_DRV_FUN_ONLINE,
+        DEVMAN_DRV_FUN_OFFLINE,
+        DEVMAN_REMOVE_FUNCTION
 } driver_to_devman_t;
 
 typedef enum {
-        DRIVER_ADD_DEVICE = IPC_FIRST_USER_METHOD
+        DRIVER_DEV_ADD = IPC_FIRST_USER_METHOD,
+        DRIVER_DEV_REMOVE,
+        DRIVER_FUN_ONLINE,
+        DRIVER_FUN_OFFLINE,
 
 } devman_to_driver_t;
@@ -149 +154 @@
 typedef enum {
         DEVMAN_DEVICE_GET_HANDLE = IPC_FIRST_USER_METHOD,
-        DEVMAN_DEVICE_GET_HANDLE_BY_CLASS,
-        DEVMAN_DEVICE_GET_DEVICE_PATH
+        DEVMAN_DEV_GET_FUNCTIONS,
+        DEVMAN_FUN_GET_CHILD,
+        DEVMAN_FUN_GET_NAME,
+        DEVMAN_FUN_ONLINE,
+        DEVMAN_FUN_OFFLINE,
+        DEVMAN_FUN_GET_PATH,
+        DEVMAN_FUN_SID_TO_HANDLE
 } client_to_devman_t;