Changeset 8565a42 in mainline for kernel/arch/arm32/src/exception.c


Ignore:
Timestamp:
2018-03-02T20:34:50Z (7 years ago)
Author:
GitHub <noreply@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
a1a81f69, d5e5fd1
Parents:
3061bc1 (diff), 34e1206 (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.
git-author:
Jiří Zárevúcky <zarevucky.jiri@…> (2018-03-02 20:34:50)
git-committer:
GitHub <noreply@…> (2018-03-02 20:34:50)
Message:

Remove all trailing whitespace, everywhere.

See individual commit messages for details.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • kernel/arch/arm32/src/exception.c

    r3061bc1 r8565a42  
    7171        volatile uint32_t handler_address_ptr = EXC_VECTORS_SIZE -
    7272            PREFETCH_OFFSET;
    73        
     73
    7474        /* make it LDR instruction and store at exception vector */
    7575        *vector = handler_address_ptr | LDR_OPCODE;
    7676        smc_coherence(vector);
    77        
     77
    7878        /* store handler's address */
    7979        *(vector + EXC_VECTORS) = handler_addr;
     
    9999        install_handler((unsigned) reset_exception_entry,
    100100            (unsigned *) EXC_RESET_VEC);
    101        
     101
    102102        install_handler((unsigned) undef_instr_exception_entry,
    103103            (unsigned *) EXC_UNDEF_INSTR_VEC);
    104        
     104
    105105        install_handler((unsigned) swi_exception_entry,
    106106            (unsigned *) EXC_SWI_VEC);
    107        
     107
    108108        install_handler((unsigned) prefetch_abort_exception_entry,
    109109            (unsigned *) EXC_PREFETCH_ABORT_VEC);
    110        
     110
    111111        install_handler((unsigned) data_abort_exception_entry,
    112112            (unsigned *) EXC_DATA_ABORT_VEC);
    113        
     113
    114114        install_handler((unsigned) irq_exception_entry,
    115115            (unsigned *) EXC_IRQ_VEC);
    116        
     116
    117117        install_handler((unsigned) fiq_exception_entry,
    118118            (unsigned *) EXC_FIQ_VEC);
     
    140140{
    141141        uint32_t control_reg = SCTLR_read();
    142        
     142
    143143        /* switch on the high vectors bit */
    144144        control_reg |= SCTLR_HIGH_VECTORS_EN_FLAG;
    145        
     145
    146146        SCTLR_write(control_reg);
    147147}
     
    190190#endif
    191191        install_exception_handlers();
    192        
     192
    193193        exc_register(EXC_UNDEF_INSTR, "undefined instruction", true,
    194194            (iroutine_t) undef_insn_exception);
Note: See TracChangeset for help on using the changeset viewer.