xiaoxiang781216 commented on code in PR #15301:
URL: https://github.com/apache/nuttx/pull/15301#discussion_r1894089252
##########
drivers/serial/uart_pci_16550.c:
##########
@@ -121,6 +121,10 @@ static int pci_u16550_probe(FAR struct pci_device_s *dev);
* Private Data
*****************************************************************************/
+#ifdef CONFIG_16550_PCI_CONSOLE
+static spinlock_t g_uart_pci_lock = SP_UNLOCKED;
Review Comment:
move to pci_u16550_priv_s
##########
drivers/serial/uart_pl011.c:
##########
@@ -248,6 +248,8 @@ static bool pl011_txempty(FAR struct uart_dev_s *dev);
* Private Data
***************************************************************************/
+static spinlock_t g_uart_pl011_lock = SP_UNLOCKED;
Review Comment:
move to pl011_uart_port_s
##########
arch/z80/src/z8/z8_serial.c:
##########
@@ -655,7 +664,15 @@ static void z8_txint(FAR struct uart_dev_s *dev, bool
enable)
}
priv->txenabled = enable;
- leave_critical_section(flags);
+}
+
+static void z8_txint(FAR struct uart_dev_s *dev, bool enable)
+{
+ struct z8_uart_s *priv = (struct z8_uart_s *)dev->priv;
Review Comment:
```suggestion
struct z8_uart_s *priv = (struct z8_uart_s *)dev->priv;
```
##########
arch/z80/src/z8/z8_serial.c:
##########
@@ -599,7 +601,15 @@ static void z8_rxint(FAR struct uart_dev_s *dev, bool
enable)
}
priv->rxenabled = enable;
- leave_critical_section(flags);
+}
+
+static void z8_rxint(FAR struct uart_dev_s *dev, bool enable)
+{
+ struct z8_uart_s *priv = (struct z8_uart_s *)dev->priv;
Review Comment:
```suggestion
struct z8_uart_s *priv = (struct z8_uart_s *)dev->priv;
```
##########
arch/z16/src/z16f/z16f_serial.c:
##########
@@ -507,10 +511,9 @@ static int z16f_receive(struct uart_dev_s *dev, uint32_t
*status)
*
****************************************************************************/
-static void z16f_rxint(struct uart_dev_s *dev, bool enable)
+static void z16f_rxint_nolock(struct uart_dev_s *dev, bool enable)
{
struct z16f_uart_s *priv = (struct z16f_uart_s *)dev->priv;
Review Comment:
```suggestion
struct z16f_uart_s *priv = (struct z16f_uart_s *)dev->priv;
```
##########
arch/z16/src/z16f/z16f_serial.c:
##########
@@ -234,12 +237,13 @@ static uint8_t z16f_disableuartirq(struct uart_dev_s *dev)
static void z16f_restoreuartirq(struct uart_dev_s *dev, uint8_t state)
{
- irqstate_t flags = spin_lock_irqsave(NULL);
+ struct z16f_uart_s *priv = (struct z16f_uart_s *)dev->priv;
Review Comment:
```suggestion
struct z16f_uart_s *priv = (struct z16f_uart_s *)dev->priv;
```
##########
arch/z16/src/z16f/z16f_serial.c:
##########
@@ -587,7 +597,15 @@ static void z16f_txint(struct uart_dev_s *dev, bool enable)
}
priv->txenabled = enable;
- leave_critical_section(flags);
+}
+
+static void z16f_txint(struct uart_dev_s *dev, bool enable)
+{
+ struct z16f_uart_s *priv = (struct z16f_uart_s *)dev->priv;
Review Comment:
```suggestion
struct z16f_uart_s *priv = (struct z16f_uart_s *)dev->priv;
```
##########
arch/z80/src/z8/z8_serial.c:
##########
@@ -582,10 +585,9 @@ static int z8_receive(FAR struct uart_dev_s *dev, FAR
uint32_t *status)
*
****************************************************************************/
-static void z8_rxint(FAR struct uart_dev_s *dev, bool enable)
+static void z8_rxint_nolock(FAR struct uart_dev_s *dev, bool enable)
{
struct z8_uart_s *priv = (struct z8_uart_s *)dev->priv;
Review Comment:
```suggestion
struct z8_uart_s *priv = (struct z8_uart_s *)dev->priv;
```
##########
arch/z80/src/z8/z8_serial.c:
##########
@@ -638,10 +648,9 @@ static void z8_send(FAR struct uart_dev_s *dev, int ch)
*
****************************************************************************/
-static void z8_txint(FAR struct uart_dev_s *dev, bool enable)
+static void z8_txint_nolock(FAR struct uart_dev_s *dev, bool enable)
{
struct z8_uart_s *priv = (struct z8_uart_s *)dev->priv;
Review Comment:
```suggestion
struct z8_uart_s *priv = (struct z8_uart_s *)dev->priv;
```
##########
arch/z16/src/z16f/z16f_serial.c:
##########
@@ -524,7 +527,15 @@ static void z16f_rxint(struct uart_dev_s *dev, bool enable)
}
priv->rxenabled = enable;
- leave_critical_section(flags);
+}
+
+static void z16f_rxint(struct uart_dev_s *dev, bool enable)
+{
+ struct z16f_uart_s *priv = (struct z16f_uart_s *)dev->priv;
Review Comment:
```suggestion
struct z16f_uart_s *priv = (struct z16f_uart_s *)dev->priv;
```
##########
arch/z16/src/z16f/z16f_serial.c:
##########
@@ -564,10 +575,9 @@ static void z16f_send(struct uart_dev_s *dev, int ch)
*
****************************************************************************/
-static void z16f_txint(struct uart_dev_s *dev, bool enable)
+static void z16f_txint_nolock(struct uart_dev_s *dev, bool enable)
{
struct z16f_uart_s *priv = (struct z16f_uart_s *)dev->priv;
Review Comment:
```suggestion
struct z16f_uart_s *priv = (struct z16f_uart_s *)dev->priv;
```
##########
arch/z80/src/z8/z8_serial.c:
##########
@@ -255,16 +258,16 @@ static inline uint8_t z8_getuart(FAR struct z8_uart_s
*priv, uint8_t offset)
static uint8_t z8_disableuartirq(FAR struct uart_dev_s *dev)
{
struct z8_uart_s *priv = (struct z8_uart_s *)dev->priv;
- irqstate_t flags = spin_lock_irqsave(NULL);
+ irqstate_t flags = spin_lock_irqsave(&priv->lock);
Review Comment:
```suggestion
struct z8_uart_s *priv = (struct z8_uart_s *)dev->priv;
irqstate_t flags = spin_lock_irqsave(&priv->lock);
uint8_t state = priv->rxenabled ?
STATE_RXENABLED : STATE_DISABLED | \
priv->txenabled ?
STATE_TXENABLED : STATE_DISABLED;
```
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscr...@nuttx.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
