Index: uspace/lib/net/netif/netif_remote.c =================================================================== --- uspace/lib/net/netif/netif_remote.c (revision 79ae36ddc409577eb0da3750b3a7280e034566a2) +++ uspace/lib/net/netif/netif_remote.c (revision 3a5ee6cb447a92567d7999bbc4bd0ae7bf1ad572) @@ -38,8 +38,6 @@ #include #include -#include #include #include - #include #include @@ -49,8 +47,8 @@ /** Return the device local hardware address. * - * @param[in] netif_phone Network interface phone. - * @param[in] device_id Device identifier. - * @param[out] address Device local hardware address. - * @param[out] data Address data. + * @param[in] sess Network interface session. + * @param[in] device_id Device identifier. + * @param[out] address Device local hardware address. + * @param[out] data Address data. * * @return EOK on success. @@ -61,8 +59,8 @@ * */ -int netif_get_addr_req(int netif_phone, device_id_t device_id, +int netif_get_addr_req(async_sess_t *sess, device_id_t device_id, measured_string_t **address, uint8_t **data) { - return generic_get_addr_req(netif_phone, NET_NETIF_GET_ADDR, device_id, + return generic_get_addr_req(sess, NET_NETIF_GET_ADDR, device_id, address, data); } @@ -70,8 +68,8 @@ /** Probe the existence of the device. * - * @param[in] netif_phone Network interface phone. - * @param[in] device_id Device identifier. - * @param[in] irq Device interrupt number. - * @param[in] io Device input/output address. + * @param[in] sess Network interface session. + * @param[in] device_id Device identifier. + * @param[in] irq Device interrupt number. + * @param[in] io Device input/output address. * * @return EOK on success. @@ -80,16 +78,20 @@ * */ -int netif_probe_req(int netif_phone, device_id_t device_id, int irq, void *io) +int netif_probe_req(async_sess_t *sess, device_id_t device_id, int irq, void *io) { - return async_obsolete_req_3_0(netif_phone, NET_NETIF_PROBE, device_id, irq, + async_exch_t *exch = async_exchange_begin(sess); + int rc = async_req_3_0(exch, NET_NETIF_PROBE, device_id, (sysarg_t) irq, (sysarg_t) io); + async_exchange_end(exch); + + return rc; } /** Send the packet queue. * - * @param[in] netif_phone Network interface phone. - * @param[in] device_id Device identifier. - * @param[in] packet Packet queue. - * @param[in] sender Sending module service. + * @param[in] sess Network interface session. + * @param[in] device_id Device identifier. + * @param[in] packet Packet queue. + * @param[in] sender Sending module service. * * @return EOK on success. @@ -98,8 +100,8 @@ * */ -int netif_send_msg(int netif_phone, device_id_t device_id, packet_t *packet, +int netif_send_msg(async_sess_t *sess, device_id_t device_id, packet_t *packet, services_t sender) { - return generic_send_msg_remote(netif_phone, NET_NETIF_SEND, device_id, + return generic_send_msg_remote(sess, NET_NETIF_SEND, device_id, packet_get_id(packet), sender, 0); } @@ -107,6 +109,6 @@ /** Start the device. * - * @param[in] netif_phone Network interface phone. - * @param[in] device_id Device identifier. + * @param[in] sess Network interface session. + * @param[in] device_id Device identifier. * * @return EOK on success. @@ -117,13 +119,17 @@ * */ -int netif_start_req(int netif_phone, device_id_t device_id) +int netif_start_req(async_sess_t *sess, device_id_t device_id) { - return async_obsolete_req_1_0(netif_phone, NET_NETIF_START, device_id); + async_exch_t *exch = async_exchange_begin(sess); + int rc = async_req_1_0(exch, NET_NETIF_START, device_id); + async_exchange_end(exch); + + return rc; } /** Stop the device. * - * @param[in] netif_phone Network interface phone. - * @param[in] device_id Device identifier. + * @param[in] sess Network interface session. + * @param[in] device_id Device identifier. * * @return EOK on success. @@ -134,19 +140,23 @@ * */ -int netif_stop_req(int netif_phone, device_id_t device_id) +int netif_stop_req(async_sess_t *sess, device_id_t device_id) { - return async_obsolete_req_1_0(netif_phone, NET_NETIF_STOP, device_id); + async_exch_t *exch = async_exchange_begin(sess); + int rc = async_req_1_0(exch, NET_NETIF_STOP, device_id); + async_exchange_end(exch); + + return rc; } /** Return the device usage statistics. * - * @param[in] netif_phone Network interface phone. - * @param[in] device_id Device identifier. - * @param[out] stats Device usage statistics. + * @param[in] sess Network interface session. + * @param[in] device_id Device identifier. + * @param[out] stats Device usage statistics. * * @return EOK on success. * */ -int netif_stats_req(int netif_phone, device_id_t device_id, +int netif_stats_req(async_sess_t *sess, device_id_t device_id, device_stats_t *stats) { @@ -154,7 +164,9 @@ return EBADMEM; - aid_t message_id = async_obsolete_send_1(netif_phone, NET_NETIF_STATS, + async_exch_t *exch = async_exchange_begin(sess); + aid_t message_id = async_send_1(exch, NET_NETIF_STATS, (sysarg_t) device_id, NULL); - async_obsolete_data_read_start(netif_phone, stats, sizeof(*stats)); + async_data_read_start(exch, stats, sizeof(*stats)); + async_exchange_end(exch); sysarg_t result; @@ -169,16 +181,14 @@ * register the message receiver. * - * @param[in] service The network interface module service. - * @param[in] device_id The device identifier. - * @param[in] me The requesting module service. - * @param[in] receiver The message receiver. + * @param[in] service Network interface module service. + * @param[in] device_id Device identifier. + * @param[in] me Requesting module service. + * @param[in] receiver Message receiver. * - * @return The phone of the needed service. - * @return EOK on success. - * @return Other error codes as defined for the bind_service() - * function. + * @return Session to the needed service. + * @return NULL on failure. * */ -int netif_bind_service(services_t service, device_id_t device_id, +async_sess_t *netif_bind_service(services_t service, device_id_t device_id, services_t me, async_client_conn_t receiver) {