Changeset 89c57b6 in mainline for uspace/lib/net/il/il_remote.c

Timestamp:

2011-04-13T14:45:41Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

88634420

Parents:

cefb126 (diff), 17279ead (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/il_remote.c (moved) (moved from uspace/lib/net/include/il_interface.h ) (5 diffs)

uspace/lib/net/il/il_remote.c

@@ -27 +27 @@
  */
 
-/** @addtogroup net_il
- *  @{
+/** @addtogroup libnet
+ * @{
  */
 
 /** @file
- * Internetwork layer module interface for the underlying network interface layer.
- * This interface is always called by the remote modules.
+ * Internetwork layer module interface for the underlying network interface
+ * layer.
  */
 
-#ifndef __NET_IL_INTERFACE_H__
-#define __NET_IL_INTERFACE_H__
-
-#include <async.h>
+#include <il_remote.h>
+#include <generic.h>
+#include <packet_client.h>
 
 #include <ipc/services.h>
+#include <ipc/il.h>
 
-#include <net_messages.h>
-#include <net_device.h>
-#include <packet/packet.h>
-#include <packet/packet_client.h>
-#include <il_messages.h>
-
-/** @name Internetwork layer module interface
- * This interface is used by other modules.
- */
-/*@{*/
+#include <net/device.h>
+#include <net/packet.h>
 
 /** Notify the internetwork layer modules about the device state change.
@@ -66 +58 @@
  *
  */
-static inline int il_device_state_msg(int il_phone, device_id_t device_id,
+int il_device_state_msg(int il_phone, device_id_t device_id,
     device_state_t state, services_t target)
 {
@@ -85 +77 @@
  *
  */
-inline static int il_received_msg(int il_phone, device_id_t device_id,
-    packet_t packet, services_t target)
+int il_received_msg(int il_phone, device_id_t device_id, packet_t *packet,
+    services_t target)
 {
         return generic_received_msg_remote(il_phone, NET_IL_RECEIVED, device_id,
@@ -104 +96 @@
  *
  */
-inline static int il_mtu_changed_msg(int il_phone, device_id_t device_id,
-    size_t mtu, services_t target)
+int il_mtu_changed_msg(int il_phone, device_id_t device_id, size_t mtu,
+    services_t target)
 {
         return generic_device_state_msg_remote(il_phone, NET_IL_MTU_CHANGED,
@@ -111 +103 @@
 }
 
-/*@}*/
-
-#endif
-
 /** @}
  */