isa: Pass i/o address space to isa_bus_new
Not used yet, but at least we're provided with the correct region. Signed-off-by: Richard Henderson <rth@twiddle.net> Signed-off-by: Avi Kivity <avi@redhat.com>
This commit is contained in:
parent
e11d64390b
commit
c2d0d01202
@ -24,6 +24,7 @@
|
||||
|
||||
struct ISABus {
|
||||
BusState qbus;
|
||||
MemoryRegion *address_space_io;
|
||||
qemu_irq *irqs;
|
||||
};
|
||||
static ISABus *isabus;
|
||||
@ -39,7 +40,7 @@ static struct BusInfo isa_bus_info = {
|
||||
.get_fw_dev_path = isabus_get_fw_dev_path,
|
||||
};
|
||||
|
||||
ISABus *isa_bus_new(DeviceState *dev)
|
||||
ISABus *isa_bus_new(DeviceState *dev, MemoryRegion *address_space_io)
|
||||
{
|
||||
if (isabus) {
|
||||
fprintf(stderr, "Can't create a second ISA bus\n");
|
||||
@ -51,6 +52,7 @@ ISABus *isa_bus_new(DeviceState *dev)
|
||||
}
|
||||
|
||||
isabus = FROM_QBUS(ISABus, qbus_create(&isa_bus_info, dev, NULL));
|
||||
isabus->address_space_io = address_space_io;
|
||||
return isabus;
|
||||
}
|
||||
|
||||
|
2
hw/isa.h
2
hw/isa.h
@ -25,7 +25,7 @@ struct ISADeviceInfo {
|
||||
isa_qdev_initfn init;
|
||||
};
|
||||
|
||||
ISABus *isa_bus_new(DeviceState *dev);
|
||||
ISABus *isa_bus_new(DeviceState *dev, MemoryRegion *address_space_io);
|
||||
void isa_bus_irqs(qemu_irq *irqs);
|
||||
qemu_irq isa_get_irq(int isairq);
|
||||
void isa_init_irq(ISADevice *dev, qemu_irq *p, int isairq);
|
||||
|
@ -102,10 +102,11 @@ static void cpu_request_exit(void *opaque, int irq, int level)
|
||||
}
|
||||
}
|
||||
|
||||
static
|
||||
void mips_jazz_init (MemoryRegion *address_space, ram_addr_t ram_size,
|
||||
const char *cpu_model,
|
||||
enum jazz_model_e jazz_model)
|
||||
static void mips_jazz_init(MemoryRegion *address_space,
|
||||
MemoryRegion *address_space_io,
|
||||
ram_addr_t ram_size,
|
||||
const char *cpu_model,
|
||||
enum jazz_model_e jazz_model)
|
||||
{
|
||||
char *filename;
|
||||
int bios_size, n;
|
||||
@ -181,7 +182,7 @@ void mips_jazz_init (MemoryRegion *address_space, ram_addr_t ram_size,
|
||||
|
||||
/* ISA devices */
|
||||
i8259 = i8259_init(env->irq[4]);
|
||||
isa_bus_new(NULL);
|
||||
isa_bus_new(NULL, address_space_io);
|
||||
isa_bus_irqs(i8259);
|
||||
cpu_exit_irq = qemu_allocate_irqs(cpu_request_exit, NULL, 1);
|
||||
DMA_init(0, cpu_exit_irq);
|
||||
@ -299,7 +300,8 @@ void mips_magnum_init (ram_addr_t ram_size,
|
||||
const char *kernel_filename, const char *kernel_cmdline,
|
||||
const char *initrd_filename, const char *cpu_model)
|
||||
{
|
||||
mips_jazz_init(get_system_memory(), ram_size, cpu_model, JAZZ_MAGNUM);
|
||||
mips_jazz_init(get_system_memory(), get_system_io(),
|
||||
ram_size, cpu_model, JAZZ_MAGNUM);
|
||||
}
|
||||
|
||||
static
|
||||
@ -308,7 +310,8 @@ void mips_pica61_init (ram_addr_t ram_size,
|
||||
const char *kernel_filename, const char *kernel_cmdline,
|
||||
const char *initrd_filename, const char *cpu_model)
|
||||
{
|
||||
mips_jazz_init(get_system_memory(), ram_size, cpu_model, JAZZ_PICA61);
|
||||
mips_jazz_init(get_system_memory(), get_system_io(),
|
||||
ram_size, cpu_model, JAZZ_PICA61);
|
||||
}
|
||||
|
||||
static QEMUMachine mips_magnum_machine = {
|
||||
|
@ -257,7 +257,7 @@ void mips_r4k_init (ram_addr_t ram_size,
|
||||
|
||||
/* The PIC is attached to the MIPS CPU INT0 pin */
|
||||
i8259 = i8259_init(env->irq[2]);
|
||||
isa_bus_new(NULL);
|
||||
isa_bus_new(NULL, get_system_io());
|
||||
isa_bus_irqs(i8259);
|
||||
|
||||
rtc_init(2000, NULL);
|
||||
|
@ -156,7 +156,7 @@ static void pc_init1(MemoryRegion *system_memory,
|
||||
} else {
|
||||
pci_bus = NULL;
|
||||
i440fx_state = NULL;
|
||||
isa_bus_new(NULL);
|
||||
isa_bus_new(NULL, system_io);
|
||||
no_hpet = 1;
|
||||
}
|
||||
isa_bus_irqs(isa_irq);
|
||||
|
@ -87,7 +87,7 @@ static int piix4_initfn(PCIDevice *dev)
|
||||
{
|
||||
PIIX4State *d = DO_UPCAST(PIIX4State, dev, dev);
|
||||
|
||||
isa_bus_new(&d->dev.qdev);
|
||||
isa_bus_new(&d->dev.qdev, pci_address_space_io(dev));
|
||||
piix4_dev = &d->dev;
|
||||
qemu_register_reset(piix4_reset, d);
|
||||
return 0;
|
||||
|
@ -504,7 +504,7 @@ static int piix3_initfn(PCIDevice *dev)
|
||||
{
|
||||
PIIX3State *d = DO_UPCAST(PIIX3State, dev, dev);
|
||||
|
||||
isa_bus_new(&d->dev.qdev);
|
||||
isa_bus_new(&d->dev.qdev, pci_address_space_io(dev));
|
||||
qemu_register_reset(piix3_reset, d);
|
||||
return 0;
|
||||
}
|
||||
|
@ -651,7 +651,7 @@ static void ppc_prep_init (ram_addr_t ram_size,
|
||||
i8259 = i8259_init(first_cpu->irq_inputs[PPC6xx_INPUT_INT]);
|
||||
pci_bus = pci_prep_init(i8259, get_system_memory(), get_system_io());
|
||||
/* Hmm, prep has no pci-isa bridge ??? */
|
||||
isa_bus_new(NULL);
|
||||
isa_bus_new(NULL, get_system_io());
|
||||
isa_bus_irqs(i8259);
|
||||
// pci_bus = i440fx_init();
|
||||
/* Register 8 MB of ISA IO space (needed for non-contiguous map) */
|
||||
|
@ -548,7 +548,7 @@ pci_ebus_init1(PCIDevice *pci_dev)
|
||||
{
|
||||
EbusState *s = DO_UPCAST(EbusState, pci_dev, pci_dev);
|
||||
|
||||
isa_bus_new(&pci_dev->qdev);
|
||||
isa_bus_new(&pci_dev->qdev, pci_address_space_io(pci_dev));
|
||||
|
||||
pci_dev->config[0x04] = 0x06; // command = bus master, pci mem
|
||||
pci_dev->config[0x05] = 0x00;
|
||||
|
@ -490,7 +490,7 @@ static int vt82c686b_initfn(PCIDevice *d)
|
||||
uint8_t *wmask;
|
||||
int i;
|
||||
|
||||
isa_bus_new(&d->qdev);
|
||||
isa_bus_new(&d->qdev, pci_address_space_io(d));
|
||||
|
||||
pci_conf = d->config;
|
||||
pci_config_set_prog_interface(pci_conf, 0x0);
|
||||
|
Loading…
Reference in New Issue
Block a user