EMTime/libopencm3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

stm32: i2c: Use const qualifier for read-only pointer in i2c_transfer7

Browse Source
This commit is contained in:
Jean THOMAS
2020-12-30 21:12:30 +01:00
committed by Karl Palsson
parent b4c03a840d
commit a9cc695381
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/libopencm3/stm32/common/i2c_common_v1.h
View File

@@ -415,7 +415,7 @@ void i2c_enable_dma(uint32_t i2c);
void i2c_disable_dma(uint32_t i2c); void i2c_disable_dma(uint32_t i2c);
void i2c_set_dma_last_transfer(uint32_t i2c); void i2c_set_dma_last_transfer(uint32_t i2c);
void i2c_clear_dma_last_transfer(uint32_t i2c); void i2c_clear_dma_last_transfer(uint32_t i2c);
void i2c_transfer7(uint32_t i2c, uint8_t addr, uint8_t *w, size_t wn, uint8_t *r, size_t rn); void i2c_transfer7(uint32_t i2c, uint8_t addr, const uint8_t *w, size_t wn, uint8_t *r, size_t rn);
void i2c_set_speed(uint32_t i2c, enum i2c_speeds speed, uint32_t clock_megahz); void i2c_set_speed(uint32_t i2c, enum i2c_speeds speed, uint32_t clock_megahz);
END_DECLS END_DECLS

2
include/libopencm3/stm32/common/i2c_common_v2.h
View File

@@ -444,7 +444,7 @@ void i2c_enable_rxdma(uint32_t i2c);
void i2c_disable_rxdma(uint32_t i2c); void i2c_disable_rxdma(uint32_t i2c);
void i2c_enable_txdma(uint32_t i2c); void i2c_enable_txdma(uint32_t i2c);
void i2c_disable_txdma(uint32_t i2c); void i2c_disable_txdma(uint32_t i2c);
void i2c_transfer7(uint32_t i2c, uint8_t addr, uint8_t *w, size_t wn, uint8_t *r, size_t rn); void i2c_transfer7(uint32_t i2c, uint8_t addr, const uint8_t *w, size_t wn, uint8_t *r, size_t rn);
void i2c_set_speed(uint32_t i2c, enum i2c_speeds speed, uint32_t clock_megahz); void i2c_set_speed(uint32_t i2c, enum i2c_speeds speed, uint32_t clock_megahz);
END_DECLS END_DECLS

4
lib/stm32/common/i2c_common_v1.c
View File

@@ -465,7 +465,7 @@ void i2c_clear_dma_last_transfer(uint32_t i2c)
I2C_CR2(i2c) &= ~I2C_CR2_LAST; I2C_CR2(i2c) &= ~I2C_CR2_LAST;
} }
static void i2c_write7_v1(uint32_t i2c, int addr, uint8_t *data, size_t n) static void i2c_write7_v1(uint32_t i2c, int addr, const uint8_t *data, size_t n)
{ {
while ((I2C_SR2(i2c) & I2C_SR2_BUSY)) { while ((I2C_SR2(i2c) & I2C_SR2_BUSY)) {
} }
@@ -532,7 +532,7 @@ static void i2c_read7_v1(uint32_t i2c, int addr, uint8_t *res, size_t n)
* @param r destination buffer to read into * @param r destination buffer to read into
* @param rn number of bytes to read (r should be at least this long) * @param rn number of bytes to read (r should be at least this long)
*/ */
void i2c_transfer7(uint32_t i2c, uint8_t addr, uint8_t *w, size_t wn, uint8_t *r, size_t rn) { void i2c_transfer7(uint32_t i2c, uint8_t addr, const uint8_t *w, size_t wn, uint8_t *r, size_t rn) {
if (wn) { if (wn) {
i2c_write7_v1(i2c, addr, w, wn); i2c_write7_v1(i2c, addr, w, wn);
} }

2
lib/stm32/common/i2c_common_v2.c
View File

@@ -395,7 +395,7 @@ void i2c_disable_txdma(uint32_t i2c)
* @param r destination buffer to read into * @param r destination buffer to read into
* @param rn number of bytes to read (r should be at least this long) * @param rn number of bytes to read (r should be at least this long)
*/ */
void i2c_transfer7(uint32_t i2c, uint8_t addr, uint8_t *w, size_t wn, uint8_t *r, size_t rn) void i2c_transfer7(uint32_t i2c, uint8_t addr, const uint8_t *w, size_t wn, uint8_t *r, size_t rn)
{ {
/* waiting for busy is unnecessary. read the RM */ /* waiting for busy is unnecessary. read the RM */
if (wn) { if (wn) {