Changeset 8ff0bd2 in mainline for uspace/srv/net/nil/eth/eth.c

Timestamp:

2011-09-04T11:30:58Z (13 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

03bc76a

Parents:

d2c67e7 (diff), deac215e (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:

• uspace/srv/net/nil/eth/eth.c (modified) (22 diffs)

uspace/srv/net/nil/eth/eth.c

@@ -59 +59 @@
 #include <packet_remote.h>
 #include <nil_skel.h>
-
-// FIXME: remove this header
-#include <kernel/ipc/ipc_methods.h>
-
 #include "eth.h"
 
@@ -171 +167 @@
 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 +176 @@
             index--) {
                 proto = eth_protos_get_index(&eth_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 +186 @@
 }
 
-int nil_initialize(int net_phone)
+int nil_initialize(async_sess_t *sess)
 {
         int rc;
@@ -199 +195 @@
         fibril_rwlock_write_lock(&eth_globals.devices_lock);
         fibril_rwlock_write_lock(&eth_globals.protos_lock);
-        eth_globals.net_phone = net_phone;
+        eth_globals.net_sess = sess;
 
         eth_globals.broadcast_addr =
@@ -226 +222 @@
 }
 
-/** 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.
- */
-static void eth_receiver(ipc_callid_t iid, ipc_call_t *icall)
+ * @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)
 {
         packet_t *packet;
@@ -240 +238 @@
                 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);
@@ -325 +323 @@
                         proto = eth_protos_get_index(&eth_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);
@@ -350 +348 @@
 
         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) {
@@ -379 +377 @@
         
         /* 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(&eth_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) {
@@ -508 +506 @@
 }
 
-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;
@@ -531 +529 @@
                 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));
                 }
@@ -614 +612 @@
 }
 
-/** 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;
@@ -637 +637 @@
         proto = eth_protos_find(&eth_globals.protos, protocol);
         if (proto) {
-                proto->phone = phone;
+                proto->sess = sess;
                 fibril_rwlock_write_unlock(&eth_globals.protos_lock);
                 return EOK;
@@ -649 +649 @@
                 proto->service = service;
                 proto->protocol = protocol;
-                proto->phone = phone;
+                proto->sess = sess;
 
                 index = eth_protos_add(&eth_globals.protos, protocol, proto);
@@ -659 +659 @@
         }
         
-        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(&eth_globals.protos_lock);
@@ -798 +798 @@
         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;
         }
@@ -819 +819 @@
                         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;
@@ -829 +829 @@
         /* Send packet queue */
         if (packet) {
-                netif_send_msg(device->phone, device_id, packet,
+                netif_send_msg(device->sess, device_id, packet,
                     SERVICE_ETHERNET);
         }
@@ -853 +853 @@
                 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:
@@ -858 +863 @@
                     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)
@@ -887 +892 @@
                         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));
         }