sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix some alignment and long line issues

Browse Source
This commit is contained in:
Gregory Nutt 2016-08-13 18:04:09 -06:00
parent 3023724cf2
commit 45e71a140a
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
arch/arm/src/kinetis/kinetis_i2c.c
View File

@ -345,15 +345,15 @@ static void kinetis_i2c_setfrequency(struct kinetis_i2cdev_s *priv,
#elif BOARD_BUS_FREQ == 36000000 #elif BOARD_BUS_FREQ == 36000000
if (frequency < 400000) if (frequency < 400000)
{ {
putreg8(0x28, KINETIS_I2C0_F); /* 113 kHz */ putreg8(0x28, KINETIS_I2C0_F); /* 113 kHz */
} }
else if (frequency < 1000000) else if (frequency < 1000000)
{ {
putreg8(0x19, KINETIS_I2C0_F); /* 375 kHz */ putreg8(0x19, KINETIS_I2C0_F); /* 375 kHz */
} }
else else
{ {
putreg8(0x0A, KINETIS_I2C0_F); /* 1 MHz */ putreg8(0x0A, KINETIS_I2C0_F); /* 1 MHz */
} }
putreg8(3, KINETIS_I2C0_FLT); putreg8(3, KINETIS_I2C0_FLT);
@ -470,7 +470,8 @@ static int kinetis_i2c_start(struct kinetis_i2cdev_s *priv)
/* Initiate actual transfer (send address) */ /* Initiate actual transfer (send address) */
putreg8((I2C_M_READ & msg->flags) == I2C_M_READ ? putreg8((I2C_M_READ & msg->flags) == I2C_M_READ ?
I2C_READADDR8(msg->addr) : I2C_WRITEADDR8(msg->addr), KINETIS_I2C0_D); I2C_READADDR8(msg->addr) : I2C_WRITEADDR8(msg->addr),
KINETIS_I2C0_D);
return OK; return OK;
} }
@ -620,7 +621,7 @@ static int kinetis_i2c_interrupt(int irq, FAR void *context)
putreg8(I2C_C1_IICEN | I2C_C1_IICIE | I2C_C1_MST | putreg8(I2C_C1_IICEN | I2C_C1_IICIE | I2C_C1_MST |
I2C_C1_TXAK, KINETIS_I2C0_C1); I2C_C1_TXAK, KINETIS_I2C0_C1);
} }
else /* go to RX mode */ else /* go to RX mode */
{ {
putreg8(I2C_C1_IICEN | I2C_C1_IICIE | I2C_C1_MST, putreg8(I2C_C1_IICEN | I2C_C1_IICIE | I2C_C1_MST,
KINETIS_I2C0_C1); KINETIS_I2C0_C1);
@ -648,7 +649,8 @@ static int kinetis_i2c_interrupt(int irq, FAR void *context)
/* Go to TX mode */ /* Go to TX mode */
putreg8(I2C_C1_IICEN | I2C_C1_IICIE | I2C_C1_MST | I2C_C1_TX, KINETIS_I2C0_C1); putreg8(I2C_C1_IICEN | I2C_C1_IICIE | I2C_C1_MST | I2C_C1_TX,
KINETIS_I2C0_C1);
msg->buffer[priv->rdcnt] = getreg8(KINETIS_I2C0_D); msg->buffer[priv->rdcnt] = getreg8(KINETIS_I2C0_D);
priv->rdcnt++; priv->rdcnt++;
@ -704,9 +706,9 @@ static int kinetis_i2c_transfer(FAR struct i2c_master_s *dev,
priv->nmsg = count; priv->nmsg = count;
priv->state = STATE_OK; priv->state = STATE_OK;
/* Configure the I2C frequency. REVISIT: Note that the frequency is set only /* Configure the I2C frequency. REVISIT: Note that the frequency is set
* on the first message. This could be extended to support different transfer * only on the first message. This could be extended to support
* frequencies for each message segment. * different transfer frequencies for each message segment.
*/ */
kinetis_i2c_setfrequency(priv, msgs->frequency); kinetis_i2c_setfrequency(priv, msgs->frequency);