diff options
| author | Avi Kivity <avi@redhat.com> | 2011-09-12 16:31:50 +0300 |
|---|---|---|
| committer | Avi Kivity <avi@redhat.com> | 2011-10-10 15:29:28 +0200 |
| commit | 589f0aaddd2ed9ab7fea5da4a2f3c155d5bdaa46 (patch) | |
| tree | 4ae8b8fc27b6c771a794e6af2d7234f917f940fd /hw/petalogix_s3adsp1800_mmu.c | |
| parent | d7973c774c3dbfaadc0a906db54b12785f6f4391 (diff) | |
| download | qemu-589f0aaddd2ed9ab7fea5da4a2f3c155d5bdaa46.zip qemu-589f0aaddd2ed9ab7fea5da4a2f3c155d5bdaa46.tar.gz qemu-589f0aaddd2ed9ab7fea5da4a2f3c155d5bdaa46.tar.bz2 | |
petalogix_s2adsp1800: convert to memory API
Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'hw/petalogix_s3adsp1800_mmu.c')
| -rw-r--r-- | hw/petalogix_s3adsp1800_mmu.c | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/hw/petalogix_s3adsp1800_mmu.c b/hw/petalogix_s3adsp1800_mmu.c index 66fb96d..17da2fd 100644 --- a/hw/petalogix_s3adsp1800_mmu.c +++ b/hw/petalogix_s3adsp1800_mmu.c @@ -35,6 +35,7 @@ #include "loader.h" #include "elf.h" #include "blockdev.h" +#include "exec-memory.h" #include "microblaze_pic_cpu.h" @@ -125,9 +126,10 @@ petalogix_s3adsp1800_init(ram_addr_t ram_size, DriveInfo *dinfo; int i; target_phys_addr_t ddr_base = 0x90000000; - ram_addr_t phys_lmb_bram; - ram_addr_t phys_ram; + MemoryRegion *phys_lmb_bram = g_new(MemoryRegion, 1); + MemoryRegion *phys_ram = g_new(MemoryRegion, 1); qemu_irq irq[32], *cpu_irq; + MemoryRegion *sysmem = get_system_memory(); /* init CPUs */ if (cpu_model == NULL) { @@ -139,13 +141,13 @@ petalogix_s3adsp1800_init(ram_addr_t ram_size, qemu_register_reset(main_cpu_reset, env); /* Attach emulated BRAM through the LMB. */ - phys_lmb_bram = qemu_ram_alloc(NULL, "petalogix_s3adsp1800.lmb_bram", - LMB_BRAM_SIZE); - cpu_register_physical_memory(0x00000000, LMB_BRAM_SIZE, - phys_lmb_bram | IO_MEM_RAM); + memory_region_init_ram(phys_lmb_bram, NULL, + "petalogix_s3adsp1800.lmb_bram", LMB_BRAM_SIZE); + memory_region_add_subregion(sysmem, 0x00000000, phys_lmb_bram); - phys_ram = qemu_ram_alloc(NULL, "petalogix_s3adsp1800.ram", ram_size); - cpu_register_physical_memory(ddr_base, ram_size, phys_ram | IO_MEM_RAM); + memory_region_init_ram(phys_ram, NULL, "petalogix_s3adsp1800.ram", + ram_size); + memory_region_add_subregion(sysmem, ddr_base, phys_ram); dinfo = drive_get(IF_PFLASH, 0, 0); pflash_cfi01_register(0xa0000000, |