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

Timestamp:

2017-10-17T13:11:35Z (8 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/fb/fb.c (modified) (3 diffs)

kernel/genarch/src/fb/fb.c

@@ -34 +34 @@
  */
 
+#include <assert.h>
+#include <debug.h>
 #include <genarch/fb/font-8x16.h>
 #include <genarch/fb/fb.h>
@@ -43 +45 @@
 #include <align.h>
 #include <panic.h>
-#include <memstr.h>
+#include <mem.h>
 #include <config.h>
 #include <bitops.h>
@@ -511 +513 @@
 outdev_t *fb_init(fb_properties_t *props)
 {
-        ASSERT(props);
-        ASSERT(props->x > 0);
-        ASSERT(props->y > 0);
-        ASSERT(props->scan > 0);
+        assert(props);
+        assert(props->x > 0);
+        assert(props->y > 0);
+        assert(props->scan > 0);
         
         rgb_conv_t rgb_conv;