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: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <20180308223946.26784-3-f4bug@amsat.org>
Reviewed-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Philippe Mathieu-Daudé 2018-03-08 23:39:23 +01:00 committed by Paolo Bonzini
parent bb3d5ea858
commit 55f613ac25
11 changed files with 19 additions and 18 deletions

View File

@ -940,8 +940,8 @@ F: hw/timer/mc146818rtc*
F: hw/watchdog/wdt_ib700.c F: hw/watchdog/wdt_ib700.c
F: include/hw/display/vga.h F: include/hw/display/vga.h
F: include/hw/char/parallel.h F: include/hw/char/parallel.h
F: include/hw/dma/i8257.h
F: include/hw/i2c/pm_smbus.h F: include/hw/i2c/pm_smbus.h
F: include/hw/isa/i8257.h
F: include/hw/timer/hpet.h F: include/hw/timer/hpet.h
F: include/hw/timer/i8254* F: include/hw/timer/i8254*
F: include/hw/timer/mc146818rtc* F: include/hw/timer/mc146818rtc*

View File

@ -24,6 +24,7 @@
#include "qemu/osdep.h" #include "qemu/osdep.h"
#include "hw/isa/isa.h" #include "hw/isa/isa.h"
#include "hw/dma/i8257.h"
#define TYPE_I82374 "i82374" #define TYPE_I82374 "i82374"
#define I82374(obj) OBJECT_CHECK(I82374State, (obj), TYPE_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), portio_list_add(&s->port_list, isa_address_space_io(&s->parent_obj),
s->iobase); 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)); memset(s->commands, 0, sizeof(s->commands));
} }

View File

@ -24,7 +24,7 @@
#include "qemu/osdep.h" #include "qemu/osdep.h"
#include "hw/hw.h" #include "hw/hw.h"
#include "hw/isa/isa.h" #include "hw/isa/isa.h"
#include "hw/isa/i8257.h" #include "hw/dma/i8257.h"
#include "qemu/main-loop.h" #include "qemu/main-loop.h"
#include "trace.h" #include "trace.h"
@ -622,7 +622,7 @@ static void i8257_register_types(void)
type_init(i8257_register_types) 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; ISADevice *isa1, *isa2;
DeviceState *d; DeviceState *d;

View File

@ -41,6 +41,7 @@
#include "elf.h" #include "elf.h"
#include "multiboot.h" #include "multiboot.h"
#include "hw/timer/mc146818rtc.h" #include "hw/timer/mc146818rtc.h"
#include "hw/dma/i8257.h"
#include "hw/timer/i8254.h" #include "hw/timer/i8254.h"
#include "hw/audio/pcspk.h" #include "hw/audio/pcspk.h"
#include "hw/pci/msi.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]); port92_init(port92, a20_line[1]);
g_free(a20_line); g_free(a20_line);
DMA_init(isa_bus, 0); i8257_dma_init(isa_bus, 0);
for(i = 0; i < MAX_FD; i++) { for(i = 0; i < MAX_FD; i++) {
fd[i] = drive_get(IF_FLOPPY, 0, i); fd[i] = drive_get(IF_FLOPPY, 0, i);

View File

@ -22,6 +22,7 @@
#include "qapi/error.h" #include "qapi/error.h"
#include "hw/hw.h" #include "hw/hw.h"
#include "hw/i386/pc.h" #include "hw/i386/pc.h"
#include "hw/dma/i8257.h"
#include "hw/char/serial.h" #include "hw/char/serial.h"
#include "hw/char/parallel.h" #include "hw/char/parallel.h"
#include "hw/block/fdc.h" #include "hw/block/fdc.h"
@ -359,7 +360,7 @@ static void mips_fulong2e_init(MachineState *machine)
/* init other devices */ /* init other devices */
pit = i8254_pit_init(isa_bus, 0x40, 0, NULL); pit = i8254_pit_init(isa_bus, 0x40, 0, NULL);
DMA_init(isa_bus, 0); i8257_dma_init(isa_bus, 0);
/* Super I/O */ /* Super I/O */
isa_create_simple(isa_bus, "i8042"); isa_create_simple(isa_bus, "i8042");

View File

@ -27,6 +27,7 @@
#include "hw/mips/mips.h" #include "hw/mips/mips.h"
#include "hw/mips/cpudevs.h" #include "hw/mips/cpudevs.h"
#include "hw/i386/pc.h" #include "hw/i386/pc.h"
#include "hw/dma/i8257.h"
#include "hw/char/serial.h" #include "hw/char/serial.h"
#include "hw/char/parallel.h" #include "hw/char/parallel.h"
#include "hw/isa/isa.h" #include "hw/isa/isa.h"
@ -220,7 +221,7 @@ static void mips_jazz_init(MachineState *machine,
/* ISA devices */ /* ISA devices */
i8259 = i8259_init(isa_bus, env->irq[4]); i8259 = i8259_init(isa_bus, env->irq[4]);
isa_bus_irqs(isa_bus, i8259); isa_bus_irqs(isa_bus, i8259);
DMA_init(isa_bus, 0); i8257_dma_init(isa_bus, 0);
pit = i8254_pit_init(isa_bus, 0x40, 0, NULL); pit = i8254_pit_init(isa_bus, 0x40, 0, NULL);
pcspk_init(isa_bus, pit); pcspk_init(isa_bus, pit);

View File

@ -27,6 +27,7 @@
#include "cpu.h" #include "cpu.h"
#include "hw/hw.h" #include "hw/hw.h"
#include "hw/i386/pc.h" #include "hw/i386/pc.h"
#include "hw/dma/i8257.h"
#include "hw/char/serial.h" #include "hw/char/serial.h"
#include "hw/char/parallel.h" #include "hw/char/parallel.h"
#include "hw/block/fdc.h" #include "hw/block/fdc.h"
@ -1209,7 +1210,7 @@ void mips_malta_init(MachineState *machine)
smbus_eeprom_init(smbus, 8, smbus_eeprom_buf, smbus_eeprom_size); smbus_eeprom_init(smbus, 8, smbus_eeprom_buf, smbus_eeprom_size);
g_free(smbus_eeprom_buf); g_free(smbus_eeprom_buf);
pit = i8254_pit_init(isa_bus, 0x40, 0, NULL); pit = i8254_pit_init(isa_bus, 0x40, 0, NULL);
DMA_init(isa_bus, 0); i8257_dma_init(isa_bus, 0);
/* Super I/O */ /* Super I/O */
isa_create_simple(isa_bus, "i8042"); isa_create_simple(isa_bus, "i8042");

View File

@ -98,10 +98,6 @@ struct sun4m_hwdef {
uint8_t nvram_machine_id; uint8_t nvram_machine_id;
}; };
void DMA_init(ISABus *bus, int high_page_enable)
{
}
static void fw_cfg_boot_set(void *opaque, const char *boot_device, static void fw_cfg_boot_set(void *opaque, const char *boot_device,
Error **errp) Error **errp)
{ {

View File

@ -90,10 +90,6 @@ typedef struct EbusState {
#define TYPE_EBUS "ebus" #define TYPE_EBUS "ebus"
#define EBUS(obj) OBJECT_CHECK(EbusState, (obj), TYPE_EBUS) #define EBUS(obj) OBJECT_CHECK(EbusState, (obj), TYPE_EBUS)
void DMA_init(ISABus *bus, int high_page_enable)
{
}
static void fw_cfg_boot_set(void *opaque, const char *boot_device, static void fw_cfg_boot_set(void *opaque, const char *boot_device,
Error **errp) Error **errp)
{ {

View File

@ -1,6 +1,10 @@
#ifndef HW_I8257_H #ifndef HW_I8257_H
#define HW_I8257_H #define HW_I8257_H
#include "hw/hw.h"
#include "hw/isa/isa.h"
#include "exec/ioport.h"
#define TYPE_I8257 "i8257" #define TYPE_I8257 "i8257"
typedef struct I8257Regs { typedef struct I8257Regs {
@ -40,4 +44,6 @@ typedef struct I8257State {
PortioList portio_pageh; PortioList portio_pageh;
} I8257State; } I8257State;
void i8257_dma_init(ISABus *bus, bool high_page_enable);
#endif #endif

View File

@ -151,6 +151,4 @@ static inline ISABus *isa_bus_from_device(ISADevice *d)
return ISA_BUS(qdev_get_parent_bus(DEVICE(d))); return ISA_BUS(qdev_get_parent_bus(DEVICE(d)));
} }
/* i8257.c */
void DMA_init(ISABus *bus, int high_page_enable);
#endif #endif