Changeset 948911d in mainline for uspace/srv/net/nil/eth/eth.h

Timestamp:

2012-01-24T02:27:43Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

230385c

Parents:

8afeb04 (diff), 2df6f6fe (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:

Mainline changes.

File:

• uspace/srv/net/nil/eth/eth.h (modified) (2 diffs)

uspace/srv/net/nil/eth/eth.h

@@ -41 +41 @@
 #include <async.h>
 #include <fibril_synch.h>
+#include <ipc/loc.h>
 #include <ipc/services.h>
 #include <net/device.h>
 #include <adt/measured_strings.h>
-#include <devman.h>
 
 /** Ethernet address length. */
@@ -224 +224 @@
         nic_device_id_t device_id;
         /** Device handle */
-        devman_handle_t handle;
+        service_id_t sid;
         /** Driver session. */
         async_sess_t *sess;