Changeset efdfebc in mainline for uspace/lib/nic/src/nic_driver.c

Timestamp:

2012-11-06T21:03:44Z (11 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

338810f

Parents:

de73242 (diff), 94795812 (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/lib/nic/src/nic_driver.c (modified) (8 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>
@@ -250 +249 @@
 {
         ddf_dev_t *dev = nic_data->dev;
+        async_sess_t *parent_sess;
         
         /* Connect to the parent's driver. */
-        dev->parent_sess = devman_parent_device_connect(EXCHANGE_SERIALIZE,
-                dev->handle, IPC_FLAG_BLOCKING);
-        if (dev->parent_sess == NULL)
+        parent_sess = ddf_dev_parent_sess_create(dev, EXCHANGE_SERIALIZE);
+        if (parent_sess == NULL)
                 return EPARTY;
         
-        return hw_res_get_list_parsed(nic_data->dev->parent_sess, resources, 0);
+        return hw_res_get_list_parsed(parent_sess, resources, 0);
 }
 
@@ -650 +649 @@
  *
  */
-static nic_t *nic_create(void)
-{
-        nic_t *nic_data = malloc(sizeof(nic_t));
+static nic_t *nic_create(ddf_dev_t *dev)
+{
+        nic_t *nic_data = ddf_dev_data_alloc(dev, 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;
         }
@@ -705 +701 @@
 nic_t *nic_create_and_bind(ddf_dev_t *device)
 {
-        assert(device);
-        assert(!device->driver_data);
-        
-        nic_t *nic_data = nic_create();
+        nic_t *nic_data = nic_create(device);
         if (!nic_data)
                 return NULL;
         
         nic_data->dev = device;
-        device->driver_data = nic_data;
         
         return nic_data;
@@ -724 +716 @@
  * @param data
  */
-static void nic_destroy(nic_t *nic_data) {
-        if (nic_data->client_session != NULL) {
-                async_hangup(nic_data->client_session);
-        }
-
+static void nic_destroy(nic_t *nic_data)
+{
         free(nic_data->specific);
-        free(nic_data);
 }
 
@@ -740 +728 @@
  * @param device The NIC device structure
  */
-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;
+void nic_unbind_and_destroy(ddf_dev_t *device)
+{
+        nic_destroy(nic_get_from_ddf_dev(device));
         return;
 }
@@ -983 +966 @@
 nic_t *nic_get_from_ddf_dev(ddf_dev_t *dev)
 {
-        return (nic_t *) dev->driver_data;
-};
+        return (nic_t *) ddf_dev_data_get(dev);
+}
 
 /** 
@@ -992 +975 @@
 nic_t *nic_get_from_ddf_fun(ddf_fun_t *fun)
 {
-        return (nic_t *) fun->driver_data;
-};
+        return (nic_t *) ddf_fun_data_get(fun);
+}
 
 /**