diff options
| author | balrog <balrog@c046a42c-6fe2-441c-8c8c-71466251a162> | 2008-05-02 01:35:20 +0000 |
|---|---|---|
| committer | balrog <balrog@c046a42c-6fe2-441c-8c8c-71466251a162> | 2008-05-02 01:35:20 +0000 |
| commit | b0f6edb18edd30f9eb0d5789ceb78f2f04e95d8f (patch) | |
| tree | 35ebd4a89660a9db017645a5186b06d773ac5e4b /hw | |
| parent | 771effeb8d49aaf4d1a39c0be5e4b722d22427ec (diff) | |
Musicpal: convert to ram_addr_t
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@4295 c046a42c-6fe2-441c-8c8c-71466251a162
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/musicpal.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/hw/musicpal.c b/hw/musicpal.c index c8ee1ac88a..56bb457958 100644 --- a/hw/musicpal.c +++ b/hw/musicpal.c @@ -1380,7 +1380,7 @@ static struct arm_boot_info musicpal_binfo = { .board_id = 0x20e, }; -static void musicpal_init(int ram_size, int vga_ram_size, +static void musicpal_init(ram_addr_t ram_size, int vga_ram_size, const char *boot_device, DisplayState *ds, const char *kernel_filename, const char *kernel_cmdline, const char *initrd_filename, const char *cpu_model) @@ -1410,7 +1410,7 @@ static void musicpal_init(int ram_size, int vga_ram_size, /* Catch various stuff not handled by separate subsystems */ iomemtype = cpu_register_io_memory(0, musicpal_readfn, - musicpal_writefn, first_cpu); + musicpal_writefn, env); cpu_register_physical_memory(0x80000000, 0x10000, iomemtype); pic = mv88w8618_pic_init(MP_PIC_BASE, pic[ARM_PIC_CPU_IRQ]); @@ -1465,7 +1465,7 @@ static void musicpal_init(int ram_size, int vga_ram_size, musicpal_binfo.kernel_filename = kernel_filename; musicpal_binfo.kernel_cmdline = kernel_cmdline; musicpal_binfo.initrd_filename = initrd_filename; - arm_load_kernel(first_cpu, &musicpal_binfo); + arm_load_kernel(env, &musicpal_binfo); } QEMUMachine musicpal_machine = { |