Changeset 63e27ef in mainline for kernel/arch/ia32

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/ia32/src

Files:

• ddi/ddi.c (modified) (2 diffs)
• interrupt.c (modified) (2 diffs)
• smp/apic.c (modified) (2 diffs)
• smp/mps.c (modified) (4 diffs)
• smp/smp.c (modified) (5 diffs)

kernel/arch/ia32/src/ddi/ddi.c

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

kernel/arch/ia32/src/interrupt.c

@@ -34 +34 @@
 
 #include <arch/interrupt.h>
+#include <assert.h>
 #include <syscall/syscall.h>
 #include <print.h>
@@ -183 +184 @@
 static void irq_interrupt(unsigned int n, istate_t *istate __attribute__((unused)))
 {
-        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);

kernel/arch/ia32/src/smp/apic.c

@@ -38 +38 @@
 #include <arch/smp/mps.h>
 #include <arch/boot/boot.h>
+#include <assert.h>
 #include <mm/page.h>
 #include <time/delay.h>
@@ -492 +493 @@
         
         /* Program Logical Destination Register. */
-        ASSERT(CPU->id < 8);
+        assert(CPU->id < 8);
         ldr_t ldr;
         

kernel/arch/ia32/src/smp/mps.c

@@ -37 +37 @@
 #include <config.h>
 #include <log.h>
-#include <debug.h>
 #include <arch/smp/mps.h>
 #include <arch/smp/apic.h>
 #include <arch/smp/smp.h>
+#include <assert.h>
 #include <func.h>
 #include <typedefs.h>
@@ -74 +74 @@
 static uint8_t mps_cpu_apic_id(size_t i)
 {
-        ASSERT(i < processor_entry_cnt);
+        assert(i < processor_entry_cnt);
         
         return processor_entries[i].l_apic_id;
@@ -81 +81 @@
 static bool mps_cpu_enabled(size_t i)
 {
-        ASSERT(i < processor_entry_cnt);
+        assert(i < processor_entry_cnt);
         
         /*
@@ -96 +96 @@
 static bool mps_cpu_bootstrap(size_t i)
 {
-        ASSERT(i < processor_entry_cnt);
+        assert(i < processor_entry_cnt);
         
         return (bool) ((processor_entries[i].cpu_flags & 0x02) == 0x02);

kernel/arch/ia32/src/smp/smp.c

@@ -38 +38 @@
 #include <arch/smp/ap.h>
 #include <arch/boot/boot.h>
+#include <assert.h>
 #include <genarch/acpi/acpi.h>
 #include <genarch/acpi/madt.h>
@@ -45 +46 @@
 #include <func.h>
 #include <panic.h>
-#include <debug.h>
 #include <arch/asm.h>
 #include <mm/page.h>
@@ -83 +83 @@
 static void cpu_arch_id_init(void)
 {
-        ASSERT(ops != NULL);
-        ASSERT(cpus != NULL);
+        assert(ops != NULL);
+        assert(cpus != NULL);
         
         for (unsigned int i = 0; i < config.cpu_count; ++i) {
@@ -102 +102 @@
         unsigned int i;
         
-        ASSERT(ops != NULL);
+        assert(ops != NULL);
 
         /*
@@ -191 +191 @@
 int smp_irq_to_pin(unsigned int irq)
 {
-        ASSERT(ops != NULL);
+        assert(ops != NULL);
         return ops->irq_to_pin(irq);
 }