Changes in uspace/lib/net/include/nil_interface.h [404dbae:14f1db0] in mainline

File:

• uspace/lib/net/include/nil_interface.h (modified) (4 diffs)

uspace/lib/net/include/nil_interface.h

@@ -27 +27 @@
  */
 
-/** @addtogroup libnet
- * @{
+/** @addtogroup net_nil
+ *  @{
  */
 
-#ifndef LIBNET_NIL_INTERFACE_H_
-#define LIBNET_NIL_INTERFACE_H_
+#ifndef __NET_NIL_INTERFACE_H__
+#define __NET_NIL_INTERFACE_H__
 
 #include <async.h>
@@ -38 +38 @@
 
 #include <ipc/ipc.h>
-#include <ipc/nil.h>
 
-#include <generic.h>
-#include <nil_remote.h>
+#include <net_messages.h>
+#include <adt/measured_strings.h>
+#include <packet/packet.h>
+#include <nil_messages.h>
+#include <net_device.h>
 
 #define nil_bind_service(service, device_id, me, receiver) \
@@ -47 +49 @@
 
 #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) \
@@ -65 +67 @@
             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