Changeset 95c675b in mainline for kernel/arch/amd64/src/interrupt.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/arch/amd64/src/interrupt.c (modified) (2 diffs)

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);