Ignore:
Timestamp:
2010-10-23T20:28:55Z (14 years ago)
Author:
Jakub Jermar <jakub@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
cc8d91a
Parents:
33dbbd2 (diff), 018d79b8 (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 from lp:~jakub/helenos/net.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • uspace/lib/net/include/ip_interface.h

    r33dbbd2 rdfda6a1  
    2727 */
    2828
    29 /** @addtogroup ip
    30  *  @{
     29/** @addtogroup libnet
     30 * @{
    3131 */
    3232
    33 #ifndef __NET_IP_INTERFACE_H__
    34 #define __NET_IP_INTERFACE_H__
     33#ifndef LIBNET_IP_INTERFACE_H_
     34#define LIBNET_IP_INTERFACE_H_
    3535
    3636#include <net/socket_codes.h>
     
    5555
    5656/** @name IP module interface
    57  *  This interface is used by other modules.
     57 * This interface is used by other modules.
    5858 */
    5959/*@{*/
    6060
    6161/** The transport layer notification function type definition.
    62  *  Notifies the transport layer modules about the received packet/s.
    63  *  @param[in] device_id The device identifier.
    64  *  @param[in] packet The received packet or the received packet queue.
    65  *  @param[in] receiver The receiving module service.
    66  *  @param[in] error The packet error reporting service. Prefixes the received packet.
    67  *  @returns EOK on success.
     62 *
     63 * Notifies the transport layer modules about the received packet/s.
     64 *
     65 * @param[in] device_id The device identifier.
     66 * @param[in] packet    The received packet or the received packet queue.
     67 * @param[in] receiver  The receiving module service.
     68 * @param[in] error     The packet error reporting service. Prefixes the
     69 *                      received packet.
     70 * @returns             EOK on success.
    6871 */
    69 typedef int     (*tl_received_msg_t)(device_id_t device_id, packet_t packet, services_t receiver, services_t error);
     72typedef int (*tl_received_msg_t)(device_id_t device_id, packet_t packet,
     73    services_t receiver, services_t error);
    7074
    71 /** Creates bidirectional connection with the ip module service and registers the message receiver.
    72  *  @param[in] service The IP module service.
    73  *  @param[in] protocol The transport layer protocol.
    74  *  @param[in] me The requesting module service.
    75  *  @param[in] receiver The message receiver. Used for remote connection.
    76  *  @returns The phone of the needed service.
    77  *  @returns EOK on success.
    78  *  @returns Other error codes as defined for the bind_service() function.
    79  */
    80 extern int ip_bind_service(services_t service, int protocol, services_t me, async_client_conn_t receiver);
    81 
    82 /** Connects to the IP module.
    83  *  @param service The IP module service. Ignored parameter.
    84  *  @returns The IP module phone on success.
    85  */
    86 extern int ip_connect_module(services_t service);
     75extern int ip_bind_service(services_t, int, services_t, async_client_conn_t);
     76extern int ip_connect_module(services_t);
    8777
    8878/*@}*/
Note: See TracChangeset for help on using the changeset viewer.