Changeset 80cd7cd in mainline for uspace/lib/net/il

Timestamp:

2011-01-13T20:58:24Z (15 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

87e373b

Parents:

eaef141 (diff), a613fea1 (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.

Location:

uspace/lib/net/il

Files:

• arp_remote.c (modified) (1 diff)
• il_remote.c (moved) (moved from uspace/lib/net/il/il_interface.c ) (1 diff)
• il_skel.c (added)
• ip_remote.c (modified) (5 diffs)

uspace/lib/net/il/arp_remote.c

@@ -165 +165 @@
 int
 arp_translate_req(int arp_phone, device_id_t device_id, services_t protocol,
-    measured_string_t *address, measured_string_t **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,

uspace/lib/net/il/il_remote.c

@@ -33 +33 @@
 /** @file
  * Internetwork layer module interface for the underlying network interface
- * layer. This interface is always called by the remote modules.
+ * layer.
  */
 
-#include <il_interface.h>
+#include <il_remote.h>
 #include <generic.h>
 #include <packet_client.h>

uspace/lib/net/il/ip_remote.c

@@ -36 +36 @@
  *
  * @see ip_interface.h
- * @see il_interface.h
+ * @see il_remote.h
  *
  */
@@ -121 +121 @@
     services_t service)
 {
-        return generic_device_req_remote(ip_phone, NET_IL_DEVICE, device_id, 0,
+        return generic_device_req_remote(ip_phone, NET_IP_DEVICE, device_id, 0,
             service);
 }
@@ -170 +170 @@
                 free(*header);
         else
-                *device_id = IPC_GET_DEVICE(&answer);
+                *device_id = IPC_GET_DEVICE(answer);
         
         return (int) result;
@@ -188 +188 @@
     packet_dimension_t *packet_dimension)
 {
-        return generic_packet_size_req_remote(ip_phone, NET_IL_PACKET_SPACE,
+        return generic_packet_size_req_remote(ip_phone, NET_IP_PACKET_SPACE,
             device_id, packet_dimension);
 }
@@ -228 +228 @@
     services_t sender, services_t error)
 {
-        return generic_send_msg_remote(ip_phone, NET_IL_SEND, device_id,
+        return generic_send_msg_remote(ip_phone, NET_IP_SEND, device_id,
             packet_get_id(packet), sender, error);
 }