From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MWSjv-0005IH-TW for qemu-devel@nongnu.org; Thu, 30 Jul 2009 06:19:59 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MWSjt-0005HF-Vw for qemu-devel@nongnu.org; Thu, 30 Jul 2009 06:19:59 -0400 Received: from [199.232.76.173] (port=34925 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MWSjt-0005H7-Pn for qemu-devel@nongnu.org; Thu, 30 Jul 2009 06:19:57 -0400 Received: from mx20.gnu.org ([199.232.41.8]:26374) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1MWSjt-0008Jj-8G for qemu-devel@nongnu.org; Thu, 30 Jul 2009 06:19:57 -0400 Received: from mx2.redhat.com ([66.187.237.31]) by mx20.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1MWSjs-0001LQ-0f for qemu-devel@nongnu.org; Thu, 30 Jul 2009 06:19:56 -0400 Received: from int-mx2.corp.redhat.com (int-mx2.corp.redhat.com [172.16.27.26]) by mx2.redhat.com (8.13.8/8.13.8) with ESMTP id n6UAJtCK002829 for ; Thu, 30 Jul 2009 06:19:55 -0400 From: Zachary Amsden Date: Thu, 30 Jul 2009 00:15:09 -1000 Message-Id: <1248948912-7877-12-git-send-email-zamsden@redhat.com> In-Reply-To: <1248948912-7877-11-git-send-email-zamsden@redhat.com> References: <1248948912-7877-1-git-send-email-zamsden@redhat.com> <1248948912-7877-2-git-send-email-zamsden@redhat.com> <1248948912-7877-3-git-send-email-zamsden@redhat.com> <1248948912-7877-4-git-send-email-zamsden@redhat.com> <1248948912-7877-5-git-send-email-zamsden@redhat.com> <1248948912-7877-6-git-send-email-zamsden@redhat.com> <1248948912-7877-7-git-send-email-zamsden@redhat.com> <1248948912-7877-8-git-send-email-zamsden@redhat.com> <1248948912-7877-9-git-send-email-zamsden@redhat.com> <1248948912-7877-10-git-send-email-zamsden@redhat.com> <1248948912-7877-11-git-send-email-zamsden@redhat.com> Subject: [Qemu-devel] [PATCH 11/14] Add some defined constants for VGA offsets. List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: zamsden@redhat.com Signed-off-by: Zachary Amsden --- hw/cirrus_vga.c | 14 +++++++------- hw/vga.c | 12 ++++++------ hw/vga_int.h | 4 ++++ hw/vmware_vga.c | 2 +- 4 files changed, 18 insertions(+), 14 deletions(-) diff --git a/hw/cirrus_vga.c b/hw/cirrus_vga.c index 60c67fe..9623820 100644 --- a/hw/cirrus_vga.c +++ b/hw/cirrus_vga.c @@ -2002,7 +2002,7 @@ static uint32_t cirrus_vga_mem_readb(void *opaque, target_phys_addr_t addr) return vga_mem_readb(s, addr); } - addr &= 0x1ffff; + addr &= VGA_VRAM_MASK; if (addr < 0x10000) { /* XXX handle bitblt */ @@ -2078,7 +2078,7 @@ static void cirrus_vga_mem_writeb(void *opaque, target_phys_addr_t addr, return; } - addr &= 0x1ffff; + addr &= VGA_VRAM_MASK; if (addr < 0x10000) { if (s->cirrus_srcptr != s->cirrus_srcptr_end) { @@ -2611,7 +2611,7 @@ static void map_linear_vram(CirrusVGAState *s) s->vga.lfb_vram_mapped = 1; } else { - cpu_register_physical_memory(s->vga.vram_phys, 0x20000, s->vga.vga_io_memory); + cpu_register_physical_memory(s->vga.vram_phys, VGA_VRAM_SIZE, s->vga.vga_io_memory); } vga_dirty_log_start(&s->vga); @@ -2622,7 +2622,7 @@ static void unmap_linear_vram(CirrusVGAState *s) if (s->vga.map_addr && s->vga.lfb_addr && s->vga.lfb_end) s->vga.map_addr = s->vga.map_size = 0; - cpu_register_physical_memory(s->vga.vram_phys, 0x20000, s->vga.vga_io_memory); + cpu_register_physical_memory(s->vga.vram_phys, VGA_VRAM_SIZE, s->vga.vga_io_memory); } /* Compute the memory access functions */ @@ -3195,11 +3195,11 @@ static void cirrus_init_common(CirrusVGAState * s, int device_id, int is_pci) register_ioport_read(0x3ba, 1, 1, vga_ioport_read, s); register_ioport_read(0x3da, 1, 1, vga_ioport_read, s); - s->vga.vram_phys = isa_mem_base + 0xa0000; + s->vga.vram_phys = isa_mem_base + VGA_ISA_ADDRESS; s->vga.vga_io_memory = cpu_register_io_memory(cirrus_vga_mem_read, cirrus_vga_mem_write, s); - cpu_register_physical_memory(s->vga.vram_phys, 0x20000, s->vga.vga_io_memory); - qemu_register_coalesced_mmio(s->vga.vram_phys, 0x20000); + cpu_register_physical_memory(s->vga.vram_phys, VGA_VRAM_SIZE, s->vga.vga_io_memory); + qemu_register_coalesced_mmio(s->vga.vram_phys, VGA_VRAM_SIZE); /* I/O handler for LFB */ s->cirrus_linear_io_addr = diff --git a/hw/vga.c b/hw/vga.c index 0941962..9fbb489 100644 --- a/hw/vga.c +++ b/hw/vga.c @@ -713,7 +713,7 @@ uint32_t vga_mem_readb(void *opaque, target_phys_addr_t addr) /* convert to VGA memory offset */ memory_map_mode = (s->gr[6] >> 2) & 3; - addr &= 0x1ffff; + addr &= VGA_VRAM_MASK; switch(memory_map_mode) { case 0: break; @@ -803,7 +803,7 @@ void vga_mem_writeb(void *opaque, target_phys_addr_t addr, uint32_t val) #endif /* convert to VGA memory offset */ memory_map_mode = (s->gr[6] >> 2) & 3; - addr &= 0x1ffff; + addr &= VGA_VRAM_MASK; switch(memory_map_mode) { case 0: break; @@ -2420,8 +2420,8 @@ void vga_init(VGAState *s, target_phys_addr_t vram_base, } vga_io_memory = cpu_register_io_memory(vga_mem_read, vga_mem_write, s); - cpu_register_physical_memory(vram_base, 0x20000, vga_io_memory); - qemu_register_coalesced_mmio(vram_base, 0x20000); + cpu_register_physical_memory(vram_base, VGA_VRAM_SIZE, vga_io_memory); + qemu_register_coalesced_mmio(vram_base, VGA_VRAM_SIZE); } int isa_vga_init(void) @@ -2431,7 +2431,7 @@ int isa_vga_init(void) s = qemu_mallocz(sizeof(VGAState)); vga_common_init(s, VGA_RAM_SIZE); - vga_init(s, isa_mem_base + 0xa0000, 0, -1); + vga_init(s, isa_mem_base + VGA_ISA_ADDRESS, 0, -1); s->ds = graphic_console_init(s->update, s->invalidate, s->screen_dump, s->text_update, s); @@ -2491,7 +2491,7 @@ int pci_vga_init(PCIBus *bus, s = &d->vga_state; vga_common_init(s, VGA_RAM_SIZE); - vga_init(s, isa_mem_base + 0xa0000, 0, -1); + vga_init(s, isa_mem_base + VGA_ISA_ADDRESS, 0, -1); s->ds = graphic_console_init(s->update, s->invalidate, s->screen_dump, s->text_update, s); diff --git a/hw/vga_int.h b/hw/vga_int.h index bab04c6..d1d0c17 100644 --- a/hw/vga_int.h +++ b/hw/vga_int.h @@ -79,6 +79,10 @@ #define CH_ATTR_SIZE (160 * 100) #define VGA_MAX_HEIGHT 2048 +#define VGA_ISA_ADDRESS 0xa0000 +#define VGA_VRAM_SIZE 0x20000 +#define VGA_VRAM_MASK 0x1ffff + struct vga_precise_retrace { int64_t ticks_per_char; int64_t total_chars; diff --git a/hw/vmware_vga.c b/hw/vmware_vga.c index d81d263..d51fa81 100644 --- a/hw/vmware_vga.c +++ b/hw/vmware_vga.c @@ -1130,7 +1130,7 @@ static void vmsvga_init(struct vmsvga_state_s *s, int vga_ram_size) #ifdef EMBED_STDVGA vga_common_init((VGAState *) s, vga_ram_size); - vga_init((VGAState *) s, isa_mem_base + 0xa0000, 0, -1); + vga_init((VGAState *) s, isa_mem_base + VGA_ISA_ADDRESS, 0, -1); #else s->vram_size = vga_ram_size; s->vram_offset = qemu_ram_alloc(vga_ram_size); -- 1.6.2.5