Fork us on GitHub Follow us on Facebook Follow us on Twitter

Changeset 54a1ca7 in mainline


Ignore:
Timestamp:
2014-07-20T16:39:50Z (6 years ago)
Author:
Jiri Svoboda <jiri@…>
Branches:
master
Children:
87a3df7f, cbfece7
Parents:
9bd4615
Message:

Convert NIC drivers away from DDF_DATA_IMPLANT.

Location:
uspace
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • uspace/drv/nic/e1k/e1k.c

    r9bd4615 r54a1ca7  
    3232 *
    3333 */
    34 
    35 /* XXX Fix this */
    36 #define _DDF_DATA_IMPLANT
    3734
    3835#include <assert.h>
     
    21532150        nic_set_ddf_fun(nic, fun);
    21542151        ddf_fun_set_ops(fun, &e1000_dev_ops);
    2155         ddf_fun_data_implant(fun, nic);
    21562152       
    21572153        rc = e1000_register_int_handler(nic);
  • uspace/drv/nic/ne2k/ne2k.c

    r9bd4615 r54a1ca7  
    3737 * @brief Bridge between NICF, DDF and business logic for the NIC
    3838 */
    39 
    40 /* XXX Fix this */
    41 #define _DDF_DATA_IMPLANT
    4239
    4340#include <stdio.h>
     
    405402                return ENOMEM;
    406403        }
     404       
    407405        nic_set_ddf_fun(nic_data, fun);
    408406        ddf_fun_set_ops(fun, &ne2k_dev_ops);
    409         ddf_fun_data_implant(fun, nic_data);
    410407       
    411408        rc = ddf_fun_bind(fun);
  • uspace/drv/nic/rtl8139/driver.c

    r9bd4615 r54a1ca7  
    2626 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
    2727 */
    28 
    29 /* XXX Fix this */
    30 #define _DDF_DATA_IMPLANT
    3128
    3229#include <assert.h>
     
    13311328                goto err_srv;
    13321329        }
     1330
    13331331        nic_set_ddf_fun(nic_data, fun);
    13341332        ddf_fun_set_ops(fun, &rtl8139_dev_ops);
    1335         ddf_fun_data_implant(fun, nic_data);
    13361333
    13371334        rc = ddf_fun_bind(fun);
  • uspace/lib/nic/src/nic_driver.c

    r9bd4615 r54a1ca7  
    914914nic_t *nic_get_from_ddf_fun(ddf_fun_t *fun)
    915915{
    916         return (nic_t *) ddf_fun_data_get(fun);
     916        return (nic_t *) ddf_dev_data_get(ddf_fun_get_dev(fun));
    917917}
    918918
Note: See TracChangeset for help on using the changeset viewer.