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

Timestamp:

2012-06-29T13:02:14Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

722912e

Parents:

ba72f2b (diff), 0bbd13e (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

Trivial conflicts.

File:

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

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

@@ -37 +37 @@
 #define LIBDRV_OPS_NIC_H_
 
-#include <net/packet.h>
 #include <ipc/services.h>
-#include <net/device.h>
+#include <nic/nic.h>
 #include <sys/time.h>
-
 #include "../ddf/driver.h"
 
 typedef struct nic_iface {
         /** Mandatory methods */
-        int (*send_message)(ddf_fun_t *, packet_id_t);
-        int (*connect_to_nil)(ddf_fun_t *, services_t, nic_device_id_t);
+        int (*send_frame)(ddf_fun_t *, void *, size_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);
@@ -89 +87 @@
         int (*vlan_get_mask)(ddf_fun_t *, nic_vlan_mask_t *);
         int (*vlan_set_mask)(ddf_fun_t *, const nic_vlan_mask_t *);
-        int (*vlan_set_tag)(ddf_fun_t *, uint16_t, int, int);
+        int (*vlan_set_tag)(ddf_fun_t *, uint16_t, bool, bool);
         
         int (*wol_virtue_add)(ddf_fun_t *, nic_wv_type_t, const void *,