Changes in uspace/lib/c/include/ipc/devman.h [1a5b252:431d6d6] in mainline

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 {
-        list_t ids;
+        link_t ids;
 } match_id_list_t;
 
@@ -95 +95 @@
 {
         match_id_t *mid = NULL;
-        link_t *link = ids->ids.head.next;
+        link_t *link = ids->ids.next;
         
-        while (link != &ids->ids.head) {
+        while (link != &ids->ids) {
                 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 = list_first(&ids->ids);
-                list_remove(link);
+        while(!list_empty(&ids->ids)) {
+                link = ids->ids.next;
+                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_LOC,
+        DEVMAN_CONNECT_FROM_DEVMAP,
         DEVMAN_CONNECT_TO_PARENTS_DEVICE
 } devman_interface_t;
@@ -138 +138 @@
         DEVMAN_ADD_FUNCTION,
         DEVMAN_ADD_MATCH_ID,
-        DEVMAN_ADD_DEVICE_TO_CATEGORY,
-        DEVMAN_DRV_FUN_ONLINE,
-        DEVMAN_DRV_FUN_OFFLINE,
-        DEVMAN_REMOVE_FUNCTION
+        DEVMAN_ADD_DEVICE_TO_CLASS
+
 } driver_to_devman_t;
 
 typedef enum {
-        DRIVER_DEV_ADD = IPC_FIRST_USER_METHOD,
-        DRIVER_DEV_REMOVE,
-        DRIVER_FUN_ONLINE,
-        DRIVER_FUN_OFFLINE,
+        DRIVER_ADD_DEVICE = IPC_FIRST_USER_METHOD
 
 } devman_to_driver_t;
@@ -154 +149 @@
 typedef enum {
         DEVMAN_DEVICE_GET_HANDLE = IPC_FIRST_USER_METHOD,
-        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
+        DEVMAN_DEVICE_GET_HANDLE_BY_CLASS,
+        DEVMAN_DEVICE_GET_DEVICE_PATH
 } client_to_devman_t;