Changeset 63e27ef in mainline for kernel/generic/src/console

Timestamp:

2017-06-19T21:47:42Z (8 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

deacc58d

Parents:

7354b5e

Message:

ASSERT → assert

Location:

kernel/generic/src/console

Files:

• chardev.c (modified) (2 diffs)
• cmd.c (modified) (3 diffs)
• console.c (modified) (2 diffs)
• kconsole.c (modified) (2 diffs)
• prompt.c (modified) (3 diffs)

kernel/generic/src/console/chardev.c

@@ -33 +33 @@
  */
 
+#include <assert.h>
 #include <adt/list.h>
 #include <console/chardev.h>
@@ -66 +67 @@
 void indev_push_character(indev_t *indev, wchar_t ch)
 {
-        ASSERT(indev);
+        assert(indev);
         
         irq_spinlock_lock(&indev->lock, true);

kernel/generic/src/console/cmd.c

@@ -41 +41 @@
  */
 
+#include <assert.h>
 #include <console/cmd.h>
 #include <console/console.h>
@@ -54 +55 @@
 #include <str.h>
 #include <macros.h>
-#include <debug.h>
 #include <cpu.h>
 #include <mm/tlb.h>
@@ -917 +917 @@
 int cmd_uptime(cmd_arg_t *argv)
 {
-        ASSERT(uptime);
+        assert(uptime);
         
         /* This doesn't have to be very accurate */

kernel/generic/src/console/console.c

@@ -34 +34 @@
  */
 
+#include <assert.h>
 #include <console/console.h>
 #include <console/chardev.h>
@@ -189 +190 @@
         void *faddr = (void *) KA2PA(kio);
         
-        ASSERT((uintptr_t) faddr % FRAME_SIZE == 0);
+        assert((uintptr_t) faddr % FRAME_SIZE == 0);
         
         kio_parea.pbase = (uintptr_t) faddr;

kernel/generic/src/console/kconsole.c

@@ -39 +39 @@
  */
 
+#include <assert.h>
 #include <console/kconsole.h>
 #include <console/console.h>
@@ -633 +634 @@
     size_t *start, size_t *end)
 {
-        ASSERT(start != NULL);
-        ASSERT(end != NULL);
+        assert(start != NULL);
+        assert(end != NULL);
         
         bool found_start = false;

kernel/generic/src/console/prompt.c

@@ -37 +37 @@
  */
 
+#include <assert.h>
 #include <console/prompt.h>
 
@@ -49 +50 @@
 bool console_prompt_display_all_hints(indev_t *indev, size_t hints)
 {
-        ASSERT(indev);
-        ASSERT(hints > 0);
+        assert(indev);
+        assert(hints > 0);
         
         printf("Display all %zu possibilities? (y or n) ", hints);
@@ -81 +82 @@
 bool console_prompt_more_hints(indev_t *indev, size_t *display_hints)
 {
-        ASSERT(indev);
-        ASSERT(display_hints != NULL);
+        assert(indev);
+        assert(display_hints != NULL);
         
         printf("--More--");