diff mbox

[3/3] vga: compile cirrus_vga in hwlib

Message ID CAAu8pHsvGt+Q+PsppX7SsVr5o7uDHYQSG+=-42JDWRp4fe9qGQ@mail.gmail.com
State New
Headers show

Commit Message

Blue Swirl Jan. 22, 2012, 1:07 p.m. UTC 
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>
---
 Makefile.objs   |    1 +
 Makefile.target |    1 -
 hw/cirrus_vga.c |    3 ---
 3 files changed, 1 insertions(+), 4 deletions(-)

     }
@@ -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,
diff mbox

Patch

From 47e5a9f8e0c43fbf2c2b0cb1edd12763bc91706d Mon Sep 17 00:00:00 2001
Message-Id: <47e5a9f8e0c43fbf2c2b0cb1edd12763bc91706d.1327237042.git.blauwirbel@gmail.com>
In-Reply-To: <41f0624d559ef63f1f3c97f4d4ecb3e310935eb9.1327237042.git.blauwirbel@gmail.com>
References: <41f0624d559ef63f1f3c97f4d4ecb3e310935eb9.1327237042.git.blauwirbel@gmail.com>
From: Blue Swirl <blauwirbel@gmail.com>
Date: Sun, 9 Oct 2011 09:58:00 +0000
Subject: [PATCH 3/3] 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>
---
 Makefile.objs   |    1 +
 Makefile.target |    1 -
 hw/cirrus_vga.c |    3 ---
 3 files changed, 1 insertions(+), 4 deletions(-)

diff --git a/Makefile.objs b/Makefile.objs
index f94c881..d404e30 100644
--- a/Makefile.objs
+++ b/Makefile.objs
@@ -287,6 +287,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 bb18d72..309d761 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 a031079..7ce35ec 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,
-- 
1.7.2.5