Changeset c38e417 in mainline for uspace/lib/nic/include/nic_impl.h

Timestamp:

2012-01-22T11:53:22Z (13 years ago)

Author:

Frantisek Princ <frantisek.princ@…>

Branches:

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

Children:

b7e0260

Parents:

eaa0c3f (diff), 8d7ec69d (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge with mainline

File:

• uspace/lib/nic/include/nic_impl.h (modified) (1 diff)

uspace/lib/nic/include/nic_impl.h

@@ -49 +49 @@
 extern int nic_get_address_impl(ddf_fun_t *dev_fun, nic_address_t *address);
 extern int nic_send_frame_impl(ddf_fun_t *dev_fun, void *data, size_t size);
-extern int nic_connect_to_nil_impl(ddf_fun_t *dev_fun, services_t nil_service,
-        int device_id);
+extern int nic_callback_create_impl(ddf_fun_t *dev_fun, int device_id);
 extern int nic_get_state_impl(ddf_fun_t *dev_fun, nic_device_state_t *state);
 extern int nic_set_state_impl(ddf_fun_t *dev_fun, nic_device_state_t state);