Changeset e55d2c1 in mainline

Timestamp:

2024-04-07T12:53:23Z (5 months ago)

Author:

Nataliia Korop <n.corop08@…>

Children:

2a0c827c

Parents:

c37c24c

Message:

add_to_cat func in lib

Location:

uspace/drv/nic

Files:

• e1k/e1k.c (modified) (1 diff)
• ne2k/ne2k.c (modified) (3 diffs)
• rtl8139/driver.c (modified) (2 diffs)
• rtl8169/driver.c (modified) (2 diffs)
• virtio-net/virtio-net.c (modified) (2 diffs)

uspace/drv/nic/e1k/e1k.c

@@ -2202 +2202 @@
                 goto err_fun_bind;
 
-        // rc = ddf_fun_add_to_category(fun, DEVICE_CATEGORY_NIC);
-        // if (rc != EOK)
-        //      goto err_add_to_cat;
-
-        // rc = ddf_fun_add_to_category(fun, "pcap");
-        // if (rc != EOK) {
-        //      ddf_msg(LVL_ERROR, "Failed adding function to category pcap");
-        //      goto err_add_to_cat;
-        // }
         rc = nic_fun_add_to_cats(fun);
         if (rc != EOK) {
                 ddf_msg(LVL_ERROR, "Failed adding function to categories");
+                ddf_fun_unbind(fun);
                 return rc;
         }

uspace/drv/nic/ne2k/ne2k.c

@@ -43 +43 @@
 #include <str_error.h>
 #include <async.h>
+#include <ddf/log.h>
 #include "dp8390.h"
 
@@ -443 +444 @@
         }
 
-        rc = ddf_fun_add_to_category(fun, DEVICE_CATEGORY_NIC);
+        rc = nic_fun_add_to_cats(fun);
         if (rc != EOK) {
+                ddf_msg(LVL_ERROR, "Failed adding function to categories");
                 ddf_fun_unbind(fun);
-                ddf_fun_destroy(fun);
-                return rc;
-        }
-        rc = ddf_fun_add_to_category(fun, "pcap");
-        if (rc != EOK) {
-                //ddf_msg(LVL_ERROR, "Failed adding function to category pcap");
-                ddf_fun_unbind(fun);
-                ddf_fun_destroy(fun);
                 return rc;
         }
@@ -483 +477 @@
         nic_driver_implement(&ne2k_driver_ops, &ne2k_dev_ops, &ne2k_nic_iface);
 
+        ddf_log_init(NAME);
         return ddf_driver_main(&ne2k_driver);
 }

uspace/drv/nic/rtl8139/driver.c

@@ -1308 +1308 @@
                 goto err_fun_create;
         }
-        rc = ddf_fun_add_to_category(fun, DEVICE_CATEGORY_NIC);
+
+        rc = nic_fun_add_to_cats(fun);
         if (rc != EOK) {
-                ddf_msg(LVL_ERROR, "Failed adding function to category");
-                goto err_fun_bind;
-        }
-
-        rc = ddf_fun_add_to_category(fun, "pcap");
-        if (rc != EOK) {
-                ddf_msg(LVL_ERROR, "Failed adding function to category pcap");
-                goto err_fun_bind;
+                ddf_msg(LVL_ERROR, "Failed adding function to categories");
+                ddf_fun_unbind(fun);
+                return rc;
         }
 
@@ -1325 +1321 @@
         return EOK;
 
-err_fun_bind:
-        ddf_fun_unbind(fun);
+        // err_fun_bind:
+        // ddf_fun_unbind(fun);
 err_fun_create:
         ddf_fun_destroy(fun);

uspace/drv/nic/rtl8169/driver.c

@@ -457 +457 @@
         }
 
-        rc = ddf_fun_add_to_category(fun, DEVICE_CATEGORY_NIC);
+        rc = nic_fun_add_to_cats(fun);
         if (rc != EOK) {
-                ddf_msg(LVL_ERROR, "Failed adding function to category");
-                goto err_fun_bind;
+                ddf_msg(LVL_ERROR, "Failed adding function to categories");
+                ddf_fun_unbind(fun);
+                return rc;
         }
 
@@ -467 +468 @@
         return EOK;
 
-err_fun_bind:
-        ddf_fun_unbind(fun);
+        // err_fun_bind:
+        // ddf_fun_unbind(fun);
 err_fun_create:
         ddf_fun_destroy(fun);

uspace/drv/nic/virtio-net/virtio-net.c

@@ -423 +423 @@
         }
 
-        rc = ddf_fun_add_to_category(fun, DEVICE_CATEGORY_NIC);
+        rc = nic_fun_add_to_cats(fun);
         if (rc != EOK) {
-                ddf_msg(LVL_ERROR, "Failed adding function to category");
-                goto unbind;
+                ddf_msg(LVL_ERROR, "Failed adding function to categories");
+                ddf_fun_unbind(fun);
+                return rc;
         }
 
@@ -432 +433 @@
             ddf_dev_get_name(dev));
 
-        rc = ddf_fun_add_to_category(fun, "pcap");
-        if (rc != EOK) {
-                ddf_msg(LVL_ERROR, "Failed adding function to category pcap");
-                goto unbind;
-        }
-
-        return EOK;
-
-unbind:
-        ddf_fun_unbind(fun);
+        return EOK;
+
+        // unbind:
+        // ddf_fun_unbind(fun);
 destroy:
         ddf_fun_destroy(fun);