Changes in uspace/lib/nic/src/nic_driver.c [acdb5bac:9cd8165] in mainline

File:

• uspace/lib/nic/src/nic_driver.c (modified) (11 diffs)

uspace/lib/nic/src/nic_driver.c

@@ -47 +47 @@
 #include <sysinfo.h>
 #include <as.h>
+#include <devman.h>
 #include <ddf/interrupt.h>
 #include <ops/nic.h>
@@ -78 +79 @@
 }
 
-/** Fill in the default implementations for device options and NIC interface.
+/**
+ * Fill in the default implementations for device options and NIC interface.
  *
  * @param driver_ops
@@ -249 +251 @@
 {
         ddf_dev_t *dev = nic_data->dev;
-        async_sess_t *parent_sess;
         
         /* Connect to the parent's driver. */
-        parent_sess = ddf_dev_parent_sess_create(dev, EXCHANGE_SERIALIZE);
-        if (parent_sess == NULL)
+        dev->parent_sess = devman_parent_device_connect(EXCHANGE_SERIALIZE,
+                dev->handle, IPC_FLAG_BLOCKING);
+        if (dev->parent_sess == NULL)
                 return EPARTY;
         
-        return hw_res_get_list_parsed(parent_sess, resources, 0);
+        return hw_res_get_list_parsed(nic_data->dev->parent_sess, resources, 0);
 }
 
@@ -622 +624 @@
 
 /**
+ * This function is to be used only in the loopback driver. It's workaround
+ * for the situation when the frame does not contain ethernet address.
+ * The filtering is therefore not applied here.
+ *
+ * @param nic_data
+ * @param data          Frame data
+ * @param size          Frame size in bytes
+ */
+void nic_received_noneth_frame(nic_t *nic_data, void *data, size_t size)
+{
+        fibril_rwlock_write_lock(&nic_data->stats_lock);
+        nic_data->stats.receive_packets++;
+        nic_data->stats.receive_bytes += size;
+        fibril_rwlock_write_unlock(&nic_data->stats_lock);
+        
+        nic_ev_received(nic_data->client_session, data, size);
+}
+
+/**
  * Some NICs can receive multiple frames during single interrupt. These can
  * send them in whole list of frames (actually nic_frame_t structures), then
@@ -649 +670 @@
  *
  */
-static nic_t *nic_create(ddf_dev_t *dev)
-{
-        nic_t *nic_data = ddf_dev_data_alloc(dev, sizeof(nic_t));
+static nic_t *nic_create(void)
+{
+        nic_t *nic_data = malloc(sizeof(nic_t));
         if (nic_data == NULL)
                 return NULL;
         
         /* Force zero to all uninitialized fields (e.g. added in future) */
+        bzero(nic_data, sizeof(nic_t));
         if (nic_rxc_init(&nic_data->rx_control) != EOK) {
+                free(nic_data);
                 return NULL;
         }
         
         if (nic_wol_virtues_init(&nic_data->wol_virtues) != EOK) {
+                free(nic_data);
                 return NULL;
         }
@@ -682 +706 @@
         fibril_rwlock_initialize(&nic_data->wv_lock);
         
-        memset(&nic_data->mac, 0, sizeof(nic_address_t));
-        memset(&nic_data->default_mac, 0, sizeof(nic_address_t));
-        memset(&nic_data->stats, 0, sizeof(nic_device_stats_t));
+        bzero(&nic_data->mac, sizeof(nic_address_t));
+        bzero(&nic_data->default_mac, sizeof(nic_address_t));
+        bzero(&nic_data->stats, sizeof(nic_device_stats_t));
         
         return nic_data;
@@ -701 +725 @@
 nic_t *nic_create_and_bind(ddf_dev_t *device)
 {
-        nic_t *nic_data = nic_create(device);
+        assert(device);
+        assert(!device->driver_data);
+        
+        nic_t *nic_data = nic_create();
         if (!nic_data)
                 return NULL;
         
         nic_data->dev = device;
+        device->driver_data = nic_data;
         
         return nic_data;
@@ -716 +744 @@
  * @param data
  */
-static void nic_destroy(nic_t *nic_data)
-{
+static void nic_destroy(nic_t *nic_data) {
+        if (nic_data->client_session != NULL) {
+                async_hangup(nic_data->client_session);
+        }
+
         free(nic_data->specific);
+        free(nic_data);
 }
 
@@ -728 +760 @@
  * @param device The NIC device structure
  */
-void nic_unbind_and_destroy(ddf_dev_t *device)
-{
-        nic_destroy(nic_get_from_ddf_dev(device));
+void nic_unbind_and_destroy(ddf_dev_t *device){
+        if (!device)
+                return;
+        if (!device->driver_data)
+                return;
+
+        nic_destroy((nic_t *) device->driver_data);
+        device->driver_data = NULL;
         return;
 }
@@ -966 +1003 @@
 nic_t *nic_get_from_ddf_dev(ddf_dev_t *dev)
 {
-        return (nic_t *) ddf_dev_data_get(dev);
-}
+        return (nic_t *) dev->driver_data;
+};
 
 /** 
@@ -975 +1012 @@
 nic_t *nic_get_from_ddf_fun(ddf_fun_t *fun)
 {
-        return (nic_t *) ddf_fun_data_get(fun);
-}
+        return (nic_t *) fun->driver_data;
+};
 
 /**