Commit 07b9098d authored by xiaoqiang zhao's avatar xiaoqiang zhao Committed by Gerd Hoffmann
Browse files

hw/audio: QOM'ify milkymist-ac97.c 



* Drop the old SysBus init function and use instance_init
* Move AUD_open_in / AUD_open_out function into realize stage

Acked-by: default avatarMichael Walle <michael@walle.cc>
Tested-by: default avatarMichael Walle <michael@walle.cc>
Signed-off-by: default avatarxiaoqiang zhao <zxq_yx_007@163.com>
Message-id: 1463111220-30335-5-git-send-email-zxq_yx_007@163.com
Signed-off-by: default avatarGerd Hoffmann <kraxel@redhat.com>
parent bda8d9b8

hw/audio/milkymist-ac97.c

+15 −11
Original line number Diff line number Diff line
@@ -284,16 +284,26 @@ static int ac97_post_load(void *opaque, int version_id) 
    return 0;

}



static int milkymist_ac97_init(SysBusDevice *dev)

static void milkymist_ac97_init(Object *obj)

{

    MilkymistAC97State *s = MILKYMIST_AC97(dev);

    MilkymistAC97State *s = MILKYMIST_AC97(obj);

    SysBusDevice *dev = SYS_BUS_DEVICE(obj);



    struct audsettings as;

    sysbus_init_irq(dev, &s->crrequest_irq);

    sysbus_init_irq(dev, &s->crreply_irq);

    sysbus_init_irq(dev, &s->dmar_irq);

    sysbus_init_irq(dev, &s->dmaw_irq);



    memory_region_init_io(&s->regs_region, obj, &ac97_mmio_ops, s,

            "milkymist-ac97", R_MAX * 4);

    sysbus_init_mmio(dev, &s->regs_region);

}



static void milkymist_ac97_realize(DeviceState *dev, Error **errp)

{

    MilkymistAC97State *s = MILKYMIST_AC97(dev);

    struct audsettings as;



    AUD_register_card("Milkymist AC'97", &s->card);



    as.freq = 48000;
@@ -305,12 +315,6 @@ static int milkymist_ac97_init(SysBusDevice *dev) 
            "mm_ac97.in", s, ac97_in_cb, &as);

    s->voice_out = AUD_open_out(&s->card, s->voice_out,

            "mm_ac97.out", s, ac97_out_cb, &as);



    memory_region_init_io(&s->regs_region, OBJECT(s), &ac97_mmio_ops, s,

            "milkymist-ac97", R_MAX * 4);

    sysbus_init_mmio(dev, &s->regs_region);



    return 0;

}



static const VMStateDescription vmstate_milkymist_ac97 = {
@@ -327,9 +331,8 @@ static const VMStateDescription vmstate_milkymist_ac97 = { 
static void milkymist_ac97_class_init(ObjectClass *klass, void *data)

{

    DeviceClass *dc = DEVICE_CLASS(klass);

    SysBusDeviceClass *k = SYS_BUS_DEVICE_CLASS(klass);



    k->init = milkymist_ac97_init;

    dc->realize = milkymist_ac97_realize;

    dc->reset = milkymist_ac97_reset;

    dc->vmsd = &vmstate_milkymist_ac97;

}
@@ -338,6 +341,7 @@ static const TypeInfo milkymist_ac97_info = { 
    .name          = TYPE_MILKYMIST_AC97,

    .parent        = TYPE_SYS_BUS_DEVICE,

    .instance_size = sizeof(MilkymistAC97State),

    .instance_init = milkymist_ac97_init,

    .class_init    = milkymist_ac97_class_init,

};