Commit 0252e66c authored by BALATON Zoltan's avatar BALATON Zoltan Committed by John Snow
Browse files

ide/via: Remove vt82c686b_init_ports() function 



This function is only called once from vt82c686b_ide_realize() and its
content is simple enough to not need a separate function but be
included in realize directly (as done in other IDE models except PIIX
currently).

Signed-off-by: default avatarBALATON Zoltan <balaton@eik.bme.hu>
Message-id: 47d854e0fa41dad6861107eac61327c247965566.1548160772.git.balaton@eik.bme.hu
Signed-off-by: default avatarJohn Snow <jsnow@redhat.com>
parent 4eefdf7c

hw/ide/via.c

+20 −24
Original line number Diff line number Diff line
@@ -32,6 +32,15 @@ 
#include "hw/ide/pci.h"

#include "trace.h"



static const struct {

    int iobase;

    int iobase2;

    int isairq;

} port_info[] = {

    {0x1f0, 0x3f6, 14},

    {0x170, 0x376, 15},

};



static uint64_t bmdma_read(void *opaque, hwaddr addr,

                           unsigned size)

{
@@ -143,34 +152,12 @@ static void via_reset(void *opaque) 
    pci_set_long(pci_conf + 0xc0, 0x00020001);

}



static void vt82c686b_init_ports(PCIIDEState *d) {

    static const struct {

        int iobase;

        int iobase2;

        int isairq;

    } port_info[] = {

        {0x1f0, 0x3f6, 14},

        {0x170, 0x376, 15},

    };

    int i;



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

        ide_bus_new(&d->bus[i], sizeof(d->bus[i]), DEVICE(d), i, 2);

        ide_init_ioport(&d->bus[i], NULL, port_info[i].iobase,

                        port_info[i].iobase2);

        ide_init2(&d->bus[i], isa_get_irq(NULL, port_info[i].isairq));



        bmdma_init(&d->bus[i], &d->bmdma[i], d);

        d->bmdma[i].bus = &d->bus[i];

        ide_register_restart_cb(&d->bus[i]);

    }

}



/* via ide func */

static void vt82c686b_ide_realize(PCIDevice *dev, Error **errp)

{

    PCIIDEState *d = PCI_IDE(dev);

    uint8_t *pci_conf = dev->config;

    int i;



    pci_config_set_prog_interface(pci_conf, 0x8a); /* legacy ATA mode */

    pci_set_long(pci_conf + PCI_CAPABILITY_LIST, 0x000000c0);
@@ -181,7 +168,16 @@ static void vt82c686b_ide_realize(PCIDevice *dev, Error **errp) 


    vmstate_register(DEVICE(dev), 0, &vmstate_ide_pci, d);



    vt82c686b_init_ports(d);

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

        ide_bus_new(&d->bus[i], sizeof(d->bus[i]), DEVICE(d), i, 2);

        ide_init_ioport(&d->bus[i], NULL, port_info[i].iobase,

                        port_info[i].iobase2);

        ide_init2(&d->bus[i], isa_get_irq(NULL, port_info[i].isairq));



        bmdma_init(&d->bus[i], &d->bmdma[i], d);

        d->bmdma[i].bus = &d->bus[i];

        ide_register_restart_cb(&d->bus[i]);

    }

}



static void vt82c686b_ide_exitfn(PCIDevice *dev)