Changeset 6a44ee4 in mainline for uspace/srv/net/nil/nildummy/nildummy.h

Timestamp:

2011-07-20T15:26:21Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

efcebe1

Parents:

25bef0ff (diff), a701812 (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/srv/net/nil/nildummy/nildummy.h (modified) (3 diffs)

uspace/srv/net/nil/nildummy/nildummy.h

@@ -38 +38 @@
 #define NET_NILDUMMY_H_
 
+#include <async.h>
 #include <fibril_synch.h>
 #include <ipc/services.h>
-
 #include <net/device.h>
 #include <adt/measured_strings.h>
@@ -81 +81 @@
         services_t service;
         
-        /** Driver phone. */
-        int phone;
+        /** Driver session. */
+        async_sess_t *sess;
         
         /** Maximal transmission unit. */
@@ -99 +99 @@
         services_t service;
         
-        /** Protocol module phone. */
-        int phone;
+        /** Protocol module session. */
+        async_sess_t *sess;
 };
 
 /** Dummy nil global data. */
 struct nildummy_globals {
-        /** Networking module phone. */
-        int net_phone;
+        /** Networking module session. */
+        async_sess_t *net_sess;
         
         /** Lock for devices. */