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

Timestamp:

2012-09-07T08:12:05Z (12 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

e0c836e8

Parents:

131d9a4 (diff), 8cf4823 (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/hid/remcons/user.h (modified) (3 diffs)

uspace/srv/hid/remcons/user.h

@@ -36 +36 @@
 #define TELNET_USER_H_
 
+#include <adt/prodcons.h>
 #include <fibril_synch.h>
 #include <inttypes.h>
+#include <io/con_srv.h>
 #include "remcons.h"
 
@@ -55 +57 @@
         /** Path name of the service. */
         char *service_name;
+        /** Console service setup */
+        con_srvs_t srvs;
 
         /** Producer-consumer of kbd_event_t. */
@@ -77 +81 @@
 
 extern telnet_user_t *telnet_user_create(int);
+extern void telnet_user_add(telnet_user_t *);
 extern void telnet_user_destroy(telnet_user_t *);
 extern telnet_user_t *telnet_user_get_for_client_connection(service_id_t);