ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix a bug that I2C driver can not transfer of 1Byte/2Byte. 

I2C driver was not considered about 1Byte/2Byte transfer.
Add 1Byte/2Byte transfer processing in I2C driver.
pull/762/head
Masao Hamanaka 2014-12-05 17:31:22 +09:00
parent e815194b57
commit dca273e167
1 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
libraries/mbed/targets/hal/TARGET_RENESAS/TARGET_RZ_A1H/i2c_api.c
View File

@ -296,7 +296,7 @@ int i2c_read(i2c_t *obj, int address, char *data, int length, int stop) {
} }
// Read in all except last byte // Read in all except last byte
if (length > 1) { if (length > 2) {
for (count = 0; count < (length - 1); count++) { for (count = 0; count < (length - 1); count++) {
if (count == (length - 2)) { if (count == (length - 2)) {
value = i2c_do_read(obj, 1); value = i2c_do_read(obj, 1);
@ -312,6 +312,26 @@ int i2c_read(i2c_t *obj, int address, char *data, int length, int stop) {
} }
data[count] = (char) value; data[count] = (char) value;
} }
} else if (length == 2) {
/* Set MR3 WATI bit is 1 */;
REG(MR3.UINT32) |= (1 << 6);
// dummy read
value = REG(DRR.UINT32);
// wait for it to arrive
i2c_wait_RDRF(obj);
// send a NOT ACK
REG(MR3.UINT32) |= (1 <<3);
data[count] = (char)REG(DRR.UINT32);
count = 1;
} else if (length == 1) {
/* Set MR3 WATI bit is 1 */;
REG(MR3.UINT32) |= (1 << 6);
// send a NOT ACK
REG(MR3.UINT32) |= (1 <<3);
// dummy read
value = REG(DRR.UINT32);
} else {
// Do Nothing
} }
// read in last byte // read in last byte
@ -325,7 +345,7 @@ int i2c_read(i2c_t *obj, int address, char *data, int length, int stop) {
/* RIICnMR3.WAIT = 0 */ /* RIICnMR3.WAIT = 0 */
REG(MR3.UINT32) &= ~(1 << 6); REG(MR3.UINT32) &= ~(1 << 6);
/* wait SR2.STOP = 1 */ /* wait SR2.STOP = 1 */
while ((work_reg & (1 << 3)) == (1 << 3)) { while (!((work_reg & (1 << 3)) == (1 << 3))) {
work_reg = REG(SR2.UINT32); work_reg = REG(SR2.UINT32);
} }
/* SR2.NACKF = 0 */ /* SR2.NACKF = 0 */