sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add irqsave/restore() macros for Cortex-M3

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@1758 42af7a65-404d-4744-a932-0658087f49c3
This commit is contained in:
patacongo 2009-05-07 15:59:13 +00:00
parent aeffecb3ce
commit e89052dfab
2 changed files with 55 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
arch/arm/include/irq.h
View File

@ -1,7 +1,7 @@
/****************************************************************************
* arch/arm/include/irq.h
*
* Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved.
* Copyright (C) 2007-2009 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <spudmonkey@racsa.co.cr>
*
* Redistribution and use in source and binary forms, with or without
@ -33,8 +33,8 @@
*
****************************************************************************/
/* This file should never be included directed but, rather,
* only indirectly through nuttx/irq.h
/* This file should never be included directed but, rather, only indirectly
* through nuttx/irq.h
*/
#ifndef __ARCH_ARM_INCLUDE_IRQ_H
@ -157,6 +157,49 @@ struct xcptcontext
#ifndef __ASSEMBLY__
#ifdef __thumb2__
/* Save the current interrupt enable state & disable IRQs */
static inline irqstate_t irqsave(void)
{
unsigned short primask;
/* Return the the current value of primask register and set
* bit 0 of the primask register to disable interrupts
*/
__asm__ __volatile__
(
"\tmrs %0, primask\n"
"\tcpsid i\n"
: "=r" (primask)
:
: "memory");
return primask;
}
/* Restore saved IRQ & FIQ state */
static inline void irqrestore(irqstate_t primask)
{
/* If bit 0 of the primask is 0, then we need to restore
* interupts.
*/
__asm__ __volatile__
(
"\ttst %0, #1\n"
"\tbne 1f\n"
"\tcpsie i\n"
"1:\n"
:
: "r" (primask)
: "memory");
}
#else /* __thumb2__ */
/* Save the current interrupt enable state & disable IRQs */
static inline irqstate_t irqsave(void)
@ -201,7 +244,8 @@ static inline void system_call(swint_t func, int parm1,
"r" ((long)(parm2)), "r" ((long)(parm3))
: "r0", "r1", "r2", "r3", "lr");
}
#endif
#endif /* __thumb2__ */
#endif /* __ASSEMBLY__ */
/****************************************************************************
* Public Variables

9
arch/arm/include/types.h
View File

@ -67,11 +67,16 @@ typedef unsigned int uint32;
typedef long long sint64;
typedef unsigned long long uint64;
/* This is the size of the interrupt state save returned by
* irqsave()
/* This is the size of the interrupt state save returned by irqsave(). For
* ARM, a 32 register value is returned, for the thumb2, Cortex-M3, the 16-bit
* primask register value is returned,
*/
#ifdef __thumb2__
typedef unsigned short irqstate_t;
#else /* __thumb2__ */
typedef unsigned int irqstate_t;
#endif /* __thumb2__ */
#endif /* __ASSEMBLY__ */