mirror of
https://github.com/apache/nuttx.git
synced 2026-05-21 04:52:02 +08:00
sama5/serial: correct usage of USE_SERIALDRIVER and USE_EARLYSERIALINIT
Also fix the following build warning:
chip/sam_serialinit.c: In function 'sam_earlyserialinit':
chip/sam_serialinit.c:71:4: warning: implicit declaration of function 'uart_earlyserialinit'; did you mean 'sam_earlyserialinit'? [-Wimplicit-function-declaration]
71 | uart_earlyserialinit();
| ^~~~~~~~~~~~~~~~~~~~
| sam_earlyserialinit
Change-Id: I93adc5be739c222482b552b6e143e44c8c047794
Signed-off-by: liuhaitao <liuhaitao@xiaomi.com>
This commit is contained in:
liuhaitao
patacongo
@@ -384,7 +384,7 @@ static uart_dev_t g_flexus2port =
|
||||
{
|
||||
.size = CONFIG_USART2_TXBUFSIZE,
|
||||
.buffer = g_flexus2txbuffer,
|
||||
},
|
||||
},
|
||||
.ops = &g_flexus_ops,
|
||||
.priv = &g_flexus2priv,
|
||||
};
|
||||
@@ -417,7 +417,7 @@ static uart_dev_t g_flexus3port =
|
||||
{
|
||||
.size = CONFIG_USART3_TXBUFSIZE,
|
||||
.buffer = g_flexus3txbuffer,
|
||||
},
|
||||
},
|
||||
.ops = &g_flexus_ops,
|
||||
.priv = &g_flexus3priv,
|
||||
};
|
||||
@@ -450,7 +450,7 @@ static uart_dev_t g_flexus4port =
|
||||
{
|
||||
.size = CONFIG_USART4_TXBUFSIZE,
|
||||
.buffer = g_flexus4txbuffer,
|
||||
},
|
||||
},
|
||||
.ops = &g_flexus_ops,
|
||||
.priv = &g_flexus4priv,
|
||||
};
|
||||
@@ -553,8 +553,8 @@ static int flexus_interrupt(int irq, void *context, FAR void *arg)
|
||||
imr = flexus_serialin(priv, SAM_FLEXUS_IMR_OFFSET); /* Interrupt mask */
|
||||
pending = priv->sr & imr; /* Mask out disabled interrupt sources */
|
||||
|
||||
/* Handle an incoming, receive byte. RXRDY: At least one complete character
|
||||
* has been received and US_RHR has not yet been read.
|
||||
/* Handle an incoming, receive byte. RXRDY: At least one complete
|
||||
* character has been received and US_RHR has not yet been read.
|
||||
*/
|
||||
|
||||
if ((pending & FLEXUS_INT_RXRDY) != 0)
|
||||
@@ -605,17 +605,18 @@ static int flexus_setup(struct uart_dev_s *dev)
|
||||
flexus_shutdown(dev);
|
||||
|
||||
#if defined(CONFIG_SERIAL_IFLOWCONTROL) || defined(CONFIG_SERIAL_OFLOWCONTROL)
|
||||
/* "Setting the USART to operate with hardware handshaking is performed by
|
||||
* writing the USART_MODE field in the Mode Register (US_MR) to the value
|
||||
* 0x2. ... Using this mode requires using the PDC or DMAC channel for
|
||||
* reception. The transmitter can handle hardware handshaking in any case."
|
||||
/* Setting the USART to operate with hardware handshaking is performed by
|
||||
* writing the USART_MODE field in the Mode Register (US_MR) to the value
|
||||
* 0x2. ... Using this mode requires using the PDC or DMAC channel for
|
||||
* reception. The transmitter can handle hardware handshaking in any case.
|
||||
*/
|
||||
|
||||
if (priv->flowc)
|
||||
{
|
||||
/* Enable hardware flow control and MCK as the timing source */
|
||||
|
||||
regval = (FLEXUS_MR_MODE_HWHS | SAM_MR_USCLKS | FLEXUS_MR_CHMODE_NORMAL);
|
||||
regval = (FLEXUS_MR_MODE_HWHS | SAM_MR_USCLKS |
|
||||
FLEXUS_MR_CHMODE_NORMAL);
|
||||
}
|
||||
else
|
||||
#endif
|
||||
@@ -624,7 +625,8 @@ static int flexus_setup(struct uart_dev_s *dev)
|
||||
* as the timing source
|
||||
*/
|
||||
|
||||
regval = (FLEXUS_MR_MODE_NORMAL | SAM_MR_USCLKS | FLEXUS_MR_CHMODE_NORMAL);
|
||||
regval = (FLEXUS_MR_MODE_NORMAL | SAM_MR_USCLKS |
|
||||
FLEXUS_MR_CHMODE_NORMAL);
|
||||
}
|
||||
|
||||
/* OR in settings for the selected number of bits */
|
||||
@@ -689,7 +691,8 @@ static int flexus_setup(struct uart_dev_s *dev)
|
||||
|
||||
/* Enable receiver & transmitter */
|
||||
|
||||
flexus_serialout(priv, SAM_FLEXUS_CR_OFFSET, (FLEXUS_CR_RXEN | FLEXUS_CR_TXEN));
|
||||
flexus_serialout(priv, SAM_FLEXUS_CR_OFFSET,
|
||||
FLEXUS_CR_RXEN | FLEXUS_CR_TXEN);
|
||||
#endif
|
||||
return OK;
|
||||
}
|
||||
@@ -722,14 +725,15 @@ static void flexus_shutdown(struct uart_dev_s *dev)
|
||||
* Name: flexus_attach
|
||||
*
|
||||
* Description:
|
||||
* Configure the USART to operation in interrupt driven mode. This method is
|
||||
* called when the serial port is opened. Normally, this is just after the
|
||||
* Configure the USART to operation in interrupt driven mode. This method
|
||||
* is called when the serial port is opened. Normally, this is just after
|
||||
* the setup() method is called, however, the serial console may operate in
|
||||
* a non-interrupt driven mode during the boot phase.
|
||||
*
|
||||
* RX and TX interrupts are not enabled when by the attach method (unless the
|
||||
* hardware supports multiple levels of interrupt enabling). The RX and TX
|
||||
* interrupts are not enabled until the txint() and rxint() methods are called.
|
||||
* RX and TX interrupts are not enabled when by the attach method (unless
|
||||
* the hardware supports multiple levels of interrupt enabling). The RX
|
||||
* and TX interrupts are not enabled until the txint() and rxint() methods
|
||||
* are called.
|
||||
*
|
||||
****************************************************************************/
|
||||
|
||||
@@ -758,7 +762,7 @@ static int flexus_attach(struct uart_dev_s *dev)
|
||||
*
|
||||
* Description:
|
||||
* Detach USART interrupts. This method is called when the serial port is
|
||||
* closed normally just before the shutdown method is called. The exception
|
||||
* closed normally just before the shutdown method is called. The exception
|
||||
* is the serial console which is never shutdown.
|
||||
*
|
||||
****************************************************************************/
|
||||
@@ -856,7 +860,7 @@ static int flexus_ioctl(struct file *filep, int cmd, unsigned long arg)
|
||||
break;
|
||||
|
||||
case 9:
|
||||
termiosp->c_cflag |= CS8 /* CS9 */;
|
||||
termiosp->c_cflag |= CS8; /* CS9 */
|
||||
break;
|
||||
}
|
||||
}
|
||||
@@ -1009,8 +1013,8 @@ static void flexus_rxint(struct uart_dev_s *dev, bool enable)
|
||||
|
||||
if (enable)
|
||||
{
|
||||
/* Receive an interrupt when their is anything in the Rx data register (or an Rx
|
||||
* timeout occurs).
|
||||
/* Receive an interrupt when their is anything in the Rx data register
|
||||
* (or an Rx timeout occurs).
|
||||
*/
|
||||
|
||||
#ifndef CONFIG_SUPPRESS_SERIAL_INTS
|
||||
@@ -1034,7 +1038,8 @@ static void flexus_rxint(struct uart_dev_s *dev, bool enable)
|
||||
static bool flexus_rxavailable(struct uart_dev_s *dev)
|
||||
{
|
||||
struct flexus_dev_s *priv = (struct flexus_dev_s *)dev->priv;
|
||||
return ((flexus_serialin(priv, SAM_FLEXUS_CSR_OFFSET) & FLEXUS_INT_RXRDY) != 0);
|
||||
uint32_t value = flexus_serialin(priv, SAM_FLEXUS_CSR_OFFSET);
|
||||
return (value & FLEXUS_INT_RXRDY) != 0;
|
||||
}
|
||||
|
||||
/****************************************************************************
|
||||
@@ -1103,7 +1108,8 @@ static void flexus_txint(struct uart_dev_s *dev, bool enable)
|
||||
static bool flexus_txready(struct uart_dev_s *dev)
|
||||
{
|
||||
struct flexus_dev_s *priv = (struct flexus_dev_s *)dev->priv;
|
||||
return ((flexus_serialin(priv, SAM_FLEXUS_CSR_OFFSET) & FLEXUS_INT_TXRDY) != 0);
|
||||
uint32_t value = flexus_serialin(priv, SAM_FLEXUS_CSR_OFFSET);
|
||||
return (value & FLEXUS_INT_TXRDY) != 0;
|
||||
}
|
||||
|
||||
/****************************************************************************
|
||||
@@ -1117,13 +1123,16 @@ static bool flexus_txready(struct uart_dev_s *dev)
|
||||
static bool flexus_txempty(struct uart_dev_s *dev)
|
||||
{
|
||||
struct flexus_dev_s *priv = (struct flexus_dev_s *)dev->priv;
|
||||
return ((flexus_serialin(priv, SAM_FLEXUS_CSR_OFFSET) & FLEXUS_INT_TXEMPTY) != 0);
|
||||
uint32_t value = flexus_serialin(priv, SAM_FLEXUS_CSR_OFFSET);
|
||||
return (value & FLEXUS_INT_TXEMPTY) != 0;
|
||||
}
|
||||
|
||||
/****************************************************************************
|
||||
* Public Functions
|
||||
****************************************************************************/
|
||||
|
||||
#ifdef USE_EARLYSERIALINIT
|
||||
|
||||
/****************************************************************************
|
||||
* Name: flexus_earlyserialinit
|
||||
*
|
||||
@@ -1145,7 +1154,8 @@ void flexus_earlyserialinit(void)
|
||||
#ifdef TTYFC0_DEV
|
||||
/* Select USART mode for the Flexcom */
|
||||
|
||||
flexus_serialout(TTYFC0_DEV.priv, SAM_FLEX_MR_OFFSET, FLEX_MR_OPMODE_USART);
|
||||
flexus_serialout(TTYFC0_DEV.priv,
|
||||
SAM_FLEX_MR_OFFSET, FLEX_MR_OPMODE_USART);
|
||||
|
||||
/* Disable the USART */
|
||||
|
||||
@@ -1154,7 +1164,8 @@ void flexus_earlyserialinit(void)
|
||||
#ifdef TTYFC1_DEV
|
||||
/* Select USART mode for the Flexcom */
|
||||
|
||||
flexus_serialout(TTYFC1_DEV.priv, SAM_FLEX_MR_OFFSET, FLEX_MR_OPMODE_USART);
|
||||
flexus_serialout(TTYFC1_DEV.priv,
|
||||
SAM_FLEX_MR_OFFSET, FLEX_MR_OPMODE_USART);
|
||||
|
||||
/* Disable the USART */
|
||||
|
||||
@@ -1163,7 +1174,8 @@ void flexus_earlyserialinit(void)
|
||||
#ifdef TTYFC2_DEV
|
||||
/* Select USART mode for the Flexcom */
|
||||
|
||||
flexus_serialout(TTYFC2_DEV.priv, SAM_FLEX_MR_OFFSET, FLEX_MR_OPMODE_USART);
|
||||
flexus_serialout(TTYFC2_DEV.priv,
|
||||
SAM_FLEX_MR_OFFSET, FLEX_MR_OPMODE_USART);
|
||||
|
||||
/* Disable the USART */
|
||||
|
||||
@@ -1172,7 +1184,8 @@ void flexus_earlyserialinit(void)
|
||||
#ifdef TTYFC3_DEV
|
||||
/* Select USART mode for the Flexcom */
|
||||
|
||||
flexus_serialout(TTYFC3_DEV.priv, SAM_FLEX_MR_OFFSET, FLEX_MR_OPMODE_USART);
|
||||
flexus_serialout(TTYFC3_DEV.priv,
|
||||
SAM_FLEX_MR_OFFSET, FLEX_MR_OPMODE_USART);
|
||||
|
||||
/* Disable the USART */
|
||||
|
||||
@@ -1181,7 +1194,8 @@ void flexus_earlyserialinit(void)
|
||||
#ifdef TTYFC4_DEV
|
||||
/* Select USART mode for the Flexcom */
|
||||
|
||||
flexus_serialout(TTYFC4_DEV.priv, SAM_FLEX_MR_OFFSET, FLEX_MR_OPMODE_USART);
|
||||
flexus_serialout(TTYFC4_DEV.priv,
|
||||
SAM_FLEX_MR_OFFSET, FLEX_MR_OPMODE_USART);
|
||||
|
||||
/* Disable the USART */
|
||||
|
||||
@@ -1195,6 +1209,7 @@ void flexus_earlyserialinit(void)
|
||||
flexus_setup(&CONSOLE_DEV);
|
||||
#endif
|
||||
}
|
||||
#endif
|
||||
|
||||
/****************************************************************************
|
||||
* Name: flexus_serialinit
|
||||
|
||||
@@ -807,7 +807,7 @@ static uart_dev_t g_usart2port =
|
||||
{
|
||||
.size = CONFIG_USART2_TXBUFSIZE,
|
||||
.buffer = g_usart2txbuffer,
|
||||
},
|
||||
},
|
||||
.ops = &g_uart_ops,
|
||||
.priv = &g_usart2priv,
|
||||
};
|
||||
@@ -840,7 +840,7 @@ static uart_dev_t g_usart3port =
|
||||
{
|
||||
.size = CONFIG_USART3_TXBUFSIZE,
|
||||
.buffer = g_usart3txbuffer,
|
||||
},
|
||||
},
|
||||
.ops = &g_uart_ops,
|
||||
.priv = &g_usart3priv,
|
||||
};
|
||||
@@ -873,7 +873,7 @@ static uart_dev_t g_usart4port =
|
||||
{
|
||||
.size = CONFIG_USART4_TXBUFSIZE,
|
||||
.buffer = g_usart4txbuffer,
|
||||
},
|
||||
},
|
||||
.ops = &g_uart_ops,
|
||||
.priv = &g_usart4priv,
|
||||
};
|
||||
@@ -896,7 +896,8 @@ static inline uint32_t up_serialin(struct up_dev_s *priv, int offset)
|
||||
* Name: up_serialout
|
||||
****************************************************************************/
|
||||
|
||||
static inline void up_serialout(struct up_dev_s *priv, int offset, uint32_t value)
|
||||
static inline void up_serialout(struct up_dev_s *priv, int offset,
|
||||
uint32_t value)
|
||||
{
|
||||
putreg32(value, priv->usartbase + offset);
|
||||
}
|
||||
@@ -974,8 +975,8 @@ static int up_interrupt(int irq, void *context, FAR void *arg)
|
||||
imr = up_serialin(priv, SAM_UART_IMR_OFFSET); /* Interrupt mask */
|
||||
pending = priv->sr & imr; /* Mask out disabled interrupt sources */
|
||||
|
||||
/* Handle an incoming, receive byte. RXRDY: At least one complete character
|
||||
* has been received and US_RHR has not yet been read.
|
||||
/* Handle an incoming, receive byte. RXRDY: At least one complete
|
||||
* character has been received and US_RHR has not yet been read.
|
||||
*/
|
||||
|
||||
if ((pending & UART_INT_RXRDY) != 0)
|
||||
@@ -1026,10 +1027,10 @@ static int up_setup(struct uart_dev_s *dev)
|
||||
up_shutdown(dev);
|
||||
|
||||
#if defined(CONFIG_SERIAL_IFLOWCONTROL) || defined(CONFIG_SERIAL_OFLOWCONTROL)
|
||||
/* "Setting the USART to operate with hardware handshaking is performed by
|
||||
* writing the USART_MODE field in the Mode Register (US_MR) to the value
|
||||
* 0x2. ... Using this mode requires using the PDC or DMAC channel for
|
||||
* reception. The transmitter can handle hardware handshaking in any case."
|
||||
/* Setting the USART to operate with hardware handshaking is performed by
|
||||
* writing the USART_MODE field in the Mode Register (US_MR) to the value
|
||||
* 0x2. ... Using this mode requires using the PDC or DMAC channel for
|
||||
* reception. The transmitter can handle hardware handshaking in any case.
|
||||
*/
|
||||
|
||||
if (priv->flowc)
|
||||
@@ -1174,14 +1175,15 @@ static void up_shutdown(struct uart_dev_s *dev)
|
||||
* Name: up_attach
|
||||
*
|
||||
* Description:
|
||||
* Configure the USART to operation in interrupt driven mode. This method is
|
||||
* called when the serial port is opened. Normally, this is just after the
|
||||
* Configure the USART to operation in interrupt driven mode. This method
|
||||
* is called when the serial port is opened. Normally, this is just after
|
||||
* the setup() method is called, however, the serial console may operate in
|
||||
* a non-interrupt driven mode during the boot phase.
|
||||
*
|
||||
* RX and TX interrupts are not enabled when by the attach method (unless the
|
||||
* hardware supports multiple levels of interrupt enabling). The RX and TX
|
||||
* interrupts are not enabled until the txint() and rxint() methods are called.
|
||||
* RX and TX interrupts are not enabled when by the attach method (unless
|
||||
* the hardware supports multiple levels of interrupt enabling). The RX
|
||||
* and TX interrupts are not enabled until the txint() and rxint() methods
|
||||
* are called.
|
||||
*
|
||||
****************************************************************************/
|
||||
|
||||
@@ -1210,7 +1212,7 @@ static int up_attach(struct uart_dev_s *dev)
|
||||
*
|
||||
* Description:
|
||||
* Detach USART interrupts. This method is called when the serial port is
|
||||
* closed normally just before the shutdown method is called. The exception
|
||||
* closed normally just before the shutdown method is called. The exception
|
||||
* is the serial console which is never shutdown.
|
||||
*
|
||||
****************************************************************************/
|
||||
@@ -1308,7 +1310,7 @@ static int up_ioctl(struct file *filep, int cmd, unsigned long arg)
|
||||
break;
|
||||
|
||||
case 9:
|
||||
termiosp->c_cflag |= CS8 /* CS9 */;
|
||||
termiosp->c_cflag |= CS8; /* CS9 */
|
||||
break;
|
||||
}
|
||||
}
|
||||
@@ -1461,8 +1463,8 @@ static void up_rxint(struct uart_dev_s *dev, bool enable)
|
||||
|
||||
if (enable)
|
||||
{
|
||||
/* Receive an interrupt when their is anything in the Rx data register (or an Rx
|
||||
* timeout occurs).
|
||||
/* Receive an interrupt when their is anything in the Rx data register
|
||||
* (or an Rx timeout occurs).
|
||||
*/
|
||||
|
||||
#ifndef CONFIG_SUPPRESS_SERIAL_INTS
|
||||
@@ -1576,6 +1578,8 @@ static bool up_txempty(struct uart_dev_s *dev)
|
||||
* Public Functions
|
||||
****************************************************************************/
|
||||
|
||||
#ifdef USE_EARLYSERIALINIT
|
||||
|
||||
/****************************************************************************
|
||||
* Name: uart_earlyserialinit
|
||||
*
|
||||
@@ -1632,6 +1636,7 @@ void uart_earlyserialinit(void)
|
||||
up_setup(&CONSOLE_DEV);
|
||||
#endif
|
||||
}
|
||||
#endif
|
||||
|
||||
/****************************************************************************
|
||||
* Name: uart_serialinit
|
||||
|
||||
@@ -127,7 +127,7 @@ void flexus_earlyserialinit(void);
|
||||
*
|
||||
****************************************************************************/
|
||||
|
||||
#if defined(SAMA5_HAVE_UART) || defined(SAMA5_HAVE_USART)
|
||||
#if defined(USE_SERIALDRIVER) && (defined(SAMA5_HAVE_UART) || defined(SAMA5_HAVE_USART))
|
||||
void uart_serialinit(void);
|
||||
#endif
|
||||
|
||||
@@ -140,7 +140,7 @@ void uart_serialinit(void);
|
||||
*
|
||||
****************************************************************************/
|
||||
|
||||
#if defined(USE_EARLYSERIALINIT) && defined(SAMA5_HAVE_FLEXCOM_USART)
|
||||
#if defined(USE_SERIALDRIVER) && defined(SAMA5_HAVE_FLEXCOM_USART)
|
||||
void flexus_serialinit(void);
|
||||
#endif
|
||||
|
||||
|
||||
@@ -49,6 +49,8 @@
|
||||
* Public Functions
|
||||
****************************************************************************/
|
||||
|
||||
#ifdef USE_EARLYSERIALINIT
|
||||
|
||||
/****************************************************************************
|
||||
* Name: sam_earlyserialinit
|
||||
*
|
||||
@@ -68,7 +70,7 @@ void sam_earlyserialinit(void)
|
||||
#if defined(SAMA5_HAVE_UART) || defined(SAMA5_HAVE_USART)
|
||||
/* Initialize UART/USART drivers */
|
||||
|
||||
uart_earlyserialinit();
|
||||
uart_earlyserialinit();
|
||||
#endif
|
||||
|
||||
#ifdef SAMA5_HAVE_FLEXCOM_USART
|
||||
@@ -77,6 +79,7 @@ void sam_earlyserialinit(void)
|
||||
flexus_earlyserialinit();
|
||||
#endif
|
||||
}
|
||||
#endif
|
||||
|
||||
/****************************************************************************
|
||||
* Name: up_serialinit
|
||||
|
||||
Reference in New Issue
Block a user