Changeset a7a85d16 in mainline for uspace/lib/net/include/net_interface.h

Timestamp:

2010-10-16T17:16:30Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

668f8cbf, e0e568ff, f14291b

Parents:

ef689ef0 (diff), c62ae1d6 (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 from lp:~jakub/helenos/net.

File:

• uspace/lib/net/include/net_interface.h (modified) (2 diffs)

uspace/lib/net/include/net_interface.h

@@ -27 +27 @@
  */
 
-/** @addtogroup net
+/** @addtogroup libnet
  *  @{
  */
 
-#ifndef __NET_NET_INTERFACE_H__
-#define __NET_NET_INTERFACE_H__
+#ifndef LIBNET_NET_INTERFACE_H_
+#define LIBNET_NET_INTERFACE_H_
 
 #include <ipc/services.h>
@@ -40 +40 @@
 
 /** @name Networking module interface
- *  This interface is used by other modules.
+ * This interface is used by other modules.
  */
 /*@{*/
 
-/** Returns the device specific configuration.
- *  Returns the global configuration if the device specific is not found.
- *  The configuration names are read and the appropriate settings are set instead.
- *  Call net_free_settings() function to release the returned configuration.
- *  @param[in] net_phone The networking module phone.
- *  @param[in] device_id The device identifier.
- *  @param[in,out] configuration The requested device configuration. The names are read and the appropriate settings are set instead.
- *  @param[in] count The configuration entries count.
- *  @param[in,out] data The configuration and settings data.
- *  @returns EOK on success.
- *  @returns EINVAL if the configuration is NULL.
- *  @returns EINVAL if the count is zero (0).
- *  @returns Other error codes as defined for the generic_translate_req() function.
- */
-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.
- *  The configuration names are read and the appropriate settings are set instead.
- *  Call net_free_settings() function to release the returned configuration.
- *  @param[in] net_phone The networking module phone.
- *  @param[in,out] configuration The requested configuration. The names are read and the appropriate settings are set instead.
- *  @param[in] count The configuration entries count.
- *  @param[in,out] data The configuration and settings data.
- *  @returns EOK on success.
- *  @returns EINVAL if the configuration is NULL.
- *  @returns EINVAL if the count is zero (0).
- *  @returns Other error codes as defined for the generic_translate_req() function.
- */
-extern int net_get_conf_req(int net_phone, measured_string_ref * configuration, size_t count, char ** data);
-
-/** Frees the received settings.
- *  @param[in] settings The received settings.
- *  @param[in] data The received settings data.
- *  @see net_get_device_conf_req()
- *  @see net_get_conf_req()
- */
-extern void net_free_settings(measured_string_ref settings, char * data);
-
-/** Connects to the networking module.
- *  @param service The networking module service. Ignored parameter.
- *  @returns The networking module phone on success.
- */
-extern int net_connect_module(services_t service);
+extern int net_get_device_conf_req(int, device_id_t, measured_string_ref *,
+    size_t, char **);
+extern int net_get_conf_req(int, measured_string_ref *, size_t, char **);
+extern void net_free_settings(measured_string_ref, char *);
+extern int net_connect_module(void);
 
 /*@}*/