Changeset db96017 in mainline for uspace/lib/net/generic/net_remote.c

Timestamp:

2012-04-07T17:41:44Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

b6913b7

Parents:

b69e4c0 (diff), 6bb169b5 (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/net/generic/net_remote.c (modified) (4 diffs)

uspace/lib/net/generic/net_remote.c

@@ -38 +38 @@
 #include <ipc/services.h>
 #include <ipc/net_net.h>
-
 #include <malloc.h>
-
+#include <async.h>
 #include <generic.h>
 #include <net/modules.h>
@@ -98 +97 @@
     size_t count, uint8_t **data)
 {
-        return generic_translate_req(sess, NET_NET_GET_DEVICE_CONF, 0, 0,
+        return generic_translate_req(sess, NET_NET_GET_CONF, 0, 0,
             *configuration, count, configuration, data);
 }
@@ -124 +123 @@
  *
  */
-int net_get_device_conf_req(async_sess_t *sess, device_id_t device_id,
+int net_get_device_conf_req(async_sess_t *sess, nic_device_id_t device_id,
     measured_string_t **configuration, size_t count, uint8_t **data)
 {
@@ -131 +130 @@
 }
 
+int net_get_devices_req(async_sess_t *sess, measured_string_t **devices,
+    size_t *count, uint8_t **data)
+{
+        if ((!devices) || (!count))
+                return EBADMEM;
+        
+        async_exch_t *exch = async_exchange_begin(sess);
+        
+        int rc = async_req_0_1(exch, NET_NET_GET_DEVICES_COUNT, count);
+        if (rc != EOK) {
+                async_exchange_end(exch);
+                return rc;
+        }
+        
+        if (*count == 0) {
+                async_exchange_end(exch);
+                *data = NULL;
+                return EOK;
+        }
+        
+        aid_t message_id = async_send_0(exch, NET_NET_GET_DEVICES, NULL);
+        rc = measured_strings_return(exch, devices, data, *count);
+        
+        async_exchange_end(exch);
+        
+        sysarg_t result;
+        async_wait_for(message_id, &result);
+        
+        if ((rc == EOK) && (result != EOK)) {
+                free(*devices);
+                free(*data);
+        }
+        
+        return (int) result;
+}
+
 /** @}
  */