Re: [Qemu-ppc] [PATCH 5/8] ppc4xx: Rename ppc4xx_sdram_t in ppc440_uc.c to ppc440_sdram_t

[David Gibson]

On Wed, Jan 02, 2019 at 03:06:38AM +0100, BALATON Zoltan wrote:
> There's already a struct with the same name in ppc4xx_devs.c. They are
> not used outside their files so don't clash but they are also not
> identical so rename the ppc440 specific one to distinguish them.
> 
> Signed-off-by: BALATON Zoltan <address@hidden>

Reviewed-by: David Gibson <address@hidden>

> ---
>  hw/ppc/ppc440_uc.c | 16 ++++++++--------
>  1 file changed, 8 insertions(+), 8 deletions(-)
> 
> diff --git a/hw/ppc/ppc440_uc.c b/hw/ppc/ppc440_uc.c
> index 9360f781ce..e46f59fba8 100644
> --- a/hw/ppc/ppc440_uc.c
> +++ b/hw/ppc/ppc440_uc.c
> @@ -481,7 +481,7 @@ void ppc4xx_sdr_init(CPUPPCState *env)
>  
>  
> /*****************************************************************************/
>  /* SDRAM controller */
> -typedef struct ppc4xx_sdram_t {
> +typedef struct ppc440_sdram_t {
>      uint32_t addr;
>      int nbanks;
>      MemoryRegion containers[4]; /* used for clipping */
> @@ -489,7 +489,7 @@ typedef struct ppc4xx_sdram_t {
>      hwaddr ram_bases[4];
>      hwaddr ram_sizes[4];
>      uint32_t bcr[4];
> -} ppc4xx_sdram_t;
> +} ppc440_sdram_t;
>  
>  enum {
>      SDRAM0_CFGADDR = 0x10,
> @@ -564,7 +564,7 @@ static target_ulong sdram_size(uint32_t bcr)
>      return size;
>  }
>  
> -static void sdram_set_bcr(ppc4xx_sdram_t *sdram,
> +static void sdram_set_bcr(ppc440_sdram_t *sdram,
>                            uint32_t *bcrp, uint32_t bcr, int enabled)
>  {
>      unsigned n = bcrp - sdram->bcr;
> @@ -589,7 +589,7 @@ static void sdram_set_bcr(ppc4xx_sdram_t *sdram,
>      }
>  }
>  
> -static void sdram_map_bcr(ppc4xx_sdram_t *sdram)
> +static void sdram_map_bcr(ppc440_sdram_t *sdram)
>  {
>      int i;
>  
> @@ -607,7 +607,7 @@ static void sdram_map_bcr(ppc4xx_sdram_t *sdram)
>  
>  static uint32_t dcr_read_sdram(void *opaque, int dcrn)
>  {
> -    ppc4xx_sdram_t *sdram = opaque;
> +    ppc440_sdram_t *sdram = opaque;
>      uint32_t ret = 0;
>  
>      switch (dcrn) {
> @@ -658,7 +658,7 @@ static uint32_t dcr_read_sdram(void *opaque, int dcrn)
>  
>  static void dcr_write_sdram(void *opaque, int dcrn, uint32_t val)
>  {
> -    ppc4xx_sdram_t *sdram = opaque;
> +    ppc440_sdram_t *sdram = opaque;
>  
>      switch (dcrn) {
>      case SDRAM_R0BAS:
> @@ -689,7 +689,7 @@ static void dcr_write_sdram(void *opaque, int dcrn, 
> uint32_t val)
>  
>  static void sdram_reset(void *opaque)
>  {
> -    ppc4xx_sdram_t *sdram = opaque;
> +    ppc440_sdram_t *sdram = opaque;
>  
>      sdram->addr = 0;
>  }
> @@ -699,7 +699,7 @@ void ppc440_sdram_init(CPUPPCState *env, int nbanks,
>                         hwaddr *ram_bases, hwaddr *ram_sizes,
>                         int do_init)
>  {
> -    ppc4xx_sdram_t *sdram;
> +    ppc440_sdram_t *sdram;
>  
>      sdram = g_malloc0(sizeof(*sdram));
>      sdram->nbanks = nbanks;

-- 
David Gibson                    | I'll have my music baroque, and my code
david AT gibson.dropbear.id.au  | minimalist, thank you.  NOT _the_ _other_
                                | _way_ _around_!
http://www.ozlabs.org/~dgibson

signature.asc
Description: PGP signature