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

Timestamp:

2012-01-22T11:53:22Z (14 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/c/include/device/nic.h (modified) (2 diffs)

uspace/lib/c/include/device/nic.h

@@ -39 +39 @@
 #include <net/device.h>
 #include <net/packet.h>
+#include <ipc/common.h>
 #include <ipc/services.h>
 
 typedef enum {
         NIC_SEND_MESSAGE = 0,
-        NIC_CONNECT_TO_NIL,
+        NIC_CALLBACK_CREATE,
         NIC_GET_STATE,
         NIC_SET_STATE,
@@ -85 +86 @@
 } nic_funcs_t;
 
+typedef enum {
+        NIC_EV_ADDR_CHANGED = IPC_FIRST_USER_METHOD,
+        NIC_EV_RECEIVED,
+        NIC_EV_DEVICE_STATE
+} nic_event_t;
+
 extern int nic_send_frame(async_sess_t *, void *, size_t);
-extern int nic_connect_to_nil(async_sess_t *, services_t, nic_device_id_t);
+extern int nic_callback_create(async_sess_t *, nic_device_id_t,
+    async_client_conn_t, void *);
 extern int nic_get_state(async_sess_t *, nic_device_state_t *);
 extern int nic_set_state(async_sess_t *, nic_device_state_t);