[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH v2 01/10] i2c:pm_smbus: Clean up some style issu
From: |
Philippe Mathieu-Daudé |
Subject: |
Re: [Qemu-devel] [PATCH v2 01/10] i2c:pm_smbus: Clean up some style issues |
Date: |
Tue, 21 Aug 2018 03:22:41 -0300 |
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.9.1 |
Hi Corey,
On 08/20/2018 05:26 PM, address@hidden wrote:
> From: Corey Minyard <address@hidden>
>
> Fix some spacing issues, remove extraneous comments, add some
> defines instead of hard-coding numbers.
>
> Signed-off-by: Corey Minyard <address@hidden>
> Cc: Michael S. Tsirkin <address@hidden>
> Cc: Paolo Bonzini <address@hidden>
> ---
> hw/i2c/pm_smbus.c | 58
> ++++++++++++++++++++++++++++++++++++-------------------
> 1 file changed, 38 insertions(+), 20 deletions(-)
>
> diff --git a/hw/i2c/pm_smbus.c b/hw/i2c/pm_smbus.c
> index 0d26e0f..83c2377 100644
> --- a/hw/i2c/pm_smbus.c
> +++ b/hw/i2c/pm_smbus.c
> @@ -22,8 +22,6 @@
> #include "hw/i2c/pm_smbus.h"
> #include "hw/i2c/smbus.h"
>
> -/* no save/load? */
> -
> #define SMBHSTSTS 0x00
> #define SMBHSTCNT 0x02
> #define SMBHSTCMD 0x03
> @@ -32,19 +30,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
> +
What about using an enum { ...
> +#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
}; ?
Regardless:
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
> +
> +/*#define DEBUG*/
>
> #ifdef DEBUG
> # define SMBUS_DPRINTF(format, ...) printf(format, ## __VA_ARGS__)
> @@ -70,11 +83,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;
> @@ -82,7 +96,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;
> @@ -91,16 +105,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;
> @@ -158,8 +173,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_start(s);
> + }
> break;
> case SMBHSTCMD:
> s->smb_cmd = val;
> @@ -198,7 +214,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;
> @@ -221,7 +237,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;
> }
>
>
- [Qemu-devel] [PATCH v2 0/8] Make the pm_smbus code more correct, minyard, 2018/08/20
- [Qemu-devel] [PATCH v2 02/10] i2c:pm_smbus: Fix the semantics of block I2C transfers, minyard, 2018/08/20
- [Qemu-devel] [PATCH v2 04/10] i2c:pm_smbus: Add block transfer capability, minyard, 2018/08/20
- [Qemu-devel] [PATCH v2 01/10] i2c:pm_smbus: Clean up some style issues, minyard, 2018/08/20
- Re: [Qemu-devel] [PATCH v2 01/10] i2c:pm_smbus: Clean up some style issues,
Philippe Mathieu-Daudé <=
- [Qemu-devel] [PATCH v2 08/10] i2c:pm_smbus: Add the ability to force block transfer enable, minyard, 2018/08/20
- [Qemu-devel] [PATCH v2 09/10] i2c: Add an SMBus vmstate structure, minyard, 2018/08/20
- [Qemu-devel] [PATCH v2 05/10] i2c:pm_smbus: Fix state transfer, minyard, 2018/08/20
- [Qemu-devel] [PATCH v2 10/10] i2c: Add vmstate handling to the smbus eeprom, minyard, 2018/08/20