← Back to branch summary

~vcs-imports/qemu/maemo

« back to all changes in this revision

Viewing changes to hw/cs4231a.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/cs4231a.c
636
636
    return 0;
637
637
}
638
638
 
639
 
int cs4231a_init (AudioState *audio, qemu_irq *pic)
 
639
int cs4231a_init (qemu_irq *pic)
640
640
{
641
641
    int i;
642
642
    CSState *s;
643
643
 
644
 
    if (!audio) {
645
 
        lerr ("No audio state\n");
646
 
        return -1;
647
 
    }
648
 
 
649
644
    s = qemu_mallocz (sizeof (*s));
650
645
 
651
646
    s->pic = pic;
661
656
    DMA_register_channel (s->dma, cs_dma_read, s);
662
657
 
663
658
    register_savevm ("cs4231a", 0, 1, cs_save, cs_load, s);
664
 
    qemu_register_reset (cs_reset, s);
 
659
    qemu_register_reset (cs_reset, 0, s);
665
660
    cs_reset (s);
666
661
 
667
 
    AUD_register_card (audio,"cs4231a", &s->card);
 
662
    AUD_register_card ("cs4231a", &s->card);
668
663
    return 0;
669
664
}