Changes in uspace/srv/net/nil/eth/eth.c [4ee7364:8d7ec69d] in mainline

File:

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

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

@@ -48 +48 @@
 #include <ipc/net.h>
 #include <ipc/services.h>
+#include <loc.h>
 #include <net/modules.h>
 #include <net_checksum.h>
@@ -169 +170 @@
 INT_MAP_IMPLEMENT(eth_protos, eth_proto_t);
 
-int nil_device_state_msg_local(nic_device_id_t device_id, sysarg_t state)
+static void eth_nic_cb_connection(ipc_callid_t iid, ipc_call_t *icall,
+    void *arg);
+
+static int eth_device_state(nic_device_id_t device_id, sysarg_t state)
 {
         int index;
@@ -226 +230 @@
  *
  * @param[in] device_id New device identifier.
- * @param[in] handle    Device driver handle.
+ * @param[in] sid       NIC service ID.
  * @param[in] mtu       Device maximum transmission unit.
  *
@@ -234 +238 @@
  *
  */
-static int eth_device_message(nic_device_id_t device_id, devman_handle_t handle,
+static int eth_device_message(nic_device_id_t device_id, service_id_t sid,
     size_t mtu)
 {
@@ -259 +263 @@
         device = eth_devices_find(&eth_globals.devices, device_id);
         if (device) {
-                if (device->handle != handle) {
+                if (device->sid != sid) {
                         printf("Device %d already exists\n", device->device_id);
                         fibril_rwlock_write_unlock(&eth_globals.devices_lock);
@@ -298 +302 @@
 
         device->device_id = device_id;
-        device->handle = handle;
+        device->sid = sid;
         device->flags = 0;
         if ((mtu > 0) && (mtu <= ETH_MAX_TAGGED_CONTENT(device->flags)))
@@ -335 +339 @@
         
         /* Bind the device driver */
-        device->sess = devman_device_connect(EXCHANGE_SERIALIZE, handle,
+        device->sess = loc_service_connect(EXCHANGE_SERIALIZE, sid,
             IPC_FLAG_BLOCKING);
         if (device->sess == NULL) {
@@ -343 +347 @@
         }
         
-        nic_connect_to_nil(device->sess, SERVICE_ETHERNET, device_id);
+        rc = nic_callback_create(device->sess, device_id,
+            eth_nic_cb_connection, NULL);
+        if (rc != EOK) {
+                fibril_rwlock_write_unlock(&eth_globals.devices_lock);
+                async_hangup(device->sess);
+                free(device);
+                return EIO;
+        }
         
         /* Get hardware address */
@@ -362 +373 @@
         }
         
-        printf("%s: Device registered (id: %d, handle: %zu: mtu: %zu, "
+        printf("%s: Device registered (id: %d, sid: %zu: mtu: %zu, "
             "mac: " PRIMAC ", flags: 0x%x)\n", NAME,
-            device->device_id, device->handle, device->mtu,
+            device->device_id, device->sid, device->mtu,
             ARGSMAC(device->addr.address), device->flags);
 
@@ -802 +813 @@
                         next = tmp;
                 } else {
+                        nic_send_frame(device->sess, packet_get_data(next),
+                            packet_get_data_length(next));
                         next = pq_next(next);
                 }
         } while (next);
         
-        /* Send packet queue */
-        if (packet)
-                nic_send_message(device->sess, packet_get_id(packet));
+        pq_release_remote(eth_globals.net_sess, packet_get_id(packet));
         
         fibril_rwlock_read_unlock(&eth_globals.devices_lock);
         return EOK;
+}
+
+static int eth_received(nic_device_id_t device_id)
+{
+        void *data;
+        size_t size;
+        int rc;
+        
+        rc = async_data_write_accept(&data, false, 0, 0, 0, &size);
+        if (rc != EOK) {
+                printf("%s: data_write_accept() failed\n", NAME);
+                return rc;
+        }
+        
+        packet_t *packet = packet_get_1_remote(eth_globals.net_sess, size);
+        if (packet == NULL)
+                return ENOMEM;
+        
+        void *pdata = packet_suffix(packet, size);
+        memcpy(pdata, data, size);
+        free(data);
+        
+        return nil_received_msg_local(device_id, packet);
 }
 
@@ -921 +955 @@
                 
                 return EOK;
-        case NET_NIL_DEVICE_STATE:
-                nil_device_state_msg_local(IPC_GET_DEVICE(*call), IPC_GET_STATE(*call));
-                async_answer_0(callid, EOK);
-                return EOK;
-        case NET_NIL_RECEIVED:
-                rc = packet_translate_remote(eth_globals.net_sess, &packet,
-                    IPC_GET_ARG2(*call));
-                if (rc == EOK)
-                        rc = nil_received_msg_local(IPC_GET_ARG1(*call), packet);
-                
-                async_answer_0(callid, (sysarg_t) rc);
-                return rc;
-        case NET_NIL_ADDR_CHANGED:
-                rc = eth_addr_changed(IPC_GET_DEVICE(*call));
-                async_answer_0(callid, (sysarg_t) rc);
-                return rc;
         }
         
         return ENOTSUP;
+}
+
+static void eth_nic_cb_connection(ipc_callid_t iid, ipc_call_t *icall, void *arg)
+{
+        int rc;
+        
+        async_answer_0(iid, EOK);
+        
+        while (true) {
+                ipc_call_t call;
+                ipc_callid_t callid = async_get_call(&call);
+                
+                if (!IPC_GET_IMETHOD(call))
+                        break;
+                
+                switch (IPC_GET_IMETHOD(call)) {
+                case NIC_EV_DEVICE_STATE:
+                        rc = eth_device_state(IPC_GET_ARG1(call),
+                            IPC_GET_ARG2(call));
+                        async_answer_0(callid, (sysarg_t) rc);
+                        break;
+                case NIC_EV_RECEIVED:
+                        rc = eth_received(IPC_GET_ARG1(call));
+                        async_answer_0(callid, (sysarg_t) rc);
+                        break;
+                case NIC_EV_ADDR_CHANGED:
+                        rc = eth_addr_changed(IPC_GET_ARG1(call));
+                        async_answer_0(callid, (sysarg_t) rc);
+                        break;
+                default:
+                        async_answer_0(callid, ENOTSUP);
+                }
+        }
 }