Changeset 3aae4e8 in mainline for uspace/lib/net/include/nil_interface.h

Timestamp:

2010-04-04T22:07:05Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

23de644

Parents:

9f10660f (diff), 73060801 (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/include/nil_interface.h (moved) (moved from uspace/srv/net/include/nil_interface.h ) (3 diffs)

uspace/lib/net/include/nil_interface.h

@@ -47 +47 @@
 #include <ipc/ipc.h>
 
-#include "../messages.h"
-
-#include "../structures/measured_strings.h"
-#include "../structures/packet/packet.h"
-
-#include "../nil/nil_messages.h"
-
-#include "device.h"
+#include <net_messages.h>
+#include <adt/measured_strings.h>
+#include <packet/packet.h>
+#include <nil_messages.h>
+#include <net_device.h>
 
 /** @name Network interface layer module interface
@@ -129 +126 @@
  *  @returns Other error codes as defined for each specific module device state function.
  */
-int nil_device_state_msg(int nil_phone, device_id_t device_id, int state);
+extern int nil_device_state_msg(int nil_phone, device_id_t device_id, int state);
 
 /** Passes the packet queue to the network interface layer.
@@ -140 +137 @@
  *  @returns Other error codes as defined for each specific module received function.
  */
-int nil_received_msg(int nil_phone, device_id_t device_id, packet_t packet, services_t target);
+extern int nil_received_msg(int nil_phone, device_id_t device_id, packet_t packet, services_t target);
 
 /** Creates bidirectional connection with the network interface layer module and registers the message receiver.