diff options
author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2008-11-07 16:59:36 +0000 |
---|---|---|
committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2008-11-07 16:59:36 +0000 |
commit | 2c9001b17ff62f61be1677ebd789f081324fe326 (patch) | |
tree | 9d7a5cc564361a837742534250d3527a06d62081 /nuttx/arch/arm | |
parent | a113aa53d96d039d28e3e54ba79b2aae6a524ca5 (diff) | |
download | px4-nuttx-2c9001b17ff62f61be1677ebd789f081324fe326.tar.gz px4-nuttx-2c9001b17ff62f61be1677ebd789f081324fe326.tar.bz2 px4-nuttx-2c9001b17ff62f61be1677ebd789f081324fe326.zip |
reconcile architectures w/o interrupt controllers
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@1153 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/arch/arm')
-rw-r--r-- | nuttx/arch/arm/include/str71x/irq.h | 2 | ||||
-rw-r--r-- | nuttx/arch/arm/src/str71x/str71x_irq.c | 4 | ||||
-rw-r--r-- | nuttx/arch/arm/src/str71x/str71x_timerisr.c | 2 |
3 files changed, 3 insertions, 5 deletions
diff --git a/nuttx/arch/arm/include/str71x/irq.h b/nuttx/arch/arm/include/str71x/irq.h index d68b3779f..ecb1dcc95 100644 --- a/nuttx/arch/arm/include/str71x/irq.h +++ b/nuttx/arch/arm/include/str71x/irq.h @@ -110,8 +110,6 @@ extern "C" { * Public Functions ************************************************************************************/ -EXTERN int up_irqpriority(int irq, ubyte priority); /* Set interrupt priority (0-15) */ - #undef EXTERN #ifdef __cplusplus } diff --git a/nuttx/arch/arm/src/str71x/str71x_irq.c b/nuttx/arch/arm/src/str71x/str71x_irq.c index 2093ecc7f..1c243f460 100644 --- a/nuttx/arch/arm/src/str71x/str71x_irq.c +++ b/nuttx/arch/arm/src/str71x/str71x_irq.c @@ -169,14 +169,14 @@ void up_maskack_irq(int irq) } /**************************************************************************** - * Name: up_irqpriority + * Name: up_prioritize_irq * * Description: * set interrupt priority * ****************************************************************************/ -int up_irqpriority(int irq, ubyte priority) +int up_prioritize_irq(int irq, int priority) { uint32 addr; uint32 reg32; diff --git a/nuttx/arch/arm/src/str71x/str71x_timerisr.c b/nuttx/arch/arm/src/str71x/str71x_timerisr.c index 571d67de2..f6b709e60 100644 --- a/nuttx/arch/arm/src/str71x/str71x_timerisr.c +++ b/nuttx/arch/arm/src/str71x/str71x_timerisr.c @@ -184,7 +184,7 @@ void up_timerinit(void) /* Set the IRQ interrupt priority */ - up_irqpriority(STR71X_IRQ_SYSTIMER, 1); + up_prioritize_irq(STR71X_IRQ_SYSTIMER, 1); /* Attach the timer interrupt vector */ |