From 29e4049e45b72b50455d8ab6eeb9a81d8a81c3b4 Mon Sep 17 00:00:00 2001 From: patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> Date: Thu, 3 Nov 2011 01:58:55 +0000 Subject: [PATCH] fix some register typing git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@4080 42af7a65-404d-4744-a932-0658087f49c3 --- arch/mips/include/mips32/irq.h | 2 +- arch/mips/include/pic32mx/irq.h | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/arch/mips/include/mips32/irq.h b/arch/mips/include/mips32/irq.h index 27f55beba5..ed6cd37f64 100755 --- a/arch/mips/include/mips32/irq.h +++ b/arch/mips/include/mips32/irq.h @@ -414,7 +414,7 @@ static inline void cp0_putstatus(irqstate_t status) static inline uint32_t cp0_getcause(void) { - register irqstate_t cause; + register uint32_t cause; __asm__ __volatile__ ( "\t.set push\n" diff --git a/arch/mips/include/pic32mx/irq.h b/arch/mips/include/pic32mx/irq.h index e4c39e36ea..24ccef8670 100755 --- a/arch/mips/include/pic32mx/irq.h +++ b/arch/mips/include/pic32mx/irq.h @@ -83,14 +83,14 @@ static inline uint32_t cp0_getintctl(void) { - register irqstate_t ebase; + register uint32_t intctl; __asm__ __volatile__ ( "\t.set push\n" "\t.set noat\n" "\t mfc0 %0, $12, 1\n" /* Get CP0 IntCtl register */ "\t.set pop\n" - : "=r" (ebase) + : "=r" (intctl) : : "memory" ); @@ -112,7 +112,7 @@ static inline uint32_t cp0_getintctl(void) * ****************************************************************************/ -static inline void cp0_putintctl(uint32_t ebase) +static inline void cp0_putintctl(uint32_t intctl) { __asm__ __volatile__ ( @@ -122,7 +122,7 @@ static inline void cp0_putintctl(uint32_t ebase) "\tmtc0 %0, $12, 1\n" /* Set the IntCtl to the provided value */ "\t.set pop\n" : - : "r" (ebase) + : "r" (intctl) : "memory" ); } @@ -143,7 +143,7 @@ static inline void cp0_putintctl(uint32_t ebase) static inline uint32_t cp0_getebase(void) { - register irqstate_t ebase; + register uint32_t ebase; __asm__ __volatile__ ( "\t.set push\n" -- GitLab