Changeset 63e27ef in mainline for kernel/arch/amd64/src

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/arch/amd64/src

Files:

• ddi/ddi.c (modified) (2 diffs)
• interrupt.c (modified) (2 diffs)

kernel/arch/amd64/src/ddi/ddi.c

@@ -35 +35 @@
 #include <ddi/ddi.h>
 #include <arch/ddi/ddi.h>
+#include <assert.h>
 #include <proc/task.h>
 #include <adt/bitmap.h>
@@ -63 +64 @@
         
         if (elements > 0) {
-                ASSERT(TASK->arch.iomap.bits);
+                assert(TASK->arch.iomap.bits);
                 
                 bitmap_t iomap;

kernel/arch/amd64/src/interrupt.c

@@ -34 +34 @@
 
 #include <arch/interrupt.h>
+#include <assert.h>
 #include <print.h>
 #include <log.h>
-#include <debug.h>
 #include <panic.h>
 #include <arch/drivers/i8259.h>
@@ -175 +175 @@
 static void irq_interrupt(unsigned int n, istate_t *istate)
 {
-        ASSERT(n >= IVT_IRQBASE);
+        assert(n >= IVT_IRQBASE);
         
         unsigned int inum = n - IVT_IRQBASE;
         bool ack = false;
-        ASSERT(inum < IRQ_COUNT);
-        ASSERT((inum != IRQ_PIC_SPUR) && (inum != IRQ_PIC1));
+        assert(inum < IRQ_COUNT);
+        assert((inum != IRQ_PIC_SPUR) && (inum != IRQ_PIC1));
         
         irq_t *irq = irq_dispatch_and_lock(inum);