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

Merged nuttx/arch into master

Browse Source
This commit is contained in:
Pierre-noel Bouteville 2015-09-23 22:52:37 +02:00
commit 53fbd6b4ec
4 changed files with 5 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
arch/arm/include/armv6-m/irq.h
View File

@ -311,17 +311,6 @@ static inline uint32_t getipsr(void)
return ipsr;
}
static inline void setipsr(uint32_t ipsr) inline_function;
static inline void setipsr(uint32_t ipsr)
{
__asm__ __volatile__
(
"\tmsr ipsr, %0\n"
:
: "r" (ipsr)
: "memory");
}
/* Get/set CONTROL */
static inline uint32_t getcontrol(void) inline_function;

11
arch/arm/include/armv7-m/irq.h
View File

@ -327,17 +327,6 @@ static inline uint32_t getipsr(void)
return ipsr;
}
static inline void setipsr(uint32_t ipsr) inline_function;
static inline void setipsr(uint32_t ipsr)
{
__asm__ __volatile__
(
"\tmsr ipsr, %0\n"
:
: "r" (ipsr)
: "memory");
}
/* Get/set CONTROL */
static inline uint32_t getcontrol(void) inline_function;

2
arch/arm/include/stm32f7/stm32f74xx75xx_irq.h
View File

@ -157,7 +157,7 @@
#define STM32_IRQ_LTDCINT (STM32_IRQ_FIRST+88) /* 88: LCD-TFT global interrupt */
#define STM32_IRQ_LTDCERRINT (STM32_IRQ_FIRST+89) /* 89: LCD-TFT global Error interrupt */
#define STM32_IRQ_DMA2D (STM32_IRQ_FIRST+90) /* 90: DMA2D global interrupt */
#define STM32_IRQ_SAI1 (STM32_IRQ_FIRST+91) /* 91: SAI2 global interrupt */
#define STM32_IRQ_SAI2 (STM32_IRQ_FIRST+91) /* 91: SAI2 global interrupt */
#define STM32_IRQ_QUADSPI (STM32_IRQ_FIRST+92) /* 92: QuadSPI global interrupt */
#define STM32_IRQ_LPTIMER1 (STM32_IRQ_FIRST+93) /* 93: LP Timer1 global interrupt */
#define STM32_IRQ_HDMICEC (STM32_IRQ_FIRST+94) /* 94: HDMI-CEC global interrupt */

8
arch/arm/src/stm32f7/stm32_uart.h
View File

@ -51,16 +51,16 @@
* device.
*/
#if CONFIG_STM32F7_ < 4
#if STM32F7_NUART < 4
# undef CONFIG_STM32F7_UART8
#endif
#if CONFIG_STM32F7_ < 4
#if STM32F7_NUART < 3
# undef CONFIG_STM32F7_UART7
#endif
#if CONFIG_STM32F7_ < 3
#if STM32F7_NUART < 2
# undef CONFIG_STM32F7_UART5
#endif
#if CONFIG_STM32F7_ < 1
#if STM32F7_NUART < 1
# undef CONFIG_STM32F7_UART4
#endif