Commit 049a9f7b authored by Hervé Poussineau's avatar Hervé Poussineau Committed by Andreas Färber
Browse files

i82378/i82374: Do not create DMA controller twice 



This fixes a crash in PReP emulation when using DMA controller to access
floppy drive.

Signed-off-by: default avatarHervé Poussineau <hpoussin@reactos.org>
Signed-off-by: default avatarAndreas Färber <andreas.faerber@web.de>
parent 42fe1c24

hw/i82374.c

+4 −1
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ do { fprintf(stderr, "i82374 ERROR: " fmt , ## __VA_ARGS__); } while (0) 


typedef struct I82374State {

    uint8_t commands[8];

    qemu_irq out;

} I82374State;



static const VMStateDescription vmstate_i82374 = {
@@ -99,7 +100,7 @@ static uint32_t i82374_read_descriptor(void *opaque, uint32_t nport) 


static void i82374_init(I82374State *s)

{

    DMA_init(1, NULL);

    DMA_init(1, &s->out);

    memset(s->commands, 0, sizeof(s->commands));

}
@@ -132,6 +133,8 @@ static int i82374_isa_init(ISADevice *dev) 


    i82374_init(s);



    qdev_init_gpio_out(&dev->qdev, &s->out, 1);



    return 0;

}

hw/i82378.c

+3 −2
Original line number Diff line number Diff line
@@ -170,6 +170,7 @@ static void i82378_init(DeviceState *dev, I82378State *s) 
{

    ISABus *isabus = DO_UPCAST(ISABus, qbus, qdev_get_child_bus(dev, "isa.0"));

    ISADevice *pit;

    ISADevice *isa;

    qemu_irq *out0_irq;



    /* This device has:
@@ -199,8 +200,8 @@ static void i82378_init(DeviceState *dev, I82378State *s) 
    pcspk_init(isabus, pit);



    /* 2 82C37 (dma) */

    DMA_init(1, &s->out[1]);

    isa_create_simple(isabus, "i82374");

    isa = isa_create_simple(isabus, "i82374");

    qdev_connect_gpio_out(&isa->qdev, 0, s->out[1]);



    /* timer */

    isa_create_simple(isabus, "mc146818rtc");