Proxmox-Port/qemu
1
0
Fork 0
mirror of https://github.com/qemu/qemu.git synced 2025-08-15 05:06:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

hw/misc/auxbus: Replace 'is_write' boolean by its value

Browse Source 
Remove the 'is_write' boolean by directly using its value in place.

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:28 +02:00 committed by Corey Minyard
parent 80675e193c
commit 4e367e65c2
1 changed files with 11 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
hw/misc/auxbus.c
View File

@ -106,7 +106,6 @@ AUXReply aux_request(AUXBus *bus, AUXCommand cmd, uint32_t address,
AUXReply ret = AUX_NACK; AUXReply ret = AUX_NACK;
I2CBus *i2c_bus = aux_get_i2c_bus(bus); I2CBus *i2c_bus = aux_get_i2c_bus(bus);
size_t i; size_t i;
bool is_write = false;
DPRINTF("request at address 0x%" PRIX32 ", command %u, len %u\n", address, DPRINTF("request at address 0x%" PRIX32 ", command %u, len %u\n", address,
cmd, len); cmd, len);
@ -117,11 +116,10 @@ AUXReply aux_request(AUXBus *bus, AUXCommand cmd, uint32_t address,
*/ */
case WRITE_AUX: case WRITE_AUX:
case READ_AUX: case READ_AUX:
is_write = cmd == READ_AUX ? false : true;
for (i = 0; i < len; i++) { for (i = 0; i < len; i++) {
if (!address_space_rw(&bus->aux_addr_space, address++, if (!address_space_rw(&bus->aux_addr_space, address++,
MEMTXATTRS_UNSPECIFIED, data++, 1, MEMTXATTRS_UNSPECIFIED, data++, 1,
is_write)) { cmd == WRITE_AUX)) {
ret = AUX_I2C_ACK; ret = AUX_I2C_ACK;
} else { } else {
ret = AUX_NACK; ret = AUX_NACK;
@ -133,19 +131,18 @@ AUXReply aux_request(AUXBus *bus, AUXCommand cmd, uint32_t address,
* Classic I2C transactions.. * Classic I2C transactions..
*/ */
case READ_I2C: case READ_I2C:
is_write = cmd == READ_I2C ? false : true;
if (i2c_bus_busy(i2c_bus)) { if (i2c_bus_busy(i2c_bus)) {
i2c_end_transfer(i2c_bus); i2c_end_transfer(i2c_bus);
} }
if (i2c_start_transfer(i2c_bus, address, !is_write)) { if (i2c_start_transfer(i2c_bus, address, true)) {
ret = AUX_I2C_NACK; ret = AUX_I2C_NACK;
break; break;
} }
ret = AUX_I2C_ACK; ret = AUX_I2C_ACK;
while (len > 0) { while (len > 0) {
if (i2c_send_recv(i2c_bus, data++, is_write) < 0) { if (i2c_send_recv(i2c_bus, data++, false) < 0) {
ret = AUX_I2C_NACK; ret = AUX_I2C_NACK;
break; break;
} }
@ -154,19 +151,18 @@ AUXReply aux_request(AUXBus *bus, AUXCommand cmd, uint32_t address,
i2c_end_transfer(i2c_bus); i2c_end_transfer(i2c_bus);
break; break;
case WRITE_I2C: case WRITE_I2C:
is_write = cmd == READ_I2C ? false : true;
if (i2c_bus_busy(i2c_bus)) { if (i2c_bus_busy(i2c_bus)) {
i2c_end_transfer(i2c_bus); i2c_end_transfer(i2c_bus);
} }
if (i2c_start_transfer(i2c_bus, address, !is_write)) { if (i2c_start_transfer(i2c_bus, address, false)) {
ret = AUX_I2C_NACK; ret = AUX_I2C_NACK;
break; break;
} }
ret = AUX_I2C_ACK; ret = AUX_I2C_ACK;
while (len > 0) { while (len > 0) {
if (i2c_send_recv(i2c_bus, data++, is_write) < 0) { if (i2c_send_recv(i2c_bus, data++, true) < 0) {
ret = AUX_I2C_NACK; ret = AUX_I2C_NACK;
break; break;
} }
@ -183,13 +179,12 @@ AUXReply aux_request(AUXBus *bus, AUXCommand cmd, uint32_t address,
* - We changed the address. * - We changed the address.
*/ */
case WRITE_I2C_MOT: case WRITE_I2C_MOT:
is_write = cmd == READ_I2C_MOT ? false : true;
ret = AUX_I2C_NACK; ret = AUX_I2C_NACK;
if (!i2c_bus_busy(i2c_bus)) { if (!i2c_bus_busy(i2c_bus)) {
/* /*
* No transactions started.. * No transactions started..
*/ */
if (i2c_start_transfer(i2c_bus, address, !is_write)) { if (i2c_start_transfer(i2c_bus, address, false)) {
break; break;
} }
} else if ((address != bus->last_i2c_address) || } else if ((address != bus->last_i2c_address) ||
@ -198,7 +193,7 @@ AUXReply aux_request(AUXBus *bus, AUXCommand cmd, uint32_t address,
* Transaction started but we need to restart.. * Transaction started but we need to restart..
*/ */
i2c_end_transfer(i2c_bus); i2c_end_transfer(i2c_bus);
if (i2c_start_transfer(i2c_bus, address, !is_write)) { if (i2c_start_transfer(i2c_bus, address, false)) {
break; break;
} }
} }
@ -206,7 +201,7 @@ 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) { while (len > 0) {
if (i2c_send_recv(i2c_bus, data++, is_write) < 0) { if (i2c_send_recv(i2c_bus, data++, true) < 0) {
i2c_end_transfer(i2c_bus); i2c_end_transfer(i2c_bus);
break; break;
} }
@ -217,13 +212,12 @@ AUXReply aux_request(AUXBus *bus, AUXCommand cmd, uint32_t address,
} }
break; break;
case READ_I2C_MOT: case READ_I2C_MOT:
is_write = cmd == READ_I2C_MOT ? false : true;
ret = AUX_I2C_NACK; ret = AUX_I2C_NACK;
if (!i2c_bus_busy(i2c_bus)) { if (!i2c_bus_busy(i2c_bus)) {
/* /*
* No transactions started.. * No transactions started..
*/ */
if (i2c_start_transfer(i2c_bus, address, !is_write)) { if (i2c_start_transfer(i2c_bus, address, true)) {
break; break;
} }
} else if ((address != bus->last_i2c_address) || } else if ((address != bus->last_i2c_address) ||
@ -232,7 +226,7 @@ AUXReply aux_request(AUXBus *bus, AUXCommand cmd, uint32_t address,
* Transaction started but we need to restart.. * Transaction started but we need to restart..
*/ */
i2c_end_transfer(i2c_bus); i2c_end_transfer(i2c_bus);
if (i2c_start_transfer(i2c_bus, address, !is_write)) { if (i2c_start_transfer(i2c_bus, address, true)) {
break; break;
} }
} }
@ -240,7 +234,7 @@ 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) { while (len > 0) {
if (i2c_send_recv(i2c_bus, data++, is_write) < 0) { if (i2c_send_recv(i2c_bus, data++, false) < 0) {
i2c_end_transfer(i2c_bus); i2c_end_transfer(i2c_bus);
break; break;
} }