Changeset 03362fbd in mainline for uspace/srv/hid/input/port/niagara.c

Timestamp:

2013-02-09T23:14:45Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

22dfd38

Parents:

b5d2e57 (diff), 005b765 (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.

Conflict resulting from bool.h → stdbool.h move and ddf structs turning opaque.
Fails to boot to shell console.

File:

• uspace/srv/hid/input/port/niagara.c (modified) (2 diffs)

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

@@ -31 +31 @@
  * @ingroup  kbd
  * @{
- */ 
+ */
 /** @file
- * @brief       Niagara console keyboard port driver.
+ * @brief Niagara console keyboard port driver.
  */
 
@@ -39 +39 @@
 #include <ddi.h>
 #include <async.h>
-#include <kbd.h>
-#include <kbd_port.h>
 #include <sysinfo.h>
 #include <stdio.h>
 #include <thread.h>
-#include <bool.h>
+#include <stdbool.h>
 #include <errno.h>
+#include "../kbd_port.h"
+#include "../kbd.h"
 
 static int niagara_port_init(kbd_dev_t *);