Changes in uspace/lib/net/generic/net_remote.c [1bfd3d3:14f1db0] in mainline

File:

• uspace/lib/net/generic/net_remote.c (modified) (1 diff)

uspace/lib/net/generic/net_remote.c

@@ -27 +27 @@
  */
 
-/** @addtogroup libnet
- * @{
+/** @addtogroup net
+ *  @{
  */
 
 /** @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 <generic.h>
-#include <net/modules.h>
-#include <net/device.h>
+#include <net_messages.h>
+#include <net_modules.h>
+#include <net_device.h>
 #include <net_interface.h>
 #include <adt/measured_strings.h>
+#include <net_net_messages.h>
 
-/** Connects to the networking module.
- *
- * @return              The networking module phone on success.
- */
-int net_connect_module(void)
-{
+int net_connect_module(services_t service){
         return connect_to_service(SERVICE_NETWORKING);
 }
 
-/** 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_t *settings, char *data)
-{
-        if (settings)
+void net_free_settings(measured_string_ref settings, char * data){
+        if(settings){
                 free(settings);
-        if (data)
+        }
+        if(data){
                 free(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.
- * @return              EOK on success.
- * @return              EINVAL if the configuration is NULL.
- * @return              EINVAL if the count is zero.
- * @return              Other error codes as defined for the
- *                      generic_translate_req() function.
- */
-int
-net_get_conf_req(int net_phone, measured_string_t **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_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 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.
- * @return              EOK on success.
- * @return              EINVAL if the configuration is NULL.
- * @return              EINVAL if the count is zero.
- * @return              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_t **configuration, size_t count, char **data)
-{
-        return generic_translate_req(net_phone, NET_NET_GET_DEVICE_CONF,
-            device_id, 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);
 }