Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-06-01 16:59:28 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

EFM32: Fix issues associated with SPI bi order. From Pierre

Browse Source
This commit is contained in:
Gregory Nutt
2014-11-09 07:15:48 -06:00
parent 8e5ae2ee18
commit fe7bdb284e
2 changed files with 33 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
arch/arm/src/efm32/efm32_spi.c
+32 -11
View File
@@ -159,6 +159,7 @@ struct efm32_spidev_s
#endif #endif
uint8_t nbits; /* Width of word in bits (4-16) */ uint8_t nbits; /* Width of word in bits (4-16) */
bool lsbfirst; /* True: Bit order is LSB first */
bool initialized; /* True: Already initialized */ bool initialized; /* True: Already initialized */
}; };
@@ -1007,32 +1008,50 @@ static void spi_setbits(struct spi_dev_s *dev, int nbits)
const struct efm32_spiconfig_s *config; const struct efm32_spiconfig_s *config;
uint32_t regval; uint32_t regval;
uint32_t setting; uint32_t setting;
unsigned int truebits; bool lsbfirst;
spivdbg("nbits=%d\n", nbits); spivdbg("nbits=%d\n", nbits);
DEBUGASSERT(priv && priv->config); DEBUGASSERT(priv && priv->config);
config = priv->config; config = priv->config;
/* Has the number of bits changed? */ /* Bit order is encoded by the sign of nbits */
if (nbits != priv->nbits) if (nbits < 0)
{ {
/* LSB first */
lsbfirst = true;
nbits = -nbits;
}
else
{
/* MSH first */
lsbfirst = false;
}
/* Has the number of bits or the bit order changed? */
if (nbits != priv->nbits || lsbfirst != priv->lsbfirst)
{
/* Set the new bit order */
regval = spi_getreg(config, EFM32_USART_CTRL_OFFSET); regval = spi_getreg(config, EFM32_USART_CTRL_OFFSET);
if (nbits < 0) if (lsbfirst)
{ {
regval &= ~USART_CTRL_MSBF; regval &= ~USART_CTRL_MSBF;
truebits = -nbits;
} }
else else
{ {
regval |= USART_CTRL_MSBF; regval |= USART_CTRL_MSBF;
truebits = nbits;
} }
spi_putreg(config, EFM32_USART_CLKDIV_OFFSET, regval); spi_putreg(config, EFM32_USART_CTRL_OFFSET, regval);
switch (truebits) /* Select the new number of bits */
switch (nbits)
{ {
case 4: case 4:
setting = USART_FRAME_DATABITS_FOUR; setting = USART_FRAME_DATABITS_FOUR;
@@ -1099,7 +1118,8 @@ static void spi_setbits(struct spi_dev_s *dev, int nbits)
* faster * faster
*/ */
priv->nbits = nbits; priv->nbits = nbits;
priv->lsbfirst = lsbfirst;
} }
} }
@@ -1556,9 +1576,9 @@ static int spi_portinitialize(struct efm32_spidev_s *priv)
USART_CTRL_CLKPHA_SAMPLELEADING; USART_CTRL_CLKPHA_SAMPLELEADING;
spi_putreg(config, EFM32_USART_CTRL_OFFSET, regval); spi_putreg(config, EFM32_USART_CTRL_OFFSET, regval);
/* LSB First */ /* MSB First */
regval &= ~USART_CTRL_MSBF; regval |= USART_CTRL_MSBF;
spi_putreg(config, EFM32_USART_CTRL_OFFSET, regval); spi_putreg(config, EFM32_USART_CTRL_OFFSET, regval);
#ifndef CONFIG_SPI_OWNBUS #ifndef CONFIG_SPI_OWNBUS
@@ -1566,6 +1586,7 @@ static int spi_portinitialize(struct efm32_spidev_s *priv)
priv->mode = SPIDEV_MODE0; priv->mode = SPIDEV_MODE0;
#endif #endif
priv->nbits = 8; priv->nbits = 8;
priv->lsbfirst = false;
/* 8 bits */ /* 8 bits */
libc/syslog/lib_syslog.c
+1 -1
View File
@@ -198,7 +198,7 @@ int vsyslog(int priority, FAR const char *fmt, va_list ap)
if ((g_syslog_mask & LOG_MASK(priority)) != 0) if ((g_syslog_mask & LOG_MASK(priority)) != 0)
{ {
/* Yes.. let vsylog_internal to the deed */ /* Yes.. let vsylog_internal do the deed */
ret = vsyslog_internal(fmt, ap); ret = vsyslog_internal(fmt, ap);
} }