Changeset 03362fbd in mainline for uspace/srv/hid/input/stroke.h

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/stroke.h (moved) (moved from uspace/srv/hid/input/include/stroke.h ) (3 diffs)

uspace/srv/hid/input/stroke.h

@@ -28 +28 @@
 
 /** @addtogroup inputgen generic
- * @brief       Generic scancode parser.
- * @ingroup  input
+ * @brief Generic scancode parser.
+ * @ingroup input
  * @{
- */ 
+ */
 /** @file
  */
@@ -38 +38 @@
 #define KBD_STROKE_H_
 
-#include <kbd.h>
+#include "kbd.h"
 
 extern void stroke_sim(kbd_dev_t *, unsigned, unsigned);
@@ -46 +46 @@
 /**
  * @}
- */ 
-
+ */