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

Fix major bug in STM32 interrupt enable/disable logic; NSH now works on STM32

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@2149 42af7a65-404d-4744-a932-0658087f49c3
This commit is contained in:
patacongo 2009-10-17 20:42:37 +00:00
parent 1ff8e5dda9
commit 94fca00261
4 changed files with 30 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
arch/arm/src/lm3s/lm3s_irq.c
View File

@ -61,7 +61,7 @@
* bringup * bringup
*/ */
#undef LM2S_IRQ_DEBUG #undef LM3S_IRQ_DEBUG
/* Get a 32-bit version of the default priority */ /* Get a 32-bit version of the default priority */
@ -93,7 +93,7 @@ uint32 *current_regs;
* *
****************************************************************************/ ****************************************************************************/
#if defined(LM2S_IRQ_DEBUG) && defined (CONFIG_DEBUG) #if defined(LM3S_IRQ_DEBUG) && defined (CONFIG_DEBUG)
static void lm3s_dumpnvic(const char *msg, int irq) static void lm3s_dumpnvic(const char *msg, int irq)
{ {
irqstate_t flags; irqstate_t flags;
@ -197,7 +197,7 @@ static int lm3s_reserved(int irq, FAR void *context)
#endif #endif
/**************************************************************************** /****************************************************************************
* Name: lml3s_irqinfo * Name: lm3s_irqinfo
* *
* Description: * Description:
* Given an IRQ number, provide the register and bit setting to enable or * Given an IRQ number, provide the register and bit setting to enable or
@ -205,7 +205,7 @@ static int lm3s_reserved(int irq, FAR void *context)
* *
****************************************************************************/ ****************************************************************************/
static int lml3s_irqinfo(int irq, uint32 *regaddr, uint32 *bit) static int lm3s_irqinfo(int irq, uint32 *regaddr, uint32 *bit)
{ {
DEBUGASSERT(irq >= LM3S_IRQ_NMI && irq < NR_IRQS); DEBUGASSERT(irq >= LM3S_IRQ_NMI && irq < NR_IRQS);
@ -367,7 +367,7 @@ void up_disable_irq(int irq)
uint32 regval; uint32 regval;
uint32 bit; uint32 bit;
if (lml3s_irqinfo(irq, &regaddr, &bit) == 0) if (lm3s_irqinfo(irq, &regaddr, &bit) == 0)
{ {
/* Clear the appropriate bit in the register to enable the interrupt */ /* Clear the appropriate bit in the register to enable the interrupt */
@ -392,7 +392,7 @@ void up_enable_irq(int irq)
uint32 regval; uint32 regval;
uint32 bit; uint32 bit;
if (lml3s_irqinfo(irq, &regaddr, &bit) == 0) if (lm3s_irqinfo(irq, &regaddr, &bit) == 0)
{ {
/* Set the appropriate bit in the register to enable the interrupt */ /* Set the appropriate bit in the register to enable the interrupt */

26
arch/arm/src/stm32/stm32_irq.c
View File

@ -61,7 +61,7 @@
* bringup * bringup
*/ */
#undef LM2S_IRQ_DEBUG #undef STM32_IRQ_DEBUG
/* Get a 32-bit version of the default priority */ /* Get a 32-bit version of the default priority */
@ -93,7 +93,7 @@ uint32 *current_regs;
* *
****************************************************************************/ ****************************************************************************/
#if defined(LM2S_IRQ_DEBUG) && defined (CONFIG_DEBUG) #if defined(STM32_IRQ_DEBUG) && defined (CONFIG_DEBUG)
static void stm32_dumpnvic(const char *msg, int irq) static void stm32_dumpnvic(const char *msg, int irq)
{ {
irqstate_t flags; irqstate_t flags;
@ -107,8 +107,9 @@ static void stm32_dumpnvic(const char *msg, int irq)
getreg32(NVIC_SYSHCON_MEMFAULTENA), getreg32(NVIC_SYSHCON_BUSFAULTENA), getreg32(NVIC_SYSHCON_MEMFAULTENA), getreg32(NVIC_SYSHCON_BUSFAULTENA),
getreg32(NVIC_SYSHCON_USGFAULTENA), getreg32(NVIC_SYSTICK_CTRL_ENABLE)); getreg32(NVIC_SYSHCON_USGFAULTENA), getreg32(NVIC_SYSTICK_CTRL_ENABLE));
#endif #endif
slldbg(" IRQ ENABLE: %08x %08x\n", slldbg(" IRQ ENABLE: %08x %08x %08x\n",
getreg32(NVIC_IRQ0_31_ENABLE), getreg32(NVIC_IRQ32_63_ENABLE)); getreg32(NVIC_IRQ0_31_ENABLE), getreg32(NVIC_IRQ32_63_ENABLE),
getreg32(NVIC_IRQ64_95_ENABLE));
slldbg(" SYSH_PRIO: %08x %08x %08x\n", slldbg(" SYSH_PRIO: %08x %08x %08x\n",
getreg32(NVIC_SYSH4_7_PRIORITY), getreg32(NVIC_SYSH8_11_PRIORITY), getreg32(NVIC_SYSH4_7_PRIORITY), getreg32(NVIC_SYSH8_11_PRIORITY),
getreg32(NVIC_SYSH12_15_PRIORITY)); getreg32(NVIC_SYSH12_15_PRIORITY));
@ -121,6 +122,11 @@ static void stm32_dumpnvic(const char *msg, int irq)
slldbg(" %08x %08x %08x %08x\n", slldbg(" %08x %08x %08x %08x\n",
getreg32(NVIC_IRQ32_35_PRIORITY), getreg32(NVIC_IRQ36_39_PRIORITY), getreg32(NVIC_IRQ32_35_PRIORITY), getreg32(NVIC_IRQ36_39_PRIORITY),
getreg32(NVIC_IRQ40_43_PRIORITY), getreg32(NVIC_IRQ44_47_PRIORITY)); getreg32(NVIC_IRQ40_43_PRIORITY), getreg32(NVIC_IRQ44_47_PRIORITY));
slldbg(" %08x %08x %08x %08x\n",
getreg32(NVIC_IRQ48_51_PRIORITY), getreg32(NVIC_IRQ52_55_PRIORITY),
getreg32(NVIC_IRQ56_59_PRIORITY), getreg32(NVIC_IRQ60_63_PRIORITY));
slldbg(" %08x\n",
getreg32(NVIC_IRQ64_67_PRIORITY));
irqrestore(flags); irqrestore(flags);
} }
#else #else
@ -197,7 +203,7 @@ static int stm32_reserved(int irq, FAR void *context)
#endif #endif
/**************************************************************************** /****************************************************************************
* Name: lml3s_irqinfo * Name: stm32_irqinfo
* *
* Description: * Description:
* Given an IRQ number, provide the register and bit setting to enable or * Given an IRQ number, provide the register and bit setting to enable or
@ -205,7 +211,7 @@ static int stm32_reserved(int irq, FAR void *context)
* *
****************************************************************************/ ****************************************************************************/
static int lml3s_irqinfo(int irq, uint32 *regaddr, uint32 *bit) static int stm32_irqinfo(int irq, uint32 *regaddr, uint32 *bit)
{ {
DEBUGASSERT(irq >= STM32_IRQ_NMI && irq < NR_IRQS); DEBUGASSERT(irq >= STM32_IRQ_NMI && irq < NR_IRQS);
@ -220,8 +226,8 @@ static int lml3s_irqinfo(int irq, uint32 *regaddr, uint32 *bit)
} }
if (irq < STM32_IRQ_INTERRUPTS + 64) if (irq < STM32_IRQ_INTERRUPTS + 64)
{ {
*regaddr = NVIC_IRQ0_31_ENABLE; *regaddr = NVIC_IRQ32_63_ENABLE;
*bit = 1 << (irq - STM32_IRQ_INTERRUPTS); *bit = 1 << (irq - STM32_IRQ_INTERRUPTS - 32);
} }
else if (irq < NR_IRQS) else if (irq < NR_IRQS)
{ {
@ -376,7 +382,7 @@ void up_disable_irq(int irq)
uint32 regval; uint32 regval;
uint32 bit; uint32 bit;
if (lml3s_irqinfo(irq, &regaddr, &bit) == 0) if (stm32_irqinfo(irq, &regaddr, &bit) == 0)
{ {
/* Clear the appropriate bit in the register to enable the interrupt */ /* Clear the appropriate bit in the register to enable the interrupt */
@ -401,7 +407,7 @@ void up_enable_irq(int irq)
uint32 regval; uint32 regval;
uint32 bit; uint32 bit;
if (lml3s_irqinfo(irq, &regaddr, &bit) == 0) if (stm32_irqinfo(irq, &regaddr, &bit) == 0)
{ {
/* Set the appropriate bit in the register to enable the interrupt */ /* Set the appropriate bit in the register to enable the interrupt */

2
arch/arm/src/stm32/stm32_lowputc.c
View File

@ -218,7 +218,7 @@
void up_lowputc(char ch) void up_lowputc(char ch)
{ {
#ifdef HAVE_CONSOLE #ifdef HAVE_CONSOLE
/* Wait until the TX FIFO is not full */ /* Wait until the TX data register is empty */
while ((getreg32(STM32_CONSOLE_BASE + STM32_USART_SR_OFFSET) & USART_SR_TXE) == 0); while ((getreg32(STM32_CONSOLE_BASE + STM32_USART_SR_OFFSET) & USART_SR_TXE) == 0);

14
arch/arm/src/stm32/stm32_serial.c
View File

@ -413,8 +413,8 @@ static inline void up_disableusartint(struct up_dev_s *priv, uint16 *ie)
* Name: up_setup * Name: up_setup
* *
* Description: * Description:
* Configure the USART baud, bits, parity, fifos, etc. This method is * Configure the USART baud, bits, parity, etc. This method is called the
* called the first time that the serial port is opened. * first time that the serial port is opened.
* *
****************************************************************************/ ****************************************************************************/
@ -824,8 +824,8 @@ static void up_rxint(struct uart_dev_s *dev, boolean enable)
ie = priv->ie; ie = priv->ie;
if (enable) if (enable)
{ {
/* Receive an interrupt when their is anything in the Rx FIFO (or an Rx /* Receive an interrupt when their is anything in the Rx data register (or an Rx
* timeout occurs. * timeout occurs).
*/ */
#ifndef CONFIG_SUPPRESS_SERIAL_INTS #ifndef CONFIG_SUPPRESS_SERIAL_INTS
@ -850,7 +850,7 @@ static void up_rxint(struct uart_dev_s *dev, boolean enable)
* Name: up_rxavailable * Name: up_rxavailable
* *
* Description: * Description:
* Return TRUE if the receive fifo is not empty * Return TRUE if the receive register is not empty
* *
****************************************************************************/ ****************************************************************************/
@ -899,7 +899,7 @@ static void up_txint(struct uart_dev_s *dev, boolean enable)
flags = irqsave(); flags = irqsave();
if (enable) if (enable)
{ {
/* Set to receive an interrupt when the TX fifo is half emptied */ /* Set to receive an interrupt when the TX data register is empty */
#ifndef CONFIG_SUPPRESS_SERIAL_INTS #ifndef CONFIG_SUPPRESS_SERIAL_INTS
up_restoreusartint(priv, priv->ie | USART_CR1_TXEIE); up_restoreusartint(priv, priv->ie | USART_CR1_TXEIE);
@ -924,7 +924,7 @@ static void up_txint(struct uart_dev_s *dev, boolean enable)
* Name: up_txready * Name: up_txready
* *
* Description: * Description:
* Return TRUE if the tranmsit fifo is not full * Return TRUE if the tranmsit data register is empty
* *
****************************************************************************/ ****************************************************************************/