openkylin
/
qemu
mirror of https://gitee.com/openkylin/qemu.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

omap_l4: rename omap_l4_attach_region() to omap_l4_attach() 

Signed-off-by: Avi Kivity <avi@redhat.com>
This commit is contained in:
Avi Kivity 2011-11-28 15:40:49 +02:00
parent a6dbd3c836
commit f44336c594
11 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hw/omap.h
View File

@ -94,7 +94,7 @@ struct omap_target_agent_s *omap_l4ta_get(
const struct omap_l4_region_s *regions, const struct omap_l4_region_s *regions,
const struct omap_l4_agent_info_s *agents, const struct omap_l4_agent_info_s *agents,
int cs); int cs);
target_phys_addr_t omap_l4_attach_region(struct omap_target_agent_s *ta, target_phys_addr_t omap_l4_attach(struct omap_target_agent_s *ta,
int region, MemoryRegion *mr); int region, MemoryRegion *mr);
target_phys_addr_t omap_l4_region_base(struct omap_target_agent_s *ta, target_phys_addr_t omap_l4_region_base(struct omap_target_agent_s *ta,
int region); int region);

10
hw/omap2.c
View File

@ -605,7 +605,7 @@ static struct omap_eac_s *omap_eac_init(struct omap_target_agent_s *ta,
memory_region_init_io(&s->iomem, &omap_eac_ops, s, "omap.eac", memory_region_init_io(&s->iomem, &omap_eac_ops, s, "omap.eac",
omap_l4_region_size(ta, 0)); omap_l4_region_size(ta, 0));
omap_l4_attach_region(ta, 0, &s->iomem); omap_l4_attach(ta, 0, &s->iomem);
return s; return s;
} }
@ -793,7 +793,7 @@ static struct omap_sti_s *omap_sti_init(struct omap_target_agent_s *ta,
memory_region_init_io(&s->iomem, &omap_sti_ops, s, "omap.sti", memory_region_init_io(&s->iomem, &omap_sti_ops, s, "omap.sti",
omap_l4_region_size(ta, 0)); omap_l4_region_size(ta, 0));
omap_l4_attach_region(ta, 0, &s->iomem); omap_l4_attach(ta, 0, &s->iomem);
memory_region_init_io(&s->iomem_fifo, &omap_sti_fifo_ops, s, memory_region_init_io(&s->iomem_fifo, &omap_sti_fifo_ops, s,
"omap.sti.fifo", 0x10000); "omap.sti.fifo", 0x10000);
@ -1813,8 +1813,8 @@ static struct omap_prcm_s *omap_prcm_init(struct omap_target_agent_s *ta,
omap_l4_region_size(ta, 0)); omap_l4_region_size(ta, 0));
memory_region_init_io(&s->iomem1, &omap_prcm_ops, s, "omap.pcrm1", memory_region_init_io(&s->iomem1, &omap_prcm_ops, s, "omap.pcrm1",
omap_l4_region_size(ta, 1)); omap_l4_region_size(ta, 1));
omap_l4_attach_region(ta, 0, &s->iomem0); omap_l4_attach(ta, 0, &s->iomem0);
omap_l4_attach_region(ta, 1, &s->iomem1); omap_l4_attach(ta, 1, &s->iomem1);
return s; return s;
} }
@ -2187,7 +2187,7 @@ static struct omap_sysctl_s *omap_sysctl_init(struct omap_target_agent_s *ta,
memory_region_init_io(&s->iomem, &omap_sysctl_ops, s, "omap.sysctl", memory_region_init_io(&s->iomem, &omap_sysctl_ops, s, "omap.sysctl",
omap_l4_region_size(ta, 0)); omap_l4_region_size(ta, 0));
omap_l4_attach_region(ta, 0, &s->iomem); omap_l4_attach(ta, 0, &s->iomem);
return s; return s;
} }

8
hw/omap_dss.c
View File

@ -1064,10 +1064,10 @@ struct omap_dss_s *omap_dss_init(struct omap_target_agent_s *ta,
memory_region_init_io(&s->iomem_im3, &omap_im3_ops, s, memory_region_init_io(&s->iomem_im3, &omap_im3_ops, s,
"omap.im3", 0x1000); "omap.im3", 0x1000);
omap_l4_attach_region(ta, 0, &s->iomem_diss1); omap_l4_attach(ta, 0, &s->iomem_diss1);
omap_l4_attach_region(ta, 1, &s->iomem_disc1); omap_l4_attach(ta, 1, &s->iomem_disc1);
omap_l4_attach_region(ta, 2, &s->iomem_rfbi1); omap_l4_attach(ta, 2, &s->iomem_rfbi1);
omap_l4_attach_region(ta, 3, &s->iomem_venc1); omap_l4_attach(ta, 3, &s->iomem_venc1);
memory_region_add_subregion(sysmem, l3_base, &s->iomem_im3); memory_region_add_subregion(sysmem, l3_base, &s->iomem_im3);
#if 0 #if 0

2
hw/omap_gptimer.c
View File

@ -482,7 +482,7 @@ struct omap_gp_timer_s *omap_gp_timer_init(struct omap_target_agent_s *ta,
memory_region_init_io(&s->iomem, &omap_gp_timer_ops, s, "omap.gptimer", memory_region_init_io(&s->iomem, &omap_gp_timer_ops, s, "omap.gptimer",
omap_l4_region_size(ta, 0)); omap_l4_region_size(ta, 0));
omap_l4_attach_region(ta, 0, &s->iomem); omap_l4_attach(ta, 0, &s->iomem);
return s; return s;
} }

2
hw/omap_i2c.c
View File

@ -464,7 +464,7 @@ struct omap_i2c_s *omap2_i2c_init(struct omap_target_agent_s *ta,
memory_region_init_io(&s->iomem, &omap_i2c_ops, s, "omap2.i2c", memory_region_init_io(&s->iomem, &omap_i2c_ops, s, "omap2.i2c",
omap_l4_region_size(ta, 0)); omap_l4_region_size(ta, 0));
omap_l4_attach_region(ta, 0, &s->iomem); omap_l4_attach(ta, 0, &s->iomem);
return s; return s;
} }

4
hw/omap_l4.c
View File

@ -138,12 +138,12 @@ struct omap_target_agent_s *omap_l4ta_get(struct omap_l4_s *bus,
memory_region_init_io(&ta->iomem, &omap_l4ta_ops, ta, "omap.l4ta", memory_region_init_io(&ta->iomem, &omap_l4ta_ops, ta, "omap.l4ta",
omap_l4_region_size(ta, info->ta_region)); omap_l4_region_size(ta, info->ta_region));
omap_l4_attach_region(ta, info->ta_region, &ta->iomem); omap_l4_attach(ta, info->ta_region, &ta->iomem);
return ta; return ta;
} }
target_phys_addr_t omap_l4_attach_region(struct omap_target_agent_s *ta, target_phys_addr_t omap_l4_attach(struct omap_target_agent_s *ta,
int region, MemoryRegion *mr) int region, MemoryRegion *mr)
{ {
target_phys_addr_t base; target_phys_addr_t base;

2
hw/omap_mmc.c
View File

@ -614,7 +614,7 @@ struct omap_mmc_s *omap2_mmc_init(struct omap_target_agent_s *ta,
memory_region_init_io(&s->iomem, &omap_mmc_ops, s, "omap.mmc", memory_region_init_io(&s->iomem, &omap_mmc_ops, s, "omap.mmc",
omap_l4_region_size(ta, 0)); omap_l4_region_size(ta, 0));
omap_l4_attach_region(ta, 0, &s->iomem); omap_l4_attach(ta, 0, &s->iomem);
/* Instantiate the storage */ /* Instantiate the storage */
s->card = sd_init(bd, 0); s->card = sd_init(bd, 0);

2
hw/omap_spi.c
View File

@ -332,7 +332,7 @@ struct omap_mcspi_s *omap_mcspi_init(struct omap_target_agent_s *ta, int chnum,
memory_region_init_io(&s->iomem, &omap_mcspi_ops, s, "omap.mcspi", memory_region_init_io(&s->iomem, &omap_mcspi_ops, s, "omap.mcspi",
omap_l4_region_size(ta, 0)); omap_l4_region_size(ta, 0));
omap_l4_attach_region(ta, 0, &s->iomem); omap_l4_attach(ta, 0, &s->iomem);
return s; return s;
} }

2
hw/omap_synctimer.c
View File

@ -96,7 +96,7 @@ struct omap_synctimer_s *omap_synctimer_init(struct omap_target_agent_s *ta,
omap_synctimer_reset(s); omap_synctimer_reset(s);
memory_region_init_io(&s->iomem, &omap_synctimer_ops, s, "omap.synctimer", memory_region_init_io(&s->iomem, &omap_synctimer_ops, s, "omap.synctimer",
omap_l4_region_size(ta, 0)); omap_l4_region_size(ta, 0));
omap_l4_attach_region(ta, 0, &s->iomem); omap_l4_attach(ta, 0, &s->iomem);
return s; return s;
} }

2
hw/omap_tap.c
View File

@ -112,5 +112,5 @@ void omap_tap_init(struct omap_target_agent_s *ta,
{ {
memory_region_init_io(&mpu->tap_iomem, &omap_tap_ops, mpu, "omap.tap", memory_region_init_io(&mpu->tap_iomem, &omap_tap_ops, mpu, "omap.tap",
omap_l4_region_size(ta, 0)); omap_l4_region_size(ta, 0));
omap_l4_attach_region(ta, 0, &mpu->tap_iomem); omap_l4_attach(ta, 0, &mpu->tap_iomem);
} }

2
hw/omap_uart.c
View File

@ -165,7 +165,7 @@ struct omap_uart_s *omap2_uart_init(MemoryRegion *sysmem,
qemu_irq txdma, qemu_irq rxdma, qemu_irq txdma, qemu_irq rxdma,
const char *label, CharDriverState *chr) const char *label, CharDriverState *chr)
{ {
target_phys_addr_t base = omap_l4_attach_region(ta, 0, NULL); target_phys_addr_t base = omap_l4_attach(ta, 0, NULL);
struct omap_uart_s *s = omap_uart_init(base, irq, struct omap_uart_s *s = omap_uart_init(base, irq,
fclk, iclk, txdma, rxdma, label, chr); fclk, iclk, txdma, rxdma, label, chr);