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

uspace/lib/net/include/net_interface.h

@@ -43 +43 @@
 #include <ipc/services.h>
 
-#include "../include/device.h"
-
-#include "../structures/measured_strings.h"
+#include <net_device.h>
+#include <adt/measured_strings.h>
 
 /** @name Networking module interface
@@ -66 +65 @@
  *  @returns Other error codes as defined for the generic_translate_req() function.
  */
-int net_get_device_conf_req(int net_phone, device_id_t device_id, measured_string_ref * configuration, size_t count, char ** data);
+extern int net_get_device_conf_req(int net_phone, device_id_t device_id, measured_string_ref * configuration, size_t count, char ** data);
 
 /** Returns the global configuration.
@@ -80 +79 @@
  *  @returns Other error codes as defined for the generic_translate_req() function.
  */
-int net_get_conf_req(int net_phone, measured_string_ref * configuration, size_t count, char ** data);
+extern int net_get_conf_req(int net_phone, measured_string_ref * configuration, size_t count, char ** data);
 
 /** Frees the received settings.
@@ -88 +87 @@
  *  @see net_get_conf_req()
  */
-void net_free_settings(measured_string_ref settings, char * data);
+extern void net_free_settings(measured_string_ref settings, char * data);
 
 /** Connects to the networking module.
@@ -95 +94 @@
  *  @returns 0 if called by the bundle module.
  */
-int net_connect_module(services_t service);
+extern int net_connect_module(services_t service);
 
 /*@}*/