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

Timestamp:

2012-02-09T20:35:12Z (12 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/lo/lo.c (modified) (3 diffs)

uspace/drv/nic/lo/lo.c

@@ -42 +42 @@
 #include <async.h>
 #include <nic.h>
-#include <packet_client.h>
 
 #define NAME  "lo"
@@ -59 +58 @@
 };
 
-static void lo_write_packet(nic_t *nic_data, packet_t *packet)
+static void lo_send_frame(nic_t *nic_data, void *data, size_t size)
 {
-        nic_report_send_ok(nic_data, 1, packet_get_data_length(packet));
-        nic_received_noneth_packet(nic_data, packet);
+        nic_report_send_ok(nic_data, 1, size);
+        nic_received_noneth_frame(nic_data, data, size);
 }
 
@@ -81 +80 @@
 static int lo_dev_add(ddf_dev_t *dev)
 {
-        nic_t *nic_data = nic_create_and_bind(dev);
-        if (nic_data == NULL) {
+        ddf_fun_t *fun = NULL;
+        bool bound = false;
+        
+        nic_t *nic = nic_create_and_bind(dev);
+        if (nic == NULL) {
                 printf("%s: Failed to initialize\n", NAME);
                 return ENOMEM;
         }
         
-        dev->driver_data = nic_data;
-        nic_set_write_packet_handler(nic_data, lo_write_packet);
+        dev->driver_data = nic;
+        nic_set_send_frame_handler(nic, lo_send_frame);
         
-        int rc = nic_connect_to_services(nic_data);
+        int rc = nic_connect_to_services(nic);
         if (rc != EOK) {
                 printf("%s: Failed to connect to services\n", NAME);
-                nic_unbind_and_destroy(dev);
-                return rc;
+                goto error;
         }
         
-        rc = nic_register_as_ddf_fun(nic_data, &lo_dev_ops);
+        fun = ddf_fun_create(nic_get_ddf_dev(nic), fun_exposed, "port0");
+        if (fun == NULL) {
+                printf("%s: Failed creating function\n", NAME);
+                rc = ENOMEM;
+                goto error;
+        }
+        nic_set_ddf_fun(nic, fun);
+        fun->ops = &lo_dev_ops;
+        fun->driver_data = nic;
+        
+        rc = nic_report_address(nic, &lo_addr);
         if (rc != EOK) {
-                printf("%s: Failed to register as DDF function\n", NAME);
-                nic_unbind_and_destroy(dev);
-                return rc;
+                printf("%s: Failed to setup loopback address\n", NAME);
+                goto error;
         }
         
-        rc = nic_report_address(nic_data, &lo_addr);
+        rc = ddf_fun_bind(fun);
         if (rc != EOK) {
-                printf("%s: Failed to setup loopback address\n", NAME);
-                nic_unbind_and_destroy(dev);
-                return rc;
+                printf("%s: Failed binding function\n", NAME);
+                goto error;
         }
+        bound = true;
+        
+        rc = ddf_fun_add_to_category(fun, DEVICE_CATEGORY_NIC);
+        if (rc != EOK)
+                goto error;
         
         printf("%s: Adding loopback device '%s'\n", NAME, dev->name);
         return EOK;
+        
+error:
+        if (bound)
+                ddf_fun_unbind(fun);
+        
+        if (fun != NULL)
+                ddf_fun_destroy(fun);
+        
+        nic_unbind_and_destroy(dev);
+        return rc;
 }