Cirrus VGA emulation

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@892 c046a42c-6fe2-441c-8c8c-71466251a162

diff --git a/Makefile.target b/Makefile.target
index ac52093d12b4be1a6cc013421c1a25b9650acfe9..c8ef7168256a75a2d0fa0d0782d8b9a13ef28a72 100644 (file)
--- a/Makefile.target
+++ b/Makefile.target
@@ -237,7 +237,8 @@ VL_OBJS=vl.o osdep.o block.o monitor.o pci.o
 ifeq ($(TARGET_ARCH), i386)
 # Hardware support
 VL_OBJS+= ide.o ne2000.o pckbd.o vga.o sb16.o dma.o oss.o
-VL_OBJS+= fdc.o mc146818rtc.o serial.o i8259.o i8254.o pc.o
+VL_OBJS+= fdc.o mc146818rtc.o serial.o i8259.o i8254.o pc.o 
+VL_OBJS+= cirrus_vga.o
 endif
 ifeq ($(TARGET_ARCH), ppc)
 # Generic PPC support

diff --git a/vl.h b/vl.h
index 9dbb5b41a3b11916a2e8d2578f4b8163fe533c66..1b5c3cfd482fc54e00ce6e53ceb92868e0124bbb 100644 (file)
--- a/vl.h
+++ b/vl.h
@@ -481,6 +481,13 @@ int vga_initialize(DisplayState *ds, uint8_t *vga_ram_base,
 void vga_update_display(void);
 void vga_screen_dump(const char *filename);
 
+/* cirrus_vga.c */
+void pci_cirrus_vga_init(DisplayState *ds, uint8_t *vga_ram_base, 
+                         unsigned long vga_ram_offset, int vga_ram_size);
+
+void isa_cirrus_vga_init(DisplayState *ds, uint8_t *vga_ram_base, 
+                         unsigned long vga_ram_offset, int vga_ram_size);
+
 /* sdl.c */
 void sdl_display_init(DisplayState *ds);