Changeset 89c57b6 in mainline for uspace/lib/net/include/netif_remote.h

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/include/netif_remote.h (modified) (1 diff)

uspace/lib/net/include/netif_remote.h

@@ -27 +27 @@
  */
 
-/** @addtogroup netif
+/** @addtogroup libnet
  * @{
  */
 
-#ifndef __NET_NETIF_REMOTE_H__
-#define __NET_NETIF_REMOTE_H__
+#ifndef LIBNET_NETIF_REMOTE_H_
+#define LIBNET_NETIF_REMOTE_H_
 
 #include <async.h>
-#include <fibril_synch.h>
-#include <ipc/ipc.h>
+#include <ipc/services.h>
+#include <adt/measured_strings.h>
 
-extern int netif_get_addr_req_remote(int, device_id_t, measured_string_ref *,
-    char **);
-extern int netif_probe_req_remote(int, device_id_t, int, int);
-extern int netif_send_msg_remote(int, device_id_t, packet_t, services_t);
-extern int netif_start_req_remote(int, device_id_t);
-extern int netif_stop_req_remote(int, device_id_t);
-extern int netif_stats_req_remote(int, device_id_t, device_stats_ref);
-extern int netif_bind_service_remote(services_t, device_id_t, services_t,
+#include <net/device.h>
+#include <net/packet.h>
+
+extern int netif_get_addr_req(int, device_id_t, measured_string_t **,
+    uint8_t **);
+extern int netif_probe_req(int, device_id_t, int, void *);
+extern int netif_send_msg(int, device_id_t, packet_t *, services_t);
+extern int netif_start_req(int, device_id_t);
+extern int netif_stop_req(int, device_id_t);
+extern int netif_stats_req(int, device_id_t, device_stats_t *);
+extern int netif_bind_service(services_t, device_id_t, services_t,
     async_client_conn_t);