riot-ci/RIOT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

cpu/samd21/periph/i2c: fix spacing, comment length

Browse Source
This commit is contained in:
Ludwig Ortmann 2015-02-18 11:04:33 +01:00
parent cec87139a5
commit e9e3f3d148
1 changed files with 20 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
cpu/samd21/periph/i2c.c
View File

@ -124,7 +124,7 @@ int i2c_init_master(i2c_t dev, i2c_speed_t speed)
return -3; return -3;
} }
/************ SERCOM PAD0 - SDA and SERCOM PAD1 - SCL ************/ /************ SERCOM PAD0 - SDA and SERCOM PAD1 - SCL *************/
/* DIR + INEN at one: in/out pin. DIRSET modifies DIR in order to set I2C SDA/SCL on output */ /* DIR + INEN at one: in/out pin. DIRSET modifies DIR in order to set I2C SDA/SCL on output */
port_group->DIRSET.reg = (1 << pin_scl); port_group->DIRSET.reg = (1 << pin_scl);
port_group->DIRSET.reg = (1 << pin_sda); port_group->DIRSET.reg = (1 << pin_sda);
@ -161,8 +161,9 @@ int i2c_init_master(i2c_t dev, i2c_speed_t speed)
/* Enable Smart Mode (ACK is sent when DATA.DATA is read) */ /* Enable Smart Mode (ACK is sent when DATA.DATA is read) */
I2CSercom->CTRLB.reg = SERCOM_I2CM_CTRLB_SMEN; I2CSercom->CTRLB.reg = SERCOM_I2CM_CTRLB_SMEN;
/* Find and set baudrate. Read speed configuration. Set transfer speed: /* Find and set baudrate. Read speed configuration. Set transfer
* SERCOM_I2CM_CTRLA_SPEED(0): Standard-mode (Sm) up to 100 kHz and Fast-mode (Fm) up to 400 kHz*/ * speed: SERCOM_I2CM_CTRLA_SPEED(0): Standard-mode (Sm) up to 100
* kHz and Fast-mode (Fm) up to 400 kHz */
switch (speed) { switch (speed) {
case I2C_SPEED_NORMAL: case I2C_SPEED_NORMAL:
tmp_baud = (int32_t)(((clock_source_speed + (2*(100000)) - 1) / (2*(100000))) - 5); tmp_baud = (int32_t)(((clock_source_speed + (2*(100000)) - 1) / (2*(100000))) - 5);
@ -276,7 +277,8 @@ int i2c_read_regs(i2c_t dev, uint8_t address, uint8_t reg, char *data, int lengt
/* start transmission and send slave address */ /* start transmission and send slave address */
_start(i2c, address, I2C_FLAG_WRITE); _start(i2c, address, I2C_FLAG_WRITE);
/* send register address/command and wait for complete transfer to be finished*/ /* send register address/command and wait for complete transfer to
* be finished */
_write(i2c, (char *)(&reg), 1); _write(i2c, (char *)(&reg), 1);
return i2c_read_bytes(dev, address, data, length); return i2c_read_bytes(dev, address, data, length);
} }
@ -390,7 +392,8 @@ static void _start(SercomI2cm *dev, uint8_t address, uint8_t rw_flag)
} }
/* Check for address response error unless previous error is detected. */ /* Check for address response error unless previous error is detected. */
/* Check for error and ignore bus-error; workaround for BUSSTATE stuck in BUSY */ /* Check for error and ignore bus-error; workaround for BUSSTATE
* stuck in BUSY */
if (dev->INTFLAG.reg & SERCOM_I2CM_INTFLAG_SB) { if (dev->INTFLAG.reg & SERCOM_I2CM_INTFLAG_SB) {
/* Clear write interrupt flag */ /* Clear write interrupt flag */
dev->INTFLAG.reg = SERCOM_I2CM_INTFLAG_SB; dev->INTFLAG.reg = SERCOM_I2CM_INTFLAG_SB;