Changeset b5e68c8 in mainline for uspace/lib/net/il/arp_remote.c

Timestamp:

2011-05-12T16:49:44Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

f36787d7

Parents:

e80329d6 (diff), 750636a (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/il/arp_remote.c (modified) (7 diffs)

uspace/lib/net/il/arp_remote.c

@@ -41 +41 @@
 #include <async.h>
 #include <errno.h>
-#include <ipc/ipc.h>
 #include <ipc/services.h>
 #include <ipc/arp.h>
@@ -52 +51 @@
  *
  * @param service       The ARP module service. Ignored parameter.
- * @returns             The ARP module phone on success.
+ * @return              The ARP module phone on success.
  */
 int arp_connect_module(services_t service)
@@ -65 +64 @@
  *
  * @param[in] arp_phone The ARP module phone used for (semi)remote calls.
- * @returns             EOK on success.
+ * @return              EOK on success.
  */
 int arp_clean_cache_req(int arp_phone)
@@ -78 +77 @@
  * @param[in] protocol  The requesting protocol service.
  * @param[in] address   The protocol address to be cleared.
- * @returns             EOK on success.
- * @returns             ENOENT if the mapping is not found.
+ * @return              EOK on success.
+ * @return              ENOENT if the mapping is not found.
  */
 int
 arp_clear_address_req(int arp_phone, device_id_t device_id, services_t protocol,
-    measured_string_ref address)
+    measured_string_t *address)
 {
         aid_t message_id;
-        ipcarg_t result;
+        sysarg_t result;
 
         message_id = async_send_2(arp_phone, NET_ARP_CLEAR_ADDRESS,
-            (ipcarg_t) device_id, protocol, NULL);
+            (sysarg_t) device_id, protocol, NULL);
         measured_strings_send(arp_phone, address, 1);
         async_wait_for(message_id, &result);
@@ -100 +99 @@
  * @param[in] arp_phone The ARP module phone used for (semi)remote calls.
  * @param[in] device_id The device identifier.
- * @returns             EOK on success.
- * @returns             ENOENT if the device is not found.
+ * @return              EOK on success.
+ * @return              ENOENT if the device is not found.
  */
 int arp_clear_device_req(int arp_phone, device_id_t device_id)
 {
         return (int) async_req_1_0(arp_phone, NET_ARP_CLEAR_DEVICE,
-            (ipcarg_t) device_id);
+            (sysarg_t) device_id);
 }
 
@@ -119 +118 @@
  * @param[in] netif     The underlying device network interface layer service.
  * @param[in] address   The local requesting protocol address of the device.
- * @returns             EOK on success.
- * @returns             EEXIST if the device is already used.
- * @returns             ENOMEM if there is not enough memory left.
- * @returns             ENOENT if the network interface service is not known.
- * @returns             EREFUSED if the network interface service is not
+ * @return              EOK on success.
+ * @return              EEXIST if the device is already used.
+ * @return              ENOMEM if there is not enough memory left.
+ * @return              ENOENT if the network interface service is not known.
+ * @return              EREFUSED if the network interface service is not
  *                      responding.
- * @returns             Other error codes as defined for the
+ * @return              Other error codes as defined for the
  *                      nil_packet_get_size() function.
- * @returns             Other error codes as defined for the nil_get_addr()
+ * @return              Other error codes as defined for the nil_get_addr()
  *                      function.
- * @returns             Other error codes as defined for the
+ * @return              Other error codes as defined for the
  *                      nil_get_broadcast_addr() function.
  */
 int arp_device_req(int arp_phone, device_id_t device_id, services_t protocol,
-    services_t netif, measured_string_ref address)
+    services_t netif, measured_string_t *address)
 {
         aid_t message_id;
-        ipcarg_t result;
+        sysarg_t result;
 
         message_id = async_send_3(arp_phone, NET_ARP_DEVICE,
-            (ipcarg_t) device_id, protocol, netif, NULL);
+            (sysarg_t) device_id, protocol, netif, NULL);
         measured_strings_send(arp_phone, address, 1);
         async_wait_for(message_id, &result);
@@ -157 +156 @@
  * @param[out] translation The translation of the local protocol address.
  * @param[out] data     The allocated raw translation data container.
- * @returns             EOK on success.
- * @returns             EINVAL if the address parameter is NULL.
- * @returns             EBADMEM if the translation or the data parameters are
+ * @return              EOK on success.
+ * @return              EINVAL if the address parameter is NULL.
+ * @return              EBADMEM if the translation or the data parameters are
  *                      NULL.
- * @returns             ENOENT if the mapping is not found.
+ * @return              ENOENT if the mapping is not found.
  */
 int
 arp_translate_req(int arp_phone, device_id_t device_id, services_t protocol,
-    measured_string_ref address, measured_string_ref *translation, char **data)
+    measured_string_t *address, measured_string_t **translation, uint8_t **data)
 {
         return generic_translate_req(arp_phone, NET_ARP_TRANSLATE, device_id,