Changeset cfb79747 in mainline for uspace/lib/drv/include/ops/nic.h

Timestamp:

2012-02-14T22:06:15Z (12 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

a31aad1

Parents:

199112e4 (diff), e10d41a (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 mainline changes.

File:

• uspace/lib/drv/include/ops/nic.h (modified) (2 diffs)

uspace/lib/drv/include/ops/nic.h

@@ -38 +38 @@
 
 #include <ipc/services.h>
-#include <net/device.h>
+#include <nic/nic.h>
 #include <sys/time.h>
 
@@ -46 +46 @@
         /** Mandatory methods */
         int (*send_frame)(ddf_fun_t *, void *, size_t);
-        int (*connect_to_nil)(ddf_fun_t *, services_t, nic_device_id_t);
+        int (*callback_create)(ddf_fun_t *);
         int (*get_state)(ddf_fun_t *, nic_device_state_t *);
         int (*set_state)(ddf_fun_t *, nic_device_state_t);