Commit 13c9bfbf authored by Peter Crosthwaite's avatar Peter Crosthwaite Committed by Edgar E. Iglesias
Browse files

xilinx: Inline usages of xilinx_intc_create() 



Inline these usages. Converts these init to at least a semi-recent QOM
styling.

Signed-off-by: default avatarPeter Crosthwaite <peter.crosthwaite@xilinx.com>
Signed-off-by: default avatarEdgar E. Iglesias <edgar.iglesias@xilinx.com>
parent 8174196b

hw/microblaze/petalogix_ml605_mmu.c

+6 −2
Original line number Diff line number Diff line
@@ -119,8 +119,12 @@ petalogix_ml605_init(QEMUMachineInitArgs *args) 
                          2, 0x89, 0x18, 0x0000, 0x0, 0);





    dev = xilinx_intc_create(INTC_BASEADDR, qdev_get_gpio_in(DEVICE(cpu),

                             MB_CPU_IRQ), 4);

    dev = qdev_create(NULL, "xlnx.xps-intc");

    qdev_prop_set_uint32(dev, "kind-of-intr", 1 << TIMER_IRQ);

    qdev_init_nofail(dev);

    sysbus_mmio_map(SYS_BUS_DEVICE(dev), 0, INTC_BASEADDR);

    sysbus_connect_irq(SYS_BUS_DEVICE(dev), 0,

                       qdev_get_gpio_in(DEVICE(cpu), MB_CPU_IRQ));

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

        irq[i] = qdev_get_gpio_in(dev, i);

    }

hw/microblaze/petalogix_s3adsp1800_mmu.c

+7 −2
Original line number Diff line number Diff line
@@ -97,8 +97,13 @@ petalogix_s3adsp1800_init(QEMUMachineInitArgs *args) 
                          FLASH_SIZE >> 16,

                          1, 0x89, 0x18, 0x0000, 0x0, 1);



    dev = xilinx_intc_create(INTC_BASEADDR, qdev_get_gpio_in(DEVICE(cpu),

                             MB_CPU_IRQ), 0xA);

    dev = qdev_create(NULL, "xlnx.xps-intc");

    qdev_prop_set_uint32(dev, "kind-of-intr",

                         1 << ETHLITE_IRQ | 1 << UARTLITE_IRQ);

    qdev_init_nofail(dev);

    sysbus_mmio_map(SYS_BUS_DEVICE(dev), 0, INTC_BASEADDR);

    sysbus_connect_irq(SYS_BUS_DEVICE(dev), 0,

                       qdev_get_gpio_in(DEVICE(cpu), MB_CPU_IRQ));

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

        irq[i] = qdev_get_gpio_in(dev, i);

    }

hw/ppc/virtex_ml507.c

+5 −1
Original line number Diff line number Diff line
@@ -218,7 +218,11 @@ static void virtex_init(QEMUMachineInitArgs *args) 
                          1, 0x89, 0x18, 0x0000, 0x0, 1);



    cpu_irq = (qemu_irq *) &env->irq_inputs[PPC40x_INPUT_INT];

    dev = xilinx_intc_create(0x81800000, cpu_irq[0], 0);

    dev = qdev_create(NULL, "xlnx.xps-intc");

    qdev_prop_set_uint32(dev, "kind-of-intr", 0);

    qdev_init_nofail(dev);

    sysbus_mmio_map(SYS_BUS_DEVICE(dev), 0, INTC_BASEADDR);

    sysbus_connect_irq(SYS_BUS_DEVICE(dev), 0, cpu_irq[0]);

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

        irq[i] = qdev_get_gpio_in(dev, i);

    }

include/hw/xilinx.h

+0 −13
Original line number Diff line number Diff line
@@ -7,19 +7,6 @@ 
#include "hw/stream.h"

#include "net/net.h"



static inline DeviceState *

xilinx_intc_create(hwaddr base, qemu_irq irq, int kind_of_intr)

{

    DeviceState *dev;



    dev = qdev_create(NULL, "xlnx.xps-intc");

    qdev_prop_set_uint32(dev, "kind-of-intr", kind_of_intr);

    qdev_init_nofail(dev);

    sysbus_mmio_map(SYS_BUS_DEVICE(dev), 0, base);

    sysbus_connect_irq(SYS_BUS_DEVICE(dev), 0, irq);

    return dev;

}



/* OPB Timer/Counter.  */

static inline DeviceState *

xilinx_timer_create(hwaddr base, qemu_irq irq, int oto, int freq)