From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56504) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wi4Y9-0005oC-7F for qemu-devel@nongnu.org; Wed, 07 May 2014 12:18:34 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Wi4Y4-0001wA-8U for qemu-devel@nongnu.org; Wed, 07 May 2014 12:18:29 -0400 Received: from mx1.redhat.com ([209.132.183.28]:45146) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wi4Y4-0001w0-0b for qemu-devel@nongnu.org; Wed, 07 May 2014 12:18:24 -0400 Date: Wed, 7 May 2014 19:17:13 +0300 From: "Michael S. Tsirkin" Message-ID: <1399479367-31336-8-git-send-email-mst@redhat.com> References: <1399479367-31336-1-git-send-email-mst@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline In-Reply-To: <1399479367-31336-1-git-send-email-mst@redhat.com> Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PULL v2 07/11] smbus: allow returning an error from reads List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell , Peter Crosthwaite , =?us-ascii?B?PT9VVEYtOD9xP0FuZHJlYXM9MjBGPUMzPUE0cmJlcj89?= , Anthony Liguori , Paolo Bonzini From: Paolo Bonzini Signed-off-by: Paolo Bonzini Acked-by: Michael S. Tsirkin Reviewed-by: Andreas F=E4rber Signed-off-by: Michael S. Tsirkin --- include/hw/i2c/smbus.h | 6 +++--- hw/i2c/smbus.c | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/hw/i2c/smbus.h b/include/hw/i2c/smbus.h index 63f0cc4..285d3b5 100644 --- a/include/hw/i2c/smbus.h +++ b/include/hw/i2c/smbus.h @@ -67,11 +67,11 @@ struct SMBusDevice { =20 /* 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, diff --git a/hw/i2c/smbus.c b/hw/i2c/smbus.c index 3febf3c..190f08e 100644 --- a/hw/i2c/smbus.c +++ b/hw/i2c/smbus.c @@ -214,7 +214,7 @@ void smbus_quick_command(I2CBus *bus, uint8_t addr, i= nt read) i2c_end_transfer(bus); } =20 -uint8_t smbus_receive_byte(I2CBus *bus, uint8_t addr) +int smbus_receive_byte(I2CBus *bus, uint8_t addr) { uint8_t data; =20 @@ -232,7 +232,7 @@ void smbus_send_byte(I2CBus *bus, uint8_t addr, uint8= _t data) i2c_end_transfer(bus); } =20 -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, uint= 8_t command, uint8_t data) i2c_end_transfer(bus); } =20 -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); --=20 MST