Revision 487414f1 hw/ppc405_boards.c

b/hw/ppc405_boards.c
162 162
    int fpga_memory;
163 163

  
164 164
    fpga = qemu_mallocz(sizeof(ref405ep_fpga_t));
165
    if (fpga != NULL) {
166
        fpga_memory = cpu_register_io_memory(0, ref405ep_fpga_read,
167
                                             ref405ep_fpga_write, fpga);
168
        cpu_register_physical_memory(base, 0x00000100, fpga_memory);
169
        ref405ep_fpga_reset(fpga);
170
        qemu_register_reset(&ref405ep_fpga_reset, fpga);
171
    }
165
    fpga_memory = cpu_register_io_memory(0, ref405ep_fpga_read,
166
                                         ref405ep_fpga_write, fpga);
167
    cpu_register_physical_memory(base, 0x00000100, fpga_memory);
168
    ref405ep_fpga_reset(fpga);
169
    qemu_register_reset(&ref405ep_fpga_reset, fpga);
172 170
}
173 171

  
174 172
static void ref405ep_init (ram_addr_t ram_size, int vga_ram_size,
......
486 484
    int cpld_memory;
487 485

  
488 486
    cpld = qemu_mallocz(sizeof(taihu_cpld_t));
489
    if (cpld != NULL) {
490
        cpld_memory = cpu_register_io_memory(0, taihu_cpld_read,
491
                                             taihu_cpld_write, cpld);
492
        cpu_register_physical_memory(base, 0x00000100, cpld_memory);
493
        taihu_cpld_reset(cpld);
494
        qemu_register_reset(&taihu_cpld_reset, cpld);
495
    }
487
    cpld_memory = cpu_register_io_memory(0, taihu_cpld_read,
488
                                         taihu_cpld_write, cpld);
489
    cpu_register_physical_memory(base, 0x00000100, cpld_memory);
490
    taihu_cpld_reset(cpld);
491
    qemu_register_reset(&taihu_cpld_reset, cpld);
496 492
}
497 493

  
498 494
static void taihu_405ep_init(ram_addr_t ram_size, int vga_ram_size,

Also available in: Unified diff