Ignore:
Timestamp:
2010-03-13T12:17:02Z (15 years ago)
Author:
Jiri Svoboda <jiri@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
6ba20a6b
Parents:
d0febca (diff), 2070570 (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/srv/net/include/netif_interface.h

    rd0febca r7715994  
    6565 *  @returns Other error codes as defined for the netif_get_addr_message() function.
    6666 */
    67 int     netif_get_addr_req( int netif_phone, device_id_t device_id, measured_string_ref * address, char ** data );
     67int netif_get_addr_req(int netif_phone, device_id_t device_id, measured_string_ref * address, char ** data);
    6868
    6969/** Probes the existence of the device.
     
    7575 *  @returns Other errro codes as defined for the netif_probe_message().
    7676 */
    77 int     netif_probe_req( int netif_phone, device_id_t device_id, int irq, int io );
     77int netif_probe_req(int netif_phone, device_id_t device_id, int irq, int io);
    7878
    7979/** Sends the packet queue.
     
    8585 *  @returns Other error codes as defined for the generic_send_msg() function.
    8686 */
    87 int     netif_send_msg( int netif_phone, device_id_t device_id, packet_t packet, services_t sender );
     87int netif_send_msg(int netif_phone, device_id_t device_id, packet_t packet, services_t sender);
    8888
    8989/** Starts the device.
     
    9494 *  @returns Other error codes as defined for the netif_start_message() function.
    9595 */
    96 int     netif_start_req( int netif_phone, device_id_t device_id );
     96int netif_start_req(int netif_phone, device_id_t device_id);
    9797
    9898/** Stops the device.
     
    103103 *  @returns Other error codes as defined for the netif_stop_message() function.
    104104 */
    105 int     netif_stop_req( int netif_phone, device_id_t device_id );
     105int netif_stop_req(int netif_phone, device_id_t device_id);
    106106
    107107/** Returns the device usage statistics.
     
    111111 *  @returns EOK on success.
    112112 */
    113 int     netif_stats_req( int netif_phone, device_id_t device_id, device_stats_ref stats );
     113int netif_stats_req(int netif_phone, device_id_t device_id, device_stats_ref stats);
    114114
    115115/** Creates bidirectional connection with the network interface module and registers the message receiver.
     
    122122 *  @returns Other error codes as defined for the bind_service() function.
    123123 */
    124 int     netif_bind_service( services_t service, device_id_t device_id, services_t me, async_client_conn_t receiver );
     124int netif_bind_service(services_t service, device_id_t device_id, services_t me, async_client_conn_t receiver);
    125125
    126126/*@}*/
Note: See TracChangeset for help on using the changeset viewer.