From patchwork Mon Feb 17 11:23:45 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 320936 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 5F1E52C00D1 for ; Mon, 17 Feb 2014 22:24:51 +1100 (EST) Received: from localhost ([::1]:39168 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WFMJd-0007Sd-6u for incoming@patchwork.ozlabs.org; Mon, 17 Feb 2014 06:24:49 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52989) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WFMJ3-0007Gg-GZ for qemu-devel@nongnu.org; Mon, 17 Feb 2014 06:24:21 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WFMIt-00075G-A4 for qemu-devel@nongnu.org; Mon, 17 Feb 2014 06:24:13 -0500 Received: from mail-qa0-x233.google.com ([2607:f8b0:400d:c00::233]:58831) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WFMIt-00075C-4K for qemu-devel@nongnu.org; Mon, 17 Feb 2014 06:24:03 -0500 Received: by mail-qa0-f51.google.com with SMTP id f11so21798943qae.10 for ; Mon, 17 Feb 2014 03:24:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=CrYY9NjzJVwOvSxloScP4j/Xipjxp6ZWlIdQFw45A9A=; b=t3zrZoNszENClhTRY8ZuFn1FjBEmJ/ehHvi8r2VLj4jF+DB2Mp0Cd91vSj+MaGi2EN hUWMz88BGDizP38cX+cUu5652GQ3kjLkIYc+HE+89oPdotKBmXqK7mS+d9sKQyPln4g1 XXULqdiJtIZFR7TGI2425FAZtGlK3ksJq4VjzTYvOQCqiYtnElJhkgqBgY+FUXRoDDmG RTPKrwUdpRi3NBzYON3L6A2tnKZl55TZVWAXRX/z/iYq9cgU9eA5qrgEyyidxpdX0USy gKgfqOvVyqqN2LpZVN6LLijZYLRhvOqbu3yt8idv4KwdJWRgWKYprI4wY5kGfPVj1vyx Ix8w== X-Received: by 10.140.22.145 with SMTP id 17mr32024652qgn.0.1392636242800; Mon, 17 Feb 2014 03:24:02 -0800 (PST) Received: from yakj.usersys.redhat.com (net-37-117-154-249.cust.vodafonedsl.it. [37.117.154.249]) by mx.google.com with ESMTPSA id k32sm21594906qgf.18.2014.02.17.03.24.00 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 17 Feb 2014 03:24:02 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Mon, 17 Feb 2014 12:23:45 +0100 Message-Id: <1392636226-26546-3-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.5.3 In-Reply-To: <1392636226-26546-1-git-send-email-pbonzini@redhat.com> References: <1392636226-26546-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2607:f8b0:400d:c00::233 Cc: alex.daerf@gmail.com, mst@redhat.com Subject: [Qemu-devel] [PATCH 2/3] smbus: return -1 if nothing found at the given address X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Fix coding standards in the meanwhile. Signed-off-by: Paolo Bonzini --- hw/i2c/smbus.c | 62 +++++++++++++++++++++++++++++++++++--------------- include/hw/i2c/smbus.h | 12 +++++----- 2 files changed, 50 insertions(+), 24 deletions(-) diff --git a/hw/i2c/smbus.c b/hw/i2c/smbus.c index a8931b7..18fb4d1 100644 --- a/hw/i2c/smbus.c +++ b/hw/i2c/smbus.c @@ -208,34 +208,44 @@ static int smbus_device_init(I2CSlave *i2c) } /* Master device commands. */ -void smbus_quick_command(i2c_bus *bus, uint8_t addr, int read) +int smbus_quick_command(i2c_bus *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; } int smbus_receive_byte(i2c_bus *bus, uint8_t addr) { uint8_t data; - i2c_start_transfer(bus, addr, 1); + if (i2c_start_transfer(bus, addr, 1)) { + return -1; + } data = i2c_recv(bus); i2c_nack(bus); i2c_end_transfer(bus); return data; } -void smbus_send_byte(i2c_bus *bus, uint8_t addr, uint8_t data) +int smbus_send_byte(i2c_bus *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; } int smbus_read_byte(i2c_bus *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 = i2c_recv(bus); @@ -244,18 +254,23 @@ int smbus_read_byte(i2c_bus *bus, uint8_t addr, uint8_t command) return data; } -void smbus_write_byte(i2c_bus *bus, uint8_t addr, uint8_t command, uint8_t data) +int smbus_write_byte(i2c_bus *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; } int smbus_read_word(i2c_bus *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 = i2c_recv(bus); @@ -265,13 +280,16 @@ int smbus_read_word(i2c_bus *bus, uint8_t addr, uint8_t command) return data; } -void smbus_write_word(i2c_bus *bus, uint8_t addr, uint8_t command, uint16_t data) +int smbus_write_word(i2c_bus *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; } int smbus_read_block(i2c_bus *bus, uint8_t addr, uint8_t command, uint8_t *data) @@ -279,33 +297,41 @@ int smbus_read_block(i2c_bus *bus, uint8_t addr, uint8_t command, uint8_t *data) int len; int i; - 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 = i2c_recv(bus); - if (len > 32) + if (len > 32) { len = 0; - for (i = 0; i < len; i++) + } + for (i = 0; i < len; i++) { data[i] = i2c_recv(bus); + } i2c_nack(bus); i2c_end_transfer(bus); return len; } -void smbus_write_block(i2c_bus *bus, uint8_t addr, uint8_t command, uint8_t *data, - int len) +int smbus_write_block(i2c_bus *bus, uint8_t addr, uint8_t command, uint8_t *data, + int len) { int i; if (len > 32) len = 32; - 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 = 0; i < len; i++) + for (i = 0; i < len; i++) { i2c_send(bus, data[i]); + } i2c_end_transfer(bus); + return 0; } static void smbus_device_class_init(ObjectClass *klass, void *data) diff --git a/include/hw/i2c/smbus.h b/include/hw/i2c/smbus.h index 4293733..358f35c 100644 --- a/include/hw/i2c/smbus.h +++ b/include/hw/i2c/smbus.h @@ -66,16 +66,16 @@ struct SMBusDevice { }; /* Master device commands. */ -void smbus_quick_command(i2c_bus *bus, uint8_t addr, int read); +int smbus_quick_command(i2c_bus *bus, uint8_t addr, int read); int smbus_receive_byte(i2c_bus *bus, uint8_t addr); -void smbus_send_byte(i2c_bus *bus, uint8_t addr, uint8_t data); +int smbus_send_byte(i2c_bus *bus, uint8_t addr, uint8_t data); int smbus_read_byte(i2c_bus *bus, uint8_t addr, uint8_t command); -void smbus_write_byte(i2c_bus *bus, uint8_t addr, uint8_t command, uint8_t data); +int smbus_write_byte(i2c_bus *bus, uint8_t addr, uint8_t command, uint8_t data); int smbus_read_word(i2c_bus *bus, uint8_t addr, uint8_t command); -void smbus_write_word(i2c_bus *bus, uint8_t addr, uint8_t command, uint16_t data); +int smbus_write_word(i2c_bus *bus, uint8_t addr, uint8_t command, uint16_t data); int smbus_read_block(i2c_bus *bus, uint8_t addr, uint8_t command, uint8_t *data); -void smbus_write_block(i2c_bus *bus, uint8_t addr, uint8_t command, uint8_t *data, - int len); +int smbus_write_block(i2c_bus *bus, uint8_t addr, uint8_t command, uint8_t *data, + int len); void smbus_eeprom_init(i2c_bus *smbus, int nb_eeprom, const uint8_t *eeprom_spd, int size);