Changeset 5cde90f in mainline for uspace/srv/hid/kbd/port/niagara.c

Timestamp:

2010-02-19T17:16:46Z (15 years ago)

Author:

Pavel Rimsky <pavel@…>

Branches:

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

Children:

617652f

Parents:

b86d436 (diff), f41aa81 (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:

Synchronizing with head (which has just been synchronized with this branch).

File:

• uspace/srv/hid/kbd/port/niagara.c (modified) (3 diffs)

uspace/srv/hid/kbd/port/niagara.c

@@ -71 +71 @@
 
 static volatile bool polling_disabled = false;
-static void *niagara_thread_impl(void *arg);
+static void niagara_thread_impl(void *arg);
 
 /**
@@ -136 +136 @@
  * Thread to poll SGCN for keypresses.
  */
-static void *niagara_thread_impl(void *arg)
+static void niagara_thread_impl(void *arg)
 {
         (void) arg;
@@ -145 +145 @@
                 usleep(POLL_INTERVAL);
         }
-        return 0;
 }
 /** @}