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

nxstyle fixes for previous commit.

Browse Source
This commit is contained in:
Gregory Nutt
2020-04-14 09:42:35 -06:00
committed by Abdelatif Guettouche
parent 552ca28d22
commit 61f6fa769a
3 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
arch/arm/src/lc823450/lc823450_i2c.c
+12 -4
View File
@@ -589,7 +589,9 @@ static void lc823450_i2c_starttransfer(FAR struct lc823450_i2c_priv_s *priv)
{
if (priv->dcnt > 1)
{
/* If the next byte to be received is not final, we have to send ACK. */
/* If the next byte to be received is not final, we have to send
* ACK.
*/
modifyreg32(priv->config->base + I2CCTL, I2C_CTL_ACK,
I2C_CTL_ACK);
@@ -665,7 +667,9 @@ static int lc823450_i2c_poll(FAR struct lc823450_i2c_priv_s *priv)
if (flags & I2C_M_READ)
{
/* When READ transaction, terminate it with NACK and then STOP condition */
/* When READ transaction, terminate it with NACK and then STOP
* condition.
*/
lc823450_i2c_sendnack(priv);
}
@@ -765,7 +769,9 @@ static int lc823450_i2c_poll(FAR struct lc823450_i2c_priv_s *priv)
if (priv->msgv->flags & I2C_M_NOSTART)
{
/* In this case, we don't have to restart using START condition. */
/* In this case, we don't have to restart using START
* condition.
*/
i2cinfo("no re-START condition\n");
@@ -931,7 +937,9 @@ static int lc823450_i2c_deinit(FAR struct lc823450_i2c_priv_s *priv,
modifyreg32(priv->config->base + I2CSTR, I2C_CTL_SCLR, I2C_CTL_SCLR);
modifyreg32(priv->config->base + I2CCTL, I2C_CTL_SRST, I2C_CTL_SRST);
/* Change pinmux from I2C to GPIO, and i2c mode to Push-Pull to Open Drain */
/* Change pinmux from I2C to GPIO, and i2c mode to Push-Pull to Open
* Drain.
*/
if (port == 0)
{
arch/arm/src/stm32l4/stm32l4_1wire.c
+3 -1
View File
@@ -1183,7 +1183,9 @@ static int stm32_1wire_pm_prepare(FAR struct pm_callback_s *cb, int domain,
if (sval <= 0)
{
/* Exclusive lock is held, do not allow entry to deeper PM states. */
/* Exclusive lock is held, do not allow entry to deeper PM
* states.
*/
return -EBUSY;
}
arch/arm/src/stm32l4/stm32l4_i2c.c
+1 -1
View File
@@ -931,7 +931,7 @@ static inline int stm32l4_i2c_sem_waitdone(FAR struct stm32l4_i2c_priv_s *priv)
************************************************************************************/
static inline void
stm32l4_i2c_set_7bit_address(FAR struct stm32l4_i2c_priv_s *priv)
stm32l4_i2c_set_7bit_address(FAR struct stm32l4_i2c_priv_s *priv)
{
stm32l4_i2c_modifyreg32(priv, STM32L4_I2C_CR2_OFFSET, I2C_CR2_SADD7_MASK,
((priv->msgv->addr & 0x7f) << I2C_CR2_SADD7_SHIFT));