Commit 25367498 authored by Philippe Mathieu-Daudé's avatar Philippe Mathieu-Daudé Committed by Peter Maydell
Browse files

sdhci: refactor common sysbus/pci realize() into sdhci_common_realize() 



Signed-off-by: default avatarPhilippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: default avatarAlistair Francis <alistair.francis@xilinx.com>
Message-id: 20180115182436.2066-6-f4bug@amsat.org
Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parent 1c92c505

hw/sd/sdhci.c

+21 −9
Original line number Diff line number Diff line
@@ -1214,6 +1214,15 @@ static void sdhci_uninitfn(SDHCIState *s) 
    s->fifo_buffer = NULL;

}



static void sdhci_common_realize(SDHCIState *s, Error **errp)

{

    s->buf_maxsz = sdhci_get_fifolen(s);

    s->fifo_buffer = g_malloc0(s->buf_maxsz);



    memory_region_init_io(&s->iomem, OBJECT(s), &sdhci_mmio_ops, s, "sdhci",

                          SDHC_REGISTERS_MAP_SIZE);

}



static bool sdhci_pending_insert_vmstate_needed(void *opaque)

{

    SDHCIState *s = opaque;
@@ -1292,14 +1301,16 @@ static Property sdhci_pci_properties[] = { 
static void sdhci_pci_realize(PCIDevice *dev, Error **errp)

{

    SDHCIState *s = PCI_SDHCI(dev);



    sdhci_initfn(s);

    sdhci_common_realize(s, errp);

    if (errp && *errp) {

        return;

    }



    dev->config[PCI_CLASS_PROG] = 0x01; /* Standard Host supported DMA */

    dev->config[PCI_INTERRUPT_PIN] = 0x01; /* interrupt pin A */

    sdhci_initfn(s);

    s->buf_maxsz = sdhci_get_fifolen(s);

    s->fifo_buffer = g_malloc0(s->buf_maxsz);

    s->irq = pci_allocate_irq(dev);

    memory_region_init_io(&s->iomem, OBJECT(s), &sdhci_mmio_ops, s, "sdhci",

            SDHC_REGISTERS_MAP_SIZE);

    pci_register_bar(dev, 0, 0, &s->iomem);

}
@@ -1362,11 +1373,12 @@ static void sdhci_sysbus_realize(DeviceState *dev, Error ** errp) 
    SDHCIState *s = SYSBUS_SDHCI(dev);

    SysBusDevice *sbd = SYS_BUS_DEVICE(dev);



    s->buf_maxsz = sdhci_get_fifolen(s);

    s->fifo_buffer = g_malloc0(s->buf_maxsz);

    sdhci_common_realize(s, errp);

    if (errp && *errp) {

        return;

    }



    sysbus_init_irq(sbd, &s->irq);

    memory_region_init_io(&s->iomem, OBJECT(s), &sdhci_mmio_ops, s, "sdhci",

            SDHC_REGISTERS_MAP_SIZE);

    sysbus_init_mmio(sbd, &s->iomem);

}