lupyuen/local-nuttx-update
1
0
Fork 0
forked from nuttx/nuttx-update
Code Pull requests Activity

Need to improve error detection

Browse source 
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@992 42af7a65-404d-4744-a932-0658087f49c3
This commit is contained in:
patacongo 2008-10-07 20:44:00 +00:00
parent c538e14adf
commit 3ade50f7e4
1 changed files with 46 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

82
drivers/serial.c
View file

@ -403,51 +403,61 @@ static int uart_open(FAR struct file *filep)
/* More than 255 opens; ubyte overflows to zero */
ret = -EMFILE;
goto errout_with_sem;
}
else
/* Check if this is the first time that the driver has been opened. */
if (tmp == 1)
{
/* Check if this is the first time that the driver has been opened. */
irqstate_t flags = irqsave();
if (tmp == 1)
/* If this is the console, then the UART has already been initialized. */
if (!dev->isconsole)
{
irqstate_t flags = irqsave();
/* Perform one time hardware initialization */
/* If this is the console, then the UART has already been initialized. */
if (!dev->isconsole)
ret = uart_setup(dev);
if (ret < 0)
{
/* Perform one time hardware initialization */
uart_setup(dev);
goto errout_with_irqsdisabled;
}
/* In any event, we do have to configure for interrupt driven mode of
* operation. Attach the hardware IRQ(s). Hmm.. should shutdown() the
* the device in the rare case that uart_attach() fails, tmp==1, and
* this is not the console.
*/
ret = uart_attach(dev);
if (ret == OK)
{
/* Mark the io buffers empty */
dev->xmit.head = 0;
dev->xmit.tail = 0;
dev->recv.head = 0;
dev->recv.tail = 0;
/* Enable the RX interrupt */
uart_enablerxint(dev);
/* Save the new open count on success */
dev->open_count = tmp;
}
irqrestore(flags);
}
/* In any event, we do have to configure for interrupt driven mode of
* operation. Attach the hardware IRQ(s). Hmm.. should shutdown() the
* the device in the rare case that uart_attach() fails, tmp==1, and
* this is not the console.
*/
ret = uart_attach(dev);
if (ret < 0)
{
uart_shutdown(dev);
goto errout_with_irqsdisabled;
}
/* Mark the io buffers empty */
dev->xmit.head = 0;
dev->xmit.tail = 0;
dev->recv.head = 0;
dev->recv.tail = 0;
/* Enable the RX interrupt */
uart_enablerxint(dev);
/* Save the new open count on success */
dev->open_count = tmp;
errout_with_irqsdisabled:
irqrestore(flags);
}
errout_with_sem:
uart_givesem(&dev->closesem);
return ret;
}