Changeset fb4d788 in mainline for uspace/srv/hid/rfb/main.c

Timestamp:

2015-07-28T11:28:14Z (9 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:

df2bce3 (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/rfb/main.c (modified) (2 diffs)

uspace/srv/hid/rfb/main.c

@@ -150 +150 @@
 }
 
-static int socket_fibril(void *unused)
-{
-        rfb_accept(&rfb);
-        
-        /* Not reached */
-        return EOK;
-}
-
 int main(int argc, char **argv)
 {
@@ -267 +259 @@
         }
         
-        fid_t fib = fibril_create(socket_fibril, NULL);
-        if (!fib) {
-                fprintf(stderr, NAME ": Unable to create socket fibril.\n");
-                return 2;
-        }
-        
-        fibril_add_ready(fib);
-        
         printf("%s: Accepting connections\n", NAME);
         task_retval(0);