Changeset 63e27ef in mainline for kernel/arch/ia32


Ignore:
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:
5 edited

Legend:

Unmodified
Added
Removed
  • kernel/arch/ia32/src/ddi/ddi.c

    r7354b5e r63e27ef  
    3535#include <ddi/ddi.h>
    3636#include <arch/ddi/ddi.h>
     37#include <assert.h>
    3738#include <proc/task.h>
    3839#include <stddef.h>
     
    6364       
    6465        if (elements > 0) {
    65                 ASSERT(TASK->arch.iomap.bits);
     66                assert(TASK->arch.iomap.bits);
    6667               
    6768                bitmap_t iomap;
  • kernel/arch/ia32/src/interrupt.c

    r7354b5e r63e27ef  
    3434
    3535#include <arch/interrupt.h>
     36#include <assert.h>
    3637#include <syscall/syscall.h>
    3738#include <print.h>
     
    183184static void irq_interrupt(unsigned int n, istate_t *istate __attribute__((unused)))
    184185{
    185         ASSERT(n >= IVT_IRQBASE);
     186        assert(n >= IVT_IRQBASE);
    186187       
    187188        unsigned int inum = n - IVT_IRQBASE;
    188189        bool ack = false;
    189         ASSERT(inum < IRQ_COUNT);
    190         ASSERT((inum != IRQ_PIC_SPUR) && (inum != IRQ_PIC1));
     190        assert(inum < IRQ_COUNT);
     191        assert((inum != IRQ_PIC_SPUR) && (inum != IRQ_PIC1));
    191192       
    192193        irq_t *irq = irq_dispatch_and_lock(inum);
  • kernel/arch/ia32/src/smp/apic.c

    r7354b5e r63e27ef  
    3838#include <arch/smp/mps.h>
    3939#include <arch/boot/boot.h>
     40#include <assert.h>
    4041#include <mm/page.h>
    4142#include <time/delay.h>
     
    492493       
    493494        /* Program Logical Destination Register. */
    494         ASSERT(CPU->id < 8);
     495        assert(CPU->id < 8);
    495496        ldr_t ldr;
    496497       
  • kernel/arch/ia32/src/smp/mps.c

    r7354b5e r63e27ef  
    3737#include <config.h>
    3838#include <log.h>
    39 #include <debug.h>
    4039#include <arch/smp/mps.h>
    4140#include <arch/smp/apic.h>
    4241#include <arch/smp/smp.h>
     42#include <assert.h>
    4343#include <func.h>
    4444#include <typedefs.h>
     
    7474static uint8_t mps_cpu_apic_id(size_t i)
    7575{
    76         ASSERT(i < processor_entry_cnt);
     76        assert(i < processor_entry_cnt);
    7777       
    7878        return processor_entries[i].l_apic_id;
     
    8181static bool mps_cpu_enabled(size_t i)
    8282{
    83         ASSERT(i < processor_entry_cnt);
     83        assert(i < processor_entry_cnt);
    8484       
    8585        /*
     
    9696static bool mps_cpu_bootstrap(size_t i)
    9797{
    98         ASSERT(i < processor_entry_cnt);
     98        assert(i < processor_entry_cnt);
    9999       
    100100        return (bool) ((processor_entries[i].cpu_flags & 0x02) == 0x02);
  • kernel/arch/ia32/src/smp/smp.c

    r7354b5e r63e27ef  
    3838#include <arch/smp/ap.h>
    3939#include <arch/boot/boot.h>
     40#include <assert.h>
    4041#include <genarch/acpi/acpi.h>
    4142#include <genarch/acpi/madt.h>
     
    4546#include <func.h>
    4647#include <panic.h>
    47 #include <debug.h>
    4848#include <arch/asm.h>
    4949#include <mm/page.h>
     
    8383static void cpu_arch_id_init(void)
    8484{
    85         ASSERT(ops != NULL);
    86         ASSERT(cpus != NULL);
     85        assert(ops != NULL);
     86        assert(cpus != NULL);
    8787       
    8888        for (unsigned int i = 0; i < config.cpu_count; ++i) {
     
    102102        unsigned int i;
    103103       
    104         ASSERT(ops != NULL);
     104        assert(ops != NULL);
    105105
    106106        /*
     
    191191int smp_irq_to_pin(unsigned int irq)
    192192{
    193         ASSERT(ops != NULL);
     193        assert(ops != NULL);
    194194        return ops->irq_to_pin(irq);
    195195}
Note: See TracChangeset for help on using the changeset viewer.