Changeset 8d9217d in mainline for uspace/lib

Timestamp:

2024-03-20T17:06:29Z (19 months ago)

Author:

Nataliia Korop <n.corop08@…>

Children:

384f081

Parents:

78edb5e

Message:

nic, drvs, pcapctl

Location:

uspace/lib

Files:

• nic/include/nic.h (modified) (1 diff)
• nic/src/nic_impl.c (modified) (1 diff)
• pcap/include/pcapctl_dump.h (modified) (1 diff)
• pcap/src/pcapctl_dump.c (modified) (6 diffs)

uspace/lib/nic/include/nic.h

@@ -282 +282 @@
 extern pcap_iface_t *nic_get_pcap_iface(nic_t *);
 
+extern errno_t nic_fun_add_to_cats(ddf_fun_t *fun);
+
 #endif // __NIC_H__
 

uspace/lib/nic/src/nic_impl.c

@@ -844 +844 @@
 }
 
+errno_t nic_fun_add_to_cats(ddf_fun_t *fun)
+{
+        errno_t rc;
+        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;
+        }
+        return EOK;
+
+err_add_to_cat:
+        ddf_fun_unbind(fun);
+        return rc;
+}
+
 /** @}
  */

uspace/lib/pcap/include/pcapctl_dump.h

@@ -55 +55 @@
 extern errno_t pcapctl_list(void);
 
-
 #endif
 

uspace/lib/pcap/src/pcapctl_dump.c

@@ -45 +45 @@
 //static service_id_t *pcap_svcs = NULL; ??
 
-static errno_t str2num(const char* str, size_t* number) {
+static errno_t str2num(const char *str, size_t *number)
+{
         size_t num = 0;
         if (*str == 0)
@@ -68 +69 @@
 }
 
-static errno_t pcapctl_cat_get_svc(const char *drv_name, service_id_t* svc) {
+static errno_t pcapctl_cat_get_svc(const char *drv_name, service_id_t *svc)
+{
         errno_t rc;
         category_id_t pcap_cat;
@@ -98 +100 @@
 }
 
-extern errno_t pcapctl_list(void) {
-
+errno_t pcapctl_list(void)
+{
         errno_t rc;
         category_id_t pcap_cat;
@@ -118 +120 @@
         }
 
-        fprintf(stdout, "Services:\n");
+        fprintf(stdout, "Devices:\n");
         for (unsigned i = 0; i < count; ++i) {
                 char *name = NULL;
@@ -128 +130 @@
 }
 
-
-static errno_t pcapctl_get_name_from_number(const char* svcnum, const char** svcname) {
-
+static errno_t pcapctl_get_name_from_number(const char *svcnum, const char **svcname)
+{
         errno_t rc;
         category_id_t pcap_cat;
@@ -183 +184 @@
                 return ENOMEM;
 
-
-        const char* svcname;
+        const char *svcname;
 
         rc = pcapctl_get_name_from_number(svcnum, &svcname);