Revision 3cbee15b hw/ppc_prep.c

b/hw/ppc_prep.c
527 527
{
528 528
    CPUState *env, *envs[MAX_CPUS];
529 529
    char buf[1024];
530
    m48t59_t *nvram;
530
    nvram_t nvram;
531
    m48t59_t *m48t59;
531 532
    int PPC_io_memory;
532 533
    int linux_boot, i, nb_nics1, bios_size;
533 534
    unsigned long bios_offset;
......
678 679
        usb_ohci_init_pci(pci_bus, 3, -1);
679 680
    }
680 681

  
681
    nvram = m48t59_init(i8259[8], 0, 0x0074, NVRAM_SIZE, 59);
682
    if (nvram == NULL)
682
    m48t59 = m48t59_init(i8259[8], 0, 0x0074, NVRAM_SIZE, 59);
683
    if (m48t59 == NULL)
683 684
        return;
684
    sysctrl->nvram = nvram;
685
    sysctrl->nvram = m48t59;
685 686

  
686 687
    /* Initialise NVRAM */
687
    PPC_NVRAM_set_params(nvram, NVRAM_SIZE, "PREP", ram_size, boot_device,
688
    nvram.opaque = m48t59;
689
    nvram.read_fn = &m48t59_read;
690
    nvram.write_fn = &m48t59_write;
691
    PPC_NVRAM_set_params(&nvram, NVRAM_SIZE, "PREP", ram_size, boot_device,
688 692
                         kernel_base, kernel_size,
689 693
                         kernel_cmdline,
690 694
                         initrd_base, initrd_size,

Also available in: Unified diff