[PATCH qemu 12/38] aspeed/smc: rework the prototype of the AspeedSMCFlash helper routines

[Andrew Jeffery]

On Fri, 2016-11-18 at 15:21 +0100, Cédric Le Goater wrote:
> Change the routines prototype to use a 'AspeedSMCFlash *' instead of
> 'AspeedSMCState *'. The result will help in making future changes
> clearer.
> 
> Signed-off-by: Cédric Le Goater <clg at kaod.org>

Reviewed-by: Andrew Jeffery <andrew at aj.id.au>

> ---
>  hw/ssi/aspeed_smc.c         | 37 ++++++++++++++++++++++---------------
>  include/hw/ssi/aspeed_smc.h |  2 +-
>  2 files changed, 23 insertions(+), 16 deletions(-)
> 
> diff --git a/hw/ssi/aspeed_smc.c b/hw/ssi/aspeed_smc.c
> index 78f5aed53247..91cdc0bf1ac7 100644
> --- a/hw/ssi/aspeed_smc.c
> +++ b/hw/ssi/aspeed_smc.c
> @@ -328,19 +328,30 @@ static const MemoryRegionOps aspeed_smc_flash_default_ops = {
>      },
>  };
>  
> -static inline int aspeed_smc_flash_mode(const AspeedSMCState *s, int cs)
> +static inline int aspeed_smc_flash_mode(const AspeedSMCFlash *fl)
>  {
> -    return s->regs[s->r_ctrl0 + cs] & CTRL_CMD_MODE_MASK;
> +    AspeedSMCState *s = fl->controller;
> +
> +    return s->regs[s->r_ctrl0 + fl->id] & CTRL_CMD_MODE_MASK;
>  }
>  
> -static inline bool aspeed_smc_is_usermode(const AspeedSMCState *s, int cs)
> +static inline bool aspeed_smc_is_usermode(const AspeedSMCFlash *fl)
>  {
> -    return aspeed_smc_flash_mode(s, cs) == CTRL_USERMODE;
> +    return aspeed_smc_flash_mode(fl) == CTRL_USERMODE;
>  }
>  
> -static inline bool aspeed_smc_is_writable(const AspeedSMCState *s, int cs)
> +static inline bool aspeed_smc_is_ce_stop_active(const AspeedSMCFlash *fl)
>  {
> -    return s->regs[s->r_conf] & (1 << (s->conf_enable_w0 + cs));
> +    AspeedSMCState *s = fl->controller;
> +
> +    return s->regs[s->r_ctrl0 + fl->id] & CTRL_CE_STOP_ACTIVE;
> +}
> +
> +static inline bool aspeed_smc_is_writable(const AspeedSMCFlash *fl)
> +{
> +    AspeedSMCState *s = fl->controller;
> +
> +    return s->regs[s->r_conf] & (1 << (s->conf_enable_w0 + fl->id));
>  }
>  
>  static uint64_t aspeed_smc_flash_read(void *opaque, hwaddr addr, unsigned size)
> @@ -350,7 +361,7 @@ static uint64_t aspeed_smc_flash_read(void *opaque, hwaddr addr, unsigned size)
>      uint64_t ret = 0;
>      int i;
>  
> -    if (aspeed_smc_is_usermode(s, fl->id)) {
> +    if (aspeed_smc_is_usermode(fl)) {
>          for (i = 0; i < size; i++) {
>              ret |= ssi_transfer(s->spi, 0x0) << (8 * i);
>          }
> @@ -370,13 +381,13 @@ static void aspeed_smc_flash_write(void *opaque, hwaddr addr, uint64_t data,
>      const AspeedSMCState *s = fl->controller;
>      int i;
>  
> -    if (!aspeed_smc_is_writable(s, fl->id)) {
> +    if (!aspeed_smc_is_writable(fl)) {
>          qemu_log_mask(LOG_GUEST_ERROR, "%s: flash is not writable at 0x%"
>                        HWADDR_PRIx "\n", __func__, addr);
>          return;
>      }
>  
> -    if (!aspeed_smc_is_usermode(s, fl->id)) {
> +    if (!aspeed_smc_is_usermode(fl)) {
>          qemu_log_mask(LOG_UNIMP, "%s: usermode not implemented\n",
>                        __func__);
>          return;
> @@ -397,17 +408,13 @@ static const MemoryRegionOps aspeed_smc_flash_ops = {
>      },
>  };
>  
> -static bool aspeed_smc_is_ce_stop_active(const AspeedSMCState *s, int cs)
> -{
> -    return s->regs[s->r_ctrl0 + cs] & CTRL_CE_STOP_ACTIVE;
> -}
> -
>  static void aspeed_smc_update_cs(const AspeedSMCState *s)
>  {
>      int i;
>  
>      for (i = 0; i < s->num_cs; ++i) {
> -        qemu_set_irq(s->cs_lines[i], aspeed_smc_is_ce_stop_active(s, i));
> +        qemu_set_irq(s->cs_lines[i],
> +                     aspeed_smc_is_ce_stop_active(&s->flashes[i]));
>      }
>  }
>  
> diff --git a/include/hw/ssi/aspeed_smc.h b/include/hw/ssi/aspeed_smc.h
> index bdfbcc0ffa7d..c64954f6103f 100644
> --- a/include/hw/ssi/aspeed_smc.h
> +++ b/include/hw/ssi/aspeed_smc.h
> @@ -47,7 +47,7 @@ typedef struct AspeedSMCController {
>  } AspeedSMCController;
>  
>  typedef struct AspeedSMCFlash {
> -    const struct AspeedSMCState *controller;
> +    struct AspeedSMCState *controller;
>  
>      uint8_t id;
>      uint32_t size;
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 801 bytes
Desc: This is a digitally signed message part
URL: <http://lists.ozlabs.org/pipermail/openbmc/attachments/20161121/1c37ed57/attachment.sig>