Changeset efdfebc in mainline for uspace/srv/hid/input/port/pl050.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/input/port/pl050.c (modified) (2 diffs)

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

@@ -41 +41 @@
 #include <unistd.h>
 #include <sysinfo.h>
-#include <kbd_port.h>
-#include <kbd.h>
 #include <ddi.h>
 #include <stdio.h>
 #include <errno.h>
+#include "../kbd_port.h"
+#include "../kbd.h"
 
 static int pl050_port_init(kbd_dev_t *);
@@ -80 +80 @@
         },
         {
-                .cmd = CMD_BTEST,
+                .cmd = CMD_AND,
                 .value = PL050_STAT_RXFULL,
                 .srcarg = 1,