Changeset f14291b in mainline for uspace/lib/net/generic/net_remote.c

Timestamp:

2010-10-19T20:55:53Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

a93d79a

Parents:

1882525 (diff), a7a85d16 (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/generic/net_remote.c (modified) (1 diff)

uspace/lib/net/generic/net_remote.c

@@ -27 +27 @@
  */
 
-/** @addtogroup net
- *  @{
+/** @addtogroup libnet
+ * @{
  */
 
 /** @file
- *  Networking interface implementation for remote modules.
- *  @see net_interface.h
+ * Networking interface implementation for remote modules.
+ * @see net_interface.h
  */
 
 #include <ipc/services.h>
+#include <ipc/net_net.h>
 
 #include <malloc.h>
 
-#include <net_messages.h>
-#include <net_modules.h>
-#include <net_device.h>
+#include <generic.h>
+#include <net/modules.h>
+#include <net/device.h>
 #include <net_interface.h>
 #include <adt/measured_strings.h>
-#include <net_net_messages.h>
 
-int net_connect_module(services_t service){
+/** Connects to the networking module.
+ *
+ * @returns             The networking module phone on success.
+ */
+int net_connect_module(void)
+{
         return connect_to_service(SERVICE_NETWORKING);
 }
 
-void net_free_settings(measured_string_ref settings, char * data){
-        if(settings){
+/** 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()
+ */
+void net_free_settings(measured_string_ref settings, char *data)
+{
+        if (settings)
                 free(settings);
-        }
-        if(data){
+        if (data)
                 free(data);
-        }
 }
 
-int net_get_conf_req(int net_phone, measured_string_ref * configuration, size_t count, char ** data){
-        return generic_translate_req(net_phone, NET_NET_GET_DEVICE_CONF, 0, 0, * configuration, count, configuration, 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.
+ * @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)
+{
+        return generic_translate_req(net_phone, NET_NET_GET_DEVICE_CONF, 0, 0,
+            *configuration, count, configuration, data);
 }
 
-int net_get_device_conf_req(int net_phone, device_id_t device_id, measured_string_ref * configuration, size_t count, char ** data){
-        return generic_translate_req(net_phone, NET_NET_GET_DEVICE_CONF, device_id, 0, * configuration, count, configuration, data);
+/** 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.
+ * @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)
+{
+        return generic_translate_req(net_phone, NET_NET_GET_DEVICE_CONF,
+            device_id, 0, *configuration, count, configuration, data);
 }