From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43301) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WUf35-0007nS-Ip for qemu-devel@nongnu.org; Mon, 31 Mar 2014 12:27:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WUf2u-0003Y7-Fg for qemu-devel@nongnu.org; Mon, 31 Mar 2014 12:26:59 -0400 Received: from mail-qc0-x233.google.com ([2607:f8b0:400d:c01::233]:33503) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WUf2u-0003Y3-Bb for qemu-devel@nongnu.org; Mon, 31 Mar 2014 12:26:48 -0400 Received: by mail-qc0-f179.google.com with SMTP id m20so9192041qcx.38 for ; Mon, 31 Mar 2014 09:26:48 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Mon, 31 Mar 2014 18:26:29 +0200 Message-Id: <1396283195-6819-2-git-send-email-pbonzini@redhat.com> In-Reply-To: <1396283195-6819-1-git-send-email-pbonzini@redhat.com> References: <1396283195-6819-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH for-2.0 1/7] 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@linaro.org, afaerber@suse.de Signed-off-by: Paolo Bonzini --- hw/i2c/smbus.c | 6 +++--- include/hw/i2c/smbus.h | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) 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, 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); 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 { /* 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, -- 1.9.0