Changeset 15d0046 in mainline for uspace/srv/hid/input/port/ski.c

Timestamp:

2014-09-12T13:22:33Z (10 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

9b20126

Parents:

8db09e4 (diff), 105d8d6 (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/input/port/ski.c (modified) (4 diffs)

uspace/srv/hid/input/port/ski.c

@@ -45 +45 @@
 
 static int ski_port_init(kbd_dev_t *);
-static void ski_port_yield(void);
-static void ski_port_reclaim(void);
 static void ski_port_write(uint8_t data);
 
 kbd_port_ops_t ski_port = {
         .init = ski_port_init,
-        .yield = ski_port_yield,
-        .reclaim = ski_port_reclaim,
         .write = ski_port_write
 };
@@ -64 +60 @@
 static void ski_thread_impl(void *arg);
 static int32_t ski_getchar(void);
-
-static volatile bool polling_disabled = false;
 
 /** Initialize Ski port driver. */
@@ -83 +77 @@
 }
 
-static void ski_port_yield(void)
-{
-        polling_disabled = true;
-}
-
-static void ski_port_reclaim(void)
-{
-        polling_disabled = false;
-}
-
 static void ski_port_write(uint8_t data)
 {
@@ -105 +89 @@
 
         while (1) {
-                while (polling_disabled == false) {
+                while (1) {
                         c = ski_getchar();
                         if (c == 0)
                                 break;
+                        
                         kbd_push_data(kbd_dev, c);
                 }