Revision c227f099 hw/sun4u.c

b/hw/sun4u.c
102 102
    return 0;
103 103
}
104 104

  
105
static int sun4u_NVRAM_set_params (a_m48t59 *nvram, uint16_t NVRAM_size,
105
static int sun4u_NVRAM_set_params (m48t59_t *nvram, uint16_t NVRAM_size,
106 106
                                   const char *arch,
107
                                   a_ram_addr RAM_size,
107
                                   ram_addr_t RAM_size,
108 108
                                   const char *boot_devices,
109 109
                                   uint32_t kernel_image, uint32_t kernel_size,
110 110
                                   const char *cmdline,
......
156 156
}
157 157
static unsigned long sun4u_load_kernel(const char *kernel_filename,
158 158
                                       const char *initrd_filename,
159
                                       a_ram_addr RAM_size, long *initrd_size)
159
                                       ram_addr_t RAM_size, long *initrd_size)
160 160
{
161 161
    int linux_boot;
162 162
    unsigned int i;
......
410 410
device_init(pci_ebus_register);
411 411

  
412 412
/* Boot PROM (OpenBIOS) */
413
static void prom_init(a_target_phys_addr addr, const char *bios_name)
413
static void prom_init(target_phys_addr_t addr, const char *bios_name)
414 414
{
415 415
    DeviceState *dev;
416 416
    SysBusDevice *s;
......
446 446

  
447 447
static int prom_init1(SysBusDevice *dev)
448 448
{
449
    a_ram_addr prom_offset;
449
    ram_addr_t prom_offset;
450 450

  
451 451
    prom_offset = qemu_ram_alloc(PROM_SIZE_MAX);
452 452
    sysbus_init_mmio(dev, PROM_SIZE_MAX, prom_offset | IO_MEM_ROM);
......
479 479
/* System RAM */
480 480
static int ram_init1(SysBusDevice *dev)
481 481
{
482
    a_ram_addr RAM_size, ram_offset;
482
    ram_addr_t RAM_size, ram_offset;
483 483
    RamDevice *d = FROM_SYSBUS(RamDevice, dev);
484 484

  
485 485
    RAM_size = d->size;
......
489 489
    return 0;
490 490
}
491 491

  
492
static void ram_init(a_target_phys_addr addr, a_ram_addr RAM_size)
492
static void ram_init(target_phys_addr_t addr, ram_addr_t RAM_size)
493 493
{
494 494
    DeviceState *dev;
495 495
    SysBusDevice *s;
......
560 560
    return env;
561 561
}
562 562

  
563
static void sun4uv_init(a_ram_addr RAM_size,
563
static void sun4uv_init(ram_addr_t RAM_size,
564 564
                        const char *boot_devices,
565 565
                        const char *kernel_filename, const char *kernel_cmdline,
566 566
                        const char *initrd_filename, const char *cpu_model,
567 567
                        const struct hwdef *hwdef)
568 568
{
569 569
    CPUState *env;
570
    a_m48t59 *nvram;
570
    m48t59_t *nvram;
571 571
    unsigned int i;
572 572
    long initrd_size, kernel_size;
573 573
    PCIBus *pci_bus, *pci_bus2, *pci_bus3;
......
704 704
};
705 705

  
706 706
/* Sun4u hardware initialisation */
707
static void sun4u_init(a_ram_addr RAM_size,
707
static void sun4u_init(ram_addr_t RAM_size,
708 708
                       const char *boot_devices,
709 709
                       const char *kernel_filename, const char *kernel_cmdline,
710 710
                       const char *initrd_filename, const char *cpu_model)
......
714 714
}
715 715

  
716 716
/* Sun4v hardware initialisation */
717
static void sun4v_init(a_ram_addr RAM_size,
717
static void sun4v_init(ram_addr_t RAM_size,
718 718
                       const char *boot_devices,
719 719
                       const char *kernel_filename, const char *kernel_cmdline,
720 720
                       const char *initrd_filename, const char *cpu_model)
......
724 724
}
725 725

  
726 726
/* Niagara hardware initialisation */
727
static void niagara_init(a_ram_addr RAM_size,
727
static void niagara_init(ram_addr_t RAM_size,
728 728
                         const char *boot_devices,
729 729
                         const char *kernel_filename, const char *kernel_cmdline,
730 730
                         const char *initrd_filename, const char *cpu_model)

Also available in: Unified diff