Changeset 7eaeec1 in mainline for uspace/drv/nic/ne2k/ne2k.c

Timestamp:

2012-08-20T21:27:38Z (12 years ago)

Author:

Sean Bartell <wingedtachikoma@…>

Branches:

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

Children:

6a97f2e

Parents:

f3a37e28 (diff), dd13349 (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/drv/nic/ne2k/ne2k.c (modified) (6 diffs)

uspace/drv/nic/ne2k/ne2k.c

@@ -38 +38 @@
  */
 
+/* XXX Fix this */
+#define _DDF_DATA_IMPLANT
+
 #include <stdio.h>
 #include <errno.h>
@@ -61 +64 @@
 #define IRQ_GET_TSR(call)  ((int) IPC_GET_ARG3(call))
 
-#define DRIVER_DATA(dev) ((nic_t *) ((dev)->driver_data))
+#define DRIVER_DATA(dev) ((nic_t *) ddf_dev_data_get(dev))
 #define NE2K(device) ((ne2k_t *) nic_get_specific(DRIVER_DATA(device)))
 
@@ -169 +172 @@
 static void ne2k_dev_cleanup(ddf_dev_t *dev)
 {
-        if (dev->driver_data != NULL) {
+        if (ddf_dev_data_get(dev) != NULL) {
                 ne2k_t *ne2k = NE2K(dev);
                 if (ne2k) {
@@ -177 +180 @@
                 nic_unbind_and_destroy(dev);
         }
-        if (dev->parent_sess != NULL) {
-                async_hangup(dev->parent_sess);
-                dev->parent_sess = NULL;
-        }
 }
 
@@ -279 +278 @@
 static int ne2k_set_address(ddf_fun_t *fun, const nic_address_t *address)
 {
-        nic_t *nic_data = DRIVER_DATA(fun);
+        nic_t *nic_data = DRIVER_DATA(ddf_fun_get_dev(fun));
         int rc = nic_report_address(nic_data, address);
         if (rc != EOK) {
@@ -410 +409 @@
         }
         nic_set_ddf_fun(nic_data, fun);
-        fun->ops = &ne2k_dev_ops;
-        fun->driver_data = nic_data;
+        ddf_fun_set_ops(fun, &ne2k_dev_ops);
+        ddf_fun_data_implant(fun, nic_data);
         
         rc = ddf_fun_bind(fun);