Changeset 849ed54 in mainline for uspace/lib/net/include/netif_interface.h

Timestamp:

2010-03-30T18:39:04Z (15 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

7553689

Parents:

7d6fe4db

Message:

Networking work:
Split the networking stack into end-user library (libsocket) and two helper libraries (libnet and libnetif).
Don't use over-the-hand compiling and linking, but rather separation of conserns.
There might be still some issues and the non-modular networking architecture is currently broken, but this will be fixed soon.

File:

• uspace/lib/net/include/netif_interface.h (moved) (moved from uspace/srv/net/include/netif_interface.h ) (8 diffs)

uspace/lib/net/include/netif_interface.h

@@ -43 +43 @@
 #include <ipc/services.h>
 
-#include "../messages.h"
-
-#include "../structures/measured_strings.h"
-#include "../structures/packet/packet.h"
-
-#include "device.h"
+#include <net_messages.h>
+#include <adt/measured_strings.h>
+#include <packet/packet.h>
+#include <net_device.h>
 
 /** @name Network interface module interface
@@ -65 +63 @@
  *  @returns Other error codes as defined for the netif_get_addr_message() function.
  */
-int netif_get_addr_req(int netif_phone, device_id_t device_id, measured_string_ref * address, char ** data);
+extern int netif_get_addr_req(int netif_phone, device_id_t device_id, measured_string_ref * address, char ** data);
 
 /** Probes the existence of the device.
@@ -75 +73 @@
  *  @returns Other errro codes as defined for the netif_probe_message().
  */
-int netif_probe_req(int netif_phone, device_id_t device_id, int irq, int io);
+extern int netif_probe_req(int netif_phone, device_id_t device_id, int irq, int io);
 
 /** Sends the packet queue.
@@ -85 +83 @@
  *  @returns Other error codes as defined for the generic_send_msg() function.
  */
-int netif_send_msg(int netif_phone, device_id_t device_id, packet_t packet, services_t sender);
+extern int netif_send_msg(int netif_phone, device_id_t device_id, packet_t packet, services_t sender);
 
 /** Starts the device.
@@ -94 +92 @@
  *  @returns Other error codes as defined for the netif_start_message() function.
  */
-int netif_start_req(int netif_phone, device_id_t device_id);
+extern int netif_start_req(int netif_phone, device_id_t device_id);
 
 /** Stops the device.
@@ -103 +101 @@
  *  @returns Other error codes as defined for the netif_stop_message() function.
  */
-int netif_stop_req(int netif_phone, device_id_t device_id);
+extern int netif_stop_req(int netif_phone, device_id_t device_id);
 
 /** Returns the device usage statistics.
@@ -111 +109 @@
  *  @returns EOK on success.
  */
-int netif_stats_req(int netif_phone, device_id_t device_id, device_stats_ref stats);
+extern int netif_stats_req(int netif_phone, device_id_t device_id, device_stats_ref stats);
 
 /** Creates bidirectional connection with the network interface module and registers the message receiver.
@@ -122 +120 @@
  *  @returns Other error codes as defined for the bind_service() function.
  */
-int netif_bind_service(services_t service, device_id_t device_id, services_t me, async_client_conn_t receiver);
+extern int netif_bind_service(services_t service, device_id_t device_id, services_t me, async_client_conn_t receiver);
 
 /*@}*/