gwj / at91sam9263 · Commits

Commit b0f6edb18edd30f9eb0d5789ceb78f2f04e95d8f

Authored by balrog
1 parent 771effeb

Musicpal: convert to ram_addr_t 


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@4295 c046a42c-6fe2-441c-8c8c-71466251a162
Inline Side-by-side
Showing 1 changed file with 3 additions and 3 deletions
hw/musicpal.c
  View file @b0f6edb
... ... @@ -1380,7 +1380,7 @@ static struct arm_boot_info musicpal_binfo = {
1380 1380 .board_id = 0x20e,
1381 1381 };
1382 1382  
1383   -static void musicpal_init(int ram_size, int vga_ram_size,
  1383 +static void musicpal_init(ram_addr_t ram_size, int vga_ram_size,
1384 1384 const char *boot_device, DisplayState *ds,
1385 1385 const char *kernel_filename, const char *kernel_cmdline,
1386 1386 const char *initrd_filename, const char *cpu_model)
... ... @@ -1410,7 +1410,7 @@ static void musicpal_init(int ram_size, int vga_ram_size,
1410 1410  
1411 1411 /* Catch various stuff not handled by separate subsystems */
1412 1412 iomemtype = cpu_register_io_memory(0, musicpal_readfn,
1413   - musicpal_writefn, first_cpu);
  1413 + musicpal_writefn, env);
1414 1414 cpu_register_physical_memory(0x80000000, 0x10000, iomemtype);
1415 1415  
1416 1416 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,
1465 1465 musicpal_binfo.kernel_filename = kernel_filename;
1466 1466 musicpal_binfo.kernel_cmdline = kernel_cmdline;
1467 1467 musicpal_binfo.initrd_filename = initrd_filename;
1468   - arm_load_kernel(first_cpu, &musicpal_binfo);
  1468 + arm_load_kernel(env, &musicpal_binfo);
1469 1469 }
1470 1470  
1471 1471 QEMUMachine musicpal_machine = {
... ...