Changeset 54a1ca7 in mainline

Timestamp:

2014-07-20T16:39:50Z (11 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

87a3df7f, cbfece7

Parents:

9bd4615

Message:

Convert NIC drivers away from DDF_DATA_IMPLANT.

Location:

uspace

Files:

• drv/nic/e1k/e1k.c (modified) (2 diffs)
• drv/nic/ne2k/ne2k.c (modified) (2 diffs)
• drv/nic/rtl8139/driver.c (modified) (2 diffs)
• lib/nic/src/nic_driver.c (modified) (1 diff)

uspace/drv/nic/e1k/e1k.c

@@ -32 +32 @@
  *
  */
-
-/* XXX Fix this */
-#define _DDF_DATA_IMPLANT
 
 #include <assert.h>
@@ -2153 +2150 @@
         nic_set_ddf_fun(nic, fun);
         ddf_fun_set_ops(fun, &e1000_dev_ops);
-        ddf_fun_data_implant(fun, nic);
         
         rc = e1000_register_int_handler(nic);

uspace/drv/nic/ne2k/ne2k.c

@@ -37 +37 @@
  * @brief Bridge between NICF, DDF and business logic for the NIC
  */
-
-/* XXX Fix this */
-#define _DDF_DATA_IMPLANT
 
 #include <stdio.h>
@@ -405 +402 @@
                 return ENOMEM;
         }
+        
         nic_set_ddf_fun(nic_data, fun);
         ddf_fun_set_ops(fun, &ne2k_dev_ops);
-        ddf_fun_data_implant(fun, nic_data);
         
         rc = ddf_fun_bind(fun);

uspace/drv/nic/rtl8139/driver.c

@@ -26 +26 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-
-/* XXX Fix this */
-#define _DDF_DATA_IMPLANT
 
 #include <assert.h>
@@ -1331 +1328 @@
                 goto err_srv;
         }
+
         nic_set_ddf_fun(nic_data, fun);
         ddf_fun_set_ops(fun, &rtl8139_dev_ops);
-        ddf_fun_data_implant(fun, nic_data);
 
         rc = ddf_fun_bind(fun);

uspace/lib/nic/src/nic_driver.c

@@ -914 +914 @@
 nic_t *nic_get_from_ddf_fun(ddf_fun_t *fun)
 {
-        return (nic_t *) ddf_fun_data_get(fun);
+        return (nic_t *) ddf_dev_data_get(ddf_fun_get_dev(fun));
 }