Changeset e86b8f0 in mainline for uspace/lib/nic

Timestamp:

2012-01-21T12:50:28Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

77a69ea, 86c71de

Parents:

3fe58d3c

Message:

Create DDF functions manually.

Location:

uspace/lib/nic

Files:

• include/nic.h (modified) (3 diffs)
• include/nic_driver.h (modified) (1 diff)
• src/nic_driver.c (modified) (2 diffs)

uspace/lib/nic/include/nic.h

@@ -44 +44 @@
 #include <ops/nic.h>
 
+#define DEVICE_CATEGORY_NIC "nic"
+
 struct nic;
 typedef struct nic nic_t;
@@ -204 +206 @@
 /* Functions called in add_device */
 extern int nic_connect_to_services(nic_t *);
-extern int nic_register_as_ddf_fun(nic_t *, ddf_dev_ops_t *);
 extern int nic_get_resources(nic_t *, hw_res_list_parsed_t *);
 extern void nic_set_specific(nic_t *, void *);
@@ -225 +226 @@
 extern ddf_dev_t *nic_get_ddf_dev(nic_t *);
 extern ddf_fun_t *nic_get_ddf_fun(nic_t *);
+extern void nic_set_ddf_fun(nic_t *, ddf_fun_t *);
 extern nic_t *nic_get_from_ddf_dev(ddf_dev_t *);
 extern nic_t *nic_get_from_ddf_fun(ddf_fun_t *);

uspace/lib/nic/include/nic_driver.h

@@ -50 +50 @@
 #include "nic_rx_control.h"
 #include "nic_wol_virtues.h"
-
-#define DEVICE_CATEGORY_NIC "nic"
 
 struct sw_poll_info {

uspace/lib/nic/src/nic_driver.c

@@ -812 +812 @@
 
 /**
- * Creates an exposed DDF function for the device, named "port0".
- * Device options are set as this function's options. The function is bound
- * (see ddf_fun_bind) and then registered to the DEVICE_CATEGORY_NIC class.
- * Note: this function should be called only from add_device handler, therefore
- * we don't need to use locks.
- *
- * @param nic_data      The NIC structure
- * @param ops           Device options for the DDF function.
- */
-int nic_register_as_ddf_fun(nic_t *nic_data, ddf_dev_ops_t *ops)
-{
-        int rc;
-        assert(nic_data);
-
-        nic_data->fun = ddf_fun_create(nic_data->dev, fun_exposed, "port0");
-        if (nic_data->fun == NULL)
-                return ENOMEM;
-        
-        nic_data->fun->ops = ops;
-        nic_data->fun->driver_data = nic_data;
-
-        rc = ddf_fun_bind(nic_data->fun);
-        if (rc != EOK) {
-                ddf_fun_destroy(nic_data->fun);
-                return rc;
-        }
-
-        rc = ddf_fun_add_to_category(nic_data->fun, DEVICE_CATEGORY_NIC);
-        if (rc != EOK) {
-                ddf_fun_destroy(nic_data->fun);
-                return rc;
-        }
-        
-        return EOK;
-}
-
-/**
  * Set information about current HW filtering.
  *  1 ...       Only those frames we want to receive are passed through HW
@@ -1063 +1026 @@
 {
         return nic_data->fun;
+}
+
+/**
+ * @param nic_data
+ * @param fun
+ */
+void nic_set_ddf_fun(nic_t *nic_data, ddf_fun_t *fun)
+{
+        nic_data->fun = fun;
 }