Commit 55f613ac authored by Philippe Mathieu-Daudé's avatar Philippe Mathieu-Daudé Committed by Paolo Bonzini
Browse files

hw/dma/i8257: Rename DMA_init() to i8257_dma_init() 



- Move the header from hw/isa/ to hw/dma/
- Remove the old i386/pc dependency
- use a bool type for the high_page_enable argument

Signed-off-by: default avatarPhilippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <20180308223946.26784-3-f4bug@amsat.org>
Reviewed-by: default avatarMark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent bb3d5ea8

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -940,8 +940,8 @@ F: hw/timer/mc146818rtc* 
F: hw/watchdog/wdt_ib700.c

F: include/hw/display/vga.h

F: include/hw/char/parallel.h

F: include/hw/dma/i8257.h

F: include/hw/i2c/pm_smbus.h

F: include/hw/isa/i8257.h

F: include/hw/timer/hpet.h

F: include/hw/timer/i8254*

F: include/hw/timer/mc146818rtc*

hw/dma/i82374.c

+2 −1
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ 


#include "qemu/osdep.h"

#include "hw/isa/isa.h"

#include "hw/dma/i8257.h"



#define TYPE_I82374 "i82374"

#define I82374(obj) OBJECT_CHECK(I82374State, (obj), TYPE_I82374)
@@ -123,7 +124,7 @@ static void i82374_realize(DeviceState *dev, Error **errp) 
    portio_list_add(&s->port_list, isa_address_space_io(&s->parent_obj),

                    s->iobase);



    DMA_init(isa_bus_from_device(ISA_DEVICE(dev)), 1);

    i8257_dma_init(isa_bus_from_device(ISA_DEVICE(dev)), true);

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

}

hw/dma/i8257.c

+2 −2
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ 
#include "qemu/osdep.h"

#include "hw/hw.h"

#include "hw/isa/isa.h"

#include "hw/isa/i8257.h"

#include "hw/dma/i8257.h"

#include "qemu/main-loop.h"

#include "trace.h"
@@ -622,7 +622,7 @@ static void i8257_register_types(void) 


type_init(i8257_register_types)



void DMA_init(ISABus *bus, int high_page_enable)

void i8257_dma_init(ISABus *bus, bool high_page_enable)

{

    ISADevice *isa1, *isa2;

    DeviceState *d;

hw/i386/pc.c

+2 −1
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ 
#include "elf.h"

#include "multiboot.h"

#include "hw/timer/mc146818rtc.h"

#include "hw/dma/i8257.h"

#include "hw/timer/i8254.h"

#include "hw/audio/pcspk.h"

#include "hw/pci/msi.h"
@@ -1607,7 +1608,7 @@ void pc_basic_device_init(ISABus *isa_bus, qemu_irq *gsi, 
    port92_init(port92, a20_line[1]);

    g_free(a20_line);



    DMA_init(isa_bus, 0);

    i8257_dma_init(isa_bus, 0);



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

        fd[i] = drive_get(IF_FLOPPY, 0, i);

hw/mips/mips_fulong2e.c

+2 −1
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ 
#include "qapi/error.h"

#include "hw/hw.h"

#include "hw/i386/pc.h"

#include "hw/dma/i8257.h"

#include "hw/char/serial.h"

#include "hw/char/parallel.h"

#include "hw/block/fdc.h"
@@ -359,7 +360,7 @@ static void mips_fulong2e_init(MachineState *machine) 


    /* init other devices */

    pit = i8254_pit_init(isa_bus, 0x40, 0, NULL);

    DMA_init(isa_bus, 0);

    i8257_dma_init(isa_bus, 0);



    /* Super I/O */

    isa_create_simple(isa_bus, "i8042");