|
14 | 14 | * limitations under the License.
|
15 | 15 | */
|
16 | 16 |
|
| 17 | +#include <string.h> |
| 18 | + |
17 | 19 | #include "objects.h"
|
18 | 20 | #include "PinNames.h"
|
19 | 21 | #include "hal_i2c.h"
|
@@ -78,18 +80,18 @@ extern u32 ConfigDebugErr;
|
78 | 80 | extern u32 ConfigDebuginfo;
|
79 | 81 | void i2c_init(i2c_t *obj, PinName sda, PinName scl)
|
80 | 82 | {
|
81 |
| - uint32_t i2c_sel; |
82 |
| - uint32_t i2c_idx; |
| 83 | + int i2c_sel; |
| 84 | + int i2c_idx; |
83 | 85 | PSAL_I2C_MNGT_ADPT pSalI2CMngtAdpt = NULL;
|
84 | 86 | PSAL_I2C_USERCB_ADPT pSalI2CUserCBAdpt = NULL;
|
85 | 87 | PSAL_I2C_HND pSalI2CHND = NULL;
|
86 | 88 |
|
87 | 89 | // Determine the I2C to use
|
88 |
| - uint32_t i2c_sda = (uint32_t)pinmap_peripheral(sda, PinMap_I2C_SDA); |
89 |
| - uint32_t i2c_scl = (uint32_t)pinmap_peripheral(scl, PinMap_I2C_SCL); |
| 90 | + int i2c_sda = (uint32_t)pinmap_peripheral(sda, PinMap_I2C_SDA); |
| 91 | + int i2c_scl = (uint32_t)pinmap_peripheral(scl, PinMap_I2C_SCL); |
90 | 92 | ConfigDebugErr &= (~(_DBG_I2C_|_DBG_GDMA_));
|
91 | 93 | ConfigDebugInfo&= (~(_DBG_I2C_|_DBG_GDMA_));
|
92 |
| - i2c_sel = (uint32_t)pinmap_merge(i2c_sda, i2c_scl); |
| 94 | + i2c_sel = pinmap_merge(i2c_sda, i2c_scl); |
93 | 95 | i2c_idx = RTL_GET_PERI_IDX(i2c_sel);
|
94 | 96 | if (unlikely(i2c_idx == NC)) {
|
95 | 97 | DBG_8195A("%s: Cannot find matched UART\n", __FUNCTION__);
|
@@ -457,7 +459,6 @@ void i2c_slave_address(i2c_t *obj, int idx, uint32_t address, uint32_t mask)
|
457 | 459 | pSalI2CHND = &(pSalI2CMngtAdpt->pSalHndPriv->SalI2CHndPriv);
|
458 | 460 | address = (address & 0xFE ) >>1;
|
459 | 461 |
|
460 |
| - uint16_t i2c_default_addr = (uint16_t) pSalI2CHND->I2CAckAddr; |
461 | 462 | uint16_t i2c_user_addr = (uint16_t) address;
|
462 | 463 |
|
463 | 464 | if (i2c_target_addr[pSalI2CHND->DevNum] != i2c_user_addr) {
|
|
0 commit comments