Index: uspace/srv/net/nil/eth/eth.c =================================================================== --- uspace/srv/net/nil/eth/eth.c (revision 9934f7d3082d2ffdd107cc0c78d61d504b0f401e) +++ uspace/srv/net/nil/eth/eth.c (revision ee2fa30aed4921e38c357a0420357b61329be533) @@ -59,8 +59,4 @@ #include #include - -// FIXME: remove this header -#include - #include "eth.h" @@ -171,5 +167,5 @@ INT_MAP_IMPLEMENT(eth_protos, eth_proto_t); -int nil_device_state_msg_local(int nil_phone, device_id_t device_id, int state) +int nil_device_state_msg_local(device_id_t device_id, sysarg_t state) { int index; @@ -180,6 +176,6 @@ index--) { proto = eth_protos_get_index(ð_globals.protos, index); - if (proto && proto->phone) { - il_device_state_msg(proto->phone, device_id, state, + if ((proto) && (proto->sess)) { + il_device_state_msg(proto->sess, device_id, state, proto->service); } @@ -190,5 +186,5 @@ } -int nil_initialize(int net_phone) +int nil_initialize(async_sess_t *sess) { int rc; @@ -199,5 +195,5 @@ fibril_rwlock_write_lock(ð_globals.devices_lock); fibril_rwlock_write_lock(ð_globals.protos_lock); - eth_globals.net_phone = net_phone; + eth_globals.net_sess = sess; eth_globals.broadcast_addr = @@ -226,10 +222,11 @@ } -/** Processes IPC messages from the registered device driver modules in an +/** Process IPC messages from the registered device driver modules in an * infinite loop. * - * @param[in] iid The message identifier. - * @param[in,out] icall The message parameters. - * @param[in] arg Local argument. + * @param[in] iid Message identifier. + * @param[in,out] icall Message parameters. + * @param[in] arg Local argument. + * */ static void eth_receiver(ipc_callid_t iid, ipc_call_t *icall, void *arg) @@ -241,14 +238,14 @@ switch (IPC_GET_IMETHOD(*icall)) { case NET_NIL_DEVICE_STATE: - nil_device_state_msg_local(0, IPC_GET_DEVICE(*icall), + nil_device_state_msg_local(IPC_GET_DEVICE(*icall), IPC_GET_STATE(*icall)); async_answer_0(iid, EOK); break; case NET_NIL_RECEIVED: - rc = packet_translate_remote(eth_globals.net_phone, + rc = packet_translate_remote(eth_globals.net_sess, &packet, IPC_GET_PACKET(*icall)); if (rc == EOK) - rc = nil_received_msg_local(0, - IPC_GET_DEVICE(*icall), packet, 0); + rc = nil_received_msg_local(IPC_GET_DEVICE(*icall), + packet, 0); async_answer_0(iid, (sysarg_t) rc); @@ -326,6 +323,6 @@ proto = eth_protos_get_index(ð_globals.protos, index); - if (proto->phone) { - il_mtu_changed_msg(proto->phone, + if (proto->sess) { + il_mtu_changed_msg(proto->sess, device->device_id, device->mtu, proto->service); @@ -351,5 +348,5 @@ configuration = &names[0]; - rc = net_get_device_conf_req(eth_globals.net_phone, device->device_id, + rc = net_get_device_conf_req(eth_globals.net_sess, device->device_id, &configuration, count, &data); if (rc != EOK) { @@ -380,14 +377,14 @@ /* Bind the device driver */ - device->phone = netif_bind_service(device->service, device->device_id, + device->sess = netif_bind_service(device->service, device->device_id, SERVICE_ETHERNET, eth_receiver); - if (device->phone < 0) { + if (device->sess == NULL) { fibril_rwlock_write_unlock(ð_globals.devices_lock); free(device); - return device->phone; + return ENOENT; } /* Get hardware address */ - rc = netif_get_addr_req(device->phone, device->device_id, &device->addr, + rc = netif_get_addr_req(device->sess, device->device_id, &device->addr, &device->addr_data); if (rc != EOK) { @@ -509,6 +506,6 @@ } -int nil_received_msg_local(int nil_phone, device_id_t device_id, - packet_t *packet, services_t target) +int nil_received_msg_local(device_id_t device_id, packet_t *packet, + services_t target) { eth_proto_t *proto; @@ -532,9 +529,9 @@ proto = eth_process_packet(flags, packet); if (proto) { - il_received_msg(proto->phone, device_id, packet, + il_received_msg(proto->sess, device_id, packet, proto->service); } else { /* Drop invalid/unknown */ - pq_release_remote(eth_globals.net_phone, + pq_release_remote(eth_globals.net_sess, packet_get_id(packet)); } @@ -615,15 +612,17 @@ } -/** Registers receiving module service. - * - * Passes received packets for this service. - * - * @param[in] service The module service. - * @param[in] phone The service phone. - * @return EOK on success. - * @return ENOENT if the service is not known. - * @return ENOMEM if there is not enough memory left. - */ -static int eth_register_message(services_t service, int phone) +/** Register receiving module service. + * + * Pass received packets for this service. + * + * @param[in] service Module service. + * @param[in] sess Service session. + * + * @return EOK on success. + * @return ENOENT if the service is not known. + * @return ENOMEM if there is not enough memory left. + * + */ +static int eth_register_message(services_t service, async_sess_t *sess) { eth_proto_t *proto; @@ -638,5 +637,5 @@ proto = eth_protos_find(ð_globals.protos, protocol); if (proto) { - proto->phone = phone; + proto->sess = sess; fibril_rwlock_write_unlock(ð_globals.protos_lock); return EOK; @@ -650,5 +649,5 @@ proto->service = service; proto->protocol = protocol; - proto->phone = phone; + proto->sess = sess; index = eth_protos_add(ð_globals.protos, protocol, proto); @@ -660,6 +659,6 @@ } - printf("%s: Protocol registered (protocol: %d, service: %d, phone: " - "%d)\n", NAME, proto->protocol, proto->service, proto->phone); + printf("%s: Protocol registered (protocol: %d, service: %d)\n", + NAME, proto->protocol, proto->service); fibril_rwlock_write_unlock(ð_globals.protos_lock); @@ -799,5 +798,5 @@ ethertype = htons(protocol_map(SERVICE_ETHERNET, sender)); if (!ethertype) { - pq_release_remote(eth_globals.net_phone, packet_get_id(packet)); + pq_release_remote(eth_globals.net_sess, packet_get_id(packet)); return EINVAL; } @@ -820,5 +819,5 @@ if (next == packet) packet = tmp; - pq_release_remote(eth_globals.net_phone, + pq_release_remote(eth_globals.net_sess, packet_get_id(next)); next = tmp; @@ -830,5 +829,5 @@ /* Send packet queue */ if (packet) { - netif_send_msg(device->phone, device_id, packet, + netif_send_msg(device->sess, device_id, packet, SERVICE_ETHERNET); } @@ -854,4 +853,9 @@ return EOK; + async_sess_t *callback = + async_callback_receive_start(EXCHANGE_SERIALIZE, call); + if (callback) + return eth_register_message(NIL_GET_PROTO(*call), callback); + switch (IPC_GET_IMETHOD(*call)) { case NET_NIL_DEVICE: @@ -859,5 +863,5 @@ IPC_GET_SERVICE(*call), IPC_GET_MTU(*call)); case NET_NIL_SEND: - rc = packet_translate_remote(eth_globals.net_phone, &packet, + rc = packet_translate_remote(eth_globals.net_sess, &packet, IPC_GET_PACKET(*call)); if (rc != EOK) @@ -888,7 +892,4 @@ return EOK; return measured_strings_reply(address, 1); - case IPC_M_CONNECT_TO_ME: - return eth_register_message(NIL_GET_PROTO(*call), - IPC_GET_PHONE(*call)); } Index: uspace/srv/net/nil/eth/eth.h =================================================================== --- uspace/srv/net/nil/eth/eth.h (revision 9934f7d3082d2ffdd107cc0c78d61d504b0f401e) +++ uspace/srv/net/nil/eth/eth.h (revision ee2fa30aed4921e38c357a0420357b61329be533) @@ -38,7 +38,7 @@ #define NET_ETH_H_ +#include #include #include - #include #include @@ -223,6 +223,6 @@ /** Device driver service. */ services_t service; - /** Driver phone. */ - int phone; + /** Driver session. */ + async_sess_t *sess; /** Maximal transmission unit. */ size_t mtu; @@ -248,12 +248,12 @@ /** Protocol identifier. */ int protocol; - /** Protocol module phone. */ - int phone; + /** Protocol module session. */ + async_sess_t *sess; }; /** Ethernet global data. */ struct eth_globals { - /** Networking module phone. */ - int net_phone; + /** Networking module session. */ + async_sess_t *net_sess; /** Safety lock for devices. */ fibril_rwlock_t devices_lock; @@ -265,5 +265,5 @@ /** * Protocol map. - * Service phone map for each protocol. + * Service map for each protocol. */ eth_protos_t protos; Index: uspace/srv/net/nil/nildummy/nildummy.c =================================================================== --- uspace/srv/net/nil/nildummy/nildummy.c (revision 9934f7d3082d2ffdd107cc0c78d61d504b0f401e) +++ uspace/srv/net/nil/nildummy/nildummy.c (revision ee2fa30aed4921e38c357a0420357b61329be533) @@ -44,5 +44,4 @@ #include #include - #include #include @@ -53,8 +52,4 @@ #include #include - -// FIXME: remove this header -#include - #include "nildummy.h" @@ -70,9 +65,9 @@ DEVICE_MAP_IMPLEMENT(nildummy_devices, nildummy_device_t); -int nil_device_state_msg_local(int nil_phone, device_id_t device_id, int state) +int nil_device_state_msg_local(device_id_t device_id, sysarg_t state) { fibril_rwlock_read_lock(&nildummy_globals.protos_lock); - if (nildummy_globals.proto.phone) - il_device_state_msg(nildummy_globals.proto.phone, device_id, + if (nildummy_globals.proto.sess) + il_device_state_msg(nildummy_globals.proto.sess, device_id, state, nildummy_globals.proto.service); fibril_rwlock_read_unlock(&nildummy_globals.protos_lock); @@ -81,5 +76,5 @@ } -int nil_initialize(int net_phone) +int nil_initialize(async_sess_t *sess) { fibril_rwlock_initialize(&nildummy_globals.devices_lock); @@ -88,6 +83,6 @@ fibril_rwlock_write_lock(&nildummy_globals.protos_lock); - nildummy_globals.net_phone = net_phone; - nildummy_globals.proto.phone = 0; + nildummy_globals.net_sess = sess; + nildummy_globals.proto.sess = NULL; int rc = nildummy_devices_initialize(&nildummy_globals.devices); @@ -102,5 +97,6 @@ * @param[in] iid Message identifier. * @param[in,out] icall Message parameters. - * @param[in] arg Local argument. + * @param[in] arg Local argument. + * */ static void nildummy_receiver(ipc_callid_t iid, ipc_call_t *icall, void *arg) @@ -112,15 +108,15 @@ switch (IPC_GET_IMETHOD(*icall)) { case NET_NIL_DEVICE_STATE: - rc = nil_device_state_msg_local(0, - IPC_GET_DEVICE(*icall), IPC_GET_STATE(*icall)); + rc = nil_device_state_msg_local(IPC_GET_DEVICE(*icall), + IPC_GET_STATE(*icall)); async_answer_0(iid, (sysarg_t) rc); break; case NET_NIL_RECEIVED: - rc = packet_translate_remote(nildummy_globals.net_phone, + rc = packet_translate_remote(nildummy_globals.net_sess, &packet, IPC_GET_PACKET(*icall)); if (rc == EOK) - rc = nil_received_msg_local(0, - IPC_GET_DEVICE(*icall), packet, 0); + rc = nil_received_msg_local(IPC_GET_DEVICE(*icall), + packet, 0); async_answer_0(iid, (sysarg_t) rc); @@ -180,6 +176,6 @@ /* Notify the upper layer module */ fibril_rwlock_read_lock(&nildummy_globals.protos_lock); - if (nildummy_globals.proto.phone) { - il_mtu_changed_msg(nildummy_globals.proto.phone, + if (nildummy_globals.proto.sess) { + il_mtu_changed_msg(nildummy_globals.proto.sess, device->device_id, device->mtu, nildummy_globals.proto.service); @@ -203,14 +199,14 @@ /* Bind the device driver */ - device->phone = netif_bind_service(device->service, device->device_id, + device->sess = netif_bind_service(device->service, device->device_id, SERVICE_ETHERNET, nildummy_receiver); - if (device->phone < 0) { + if (device->sess == NULL) { fibril_rwlock_write_unlock(&nildummy_globals.devices_lock); free(device); - return device->phone; + return ENOENT; } /* Get hardware address */ - int rc = netif_get_addr_req(device->phone, device->device_id, + int rc = netif_get_addr_req(device->sess, device->device_id, &device->addr, &device->addr_data); if (rc != EOK) { @@ -307,13 +303,13 @@ } -int nil_received_msg_local(int nil_phone, device_id_t device_id, - packet_t *packet, services_t target) +int nil_received_msg_local(device_id_t device_id, packet_t *packet, + services_t target) { fibril_rwlock_read_lock(&nildummy_globals.protos_lock); - if (nildummy_globals.proto.phone) { + if (nildummy_globals.proto.sess) { do { packet_t *next = pq_detach(packet); - il_received_msg(nildummy_globals.proto.phone, device_id, + il_received_msg(nildummy_globals.proto.sess, device_id, packet, nildummy_globals.proto.service); packet = next; @@ -331,5 +327,5 @@ * * @param[in] service Module service. - * @param[in] phone Service phone. + * @param[in] sess Service session. * * @return EOK on success. @@ -338,12 +334,12 @@ * */ -static int nildummy_register_message(services_t service, int phone) +static int nildummy_register_message(services_t service, async_sess_t *sess) { fibril_rwlock_write_lock(&nildummy_globals.protos_lock); nildummy_globals.proto.service = service; - nildummy_globals.proto.phone = phone; - - printf("%s: Protocol registered (service: %d, phone: %d)\n", - NAME, nildummy_globals.proto.service, nildummy_globals.proto.phone); + nildummy_globals.proto.sess = sess; + + printf("%s: Protocol registered (service: %d)\n", + NAME, nildummy_globals.proto.service); fibril_rwlock_write_unlock(&nildummy_globals.protos_lock); @@ -376,5 +372,5 @@ /* Send packet queue */ if (packet) - netif_send_msg(device->phone, device_id, packet, + netif_send_msg(device->sess, device_id, packet, SERVICE_NILDUMMY); @@ -400,4 +396,9 @@ return EOK; + async_sess_t *callback = + async_callback_receive_start(EXCHANGE_SERIALIZE, call); + if (callback) + return nildummy_register_message(NIL_GET_PROTO(*call), callback); + switch (IPC_GET_IMETHOD(*call)) { case NET_NIL_DEVICE: @@ -406,5 +407,5 @@ case NET_NIL_SEND: - rc = packet_translate_remote(nildummy_globals.net_phone, + rc = packet_translate_remote(nildummy_globals.net_sess, &packet, IPC_GET_PACKET(*call)); if (rc != EOK) @@ -436,8 +437,4 @@ return rc; return measured_strings_reply(address, 1); - - case IPC_M_CONNECT_TO_ME: - return nildummy_register_message(NIL_GET_PROTO(*call), - IPC_GET_PHONE(*call)); } Index: uspace/srv/net/nil/nildummy/nildummy.h =================================================================== --- uspace/srv/net/nil/nildummy/nildummy.h (revision 9934f7d3082d2ffdd107cc0c78d61d504b0f401e) +++ uspace/srv/net/nil/nildummy/nildummy.h (revision ee2fa30aed4921e38c357a0420357b61329be533) @@ -38,7 +38,7 @@ #define NET_NILDUMMY_H_ +#include #include #include - #include #include @@ -81,6 +81,6 @@ services_t service; - /** Driver phone. */ - int phone; + /** Driver session. */ + async_sess_t *sess; /** Maximal transmission unit. */ @@ -99,12 +99,12 @@ services_t service; - /** Protocol module phone. */ - int phone; + /** Protocol module session. */ + async_sess_t *sess; }; /** Dummy nil global data. */ struct nildummy_globals { - /** Networking module phone. */ - int net_phone; + /** Networking module session. */ + async_sess_t *net_sess; /** Lock for devices. */