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

Timestamp:

2010-11-02T22:38:46Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

af894a21

Parents:

aab02fb (diff), e06ef614 (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 (modified) (4 diffs)

uspace/lib/net/include/nil_interface.h

@@ -27 +27 @@
  */
 
-/** @addtogroup net_nil
- *  @{
+/** @addtogroup libnet
+ * @{
  */
 
-#ifndef __NET_NIL_INTERFACE_H__
-#define __NET_NIL_INTERFACE_H__
+#ifndef LIBNET_NIL_INTERFACE_H_
+#define LIBNET_NIL_INTERFACE_H_
 
 #include <async.h>
@@ -38 +38 @@
 
 #include <ipc/ipc.h>
+#include <ipc/nil.h>
 
-#include <net_messages.h>
-#include <adt/measured_strings.h>
-#include <packet/packet.h>
-#include <nil_messages.h>
-#include <net_device.h>
+#include <generic.h>
+#include <nil_remote.h>
 
 #define nil_bind_service(service, device_id, me, receiver) \
@@ -49 +47 @@
 
 #define nil_packet_size_req(nil_phone, device_id, packet_dimension) \
-        generic_packet_size_req_remote(nil_phone, NET_NIL_PACKET_SPACE, device_id, \
-            packet_dimension)
+        generic_packet_size_req_remote(nil_phone, NET_NIL_PACKET_SPACE, \
+            device_id, packet_dimension)
 
 #define nil_get_addr_req(nil_phone, device_id, address, data) \
@@ -67 +65 @@
             netif_service)
 
-
-#ifdef CONFIG_NETIF_NIL_BUNDLE
-
-#include <nil_local.h>
-#include <packet/packet_server.h>
-
-#define nil_device_state_msg  nil_device_state_msg_local
-#define nil_received_msg      nil_received_msg_local
-
-#else /* CONFIG_NETIF_NIL_BUNDLE */
-
-#include <nil_remote.h>
-#include <packet/packet_server.h>
-
 #define nil_device_state_msg  nil_device_state_msg_remote
 #define nil_received_msg      nil_received_msg_remote
-
-#endif /* CONFIG_NETIF_NIL_BUNDLE */
 
 #endif