Changeset b7068da in mainline for uspace/drv/nic/ne2k/ne2k.c

Timestamp:

2012-02-09T20:35:12Z (13 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

591762c6

Parents:

7cede12c (diff), 3d4750f (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) (5 diffs)

uspace/drv/nic/ne2k/ne2k.c

@@ -261 +261 @@
         /* 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 packet may also be lost, but this is not a problem.
+         * that. Some frames may also be lost, but this is not a problem.
          */
         ne2k_set_physical_address((ne2k_t *) nic_get_specific(nic_data), address);
@@ -338 +338 @@
 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);
@@ -343 +345 @@
                 return ENOMEM;
         
-        nic_set_write_packet_handler(nic_data, ne2k_send);
+        nic_set_send_frame_handler(nic_data, ne2k_send);
         nic_set_state_change_handlers(nic_data,
                 ne2k_on_activating, NULL, ne2k_on_stopping);
@@ -371 +373 @@
         }
         
-        rc = nic_register_as_ddf_fun(nic_data, &ne2k_dev_ops);
+        rc = nic_connect_to_services(nic_data);
         if (rc != EOK) {
                 ne2k_dev_cleanup(dev);
@@ -377 +379 @@
         }
         
-        rc = nic_connect_to_services(nic_data);
-        if (rc != EOK) {
+        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);
+        fun->ops = &ne2k_dev_ops;
+        fun->driver_data = 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;
         }