Changeset 95c675b in mainline for kernel/genarch/src/kbrd/kbrd_at.c

Timestamp:

2017-10-17T13:11:35Z (7 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

60af4cdb

Parents:

dbf32b1 (diff), a416d070 (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

File:

• kernel/genarch/src/kbrd/kbrd_at.c (modified) (2 diffs)

kernel/genarch/src/kbrd/kbrd_at.c

@@ -35 +35 @@
  */
 
+#include <assert.h>
 #include <genarch/kbrd/kbrd.h>
 #include <genarch/kbrd/scanc.h>
@@ -192 +193 @@
 indev_t *kbrd_wire(kbrd_instance_t *instance, indev_t *sink)
 {
-        ASSERT(instance);
-        ASSERT(sink);
+        assert(instance);
+        assert(sink);
         
         instance->sink = sink;