Changeset efedee77 in mainline for uspace/lib/net/include/ip_interface.h

Timestamp:

2010-11-02T22:38:46Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

af894a21

Parents:

aab02fb (diff), e06ef614 (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/ip_interface.h (modified) (2 diffs)

uspace/lib/net/include/ip_interface.h

@@ -27 +27 @@
  */
 
-/** @addtogroup ip
- *  @{
+/** @addtogroup libnet 
+ * @{
  */
 
-#ifndef __NET_IP_INTERFACE_H__
-#define __NET_IP_INTERFACE_H__
+#ifndef LIBNET_IP_INTERFACE_H_
+#define LIBNET_IP_INTERFACE_H_
 
+#include <net/socket_codes.h>
 #include <async.h>
 #include <ipc/services.h>
 
-#include <net_device.h>
-#include <packet/packet.h>
+#include <net/device.h>
+#include <net/packet.h>
 
-#include <in.h>
-#include <ip_codes.h>
-#include <socket_codes.h>
-
-#ifdef CONFIG_IL_TL_BUNDLE
-
-#include <ip_local.h>
-
-#define ip_received_error_msg  ip_received_error_msg_local
-#define ip_set_gateway_req     ip_set_gateway_req_local
-#define ip_packet_size_req     ip_packet_size_req_local
-#define ip_device_req          ip_device_req_local
-#define ip_add_route_req       ip_add_route_req_local
-#define ip_send_msg            ip_send_msg_local
-#define ip_get_route_req       ip_get_route_req_local
-
-#else
+#include <net/in.h>
+#include <net/ip_codes.h>
 
 #include <ip_remote.h>
@@ -68 +54 @@
 #define ip_get_route_req       ip_get_route_req_remote
 
-#endif
-
 /** @name IP module interface
- *  This interface is used by other modules.
+ * This interface is used by other modules.
  */
 /*@{*/
 
 /** The transport layer notification function type definition.
- *  Notifies the transport layer modules about the received packet/s.
- *  @param[in] device_id The device identifier.
- *  @param[in] packet The received packet or the received packet queue.
- *  @param[in] receiver The receiving module service.
- *  @param[in] error The packet error reporting service. Prefixes the received packet.
- *  @returns EOK on success.
+ *
+ * Notifies the transport layer modules about the received packet/s.
+ *
+ * @param[in] device_id The device identifier.
+ * @param[in] packet    The received packet or the received packet queue.
+ * @param[in] receiver  The receiving module service.
+ * @param[in] error     The packet error reporting service. Prefixes the
+ *                      received packet.
+ * @returns             EOK on success.
  */
-typedef int     (*tl_received_msg_t)(device_id_t device_id, packet_t packet, services_t receiver, services_t error);
+typedef int (*tl_received_msg_t)(device_id_t device_id, packet_t packet,
+    services_t receiver, services_t error);
 
-/** Creates bidirectional connection with the ip module service and registers the message receiver.
- *  @param[in] service The IP module service.
- *  @param[in] protocol The transport layer protocol.
- *  @param[in] me The requesting module service.
- *  @param[in] receiver The message receiver. Used for remote connection.
- *  @param[in] tl_received_msg The message processing function. Used if bundled together.
- *  @returns The phone of the needed service.
- *  @returns EOK on success.
- *  @returns Other error codes as defined for the bind_service() function.
- */
-extern int ip_bind_service(services_t service, int protocol, services_t me, async_client_conn_t receiver, tl_received_msg_t tl_received_msg);
-
-/** Connects to the IP module.
- *  @param service The IP module service. Ignored parameter.
- *  @returns The IP module phone on success.
- *  @returns 0 if called by the bundle module.
- */
-extern int ip_connect_module(services_t service);
+extern int ip_bind_service(services_t, int, services_t, async_client_conn_t);
+extern int ip_connect_module(services_t);
 
 /*@}*/