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

Timestamp:

2011-08-03T17:34:57Z (13 years ago)

Author:

Oleg Romanenko <romanenko.oleg@…>

Branches:

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

Children:

1940326

Parents:

52a79081 (diff), 3fab770 (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 from mainline

File:

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

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

@@ -38 +38 @@
 #define NET_ETH_H_
 
+#include <async.h>
 #include <fibril_synch.h>
 #include <ipc/services.h>
-
 #include <net/device.h>
 #include <adt/measured_strings.h>
@@ -223 +223 @@
         /** Device driver service. */
         services_t service;
-        /** Driver phone. */
-        int phone;
+        /** Driver session. */
+        async_sess_t *sess;
         /** Maximal transmission unit. */
         size_t mtu;
@@ -248 +248 @@
         /** Protocol identifier. */
         int protocol;
-        /** Protocol module phone. */
-        int phone;
+        /** Protocol module session. */
+        async_sess_t *sess;
 };
 
 /** Ethernet global data. */
 struct eth_globals {
-        /** Networking module phone. */
-        int net_phone;
+        /** Networking module session. */
+        async_sess_t *net_sess;
         /** Safety lock for devices. */
         fibril_rwlock_t devices_lock;
@@ -265 +265 @@
         /**
          * Protocol map.
-         * Service phone map for each protocol.
+         * Service map for each protocol.
          */
         eth_protos_t protos;