From patchwork Fri Dec 30 15:21:34 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Corey Minyard X-Patchwork-Id: 89380 Delivered-To: patch@linaro.org Received: by 10.140.20.101 with SMTP id 92csp6487896qgi; Fri, 30 Dec 2016 07:28:41 -0800 (PST) X-Received: by 10.200.49.165 with SMTP id h34mr41304521qte.43.1483111721619; Fri, 30 Dec 2016 07:28:41 -0800 (PST) Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id c53si24811799qtc.267.2016.12.30.07.28.41 for (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 30 Dec 2016 07:28:41 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@gmail.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom=qemu-devel-bounces+patch=linaro.org@nongnu.org Received: from localhost ([::1]:40326 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cMz6n-0007Di-3M for patch@linaro.org; Fri, 30 Dec 2016 10:28:41 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43248) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cMz0O-0002Gm-Rv for qemu-devel@nongnu.org; Fri, 30 Dec 2016 10:22:05 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cMz0L-0000Cj-J7 for qemu-devel@nongnu.org; Fri, 30 Dec 2016 10:22:04 -0500 Received: from mail-pg0-x241.google.com ([2607:f8b0:400e:c05::241]:33860) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1cMz0L-0000CO-CY for qemu-devel@nongnu.org; Fri, 30 Dec 2016 10:22:01 -0500 Received: by mail-pg0-x241.google.com with SMTP id b1so22369129pgc.1 for ; Fri, 30 Dec 2016 07:21:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=MvnRZ9lpc6Pab+Wcz/em6buet9BEYFsrjN/+JiFG2rU=; b=Auia+2Cay5ejzwXM0B0pLoRGIvba9CgLFoAXvG/RpcjByCWerysUXLENuCg/WhN5cn jP+ymUFdrWxxwj9fauAeNZGAf3bBoviktDfQERDDS7O5cHh0cFcUGI4Rl82YNMlkCExp MVuWXIBSdoWLIIdELaMD5B0ZI3XiTl6J5flJ7T7Y/o/MA/JVlfqLb96aLfKBLZOvnDuC zkOH0n1z1z8G5oNb/GIBfXQf10ZYnLNc7dGOgYf7Buyzd3l9Z32yBlaZBJF5JzcK6Tr5 KGGcMCZ7vWGldIUqzj0qnY/3RZnMuhNcan3qoIAdq1JgX5anaYjAUdbYl4fv6EOd/jTN WJKA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=MvnRZ9lpc6Pab+Wcz/em6buet9BEYFsrjN/+JiFG2rU=; b=lUTWMEQB2nIqI6NSiQVzianJHNbeU+UXkOjLpsHbQCdCQNv5g7L6Zfa4Wlg3ggxcFo tLOgrzd0wCqNgf3liLq/G7MmRcbZqnzq83AQSkCB+dFR2zL1UxR1vYa4nYoGlR7P27HK fHyWSTE+ZsXRcu+QmCefs9RUq8Ut2S37AcGHcBU6zKkOBuqumJ3ny7FwvJAU0klOYfU2 /cd9uwoAGyEP0wpVo/3fwm8zJ/NshVBlRVVtKUa0h9LcYl6MqRuGYvgXOHF23T31Rmhs E+iWfxPgu3T2k5ein77nV6nSkXy7OSE6Qr+zbpDebwSeOlFX0Gbkhn1IhAsglFtyp9Wo vDdw== X-Gm-Message-State: AIkVDXJP06maJJG1YsqYMBlfFN4BqlqPFKkG4N2McI9zqleiHstoLQPQZSHjsIneKVZJDA== X-Received: by 10.84.217.18 with SMTP id o18mr100800976pli.45.1483111318727; Fri, 30 Dec 2016 07:21:58 -0800 (PST) Received: from serve.minyard.net ([47.184.183.230]) by smtp.gmail.com with ESMTPSA id 186sm113514756pfv.61.2016.12.30.07.21.57 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 30 Dec 2016 07:21:57 -0800 (PST) Received: from t430.minyard.net (t430m.minyard.net [192.168.27.3]) by serve.minyard.net (Postfix) with ESMTPA id A39BF141C; Fri, 30 Dec 2016 09:21:55 -0600 (CST) Received: by t430.minyard.net (Postfix, from userid 1000) id E980130007A; Fri, 30 Dec 2016 09:21:52 -0600 (CST) From: minyard@acm.org To: qemu-devel@nongnu.org Date: Fri, 30 Dec 2016 09:21:34 -0600 Message-Id: <1483111310-24808-4-git-send-email-minyard@acm.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1483111310-24808-1-git-send-email-minyard@acm.org> References: <1483111310-24808-1-git-send-email-minyard@acm.org> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2607:f8b0:400e:c05::241 Subject: [Qemu-devel] [PATCH 03/19] i2c:pm_smbus: Clean up some style issues X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Corey Minyard , minyard@acm.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Corey Minyard Fix some spacing issues, remove extraneous comments, add some defines instead of hard-coding numbers. Signed-off-by: Corey Minyard --- hw/i2c/pm_smbus.c | 58 ++++++++++++++++++++++++++++++++++++------------------- 1 file changed, 38 insertions(+), 20 deletions(-) -- 2.7.4 diff --git a/hw/i2c/pm_smbus.c b/hw/i2c/pm_smbus.c index 6fc3923..92c3aebd 100644 --- a/hw/i2c/pm_smbus.c +++ b/hw/i2c/pm_smbus.c @@ -23,8 +23,6 @@ #include "hw/i2c/pm_smbus.h" #include "hw/i2c/smbus.h" -/* no save/load? */ - #define SMBHSTSTS 0x00 #define SMBHSTCNT 0x02 #define SMBHSTCMD 0x03 @@ -33,19 +31,34 @@ #define SMBHSTDAT1 0x06 #define SMBBLKDAT 0x07 -#define STS_HOST_BUSY (1) -#define STS_INTR (1<<1) -#define STS_DEV_ERR (1<<2) -#define STS_BUS_ERR (1<<3) -#define STS_FAILED (1<<4) -#define STS_SMBALERT (1<<5) -#define STS_INUSE_STS (1<<6) -#define STS_BYTE_DONE (1<<7) +#define STS_HOST_BUSY (1 << 0) +#define STS_INTR (1 << 1) +#define STS_DEV_ERR (1 << 2) +#define STS_BUS_ERR (1 << 3) +#define STS_FAILED (1 << 4) +#define STS_SMBALERT (1 << 5) +#define STS_INUSE_STS (1 << 6) +#define STS_BYTE_DONE (1 << 7) /* Signs of successfully transaction end : * ByteDoneStatus = 1 (STS_BYTE_DONE) and INTR = 1 (STS_INTR ) */ -//#define DEBUG +#define CTL_INTREN (1 << 0) +#define CTL_KILL (1 << 1) +#define CTL_LAST_BYTE (1 << 5) +#define CTL_START (1 << 6) +#define CTL_PEC_EN (1 << 7) +#define CTL_RETURN_MASK 0x1f + +#define PROT_QUICK 0 +#define PROT_BYTE 1 +#define PROT_BYTE_DATA 2 +#define PROT_WORD_DATA 3 +#define PROT_PROC_CALL 4 +#define PROT_BLOCK_DATA 5 +#define PROT_I2C_BLOCK_DATA 6 + +/*#define DEBUG*/ #ifdef DEBUG # define SMBUS_DPRINTF(format, ...) printf(format, ## __VA_ARGS__) @@ -68,11 +81,12 @@ static void smb_transaction(PMSMBus *s) if ((s->smb_stat & STS_DEV_ERR) != 0) { goto error; } + switch(prot) { - case 0x0: + case PROT_QUICK: ret = smbus_quick_command(bus, addr, read); goto done; - case 0x1: + case PROT_BYTE: if (read) { ret = smbus_receive_byte(bus, addr); goto data8; @@ -80,7 +94,7 @@ static void smb_transaction(PMSMBus *s) ret = smbus_send_byte(bus, addr, cmd); goto done; } - case 0x2: + case PROT_BYTE_DATA: if (read) { ret = smbus_read_byte(bus, addr, cmd); goto data8; @@ -89,16 +103,17 @@ static void smb_transaction(PMSMBus *s) goto done; } break; - case 0x3: + case PROT_WORD_DATA: if (read) { ret = smbus_read_word(bus, addr, cmd); goto data16; } else { - ret = smbus_write_word(bus, addr, cmd, (s->smb_data1 << 8) | s->smb_data0); + ret = smbus_write_word(bus, addr, cmd, + (s->smb_data1 << 8) | s->smb_data0); goto done; } break; - case 0x5: + case PROT_I2C_BLOCK_DATA: if (read) { ret = smbus_read_block(bus, addr, cmd, s->smb_data); goto data8; @@ -149,8 +164,9 @@ static void smb_ioport_writeb(void *opaque, hwaddr addr, uint64_t val, break; case SMBHSTCNT: s->smb_ctl = val; - if (val & 0x40) + if (s->smb_ctl & CTL_START) { smb_transaction(s); + } break; case SMBHSTCMD: s->smb_cmd = val; @@ -185,7 +201,7 @@ static uint64_t smb_ioport_readb(void *opaque, hwaddr addr, unsigned width) break; case SMBHSTCNT: s->smb_index = 0; - val = s->smb_ctl & 0x1f; + val = s->smb_ctl & CTL_RETURN_MASK; break; case SMBHSTCMD: val = s->smb_cmd; @@ -208,7 +224,9 @@ static uint64_t smb_ioport_readb(void *opaque, hwaddr addr, unsigned width) val = 0; break; } - SMBUS_DPRINTF("SMB readb port=0x%04" HWADDR_PRIx " val=0x%02x\n", addr, val); + SMBUS_DPRINTF("SMB readb port=0x%04" HWADDR_PRIx " val=0x%02x\n", + addr, val); + return val; }