Mirrors_Framework/PX4-Autopilot
1
0
Fork 0
mirror of https://github.com/PX4/PX4-Autopilot.git synced 2026-05-28 19:32:36 +08:00
Code Issues Actions 10 Packages Projects Releases Wiki Activity

Avoid a race where up_putc can leave the driver in an inconsistent state (though how is not clear). This manifests as the system hanging after printing "nsh_romfsetc: "

Browse Source 
Avoid attempting to repeat low-level initialization for the console when enabling DMA.
This commit is contained in:
px4dev
2012-09-14 00:21:24 -07:00
parent d7fb2175eb
commit 04b5856764
1 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nuttx/arch/arm/src/stm32/stm32_serial.c
+14 -10
View File
@@ -956,7 +956,8 @@ static int up_setup(struct uart_dev_s *dev)
/* Set up the cached interrupt enables value */ /* Set up the cached interrupt enables value */
priv->ie = 0; up_restoreusartint(priv, 0);
return OK; return OK;
} }
@@ -976,12 +977,15 @@ static int up_dma_setup(struct uart_dev_s *dev)
int result; int result;
uint32_t regval; uint32_t regval;
/* Do the basic UART setup first */ /* Do the basic UART setup first, unless we are the console */
result = up_setup(dev); if (!dev->isconsole)
if (result != OK) {
{ result = up_setup(dev);
return result; if (result != OK)
{
return result;
}
} }
/* Acquire the DMA channel. This should always succeed. */ /* Acquire the DMA channel. This should always succeed. */
@@ -1941,10 +1945,10 @@ void stm32_serial_dma_poll(void)
int up_putc(int ch) int up_putc(int ch)
{ {
#if CONSOLE_UART > 0 #if CONSOLE_UART > 0
struct up_dev_s *priv = uart_devs[CONSOLE_UART - 1]; // struct up_dev_s *priv = uart_devs[CONSOLE_UART - 1];
uint16_t ie; // uint16_t ie;
up_disableusartint(priv, &ie); // up_disableusartint(priv, &ie);
/* Check for LF */ /* Check for LF */
@@ -1956,7 +1960,7 @@ int up_putc(int ch)
} }
up_lowputc(ch); up_lowputc(ch);
up_restoreusartint(priv, ie); // up_restoreusartint(priv, ie);
#endif #endif
return ch; return ch;
} }