fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-25 16:23:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix logic in STM32 SPI driver that leaves interrupts disabled; back out earlier change to irqsave()

Browse Source 
git-svn-id: https://nuttx.svn.sourceforge.net/svnroot/nuttx/trunk@5158 7fd9a85b-ad96-42d3-883c-3090e2eb8679
This commit is contained in:
patacongo
2012-09-15 18:09:50 +00:00
parent 3364b55f86
commit fd63baf0fa
3 changed files with 75 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nuttx/arch/arm/include/armv7-m/irq.h
+58 -46
View File
@@ -129,6 +129,64 @@ struct xcptcontext
#ifndef __ASSEMBLY__
/* Disable IRQs */
static inline void irqdisable(void) __attribute__((always_inline));
static inline void irqdisable(void)
{
__asm__ __volatile__ ("\tcpsid i\n");
}
/* Save the current primask state & disable IRQs */
static inline irqstate_t irqsave(void) __attribute__((always_inline));
static inline irqstate_t irqsave(void)
{
unsigned short primask;
/* Return 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;
}
/* Enable IRQs */
static inline void irqenable(void) __attribute__((always_inline));
static inline void irqenable(void)
{
__asm__ __volatile__ ("\tcpsie i\n");
}
/* Restore saved primask state */
static inline void irqrestore(irqstate_t primask) __attribute__((always_inline));
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");
}
/* Get/set the primask register */
static inline uint8_t getprimask(void) __attribute__((always_inline));
@@ -145,39 +203,6 @@ static inline uint8_t getprimask(void)
return (uint8_t)primask;
}
/* Disable IRQs */
static inline void irqdisable(void) __attribute__((always_inline));
static inline void irqdisable(void)
{
__asm__ __volatile__ ("\tcpsid i\n");
}
/* Save the current primask state & disable IRQs */
static inline irqstate_t irqsave(void) __attribute__((always_inline));
static inline irqstate_t irqsave(void)
{
/* Return the current value of primask register (before disabling) */
uint8_t primask = getprimask();
/* Then set bit 0 of the primask register to disable interrupts */
irqdisable();
return primask;
}
/* Enable IRQs */
static inline void irqenable(void) __attribute__((always_inline));
static inline void irqenable(void)
{
__asm__ __volatile__ ("\tcpsie i\n");
}
/* Restore saved primask state */
static inline void setprimask(uint32_t primask) __attribute__((always_inline));
static inline void setprimask(uint32_t primask)
{
@@ -189,19 +214,6 @@ static inline void setprimask(uint32_t primask)
: "memory");
}
static inline void irqrestore(irqstate_t primask) __attribute__((always_inline));
static inline void irqrestore(irqstate_t primask)
{
/* If bit 0 of the primask is 0, then we need to restore
* interrupts.
*/
if ((primask & 1) == 0)
{
setprimask(primask);
}
}
/* Get/set the basepri register */
static inline uint8_t getbasepri(void) __attribute__((always_inline));