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>
This commit is contained in:
parent
fd4aa97903
commit
331636431a
|
@ -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_VGA_ISA_MM) += vga-isa-mm.o
|
||||||
hw-obj-$(CONFIG_VMWARE_VGA) += vmware_vga.o
|
hw-obj-$(CONFIG_VMWARE_VGA) += vmware_vga.o
|
||||||
hw-obj-$(CONFIG_VMMOUSE) += vmmouse.o
|
hw-obj-$(CONFIG_VMMOUSE) += vmmouse.o
|
||||||
|
hw-obj-$(CONFIG_VGA_CIRRUS) += cirrus_vga.o
|
||||||
|
|
||||||
hw-obj-$(CONFIG_RC4030) += rc4030.o
|
hw-obj-$(CONFIG_RC4030) += rc4030.o
|
||||||
hw-obj-$(CONFIG_DP8393X) += dp8393x.o
|
hw-obj-$(CONFIG_DP8393X) += dp8393x.o
|
||||||
|
|
|
@ -197,7 +197,6 @@ obj-$(CONFIG_REALLY_VIRTFS) += 9pfs/virtio-9p-device.o
|
||||||
obj-$(CONFIG_KVM) += kvm.o kvm-all.o
|
obj-$(CONFIG_KVM) += kvm.o kvm-all.o
|
||||||
obj-$(CONFIG_NO_KVM) += kvm-stub.o
|
obj-$(CONFIG_NO_KVM) += kvm-stub.o
|
||||||
obj-$(CONFIG_VGA) += vga.o
|
obj-$(CONFIG_VGA) += vga.o
|
||||||
obj-$(CONFIG_VGA_CIRRUS) += cirrus_vga.o
|
|
||||||
obj-y += memory.o savevm.o
|
obj-y += memory.o savevm.o
|
||||||
LIBS+=-lz
|
LIBS+=-lz
|
||||||
|
|
||||||
|
|
|
@ -618,7 +618,6 @@ static void cirrus_invalidate_region(CirrusVGAState * s, int off_begin,
|
||||||
for (y = 0; y < lines; y++) {
|
for (y = 0; y < lines; y++) {
|
||||||
off_cur = off_begin;
|
off_cur = off_begin;
|
||||||
off_cur_end = (off_cur + bytesperline) & s->cirrus_addr_mask;
|
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);
|
memory_region_set_dirty(&s->vga.vram, off_cur, off_cur_end - off_cur);
|
||||||
off_begin += off_pitch;
|
off_begin += off_pitch;
|
||||||
}
|
}
|
||||||
|
@ -1897,8 +1896,6 @@ static void cirrus_mmio_blt_write(CirrusVGAState * s, unsigned address,
|
||||||
*
|
*
|
||||||
* write mode 4/5
|
* write mode 4/5
|
||||||
*
|
*
|
||||||
* assume TARGET_PAGE_SIZE >= 16
|
|
||||||
*
|
|
||||||
***************************************/
|
***************************************/
|
||||||
|
|
||||||
static void cirrus_mem_writeb_mode4and5_8bpp(CirrusVGAState * s,
|
static void cirrus_mem_writeb_mode4and5_8bpp(CirrusVGAState * s,
|
||||||
|
|
Reference in New Issue