← Back to branch summary

~vcs-imports/qemu/maemo

« back to all changes in this revision

Viewing changes to hw/ppc4xx_devs.c

  • Committer: Riku Voipio
  • Date: 2009-06-08 15:31:58 UTC
  • mfrom: (6281.2.366)
  • mto: This revision was merged to the branch mainline in revision 6452.
  • Revision ID: git-v1:759b334a9739814df2883aa4c41b1c0f5670e90a
Merge commit 'gnu/master' into test

Epic merge

Conflicts:
        Makefile
        block.c
        block.h
        configure
        hw/boards.h
        hw/flash.h
        hw/integratorcp.c
        hw/nand.c
        hw/omap2.c
        hw/omap_i2c.c
        hw/sd.c
        hw/smc91c111.c
        hw/tsc2005.c
        hw/tusb6010.c
        hw/usb-musb.c
        linux-user/syscall.c
        target-arm/machine.c
        target-arm/translate.c

Show diffs side-by-side

added added

removed removed

Lines of Context:
hw/ppc4xx_devs.c
60
60
    tb_clk->opaque = env;
61
61
    ppc_dcr_init(env, NULL, NULL);
62
62
    /* Register qemu callbacks */
63
 
    qemu_register_reset(&cpu_ppc_reset, env);
 
63
    qemu_register_reset(&cpu_ppc_reset, 0, env);
64
64
 
65
65
    return env;
66
66
}
498
498
        ppc_dcr_register(env, dcr_base + i, uic,
499
499
                         &dcr_read_uic, &dcr_write_uic);
500
500
    }
501
 
    qemu_register_reset(ppcuic_reset, uic);
 
501
    qemu_register_reset(ppcuic_reset, 0, uic);
502
502
    ppcuic_reset(uic);
503
503
 
504
504
    return qemu_allocate_irqs(&ppcuic_set_irq, uic, UIC_MAX_IRQ);
834
834
    memcpy(sdram->ram_sizes, ram_sizes,
835
835
           nbanks * sizeof(target_phys_addr_t));
836
836
    sdram_reset(sdram);
837
 
    qemu_register_reset(&sdram_reset, sdram);
 
837
    qemu_register_reset(&sdram_reset, 0, sdram);
838
838
    ppc_dcr_register(env, SDRAM0_CFGADDR,
839
839
                     sdram, &dcr_read_sdram, &dcr_write_sdram);
840
840
    ppc_dcr_register(env, SDRAM0_CFGDATA,