Changeset 89c57b6 in mainline for uspace/lib/net/netif/netif_remote.c

Timestamp:

2011-04-13T14:45:41Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

88634420

Parents:

cefb126 (diff), 17279ead (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/netif/netif_remote.c (modified) (6 diffs)

uspace/lib/net/netif/netif_remote.c

@@ -27 +27 @@
  */
 
-/** @addtogroup netif
+/** @addtogroup libnet
  * @{
  */
@@ -35 +35 @@
  */
 
+#include <netif_remote.h>
+#include <packet_client.h>
+#include <generic.h>
+
 #include <ipc/services.h>
+#include <ipc/netif.h>
 
-#include <net_modules.h>
+#include <net/modules.h>
 #include <adt/measured_strings.h>
-#include <packet/packet.h>
-#include <packet/packet_client.h>
-#include <net_device.h>
-#include <netif_remote.h>
-#include <netif_messages.h>
+#include <net/packet.h>
+#include <net/device.h>
 
-int netif_get_addr_req_remote(int netif_phone, device_id_t device_id,
-    measured_string_ref *address, char **data)
+/** Return the device local hardware address.
+ *
+ * @param[in]  netif_phone Network interface phone.
+ * @param[in]  device_id   Device identifier.
+ * @param[out] address     Device local hardware address.
+ * @param[out] data        Address data.
+ *
+ * @return EOK on success.
+ * @return EBADMEM if the address parameter is NULL.
+ * @return ENOENT if there no such device.
+ * @return Other error codes as defined for the
+ *         netif_get_addr_message() function.
+ *
+ */
+int netif_get_addr_req(int netif_phone, device_id_t device_id,
+    measured_string_t **address, uint8_t **data)
 {
         return generic_get_addr_req(netif_phone, NET_NETIF_GET_ADDR, device_id,
@@ -52 +68 @@
 }
 
-int netif_probe_req_remote(int netif_phone, device_id_t device_id, int irq, int io)
+/** Probe the existence of the device.
+ *
+ * @param[in] netif_phone Network interface phone.
+ * @param[in] device_id   Device identifier.
+ * @param[in] irq         Device interrupt number.
+ * @param[in] io          Device input/output address.
+ *
+ * @return EOK on success.
+ * @return Other error codes as defined for the
+ *         netif_probe_message().
+ *
+ */
+int netif_probe_req(int netif_phone, device_id_t device_id, int irq, void *io)
 {
-        return async_req_3_0(netif_phone, NET_NETIF_PROBE, device_id, irq, io);
+        return async_req_3_0(netif_phone, NET_NETIF_PROBE, device_id, irq,
+            (sysarg_t) io);
 }
 
-int netif_send_msg_remote(int netif_phone, device_id_t device_id, packet_t packet,
+/** Send the packet queue.
+ *
+ * @param[in] netif_phone Network interface phone.
+ * @param[in] device_id   Device identifier.
+ * @param[in] packet      Packet queue.
+ * @param[in] sender      Sending module service.
+ *
+ * @return EOK on success.
+ * @return Other error codes as defined for the generic_send_msg()
+ *         function.
+ *
+ */
+int netif_send_msg(int netif_phone, device_id_t device_id, packet_t *packet,
     services_t sender)
 {
@@ -64 +105 @@
 }
 
-int netif_start_req_remote(int netif_phone, device_id_t device_id)
+/** Start the device.
+ *
+ * @param[in] netif_phone Network interface phone.
+ * @param[in] device_id   Device identifier.
+ *
+ * @return EOK on success.
+ * @return Other error codes as defined for the find_device()
+ *         function.
+ * @return Other error codes as defined for the
+ *         netif_start_message() function.
+ *
+ */
+int netif_start_req(int netif_phone, device_id_t device_id)
 {
         return async_req_1_0(netif_phone, NET_NETIF_START, device_id);
 }
 
-int netif_stop_req_remote(int netif_phone, device_id_t device_id)
+/** Stop the device.
+ *
+ * @param[in] netif_phone Network interface phone.
+ * @param[in] device_id   Device identifier.
+ *
+ * @return EOK on success.
+ * @return Other error codes as defined for the find_device()
+ *         function.
+ * @return Other error codes as defined for the
+ *         netif_stop_message() function.
+ *
+ */
+int netif_stop_req(int netif_phone, device_id_t device_id)
 {
         return async_req_1_0(netif_phone, NET_NETIF_STOP, device_id);
 }
 
-int netif_stats_req_remote(int netif_phone, device_id_t device_id,
-    device_stats_ref stats)
+/** Return the device usage statistics.
+ *
+ * @param[in] netif_phone Network interface phone.
+ * @param[in] device_id   Device identifier.
+ * @param[out] stats      Device usage statistics.
+ *
+ * @return EOK on success.
+ *
+ */
+int netif_stats_req(int netif_phone, device_id_t device_id,
+    device_stats_t *stats)
 {
         if (!stats)
@@ -81 +155 @@
         
         aid_t message_id = async_send_1(netif_phone, NET_NETIF_STATS,
-            (ipcarg_t) device_id, NULL);
+            (sysarg_t) device_id, NULL);
         async_data_read_start(netif_phone, stats, sizeof(*stats));
         
-        ipcarg_t result;
+        sysarg_t result;
         async_wait_for(message_id, &result);
         
@@ -90 +164 @@
 }
 
-int netif_bind_service_remote(services_t service, device_id_t device_id, services_t me,
-    async_client_conn_t receiver)
+/** Create bidirectional connection with the network interface module
+ *
+ * Create bidirectional connection with the network interface module and
+ * register the message receiver.
+ *
+ * @param[in] service   The network interface module service.
+ * @param[in] device_id The device identifier.
+ * @param[in] me        The requesting module service.
+ * @param[in] receiver  The message receiver.
+ *
+ * @return The phone of the needed service.
+ * @return EOK on success.
+ * @return Other error codes as defined for the bind_service()
+ *         function.
+ *
+ */
+int netif_bind_service(services_t service, device_id_t device_id,
+    services_t me, async_client_conn_t receiver)
 {
         return bind_service(service, device_id, me, 0, receiver);