Changeset 0773396 in mainline for uspace/lib/c/generic/devman.c

Timestamp:

2013-12-25T13:05:25Z (10 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

bc54126c

Parents:

f4a47e52 (diff), 6946f23 (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/generic/devman.c (modified) (8 diffs)

uspace/lib/c/generic/devman.c

@@ -1 +1 @@
 /*
  * Copyright (c) 2007 Josef Cejka
- * Copyright (c) 2011 Jiri Svoboda
+ * Copyright (c) 2013 Jiri Svoboda
  * Copyright (c) 2010 Lenka Trochtova
  * All rights reserved.
@@ -230 +230 @@
         }
         
-        match_id_t *match_id = NULL;
-        
-        list_foreach(match_ids->ids, link) {
-                match_id = list_get_instance(link, match_id_t, link);
-                
+        list_foreach(match_ids->ids, link, match_id_t, match_id) {
                 ipc_call_t answer2;
                 aid_t req2 = async_send_1(exch, DEVMAN_ADD_MATCH_ID,
@@ -405 +401 @@
 }
 
-static int devman_get_str_internal(sysarg_t method, sysarg_t arg1, char *buf,
-    size_t buf_size)
+static int devman_get_str_internal(sysarg_t method, sysarg_t arg1,
+    sysarg_t arg2, sysarg_t *r1, char *buf, size_t buf_size)
 {
         async_exch_t *exch;
@@ -416 +412 @@
         
         ipc_call_t answer;
-        aid_t req = async_send_1(exch, method, arg1, &answer);
+        aid_t req = async_send_2(exch, method, arg1, arg2, &answer);
         aid_t dreq = async_data_read(exch, buf, buf_size - 1, &dreply);
         async_wait_for(dreq, &dretval);
@@ -434 +430 @@
         }
         
+        if (r1 != NULL)
+                *r1 = IPC_GET_ARG1(answer);
         act_size = IPC_GET_ARG2(dreply);
         assert(act_size <= buf_size - 1);
@@ -443 +441 @@
 int devman_fun_get_path(devman_handle_t handle, char *buf, size_t buf_size)
 {
-        return devman_get_str_internal(DEVMAN_FUN_GET_PATH, handle, buf,
-            buf_size);
+        return devman_get_str_internal(DEVMAN_FUN_GET_PATH, handle, 0, NULL,
+            buf, buf_size);
+}
+
+int devman_fun_get_match_id(devman_handle_t handle, size_t index, char *buf,
+    size_t buf_size, unsigned int *rscore)
+{
+        int rc;
+        sysarg_t score = 0;
+
+        rc = devman_get_str_internal(DEVMAN_FUN_GET_MATCH_ID, handle, index,
+            &score, buf, buf_size);
+        if (rc != EOK)
+                return rc;
+
+        *rscore = score;
+        return rc;
 }
 
 int devman_fun_get_name(devman_handle_t handle, char *buf, size_t buf_size)
 {
-        return devman_get_str_internal(DEVMAN_FUN_GET_NAME, handle, buf,
-            buf_size);
+        return devman_get_str_internal(DEVMAN_FUN_GET_NAME, handle, 0, NULL,
+            buf, buf_size);
 }
 
 int devman_fun_get_driver_name(devman_handle_t handle, char *buf, size_t buf_size)
 {
-        return devman_get_str_internal(DEVMAN_FUN_GET_DRIVER_NAME, handle, buf,
-            buf_size);
+        return devman_get_str_internal(DEVMAN_FUN_GET_DRIVER_NAME, handle, 0,
+            NULL, buf, buf_size);
 }
 
@@ -583 +596 @@
 }
 
+int devman_dev_get_parent(devman_handle_t devh, devman_handle_t *funh)
+{
+        async_exch_t *exch = devman_exchange_begin(DEVMAN_CLIENT);
+        if (exch == NULL)
+                return ENOMEM;
+        
+        sysarg_t retval = async_req_1_1(exch, DEVMAN_DEV_GET_PARENT,
+            devh, funh);
+        
+        devman_exchange_end(exch);
+        return (int) retval;
+}
+
 int devman_fun_sid_to_handle(service_id_t sid, devman_handle_t *handle)
 {
@@ -596 +622 @@
 }
 
+int devman_get_drivers(devman_handle_t **drvs,
+    size_t *count)
+{
+        return devman_get_handles_internal(DEVMAN_GET_DRIVERS, 0, drvs, count);
+}
+
+int devman_driver_get_devices(devman_handle_t drvh, devman_handle_t **devs,
+    size_t *count)
+{
+        return devman_get_handles_internal(DEVMAN_DRIVER_GET_DEVICES,
+            drvh, devs, count);
+}
+
+int devman_driver_get_handle(const char *drvname, devman_handle_t *handle)
+{
+        async_exch_t *exch;
+
+        exch = devman_exchange_begin(DEVMAN_CLIENT);
+        if (exch == NULL)
+                return ENOMEM;
+        
+        ipc_call_t answer;
+        aid_t req = async_send_0(exch, DEVMAN_DRIVER_GET_HANDLE, &answer);
+        sysarg_t retval = async_data_write_start(exch, drvname,
+            str_size(drvname));
+        
+        devman_exchange_end(exch);
+        
+        if (retval != EOK) {
+                async_forget(req);
+                return retval;
+        }
+        
+        async_wait_for(req, &retval);
+        
+        if (retval != EOK) {
+                if (handle != NULL)
+                        *handle = (devman_handle_t) -1;
+                
+                return retval;
+        }
+        
+        if (handle != NULL)
+                *handle = (devman_handle_t) IPC_GET_ARG1(answer);
+        
+        return retval;
+}
+
+int devman_driver_get_match_id(devman_handle_t handle, size_t index, char *buf,
+    size_t buf_size, unsigned int *rscore)
+{
+        int rc;
+        sysarg_t score = 0;
+
+        rc = devman_get_str_internal(DEVMAN_DRIVER_GET_MATCH_ID, handle, index,
+            &score, buf, buf_size);
+        if (rc != EOK)
+                return rc;
+
+        *rscore = score;
+        return rc;
+}
+
+int devman_driver_get_name(devman_handle_t handle, char *buf, size_t buf_size)
+{
+        return devman_get_str_internal(DEVMAN_DRIVER_GET_NAME, handle, 0, NULL,
+            buf, buf_size);
+}
+
+int devman_driver_get_state(devman_handle_t drvh, driver_state_t *rstate)
+{
+        sysarg_t state;
+        async_exch_t *exch = devman_exchange_begin(DEVMAN_CLIENT);
+        if (exch == NULL)
+                return ENOMEM;
+        
+        int rc = async_req_1_1(exch, DEVMAN_DRIVER_GET_STATE, drvh,
+            &state);
+        
+        devman_exchange_end(exch);
+        if (rc != EOK)
+                return rc;
+
+        *rstate = state;
+        return rc;
+}
+
+int devman_driver_load(devman_handle_t drvh)
+{
+        async_exch_t *exch = devman_exchange_begin(DEVMAN_CLIENT);
+        if (exch == NULL)
+                return ENOMEM;
+        
+        int rc = async_req_1_0(exch, DEVMAN_DRIVER_LOAD, drvh);
+        
+        devman_exchange_end(exch);
+        return rc;
+}
+
 /** @}
  */