lkml.org 
[lkml]   [2007]   [Dec]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Date
    Subject[PATCH 11/47] Minor fixes to CRISv32 irq defines.
    - Include files using <>
    - Change NR_REAL_IRQS to be calculated from the other defines.
    - Set MACH_IRQS depending on the value of NR_REAL_IRQS.
    - Remove unused mask parameter to BUILD_IRQ macro.

    Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>
    ---
    include/asm-cris/arch-v32/irq.h | 15 ++++++++++-----
    1 files changed, 10 insertions(+), 5 deletions(-)

    diff --git a/include/asm-cris/arch-v32/irq.h b/include/asm-cris/arch-v32/irq.h
    index bac94ee..9e4c9fb 100644
    --- a/include/asm-cris/arch-v32/irq.h
    +++ b/include/asm-cris/arch-v32/irq.h
    @@ -1,12 +1,17 @@
    #ifndef _ASM_ARCH_IRQ_H
    #define _ASM_ARCH_IRQ_H

    -#include "hwregs/intr_vect.h"
    +#include <hwregs/intr_vect.h>

    /* Number of non-cpu interrupts. */
    -#define NR_IRQS 0x50 /* Exceptions + IRQs */
    -#define NR_REAL_IRQS 0x20 /* IRQs */
    +#define NR_IRQS NBR_INTR_VECT /* Exceptions + IRQs */
    #define FIRST_IRQ 0x31 /* Exception number for first IRQ */
    +#define NR_REAL_IRQS (NBR_INTR_VECT - FIRST_IRQ) /* IRQs */
    +#if NR_REAL_IRQS > 32
    +#define MACH_IRQS 64
    +#else
    +#define MACH_IRQS 32
    +#endif

    #ifndef __ASSEMBLY__
    /* Global IRQ vector. */
    @@ -73,7 +78,7 @@ void set_exception_vector(int n, irqvectptr addr);
    * which will acknowledge the interrupt, is run. The actual blocking is made
    * by crisv32_do_IRQ.
    */
    -#define BUILD_IRQ(nr, mask) \
    +#define BUILD_IRQ(nr) \
    void IRQ_NAME(nr); \
    __asm__ ( \
    ".text\n\t" \
    @@ -81,7 +86,7 @@ __asm__ ( \
    SAVE_ALL \
    KGDB_FIXUP \
    "move.d "#nr",$r10\n\t" \
    - "move.d $sp,$r12\n\t" \
    + "move.d $sp, $r12\n\t" \
    "jsr crisv32_do_IRQ\n\t" \
    "moveq 1, $r11\n\t" \
    "jump ret_from_intr\n\t" \
    --
    1.5.3.6.970.gd25430


    \
     
     \ /
      Last update: 2007-12-06 16:11    [W:0.026 / U:61.256 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site