From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44288) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wi402-0003w8-TZ for qemu-devel@nongnu.org; Wed, 07 May 2014 11:43:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Wi3zx-0005Cv-Od for qemu-devel@nongnu.org; Wed, 07 May 2014 11:43:14 -0400 Received: from mx1.redhat.com ([209.132.183.28]:37283) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wi3zx-0005Ch-BM for qemu-devel@nongnu.org; Wed, 07 May 2014 11:43:09 -0400 Date: Wed, 7 May 2014 18:41:55 +0300 From: "Michael S. Tsirkin" Message-ID: <1399477052-18612-9-git-send-email-mst@redhat.com> References: <1399477052-18612-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: <1399477052-18612-1-git-send-email-mst@redhat.com> Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PULL 08/10] smbus: return -1 if nothing found at the given address 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 --- include/hw/i2c/smbus.h | 12 +++++----- hw/i2c/smbus.c | 62 +++++++++++++++++++++++++++++++++++---------= ------ 2 files changed, 50 insertions(+), 24 deletions(-) diff --git a/include/hw/i2c/smbus.h b/include/hw/i2c/smbus.h index 285d3b5..544bbc1 100644 --- a/include/hw/i2c/smbus.h +++ b/include/hw/i2c/smbus.h @@ -66,16 +66,16 @@ struct SMBusDevice { }; =20 /* Master device commands. */ -void smbus_quick_command(I2CBus *bus, uint8_t addr, int read); +int smbus_quick_command(I2CBus *bus, uint8_t addr, int read); int smbus_receive_byte(I2CBus *bus, uint8_t addr); -void smbus_send_byte(I2CBus *bus, uint8_t addr, uint8_t data); +int smbus_send_byte(I2CBus *bus, uint8_t addr, uint8_t data); 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); +int smbus_write_byte(I2CBus *bus, uint8_t addr, uint8_t command, uint8_t= data); 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_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, - int len); +int smbus_write_block(I2CBus *bus, uint8_t addr, uint8_t command, uint8_= t *data, + int len); =20 void smbus_eeprom_init(I2CBus *smbus, int nb_eeprom, const uint8_t *eeprom_spd, int size); diff --git a/hw/i2c/smbus.c b/hw/i2c/smbus.c index 190f08e..6e27ae8 100644 --- a/hw/i2c/smbus.c +++ b/hw/i2c/smbus.c @@ -208,34 +208,44 @@ static int smbus_device_init(I2CSlave *i2c) } =20 /* Master device commands. */ -void smbus_quick_command(I2CBus *bus, uint8_t addr, int read) +int smbus_quick_command(I2CBus *bus, uint8_t addr, int read) { - i2c_start_transfer(bus, addr, read); + if (i2c_start_transfer(bus, addr, read)) { + return -1; + } i2c_end_transfer(bus); + return 0; } =20 int smbus_receive_byte(I2CBus *bus, uint8_t addr) { uint8_t data; =20 - i2c_start_transfer(bus, addr, 1); + if (i2c_start_transfer(bus, addr, 1)) { + return -1; + } data =3D i2c_recv(bus); i2c_nack(bus); i2c_end_transfer(bus); return data; } =20 -void smbus_send_byte(I2CBus *bus, uint8_t addr, uint8_t data) +int smbus_send_byte(I2CBus *bus, uint8_t addr, uint8_t data) { - i2c_start_transfer(bus, addr, 0); + if (i2c_start_transfer(bus, addr, 0)) { + return -1; + } i2c_send(bus, data); i2c_end_transfer(bus); + return 0; } =20 int smbus_read_byte(I2CBus *bus, uint8_t addr, uint8_t command) { uint8_t data; - i2c_start_transfer(bus, addr, 0); + if (i2c_start_transfer(bus, addr, 0)) { + return -1; + } i2c_send(bus, command); i2c_start_transfer(bus, addr, 1); data =3D i2c_recv(bus); @@ -244,18 +254,23 @@ int smbus_read_byte(I2CBus *bus, uint8_t addr, uint= 8_t command) return data; } =20 -void smbus_write_byte(I2CBus *bus, uint8_t addr, uint8_t command, uint8_= t data) +int smbus_write_byte(I2CBus *bus, uint8_t addr, uint8_t command, uint8_t= data) { - i2c_start_transfer(bus, addr, 0); + if (i2c_start_transfer(bus, addr, 0)) { + return -1; + } i2c_send(bus, command); i2c_send(bus, data); i2c_end_transfer(bus); + return 0; } =20 int smbus_read_word(I2CBus *bus, uint8_t addr, uint8_t command) { uint16_t data; - i2c_start_transfer(bus, addr, 0); + if (i2c_start_transfer(bus, addr, 0)) { + return -1; + } i2c_send(bus, command); i2c_start_transfer(bus, addr, 1); data =3D i2c_recv(bus); @@ -265,13 +280,16 @@ int smbus_read_word(I2CBus *bus, uint8_t addr, uint= 8_t command) return data; } =20 -void smbus_write_word(I2CBus *bus, uint8_t addr, uint8_t command, uint16= _t data) +int smbus_write_word(I2CBus *bus, uint8_t addr, uint8_t command, uint16_= t data) { - i2c_start_transfer(bus, addr, 0); + if (i2c_start_transfer(bus, addr, 0)) { + return -1; + } i2c_send(bus, command); i2c_send(bus, data & 0xff); i2c_send(bus, data >> 8); i2c_end_transfer(bus); + return 0; } =20 int smbus_read_block(I2CBus *bus, uint8_t addr, uint8_t command, uint8_t= *data) @@ -279,33 +297,41 @@ int smbus_read_block(I2CBus *bus, uint8_t addr, uin= t8_t command, uint8_t *data) int len; int i; =20 - i2c_start_transfer(bus, addr, 0); + if (i2c_start_transfer(bus, addr, 0)) { + return -1; + } i2c_send(bus, command); i2c_start_transfer(bus, addr, 1); len =3D i2c_recv(bus); - if (len > 32) + if (len > 32) { len =3D 0; - for (i =3D 0; i < len; i++) + } + for (i =3D 0; i < len; i++) { data[i] =3D i2c_recv(bus); + } i2c_nack(bus); i2c_end_transfer(bus); return len; } =20 -void smbus_write_block(I2CBus *bus, uint8_t addr, uint8_t command, uint8= _t *data, - int len) +int smbus_write_block(I2CBus *bus, uint8_t addr, uint8_t command, uint8_= t *data, + int len) { int i; =20 if (len > 32) len =3D 32; =20 - i2c_start_transfer(bus, addr, 0); + if (i2c_start_transfer(bus, addr, 0)) { + return -1; + } i2c_send(bus, command); i2c_send(bus, len); - for (i =3D 0; i < len; i++) + for (i =3D 0; i < len; i++) { i2c_send(bus, data[i]); + } i2c_end_transfer(bus); + return 0; } =20 static void smbus_device_class_init(ObjectClass *klass, void *data) --=20 MST