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

drivers: fix overshift and overflow errors on 8Bit MCUs

Browse Source 
- bmp180: fix overshift error
    - hih6130: fix overflow in sleep interval
    - pn532: fix overshift error
    - bh1750fvi: fix overshift error
    - mpu9050: fix overflow error
This commit is contained in:
smlng 2017-08-30 14:32:57 +02:00
parent c177a1a75d
commit 8d62031463
5 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/bh1750fvi/bh1750fvi.c
View File

@ -71,7 +71,7 @@ uint16_t bh1750fvi_sample(const bh1750fvi_t *dev)
i2c_release(dev->i2c);
/* and finally we calculate the actual LUX value */
tmp = (raw[0] << 24) | (raw[1] << 16);
tmp = ((uint32_t)raw[0] << 24) | ((uint32_t)raw[1] << 16);
tmp /= RES_DIV;
return (uint16_t)(tmp);
}

5
drivers/bmp180/bmp180.c
View File

@ -198,7 +198,7 @@ static int _read_ut(const bmp180_t *dev, int32_t *output)
i2c_release(DEV_I2C);
return -1;
}
*output = ( ut[0] << 8 ) | ut[1];
*output = ((uint16_t)ut[0] << 8) | ut[1];
DEBUG("UT: %i\n", (int)*output);
@ -234,7 +234,8 @@ static int _read_up(const bmp180_t *dev, int32_t *output)
return -1;
}
*output = ((up[0] << 16) | (up[1] << 8) | up[2]) >> (8 - OVERSAMPLING);
*output = (((uint32_t)up[0] << 16) |
((uint32_t)up[1] << 8) | up[2]) >> (8 - OVERSAMPLING);
DEBUG("UP: %i\n", (int)*output);

2
drivers/hih6130/hih6130.c
View File

@ -52,7 +52,7 @@ enum {
};
/** @brief Delay between requesting a measurement and data becoming ready */
#define MEASUREMENT_DELAY (50*1000)
#define MEASUREMENT_DELAY (50LU * US_PER_MS)
/** @brief Trigger a new measurement on the sensor */
static inline int hih6130_measurement_request(const hih6130_t *dev)

4
drivers/mpu9150/mpu9150.c
View File

@ -375,8 +375,8 @@ int mpu9150_read_temperature(const mpu9150_t *dev, int32_t *output)
/* Release the bus */
i2c_release(dev->i2c_dev);
temp = (data[0] << 8) | data[1];
*output = ((((int32_t)temp) * 1000) / 340) + (35*1000);
temp = ((uint16_t)data[0] << 8) | data[1];
*output = (((int32_t)temp * 1000LU) / 340) + (35 * 1000LU);
return 0;
}

6
drivers/pn532/pn532.c
View File

@ -379,9 +379,9 @@ int pn532_fw_version(pn532_t *dev, uint32_t *fw_ver)
buff[BUFF_CMD_START] = CMD_FIRMWARE_VERSION;
if (send_rcv(dev, buff, 0, 4) == 4) {
*fw_ver = (buff[0] << 24); /* ic version */
*fw_ver += (buff[1] << 16); /* fw ver */
*fw_ver += (buff[2] << 8); /* fw rev */
*fw_ver = ((uint32_t)buff[0] << 24); /* ic version */
*fw_ver += ((uint32_t)buff[1] << 16); /* fw ver */
*fw_ver += ((uint32_t)buff[2] << 8); /* fw rev */
*fw_ver += (buff[3]); /* feature support */
ret = 0;
}