OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

hw/misc/auxbus: Replace i2c_send_recv() by i2c_recv() & i2c_send()

Browse Source 
Instead of using the confuse i2c_send_recv(), replace
  i2c_send_recv(send = true) by i2c_send() and
  i2c_send_recv(send = false) by i2c_recv().
During the replacement we also change a while() statement by for().
The resulting code is easier to review.

Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Acked-by: Corey Minyard <cminyard@mvista.com>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: Corey Minyard <cminyard@mvista.com>
This commit is contained in:
Philippe Mathieu-Daudé 2021-06-17 13:53:29 +02:00 committed by Corey Minyard
parent 4e367e65c2
commit cbecd9f822
1 changed files with 11 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
hw/misc/auxbus.c
View File

@ -141,12 +141,8 @@ AUXReply aux_request(AUXBus *bus, AUXCommand cmd, uint32_t address,
} }
ret = AUX_I2C_ACK; ret = AUX_I2C_ACK;
while (len > 0) { for (i = 0; i < len; i++) {
if (i2c_send_recv(i2c_bus, data++, false) < 0) { data[i] = i2c_recv(i2c_bus);
ret = AUX_I2C_NACK;
break;
}
len--;
} }
i2c_end_transfer(i2c_bus); i2c_end_transfer(i2c_bus);
break; break;
@ -161,12 +157,11 @@ AUXReply aux_request(AUXBus *bus, AUXCommand cmd, uint32_t address,
} }
ret = AUX_I2C_ACK; ret = AUX_I2C_ACK;
while (len > 0) { for (i = 0; i < len; i++) {
if (i2c_send_recv(i2c_bus, data++, true) < 0) { if (i2c_send(i2c_bus, data[i]) < 0) {
ret = AUX_I2C_NACK; ret = AUX_I2C_NACK;
break; break;
} }
len--;
} }
i2c_end_transfer(i2c_bus); i2c_end_transfer(i2c_bus);
break; break;
@ -200,15 +195,13 @@ AUXReply aux_request(AUXBus *bus, AUXCommand cmd, uint32_t address,
bus->last_transaction = cmd; bus->last_transaction = cmd;
bus->last_i2c_address = address; bus->last_i2c_address = address;
while (len > 0) { ret = AUX_I2C_ACK;
if (i2c_send_recv(i2c_bus, data++, true) < 0) { for (i = 0; i < len; i++) {
if (i2c_send(i2c_bus, data[i]) < 0) {
i2c_end_transfer(i2c_bus); i2c_end_transfer(i2c_bus);
ret = AUX_I2C_NACK;
break; break;
} }
len--;
}
if (len == 0) {
ret = AUX_I2C_ACK;
} }
break; break;
case READ_I2C_MOT: case READ_I2C_MOT:
@ -233,16 +226,10 @@ AUXReply aux_request(AUXBus *bus, AUXCommand cmd, uint32_t address,
bus->last_transaction = cmd; bus->last_transaction = cmd;
bus->last_i2c_address = address; bus->last_i2c_address = address;
while (len > 0) { for (i = 0; i < len; i++) {
if (i2c_send_recv(i2c_bus, data++, false) < 0) { data[i] = i2c_recv(i2c_bus);
i2c_end_transfer(i2c_bus);
break;
} }
len--;
}
if (len == 0) {
ret = AUX_I2C_ACK; ret = AUX_I2C_ACK;
}
break; break;
default: default:
qemu_log_mask(LOG_UNIMP, "AUX cmd=%u not implemented\n", cmd); qemu_log_mask(LOG_UNIMP, "AUX cmd=%u not implemented\n", cmd);