Changeset efdfebc in mainline for uspace/srv/hid/remcons/user.c

Timestamp:

2012-11-06T21:03:44Z (11 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

338810f

Parents:

de73242 (diff), 94795812 (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.c (modified) (3 diffs)

uspace/srv/hid/remcons/user.c

@@ -35 +35 @@
 #include <stdio.h>
 #include <adt/prodcons.h>
-#include <ipc/input.h>
-#include <ipc/console.h>
-#include <ipc/vfs.h>
 #include <errno.h>
 #include <str_error.h>
@@ -95 +92 @@
         user->locsrv_connection_count = 0;
 
-
+        user->cursor_x = 0;
+
+        return user;
+}
+
+void telnet_user_add(telnet_user_t *user)
+{
         fibril_mutex_lock(&users_guard);
         list_append(&user->link, &users);
         fibril_mutex_unlock(&users_guard);
-
-        user->cursor_x = 0;
-
-        return user;
 }
 
@@ -199 +198 @@
                 if ((recv_length == 0) || (recv_length == ENOTCONN)) {
                         user->socket_closed = true;
+                        user->srvs.aborted = true;
                         return ENOENT;
                 }