Commit 4201e616 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/kraxel/tags/pull-audio-20170111-1' into staging 



audio: qomify drivers, hotplug fixes.

# gpg: Signature made Wed 11 Jan 2017 09:32:09 GMT
# gpg:                using RSA key 0x4CB6D8EED3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>"
# gpg:                 aka "Gerd Hoffmann <gerd@kraxel.org>"
# gpg:                 aka "Gerd Hoffmann (private) <kraxel@gmail.com>"
# Primary key fingerprint: A032 8CFF B93A 17A7 9901  FE7D 4CB6 D8EE D3E8 7138

* remotes/kraxel/tags/pull-audio-20170111-1:
  es1370: wire up reset via DeviceClass
  audio: ac97: add exit function
  audio: es1370: add exit function
  hw/audio: QOM'ify pl041.c
  hw/audio: QOM'ify marvell_88w8618.c

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 0f2d17c1 11f547e5

hw/audio/ac97.c

+11 −0
Original line number Diff line number Diff line
@@ -1387,6 +1387,16 @@ static void ac97_realize(PCIDevice *dev, Error **errp) 
    ac97_on_reset (&s->dev.qdev);

}



static void ac97_exit(PCIDevice *dev)

{

    AC97LinkState *s = DO_UPCAST(AC97LinkState, dev, dev);



    AUD_close_in(&s->card, s->voice_pi);

    AUD_close_out(&s->card, s->voice_po);

    AUD_close_in(&s->card, s->voice_mc);

    AUD_remove_card(&s->card);

}



static int ac97_init (PCIBus *bus)

{

    pci_create_simple (bus, -1, "AC97");
@@ -1404,6 +1414,7 @@ static void ac97_class_init (ObjectClass *klass, void *data) 
    PCIDeviceClass *k = PCI_DEVICE_CLASS (klass);



    k->realize = ac97_realize;

    k->exit = ac97_exit;

    k->vendor_id = PCI_VENDOR_ID_INTEL;

    k->device_id = PCI_DEVICE_ID_INTEL_82801AA_5;

    k->revision = 0x01;

hw/audio/es1370.c

+17 −3
Original line number Diff line number Diff line
@@ -1010,9 +1010,9 @@ static const VMStateDescription vmstate_es1370 = { 
    }

};



static void es1370_on_reset (void *opaque)

static void es1370_on_reset(DeviceState *dev)

{

    ES1370State *s = opaque;

    ES1370State *s = container_of(dev, ES1370State, dev.qdev);

    es1370_reset (s);

}
@@ -1035,12 +1035,24 @@ static void es1370_realize(PCIDevice *dev, Error **errp) 


    memory_region_init_io (&s->io, OBJECT(s), &es1370_io_ops, s, "es1370", 256);

    pci_register_bar (&s->dev, 0, PCI_BASE_ADDRESS_SPACE_IO, &s->io);

    qemu_register_reset (es1370_on_reset, s);



    AUD_register_card ("es1370", &s->card);

    es1370_reset (s);

}



static void es1370_exit(PCIDevice *dev)

{

    ES1370State *s = ES1370(dev);

    int i;



    for (i = 0; i < 2; ++i) {

        AUD_close_out(&s->card, s->dac_voice[i]);

    }



    AUD_close_in(&s->card, s->adc_voice);

    AUD_remove_card(&s->card);

}



static int es1370_init (PCIBus *bus)

{

    pci_create_simple (bus, -1, TYPE_ES1370);
@@ -1053,6 +1065,7 @@ static void es1370_class_init (ObjectClass *klass, void *data) 
    PCIDeviceClass *k = PCI_DEVICE_CLASS (klass);



    k->realize = es1370_realize;

    k->exit = es1370_exit;

    k->vendor_id = PCI_VENDOR_ID_ENSONIQ;

    k->device_id = PCI_DEVICE_ID_ENSONIQ_ES1370;

    k->class_id = PCI_CLASS_MULTIMEDIA_AUDIO;
@@ -1061,6 +1074,7 @@ static void es1370_class_init (ObjectClass *klass, void *data) 
    set_bit(DEVICE_CATEGORY_SOUND, dc->categories);

    dc->desc = "ENSONIQ AudioPCI ES1370";

    dc->vmsd = &vmstate_es1370;

    dc->reset = es1370_on_reset;

}



static const TypeInfo es1370_info = {

hw/audio/marvell_88w8618.c

+11 −7
Original line number Diff line number Diff line
@@ -241,19 +241,23 @@ static const MemoryRegionOps mv88w8618_audio_ops = { 
    .endianness = DEVICE_NATIVE_ENDIAN,

};



static int mv88w8618_audio_init(SysBusDevice *dev)

static void mv88w8618_audio_init(Object *obj)

{

    SysBusDevice *dev = SYS_BUS_DEVICE(obj);

    mv88w8618_audio_state *s = MV88W8618_AUDIO(dev);



    sysbus_init_irq(dev, &s->irq);



    wm8750_data_req_set(s->wm, mv88w8618_audio_callback, s);



    memory_region_init_io(&s->iomem, OBJECT(s), &mv88w8618_audio_ops, s,

    memory_region_init_io(&s->iomem, obj, &mv88w8618_audio_ops, s,

                          "audio", MP_AUDIO_SIZE);

    sysbus_init_mmio(dev, &s->iomem);

}



    return 0;

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

{

    mv88w8618_audio_state *s = MV88W8618_AUDIO(dev);



    wm8750_data_req_set(s->wm, mv88w8618_audio_callback, s);

}



static const VMStateDescription mv88w8618_audio_vmsd = {
@@ -282,9 +286,8 @@ static Property mv88w8618_audio_properties[] = { 
static void mv88w8618_audio_class_init(ObjectClass *klass, void *data)

{

    DeviceClass *dc = DEVICE_CLASS(klass);

    SysBusDeviceClass *k = SYS_BUS_DEVICE_CLASS(klass);



    k->init = mv88w8618_audio_init;

    dc->realize = mv88w8618_audio_realize;

    dc->reset = mv88w8618_audio_reset;

    dc->vmsd = &mv88w8618_audio_vmsd;

    dc->props = mv88w8618_audio_properties;
@@ -296,6 +299,7 @@ static const TypeInfo mv88w8618_audio_info = { 
    .name          = TYPE_MV88W8618_AUDIO,

    .parent        = TYPE_SYS_BUS_DEVICE,

    .instance_size = sizeof(mv88w8618_audio_state),

    .instance_init = mv88w8618_audio_init,

    .class_init    = mv88w8618_audio_class_init,

};

hw/audio/pl041.c

+14 −11
Original line number Diff line number Diff line
@@ -521,12 +521,23 @@ static const MemoryRegionOps pl041_ops = { 
    .endianness = DEVICE_NATIVE_ENDIAN,

};



static int pl041_init(SysBusDevice *dev)

static void pl041_init(Object *obj)

{

    SysBusDevice *dev = SYS_BUS_DEVICE(obj);

    PL041State *s = PL041(dev);



    DBG_L1("pl041_init 0x%08x\n", (uint32_t)s);



    /* Connect the device to the sysbus */

    memory_region_init_io(&s->iomem, obj, &pl041_ops, s, "pl041", 0x1000);

    sysbus_init_mmio(dev, &s->iomem);

    sysbus_init_irq(dev, &s->irq);

}



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

{

    PL041State *s = PL041(dev);



    /* Check the device properties */

    switch (s->fifo_depth) {

    case 8:
@@ -545,18 +556,10 @@ static int pl041_init(SysBusDevice *dev) 
        qemu_log_mask(LOG_UNIMP,

                      "pl041: unsupported non-compact fifo depth [%i]\n",

                      s->fifo_depth);

        return -1;

    }



    /* Connect the device to the sysbus */

    memory_region_init_io(&s->iomem, OBJECT(s), &pl041_ops, s, "pl041", 0x1000);

    sysbus_init_mmio(dev, &s->iomem);

    sysbus_init_irq(dev, &s->irq);



    /* Init the codec */

    lm4549_init(&s->codec, &pl041_request_data, (void *)s);



    return 0;

}



static const VMStateDescription vmstate_pl041_regfile = {
@@ -627,9 +630,8 @@ static Property pl041_device_properties[] = { 
static void pl041_device_class_init(ObjectClass *klass, void *data)

{

    DeviceClass *dc = DEVICE_CLASS(klass);

    SysBusDeviceClass *k = SYS_BUS_DEVICE_CLASS(klass);



    k->init = pl041_init;

    dc->realize = pl041_realize;

    set_bit(DEVICE_CATEGORY_SOUND, dc->categories);

    dc->reset = pl041_device_reset;

    dc->vmsd = &vmstate_pl041;
@@ -640,6 +642,7 @@ static const TypeInfo pl041_device_info = { 
    .name          = TYPE_PL041,

    .parent        = TYPE_SYS_BUS_DEVICE,

    .instance_size = sizeof(PL041State),

    .instance_init = pl041_init,

    .class_init    = pl041_device_class_init,

};