Ignore:
Timestamp:
2011-07-13T22:39:18Z (13 years ago)
Author:
Jiří Zárevúcky <zarevucky.jiri@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
e6910c8
Parents:
5974661 (diff), 8ecef91 (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 libposix.

File:
1 edited

Legend:

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

    r5974661 re4f8c77  
    3838#include <net/device.h>
    3939#include <adt/measured_strings.h>
     40#include <async.h>
    4041
    4142/** @name Networking module interface
     
    4445/*@{*/
    4546
    46 extern int net_get_device_conf_req(int, device_id_t, measured_string_t **,
    47     size_t, uint8_t **);
    48 extern int net_get_conf_req(int, measured_string_t **, size_t, uint8_t **);
     47extern int net_get_device_conf_req(async_sess_t *, device_id_t,
     48    measured_string_t **, size_t, uint8_t **);
     49extern int net_get_conf_req(async_sess_t *, measured_string_t **, size_t,
     50    uint8_t **);
    4951extern void net_free_settings(measured_string_t *, uint8_t *);
    50 extern int net_connect_module(void);
     52extern async_sess_t *net_connect_module(void);
    5153
    5254/*@}*/
Note: See TracChangeset for help on using the changeset viewer.