Commit d6bfa22f729500d1bc7f90a560ef278c22a2e291
1 parent
e6e5ad80
Cirrus VGA emulation
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@892 c046a42c-6fe2-441c-8c8c-71466251a162
Showing
2 changed files
with
9 additions
and
1 deletions
Makefile.target
| @@ -237,7 +237,8 @@ VL_OBJS=vl.o osdep.o block.o monitor.o pci.o | @@ -237,7 +237,8 @@ VL_OBJS=vl.o osdep.o block.o monitor.o pci.o | ||
| 237 | ifeq ($(TARGET_ARCH), i386) | 237 | ifeq ($(TARGET_ARCH), i386) |
| 238 | # Hardware support | 238 | # Hardware support |
| 239 | VL_OBJS+= ide.o ne2000.o pckbd.o vga.o sb16.o dma.o oss.o | 239 | VL_OBJS+= ide.o ne2000.o pckbd.o vga.o sb16.o dma.o oss.o |
| 240 | -VL_OBJS+= fdc.o mc146818rtc.o serial.o i8259.o i8254.o pc.o | 240 | +VL_OBJS+= fdc.o mc146818rtc.o serial.o i8259.o i8254.o pc.o |
| 241 | +VL_OBJS+= cirrus_vga.o | ||
| 241 | endif | 242 | endif |
| 242 | ifeq ($(TARGET_ARCH), ppc) | 243 | ifeq ($(TARGET_ARCH), ppc) |
| 243 | # Generic PPC support | 244 | # Generic PPC support |
vl.h
| @@ -481,6 +481,13 @@ int vga_initialize(DisplayState *ds, uint8_t *vga_ram_base, | @@ -481,6 +481,13 @@ int vga_initialize(DisplayState *ds, uint8_t *vga_ram_base, | ||
| 481 | void vga_update_display(void); | 481 | void vga_update_display(void); |
| 482 | void vga_screen_dump(const char *filename); | 482 | void vga_screen_dump(const char *filename); |
| 483 | 483 | ||
| 484 | +/* cirrus_vga.c */ | ||
| 485 | +void pci_cirrus_vga_init(DisplayState *ds, uint8_t *vga_ram_base, | ||
| 486 | + unsigned long vga_ram_offset, int vga_ram_size); | ||
| 487 | + | ||
| 488 | +void isa_cirrus_vga_init(DisplayState *ds, uint8_t *vga_ram_base, | ||
| 489 | + unsigned long vga_ram_offset, int vga_ram_size); | ||
| 490 | + | ||
| 484 | /* sdl.c */ | 491 | /* sdl.c */ |
| 485 | void sdl_display_init(DisplayState *ds); | 492 | void sdl_display_init(DisplayState *ds); |
| 486 | 493 |