Changes in uspace/drv/nic/ne2k/ne2k.c [56fd7cf:9571230] in mainline

File:

• uspace/drv/nic/ne2k/ne2k.c (modified) (10 diffs)

uspace/drv/nic/ne2k/ne2k.c

@@ -38 +38 @@
  */
 
-/* XXX Fix this */
-#define _DDF_DATA_IMPLANT
-
 #include <stdio.h>
 #include <errno.h>
@@ -64 +61 @@
 #define IRQ_GET_TSR(call)  ((int) IPC_GET_ARG3(call))
 
-#define DRIVER_DATA(dev) ((nic_t *) ddf_dev_data_get(dev))
+#define DRIVER_DATA(dev) ((nic_t *) ((dev)->driver_data))
 #define NE2K(device) ((ne2k_t *) nic_get_specific(DRIVER_DATA(device)))
 
@@ -86 +83 @@
         {
                 /* Mask supported interrupt causes */
-                .cmd = CMD_AND,
+                .cmd = CMD_BTEST,
                 .value = (ISR_PRX | ISR_PTX | ISR_RXE | ISR_TXE | ISR_OVW |
                     ISR_CNT | ISR_RDC),
@@ -172 +169 @@
 static void ne2k_dev_cleanup(ddf_dev_t *dev)
 {
-        if (ddf_dev_data_get(dev) != NULL) {
+        if (dev->driver_data != NULL) {
                 ne2k_t *ne2k = NE2K(dev);
                 if (ne2k) {
@@ -180 +177 @@
                 nic_unbind_and_destroy(dev);
         }
+        if (dev->parent_sess != NULL) {
+                async_hangup(dev->parent_sess);
+                dev->parent_sess = NULL;
+        }
 }
 
@@ -278 +279 @@
 static int ne2k_set_address(ddf_fun_t *fun, const nic_address_t *address)
 {
-        nic_t *nic_data = DRIVER_DATA(ddf_fun_get_dev(fun));
+        nic_t *nic_data = DRIVER_DATA(fun);
         int rc = nic_report_address(nic_data, address);
         if (rc != EOK) {
@@ -285 +286 @@
         /* Note: some frame with previous physical address may slip to NIL here
          * (for a moment the filtering is not exact), but ethernet should be OK with
-         * that. Some frames may also be lost, but this is not a problem.
+         * that. Some packet may also be lost, but this is not a problem.
          */
         ne2k_set_physical_address((ne2k_t *) nic_get_specific(nic_data), address);
@@ -362 +363 @@
 static int ne2k_dev_add(ddf_dev_t *dev)
 {
-        ddf_fun_t *fun;
-        
         /* Allocate driver data for the device. */
         nic_t *nic_data = nic_create_and_bind(dev);
@@ -397 +396 @@
         }
         
+        rc = nic_register_as_ddf_fun(nic_data, &ne2k_dev_ops);
+        if (rc != EOK) {
+                ne2k_dev_cleanup(dev);
+                return rc;
+        }
+        
         rc = nic_connect_to_services(nic_data);
         if (rc != EOK) {
@@ -403 +408 @@
         }
         
-        fun = ddf_fun_create(nic_get_ddf_dev(nic_data), fun_exposed, "port0");
-        if (fun == NULL) {
-                ne2k_dev_cleanup(dev);
-                return ENOMEM;
-        }
-        nic_set_ddf_fun(nic_data, fun);
-        ddf_fun_set_ops(fun, &ne2k_dev_ops);
-        ddf_fun_data_implant(fun, nic_data);
-        
-        rc = ddf_fun_bind(fun);
-        if (rc != EOK) {
-                ddf_fun_destroy(fun);
-                ne2k_dev_cleanup(dev);
-                return rc;
-        }
-        
-        rc = ddf_fun_add_to_category(fun, DEVICE_CATEGORY_NIC);
-        if (rc != EOK) {
-                ddf_fun_unbind(fun);
-                ddf_fun_destroy(fun);
-                return rc;
-        }
-        
         return EOK;
 }