Commit 5229f45b authored by Paolo Bonzini's avatar Paolo Bonzini Committed by Peter Maydell
Browse files

aux: fix break that wanted to break two levels out 



The last "ret = AUX_I2C_NACK;" is dead, because it is always overridden
by AUX_I2C_ACK.  What really the code wants is to jump out of the switch
statement, and a "return" will not cut it because it would omit a debug
printf.

Change the logic so that we can break out of the while loop.  For clarity,
hoist the bus->last_* assignments up, right after i2c_start_transfer.

Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parent bb14a1ed

hw/misc/aux.c

+6 −6
Original line number Diff line number Diff line
@@ -153,12 +153,12 @@ AUXReply aux_request(AUXBus *bus, AUXCommand cmd, uint32_t address, 
    case WRITE_I2C_MOT:

    case READ_I2C_MOT:

        is_write = cmd == READ_I2C_MOT ? false : true;

        ret = AUX_I2C_NACK;

        if (!i2c_bus_busy(i2c_bus)) {

            /*

             * No transactions started..

             */

            if (i2c_start_transfer(i2c_bus, address, is_write)) {

                ret = AUX_I2C_NACK;

                break;

            }

        } else if ((address != bus->last_i2c_address) ||
@@ -168,22 +168,22 @@ AUXReply aux_request(AUXBus *bus, AUXCommand cmd, uint32_t address, 
             */

            i2c_end_transfer(i2c_bus);

            if (i2c_start_transfer(i2c_bus, address, is_write)) {

                ret = AUX_I2C_NACK;

                break;

            }

        }



        bus->last_transaction = cmd;

        bus->last_i2c_address = address;

        while (len > 0) {

            if (i2c_send_recv(i2c_bus, data++, is_write) < 0) {

                ret = AUX_I2C_NACK;

                i2c_end_transfer(i2c_bus);

                break;

            }

            len--;

        }

        bus->last_transaction = cmd;

        bus->last_i2c_address = address;

        if (len == 0) {

            ret = AUX_I2C_ACK;

        }

        break;

    default:

        DPRINTF("Not implemented!\n");