Changeset fb4d788 in mainline for uspace/srv/hid/remcons/user.h

Timestamp:

2015-07-28T11:28:14Z (10 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

6accc5cf

Parents:

df2bce32 (diff), 47726b5e (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 the mainline

File:

• uspace/srv/hid/remcons/user.h (modified) (3 diffs)

uspace/srv/hid/remcons/user.h

@@ -38 +38 @@
 #include <adt/prodcons.h>
 #include <fibril_synch.h>
+#include <inet/tcp.h>
 #include <inttypes.h>
 #include <io/con_srv.h>
@@ -51 +52 @@
         /** Internal id, used for creating locfs entries. */
         int id;
-        /** Associated socket. */
-        int socket;
+        /** Associated connection. */
+        tcp_conn_t *conn;
         /** Location service id assigned to the virtual terminal. */
         service_id_t service_id;
@@ -80 +81 @@
 } telnet_user_t;
 
-extern telnet_user_t *telnet_user_create(int);
+extern telnet_user_t *telnet_user_create(tcp_conn_t *);
 extern void telnet_user_add(telnet_user_t *);
 extern void telnet_user_destroy(telnet_user_t *);