Ignore:
Timestamp:
2011-07-12T03:00:14Z (13 years ago)
Author:
Petr Koupy <petr.koupy@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
6817eba
Parents:
eca52a8 (diff), 026793d (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:
1 edited

Legend:

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

    reca52a8 rf51f193  
    3434#define LIBNET_NETIF_REMOTE_H_
    3535
    36 #include <async.h>
    3736#include <ipc/services.h>
    3837#include <adt/measured_strings.h>
    39 
    4038#include <net/device.h>
    4139#include <net/packet.h>
     40#include <async.h>
    4241
    43 extern int netif_get_addr_req(int, device_id_t, measured_string_t **,
     42extern int netif_get_addr_req(async_sess_t *, device_id_t, measured_string_t **,
    4443    uint8_t **);
    45 extern int netif_probe_req(int, device_id_t, int, void *);
    46 extern int netif_send_msg(int, device_id_t, packet_t *, services_t);
    47 extern int netif_start_req(int, device_id_t);
    48 extern int netif_stop_req(int, device_id_t);
    49 extern int netif_stats_req(int, device_id_t, device_stats_t *);
    50 extern int netif_bind_service(services_t, device_id_t, services_t,
     44extern int netif_probe_req(async_sess_t *, device_id_t, int, void *);
     45extern int netif_send_msg(async_sess_t *, device_id_t, packet_t *, services_t);
     46extern int netif_start_req(async_sess_t *, device_id_t);
     47extern int netif_stop_req(async_sess_t *, device_id_t);
     48extern int netif_stats_req(async_sess_t *, device_id_t, device_stats_t *);
     49extern async_sess_t *netif_bind_service(services_t, device_id_t, services_t,
    5150    async_client_conn_t);
    5251
Note: See TracChangeset for help on using the changeset viewer.