Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-06-04 23:03:27 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

arch/arm/src/samd2l2 serial: Fix SAMD2L2 serial driver it needs sam_usart_enable() to work

Browse Source
This commit is contained in:
Alan Carvalho de Assis
2019-01-26 12:51:51 -06:00
committed by Gregory Nutt
parent 8763e51583
commit db0b9b7c34
6 changed files with 145 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
arch/arm/src/samd2l2/sam_lowputc.c
+33 -34
View File
@@ -90,7 +90,7 @@
#ifdef SAMD2L2_HAVE_USART
static void
sam_wait_synchronization(const struct sam_usart_config_s * const config)
sam_wait_synchronization(const struct sam_usart_config_s *const config)
{
while (usart_syncbusy(config));
}
@@ -106,7 +106,7 @@ sam_wait_synchronization(const struct sam_usart_config_s * const config)
#ifdef SAMD2L2_HAVE_USART
static inline int
sam_usart_configure(const struct sam_usart_config_s * const config)
sam_usart_configure(const struct sam_usart_config_s *const config)
{
uint32_t ctrla;
uint32_t ctrlb;
@@ -257,7 +257,7 @@ sam_usart_configure(const struct sam_usart_config_s * const config)
#ifdef SAMD2L2_HAVE_USART
static inline void
sam_pad_configure(const struct sam_usart_config_s * const config)
sam_pad_configure(const struct sam_usart_config_s *const config)
{
/* Configure SERCOM pads */
@@ -294,7 +294,7 @@ sam_pad_configure(const struct sam_usart_config_s * const config)
****************************************************************************/
#ifdef SAMD2L2_HAVE_USART
int sam_usart_internal(const struct sam_usart_config_s * const config)
int sam_usart_internal(const struct sam_usart_config_s *const config)
{
#ifdef CONFIG_ARCH_FAMILY_SAML21
int channel;
@@ -339,34 +339,6 @@ int sam_usart_internal(const struct sam_usart_config_s * const config)
}
#endif
/****************************************************************************
* Name: sam_usart_enable
*
* Description:
* Enable the SERCOM USART (without enabling interrupts).
*
****************************************************************************/
#ifdef SAMD2L2_HAVE_USART
static inline void
sam_usart_enable(const struct sam_usart_config_s * const config)
{
uintptr_t regaddr;
uint32_t regval;
/* Wait until synchronization is complete */
sam_wait_synchronization(config);
/* Enable USART module */
regaddr = config->base + SAM_USART_CTRLA_OFFSET;
regval = getreg32(regaddr);
regval |= USART_CTRLA_ENABLE;
putreg32(regval, regaddr);
}
#endif
/****************************************************************************
* Public Functions
****************************************************************************/
@@ -401,7 +373,7 @@ void sam_lowsetup(void)
****************************************************************************/
#ifdef SAMD2L2_HAVE_USART
int sam_usart_initialize(const struct sam_usart_config_s * const config)
int sam_usart_initialize(const struct sam_usart_config_s *const config)
{
irqstate_t flags;
int ret;
@@ -431,7 +403,7 @@ int sam_usart_initialize(const struct sam_usart_config_s * const config)
****************************************************************************/
#ifdef SAMD2L2_HAVE_USART
void sam_usart_reset(const struct sam_usart_config_s * const config)
void sam_usart_reset(const struct sam_usart_config_s *const config)
{
uintptr_t regaddr = config->base + SAM_USART_CTRLA_OFFSET;
uint32_t regval;
@@ -451,6 +423,33 @@ void sam_usart_reset(const struct sam_usart_config_s * const config)
}
#endif
/****************************************************************************
* Name: sam_usart_enable
*
* Description:
* Enable the SERCOM USART (without enabling interrupts).
*
****************************************************************************/
#ifdef SAMD2L2_HAVE_USART
void sam_usart_enable(const struct sam_usart_config_s *const config)
{
uintptr_t regaddr;
uint32_t regval;
/* Wait until synchronization is complete */
sam_wait_synchronization(config);
/* Enable USART module */
regaddr = config->base + SAM_USART_CTRLA_OFFSET;
regval = getreg32(regaddr);
regval |= USART_CTRLA_ENABLE;
putreg32(regval, regaddr);
}
#endif
/****************************************************************************
* Name: sam_lowputc
*
arch/arm/src/samd2l2/sam_lowputc.h
+15 -2
View File
@@ -93,7 +93,7 @@ void sam_lowsetup(void);
#ifdef SAMD2L2_HAVE_USART
struct sam_usart_config_s;
int sam_usart_initialize(const struct sam_usart_config_s * const config);
int sam_usart_initialize(const struct sam_usart_config_s *const config);
#endif
/****************************************************************************
@@ -107,7 +107,20 @@ int sam_usart_initialize(const struct sam_usart_config_s * const config);
#ifdef SAMD2L2_HAVE_USART
struct sam_usart_config_s;
void sam_usart_reset(const struct sam_usart_config_s * const config);
void sam_usart_reset(const struct sam_usart_config_s *const config);
#endif
/****************************************************************************
* Name: sam_usart_enable
*
* Description:
* Enable the SERCOM USART (without enabling interrupts).
*
****************************************************************************/
#ifdef SAMD2L2_HAVE_USART
struct sam_usart_config_s;
void sam_usart_enable(const struct sam_usart_config_s *const config);
#endif
/****************************************************************************
arch/arm/src/samd2l2/sam_serial.c
+4
View File
@@ -666,6 +666,10 @@ static int sam_setup(struct uart_dev_s *dev)
if (!dev->isconsole)
{
ret = sam_usart_initialize(priv->config);
if (ret >= 0)
{
sam_usart_enable(priv->config);
}
}
#endif