mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ppc4xx: Rename ppc4xx_sdram_t in ppc440_uc.c to ppc440_sdram_t

Browse Source 
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 <balaton@eik.bme.hu>
Reviewed-by: David Gibson <david@gibson.dropbear.id.au>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
This commit is contained in:
BALATON Zoltan 2019-01-03 17:27:24 +01:00 committed by David Gibson
parent 7d8ccf58d5
commit 0a57fbee20
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
hw/ppc/ppc440_uc.c
View File

@ -481,7 +481,7 @@ void ppc4xx_sdr_init(CPUPPCState *env)
/*****************************************************************************/ /*****************************************************************************/
/* SDRAM controller */ /* SDRAM controller */
typedef struct ppc4xx_sdram_t { typedef struct ppc440_sdram_t {
uint32_t addr; uint32_t addr;
int nbanks; int nbanks;
MemoryRegion containers[4]; /* used for clipping */ MemoryRegion containers[4]; /* used for clipping */
@ -489,7 +489,7 @@ typedef struct ppc4xx_sdram_t {
hwaddr ram_bases[4]; hwaddr ram_bases[4];
hwaddr ram_sizes[4]; hwaddr ram_sizes[4];
uint32_t bcr[4]; uint32_t bcr[4];
} ppc4xx_sdram_t; } ppc440_sdram_t;
enum { enum {
SDRAM0_CFGADDR = 0x10, SDRAM0_CFGADDR = 0x10,
@ -564,7 +564,7 @@ static target_ulong sdram_size(uint32_t bcr)
return size; 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) uint32_t *bcrp, uint32_t bcr, int enabled)
{ {
unsigned n = bcrp - sdram->bcr; 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; 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) static uint32_t dcr_read_sdram(void *opaque, int dcrn)
{ {
ppc4xx_sdram_t *sdram = opaque; ppc440_sdram_t *sdram = opaque;
uint32_t ret = 0; uint32_t ret = 0;
switch (dcrn) { 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) static void dcr_write_sdram(void *opaque, int dcrn, uint32_t val)
{ {
ppc4xx_sdram_t *sdram = opaque; ppc440_sdram_t *sdram = opaque;
switch (dcrn) { switch (dcrn) {
case SDRAM_R0BAS: 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) static void sdram_reset(void *opaque)
{ {
ppc4xx_sdram_t *sdram = opaque; ppc440_sdram_t *sdram = opaque;
sdram->addr = 0; sdram->addr = 0;
} }
@ -699,7 +699,7 @@ void ppc440_sdram_init(CPUPPCState *env, int nbanks,
hwaddr *ram_bases, hwaddr *ram_sizes, hwaddr *ram_bases, hwaddr *ram_sizes,
int do_init) int do_init)
{ {
ppc4xx_sdram_t *sdram; ppc440_sdram_t *sdram;
sdram = g_malloc0(sizeof(*sdram)); sdram = g_malloc0(sizeof(*sdram));
sdram->nbanks = nbanks; sdram->nbanks = nbanks;