Changes in uspace/lib/net/generic/net_remote.c [609243f4:61bfc370] in mainline

File:

• uspace/lib/net/generic/net_remote.c (modified) (4 diffs)

uspace/lib/net/generic/net_remote.c

@@ -38 +38 @@
 #include <ipc/services.h>
 #include <ipc/net_net.h>
+
 #include <malloc.h>
-#include <async.h>
-#include <devman.h>
+
 #include <generic.h>
 #include <net/modules.h>
@@ -47 +47 @@
 #include <adt/measured_strings.h>
 
-/** Connect to the networking module.
+/** Connects to the networking module.
  *
- * @return Networking module session on success.
- *
+ * @return              The networking module phone on success.
  */
-async_sess_t *net_connect_module(void)
+int net_connect_module(void)
 {
         return connect_to_service(SERVICE_NETWORKING);
 }
 
-/** Free the received settings.
+/** Frees the received settings.
  *
- * @param[in] settings Received settings.
- * @param[in] data     Received settings data.
- *
- * @see net_get_device_conf_req()
+ * @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, uint8_t *data)
@@ -74 +71 @@
 }
 
-/** Return the global configuration.
+/** Returns the global configuration.
  *
  * The configuration names are read and the appropriate settings are set
@@ -80 +77 @@
  * configuration.
  *
- * @param[in]     sess          Networking module session.
- * @param[in,out] configuration Requested configuration. The names are
- *                              read and the appropriate settings are set
- *                              instead.
+ * @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         Configuration entries count.
- * @param[in,out] data          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.
- *
+ * @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(async_sess_t *sess, measured_string_t **configuration,
+int
+net_get_conf_req(int net_phone, measured_string_t **configuration,
     size_t count, uint8_t **data)
 {
-        return generic_translate_req(sess, NET_NET_GET_CONF, 0, 0,
+        return generic_translate_req(net_phone, NET_NET_GET_DEVICE_CONF, 0, 0,
             *configuration, count, configuration, data);
 }
 
-/** Return the device specific configuration.
+/** Returns the device specific configuration.
  *
- * Return the global configuration if the device specific is not found.
+ * 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]     sess          The networking module session.
- * @param[in]     device_id     Device identifier.
- * @param[in,out] configuration Requested device configuration. The names
- *                              are read and the appropriate settings are
- *                              set instead.
- * @param[in]     count         Configuration entries count.
- * @param[in,out] data          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.
- *
+ * @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(async_sess_t *sess, nic_device_id_t device_id,
+int
+net_get_device_conf_req(int net_phone, device_id_t device_id,
     measured_string_t **configuration, size_t count, uint8_t **data)
 {
-        return generic_translate_req(sess, NET_NET_GET_DEVICE_CONF,
+        return generic_translate_req(net_phone, NET_NET_GET_DEVICE_CONF,
             device_id, 0, *configuration, count, configuration, data);
-}
-
-int net_get_devices_req(async_sess_t *sess, measured_string_t **devices,
-    size_t *count, uint8_t **data)
-{
-        if ((!devices) || (!count))
-                return EBADMEM;
-        
-        async_exch_t *exch = async_exchange_begin(sess);
-        
-        int rc = async_req_0_1(exch, NET_NET_GET_DEVICES_COUNT, count);
-        if (rc != EOK) {
-                async_exchange_end(exch);
-                return rc;
-        }
-        
-        if (*count == 0) {
-                async_exchange_end(exch);
-                *data = NULL;
-                return EOK;
-        }
-        
-        aid_t message_id = async_send_0(exch, NET_NET_GET_DEVICES, NULL);
-        rc = measured_strings_return(exch, devices, data, *count);
-        
-        async_exchange_end(exch);
-        
-        sysarg_t result;
-        async_wait_for(message_id, &result);
-        
-        if ((rc == EOK) && (result != EOK)) {
-                free(*devices);
-                free(*data);
-        }
-        
-        return (int) result;
-}
-
-int net_driver_ready(async_sess_t *sess, devman_handle_t handle)
-{
-        async_exch_t *exch = async_exchange_begin(sess);
-        int rc = async_req_1_0(exch, NET_NET_DRIVER_READY, handle);
-        async_exchange_end(exch);
-        
-        return rc;
 }