system/qemu
system/qemu
1
0
Fork 0
mirror of https://gitlab.com/qemu-project/qemu synced 2024-11-05 20:35:44 +00:00
Code Issues Projects Releases Packages Wiki Activity

isa: Pass i/o address space to isa_bus_new

Browse source 
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:
Richard Henderson 2011-08-10 15:28:11 -07:00 committed by Avi Kivity
parent e11d64390b
commit c2d0d01202
10 changed files with 21 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
hw/isa-bus.c
View file

@ -24,6 +24,7 @@
struct ISABus { struct ISABus {
BusState qbus; BusState qbus;
MemoryRegion *address_space_io;
qemu_irq *irqs; qemu_irq *irqs;
}; };
static ISABus *isabus; static ISABus *isabus;
@ -39,7 +40,7 @@ static struct BusInfo isa_bus_info = {
.get_fw_dev_path = isabus_get_fw_dev_path, .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) { if (isabus) {
fprintf(stderr, "Can't create a second ISA bus\n"); 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 = FROM_QBUS(ISABus, qbus_create(&isa_bus_info, dev, NULL));
isabus->address_space_io = address_space_io;
return isabus; return isabus;
} }

2
hw/isa.h
View file

@ -25,7 +25,7 @@ struct ISADeviceInfo {
isa_qdev_initfn init; 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); void isa_bus_irqs(qemu_irq *irqs);
qemu_irq isa_get_irq(int isairq); qemu_irq isa_get_irq(int isairq);
void isa_init_irq(ISADevice *dev, qemu_irq *p, int isairq); void isa_init_irq(ISADevice *dev, qemu_irq *p, int isairq);

13
hw/mips_jazz.c
View file

@ -102,8 +102,9 @@ static void cpu_request_exit(void *opaque, int irq, int level)
} }
} }
static static void mips_jazz_init(MemoryRegion *address_space,
void mips_jazz_init (MemoryRegion *address_space, ram_addr_t ram_size, MemoryRegion *address_space_io,
ram_addr_t ram_size,
const char *cpu_model, const char *cpu_model,
enum jazz_model_e jazz_model) enum jazz_model_e jazz_model)
{ {
@ -181,7 +182,7 @@ void mips_jazz_init (MemoryRegion *address_space, ram_addr_t ram_size,
/* ISA devices */ /* ISA devices */
i8259 = i8259_init(env->irq[4]); i8259 = i8259_init(env->irq[4]);
isa_bus_new(NULL); isa_bus_new(NULL, address_space_io);
isa_bus_irqs(i8259); isa_bus_irqs(i8259);
cpu_exit_irq = qemu_allocate_irqs(cpu_request_exit, NULL, 1); cpu_exit_irq = qemu_allocate_irqs(cpu_request_exit, NULL, 1);
DMA_init(0, cpu_exit_irq); 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 *kernel_filename, const char *kernel_cmdline,
const char *initrd_filename, const char *cpu_model) 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 static
@ -308,7 +310,8 @@ void mips_pica61_init (ram_addr_t ram_size,
const char *kernel_filename, const char *kernel_cmdline, const char *kernel_filename, const char *kernel_cmdline,
const char *initrd_filename, const char *cpu_model) 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 = { static QEMUMachine mips_magnum_machine = {

2
hw/mips_r4k.c
View file

@ -257,7 +257,7 @@ void mips_r4k_init (ram_addr_t ram_size,
/* The PIC is attached to the MIPS CPU INT0 pin */ /* The PIC is attached to the MIPS CPU INT0 pin */
i8259 = i8259_init(env->irq[2]); i8259 = i8259_init(env->irq[2]);
isa_bus_new(NULL); isa_bus_new(NULL, get_system_io());
isa_bus_irqs(i8259); isa_bus_irqs(i8259);
rtc_init(2000, NULL); rtc_init(2000, NULL);

2
hw/pc_piix.c
View file

@ -156,7 +156,7 @@ static void pc_init1(MemoryRegion *system_memory,
} else { } else {
pci_bus = NULL; pci_bus = NULL;
i440fx_state = NULL; i440fx_state = NULL;
isa_bus_new(NULL); isa_bus_new(NULL, system_io);
no_hpet = 1; no_hpet = 1;
} }
isa_bus_irqs(isa_irq); isa_bus_irqs(isa_irq);

2
hw/piix4.c
View file

@ -87,7 +87,7 @@ static int piix4_initfn(PCIDevice *dev)
{ {
PIIX4State *d = DO_UPCAST(PIIX4State, dev, 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; piix4_dev = &d->dev;
qemu_register_reset(piix4_reset, d); qemu_register_reset(piix4_reset, d);
return 0; return 0;

2
hw/piix_pci.c
View file

@ -504,7 +504,7 @@ static int piix3_initfn(PCIDevice *dev)
{ {
PIIX3State *d = DO_UPCAST(PIIX3State, dev, 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); qemu_register_reset(piix3_reset, d);
return 0; return 0;
} }

2
hw/ppc_prep.c
View file

@ -651,7 +651,7 @@ static void ppc_prep_init (ram_addr_t ram_size,
i8259 = i8259_init(first_cpu->irq_inputs[PPC6xx_INPUT_INT]); i8259 = i8259_init(first_cpu->irq_inputs[PPC6xx_INPUT_INT]);
pci_bus = pci_prep_init(i8259, get_system_memory(), get_system_io()); pci_bus = pci_prep_init(i8259, get_system_memory(), get_system_io());
/* Hmm, prep has no pci-isa bridge ??? */ /* Hmm, prep has no pci-isa bridge ??? */
isa_bus_new(NULL); isa_bus_new(NULL, get_system_io());
isa_bus_irqs(i8259); isa_bus_irqs(i8259);
// pci_bus = i440fx_init(); // pci_bus = i440fx_init();
/* Register 8 MB of ISA IO space (needed for non-contiguous map) */ /* Register 8 MB of ISA IO space (needed for non-contiguous map) */

2
hw/sun4u.c
View file

@ -548,7 +548,7 @@ pci_ebus_init1(PCIDevice *pci_dev)
{ {
EbusState *s = DO_UPCAST(EbusState, pci_dev, 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[0x04] = 0x06; // command = bus master, pci mem
pci_dev->config[0x05] = 0x00; pci_dev->config[0x05] = 0x00;

2
hw/vt82c686.c
View file

@ -490,7 +490,7 @@ static int vt82c686b_initfn(PCIDevice *d)
uint8_t *wmask; uint8_t *wmask;
int i; int i;
isa_bus_new(&d->qdev); isa_bus_new(&d->qdev, pci_address_space_io(d));
pci_conf = d->config; pci_conf = d->config;
pci_config_set_prog_interface(pci_conf, 0x0); pci_config_set_prog_interface(pci_conf, 0x0);