diff options
| author | Blue Swirl <blauwirbel@gmail.com> | 2011-10-09 09:58:00 +0000 |
|---|---|---|
| committer | Blue Swirl <blauwirbel@gmail.com> | 2012-01-25 18:32:59 +0000 |
| commit | 331636431af32ece373f4b1fb7c3ae9d0615e2a6 (patch) | |
| tree | b2a0c761e8e3b3b76361ed1d9f9990e6fd7d8bfb | |
| parent | fd4aa979033ca604ad829cf95055d4b5c5ed1063 (diff) | |
| download | qemu-331636431af32ece373f4b1fb7c3ae9d0615e2a6.tar.gz | |
vga: compile cirrus_vga in hwlib
Remove target dependencies and compile Cirrus VGA in hwlib.
Address masking can be removed since memory API handles that now.
Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
| -rw-r--r-- | Makefile.objs | 1 | ||||
| -rw-r--r-- | Makefile.target | 1 | ||||
| -rw-r--r-- | hw/cirrus_vga.c | 3 |
3 files changed, 1 insertions, 4 deletions
diff --git a/Makefile.objs b/Makefile.objs index 04a1d1b497..9ca606356f 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -289,6 +289,7 @@ hw-obj-$(CONFIG_VGA_ISA) += vga-isa.o hw-obj-$(CONFIG_VGA_ISA_MM) += vga-isa-mm.o hw-obj-$(CONFIG_VMWARE_VGA) += vmware_vga.o hw-obj-$(CONFIG_VMMOUSE) += vmmouse.o +hw-obj-$(CONFIG_VGA_CIRRUS) += cirrus_vga.o hw-obj-$(CONFIG_RC4030) += rc4030.o hw-obj-$(CONFIG_DP8393X) += dp8393x.o diff --git a/Makefile.target b/Makefile.target index 69193d4938..e554d333a7 100644 --- a/Makefile.target +++ b/Makefile.target @@ -197,7 +197,6 @@ obj-$(CONFIG_REALLY_VIRTFS) += 9pfs/virtio-9p-device.o obj-$(CONFIG_KVM) += kvm.o kvm-all.o obj-$(CONFIG_NO_KVM) += kvm-stub.o obj-$(CONFIG_VGA) += vga.o -obj-$(CONFIG_VGA_CIRRUS) += cirrus_vga.o obj-y += memory.o savevm.o LIBS+=-lz diff --git a/hw/cirrus_vga.c b/hw/cirrus_vga.c index a031079412..7ce35ec51c 100644 --- a/hw/cirrus_vga.c +++ b/hw/cirrus_vga.c @@ -618,7 +618,6 @@ static void cirrus_invalidate_region(CirrusVGAState * s, int off_begin, for (y = 0; y < lines; y++) { off_cur = off_begin; off_cur_end = (off_cur + bytesperline) & s->cirrus_addr_mask; - off_cur &= TARGET_PAGE_MASK; memory_region_set_dirty(&s->vga.vram, off_cur, off_cur_end - off_cur); off_begin += off_pitch; } @@ -1897,8 +1896,6 @@ static void cirrus_mmio_blt_write(CirrusVGAState * s, unsigned address, * * write mode 4/5 * - * assume TARGET_PAGE_SIZE >= 16 - * ***************************************/ static void cirrus_mem_writeb_mode4and5_8bpp(CirrusVGAState * s, |