Commit 285364e9 authored by Paolo Bonzini's avatar Paolo Bonzini Committed by Michael S. Tsirkin
Browse files

smbus: allow returning an error from reads 



Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
Acked-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Reviewed-by: default avatarAndreas Färber <afaerber@suse.de>
Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
parent aa93200b

hw/i2c/smbus.c

+3 −3
Original line number Diff line number Diff line
@@ -214,7 +214,7 @@ void smbus_quick_command(I2CBus *bus, uint8_t addr, int read) 
    i2c_end_transfer(bus);

}



uint8_t smbus_receive_byte(I2CBus *bus, uint8_t addr)

int smbus_receive_byte(I2CBus *bus, uint8_t addr)

{

    uint8_t data;
@@ -232,7 +232,7 @@ void smbus_send_byte(I2CBus *bus, uint8_t addr, uint8_t data) 
    i2c_end_transfer(bus);

}



uint8_t smbus_read_byte(I2CBus *bus, uint8_t addr, uint8_t command)

int smbus_read_byte(I2CBus *bus, uint8_t addr, uint8_t command)

{

    uint8_t data;

    i2c_start_transfer(bus, addr, 0);
@@ -252,7 +252,7 @@ void smbus_write_byte(I2CBus *bus, uint8_t addr, uint8_t command, uint8_t data) 
    i2c_end_transfer(bus);

}



uint16_t smbus_read_word(I2CBus *bus, uint8_t addr, uint8_t command)

int smbus_read_word(I2CBus *bus, uint8_t addr, uint8_t command)

{

    uint16_t data;

    i2c_start_transfer(bus, addr, 0);

include/hw/i2c/smbus.h

+3 −3
Original line number Diff line number Diff line
@@ -67,11 +67,11 @@ struct SMBusDevice { 


/* Master device commands.  */

void smbus_quick_command(I2CBus *bus, uint8_t addr, int read);

uint8_t smbus_receive_byte(I2CBus *bus, uint8_t addr);

int smbus_receive_byte(I2CBus *bus, uint8_t addr);

void smbus_send_byte(I2CBus *bus, uint8_t addr, uint8_t data);

uint8_t smbus_read_byte(I2CBus *bus, uint8_t addr, uint8_t command);

int smbus_read_byte(I2CBus *bus, uint8_t addr, uint8_t command);

void smbus_write_byte(I2CBus *bus, uint8_t addr, uint8_t command, uint8_t data);

uint16_t smbus_read_word(I2CBus *bus, uint8_t addr, uint8_t command);

int smbus_read_word(I2CBus *bus, uint8_t addr, uint8_t command);

void smbus_write_word(I2CBus *bus, uint8_t addr, uint8_t command, uint16_t data);

int smbus_read_block(I2CBus *bus, uint8_t addr, uint8_t command, uint8_t *data);

void smbus_write_block(I2CBus *bus, uint8_t addr, uint8_t command, uint8_t *data,