Changeset 3aae4e8 in mainline for uspace/lib/net/include/netif.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/netif.h (moved) (moved from uspace/srv/net/netif/netif.h ) (6 diffs)

uspace/lib/net/include/netif.h

@@ -45 +45 @@
 #include <ipc/ipc.h>
 
-#include "../err.h"
-
-#include "../include/device.h"
-
-#include "../structures/packet/packet.h"
+#include <net_err.h>
+#include <net_device.h>
+#include <packet/packet.h>
 
 /** Network interface module skeleton global data.
@@ -102 +100 @@
 };
 
+extern netif_globals_t netif_globals;
+
 /**     Finds the device specific data.
  *  @param[in] device_id The device identifier.
@@ -109 +109 @@
  *  @returns EPERM if the device is not initialized.
  */
-int find_device(device_id_t device_id, device_ref * device);
+extern int find_device(device_id_t device_id, device_ref * device);
 
 /** Clears the usage statistics.
  *  @param[in] stats The usage statistics.
  */
-void null_device_stats(device_stats_ref stats);
+extern void null_device_stats(device_stats_ref stats);
 
 // prepared for future optimalizations
@@ -120 +120 @@
  *  @param[in] packet_id The packet identifier.
  */
-void netif_pq_release(packet_id_t packet_id);
+extern void netif_pq_release(packet_id_t packet_id);
 
 /** Allocates new packet to handle the given content size.
@@ -127 +127 @@
  *  @returns NULL if there is an error.
  */
-packet_t netif_packet_get_1(size_t content);
+extern packet_t netif_packet_get_1(size_t content);
 
 /** Processes the netif module messages.
@@ -140 +140 @@
  *  @see IS_NET_NETIF_MESSAGE()
  */
-int netif_message(ipc_callid_t callid, ipc_call_t * call, ipc_call_t * answer, int * answer_count);
+extern int netif_message(ipc_callid_t callid, ipc_call_t * call, ipc_call_t * answer, int * answer_count);
 
 /** Initializes the netif module.
  *  The function has to be defined in each module.
- *  @param[in] client_connection The client connection functio to be registered.
+ *  @param[in] net_client_connection The client connection functio to be registered.
  *  @returns EOK on success.
  *  @returns Other error codes as defined for each specific module message function.
  */
-int netif_init_module(async_client_conn_t client_connection);
+extern int netif_init_module(async_client_conn_t client_connection);
 
 /** Starts and maintains the netif module until terminated.
  *  @returns EOK after the module is terminated.
  */
-int netif_run_module(void);
+extern int netif_run_module(void);
 
 #endif