#include "console.h"
#include "vga_int.h"
#include "kvm.h"
+#include "loader.h"
/*
* TODO:
s->vga.screen_dump, s->vga.text_update,
&s->vga);
vmstate_register(0, &vmstate_cirrus_vga, s);
+ rom_add_vga(VGABIOS_CIRRUS_FILENAME);
/* XXX ISA-LFB support */
}
PCI_ADDRESS_SPACE_MEM, cirrus_pci_mmio_map);
}
vmstate_register(0, &vmstate_pci_cirrus_vga, d);
- /* XXX: ROM BIOS */
+
+ /* ROM BIOS */
+ rom_add_vga(VGABIOS_CIRRUS_FILENAME);
return 0;
}
//#define DEBUG_MULTIBOOT
#define BIOS_FILENAME "bios.bin"
-#define VGABIOS_FILENAME "vgabios.bin"
-#define VGABIOS_CIRRUS_FILENAME "vgabios-cirrus.bin"
#define PC_MAX_BIOS_SIZE (4 * 1024 * 1024)
IsaIrqState *isa_irq_state;
DriveInfo *hd[MAX_IDE_BUS * MAX_IDE_DEVS];
DriveInfo *fd[MAX_FD];
- int using_vga = cirrus_vga_enabled || std_vga_enabled || vmsvga_enabled;
void *fw_cfg;
if (ram_size >= 0xe0000000 ) {
option_rom_offset = qemu_ram_alloc(PC_ROM_SIZE);
cpu_register_physical_memory(PC_ROM_MIN_VGA, PC_ROM_SIZE, option_rom_offset);
- if (using_vga) {
- /* VGA BIOS load */
- if (cirrus_vga_enabled) {
- rom_add_vga(VGABIOS_CIRRUS_FILENAME);
- } else {
- rom_add_vga(VGABIOS_FILENAME);
- }
- }
-
/* map all the bios at the top of memory */
cpu_register_physical_memory((uint32_t)(-bios_size),
bios_size, bios_offset | IO_MEM_ROM);
#include "vga_int.h"
#include "pixel_ops.h"
#include "qemu-timer.h"
+#include "loader.h"
int isa_vga_init(void)
{
cpu_register_physical_memory(VBE_DISPI_LFB_PHYSICAL_ADDRESS,
VGA_RAM_SIZE, s->vram_offset);
#endif
+ /* ROM BIOS */
+ rom_add_vga(VGABIOS_FILENAME);
return 0;
}
#include "vga_int.h"
#include "pixel_ops.h"
#include "qemu-timer.h"
+#include "loader.h"
typedef struct PCIVGAState {
PCIDevice dev;
pci_register_bar(&d->dev, PCI_ROM_SLOT, bios_total_size,
PCI_ADDRESS_SPACE_MEM_PREFETCH, vga_map);
}
+
+ /* ROM BIOS */
+ rom_add_vga(VGABIOS_FILENAME);
return 0;
}
extern const uint8_t gr_mask[16];
#define VGA_RAM_SIZE (8192 * 1024)
+#define VGABIOS_FILENAME "vgabios.bin"
+#define VGABIOS_CIRRUS_FILENAME "vgabios-cirrus.bin"
extern CPUReadMemoryFunc * const vga_mem_read[3];
extern CPUWriteMemoryFunc * const vga_mem_write[3];