Commit 11f295118c5b78910b0b26c1a856944016895ec8
1 parent
39d51eb8
A VGA card for the Malta board.
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@2494 c046a42c-6fe2-441c-8c8c-71466251a162
Showing
2 changed files
with
5 additions
and
0 deletions
hw/gt64xxx.c
| @@ -239,6 +239,7 @@ static void gt64120_pci_mapping(GT64120State *s) | @@ -239,6 +239,7 @@ static void gt64120_pci_mapping(GT64120State *s) | ||
| 239 | /* Map new IO address */ | 239 | /* Map new IO address */ |
| 240 | s->PCI0IO_start = s->regs[GT_PCI0IOLD] << 21; | 240 | s->PCI0IO_start = s->regs[GT_PCI0IOLD] << 21; |
| 241 | s->PCI0IO_length = ((s->regs[GT_PCI0IOHD] + 1) - (s->regs[GT_PCI0IOLD] & 0x7f)) << 21; | 241 | s->PCI0IO_length = ((s->regs[GT_PCI0IOHD] + 1) - (s->regs[GT_PCI0IOLD] & 0x7f)) << 21; |
| 242 | + isa_mem_base = s->PCI0IO_start; | ||
| 242 | isa_mmio_init(s->PCI0IO_start, s->PCI0IO_length); | 243 | isa_mmio_init(s->PCI0IO_start, s->PCI0IO_length); |
| 243 | } | 244 | } |
| 244 | } | 245 | } |
hw/mips_malta.c
| @@ -719,6 +719,10 @@ void mips_malta_init (int ram_size, int vga_ram_size, int boot_device, | @@ -719,6 +719,10 @@ void mips_malta_init (int ram_size, int vga_ram_size, int boot_device, | ||
| 719 | 719 | ||
| 720 | /* Network card */ | 720 | /* Network card */ |
| 721 | network_init(pci_bus); | 721 | network_init(pci_bus); |
| 722 | + | ||
| 723 | + /* Optional PCI video card */ | ||
| 724 | + pci_cirrus_vga_init(pci_bus, ds, phys_ram_base + ram_size, | ||
| 725 | + ram_size, vga_ram_size); | ||
| 722 | } | 726 | } |
| 723 | 727 | ||
| 724 | QEMUMachine mips_malta_machine = { | 728 | QEMUMachine mips_malta_machine = { |