diff options
author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2011-11-03 01:58:55 +0000 |
---|---|---|
committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2011-11-03 01:58:55 +0000 |
commit | 7cda77d3020afa4b87f26e8a4783e35f4d8b4d69 (patch) | |
tree | 34cdd5a3e48e529a1e8eca4042eb8cb7e6f05705 | |
parent | 2d0ffd63b07bb871c30aec7d9fc19964c142985e (diff) | |
download | nuttx-7cda77d3020afa4b87f26e8a4783e35f4d8b4d69.tar.gz nuttx-7cda77d3020afa4b87f26e8a4783e35f4d8b4d69.tar.bz2 nuttx-7cda77d3020afa4b87f26e8a4783e35f4d8b4d69.zip |
fix some register typing
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@4080 42af7a65-404d-4744-a932-0658087f49c3
-rwxr-xr-x | nuttx/arch/mips/include/mips32/irq.h | 2 | ||||
-rwxr-xr-x | nuttx/arch/mips/include/pic32mx/irq.h | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/nuttx/arch/mips/include/mips32/irq.h b/nuttx/arch/mips/include/mips32/irq.h index 27f55beba..ed6cd37f6 100755 --- a/nuttx/arch/mips/include/mips32/irq.h +++ b/nuttx/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/nuttx/arch/mips/include/pic32mx/irq.h b/nuttx/arch/mips/include/pic32mx/irq.h index e4c39e36e..24ccef867 100755 --- a/nuttx/arch/mips/include/pic32mx/irq.h +++ b/nuttx/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" |