From patchwork Thu Jul 22 22:03:23 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Blue Swirl X-Patchwork-Id: 59670 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id C859C1007D7 for ; Fri, 23 Jul 2010 08:26:27 +1000 (EST) Received: from localhost ([127.0.0.1]:52137 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Oc4De-0004dQ-PK for incoming@patchwork.ozlabs.org; Thu, 22 Jul 2010 18:26:22 -0400 Received: from [140.186.70.92] (port=42696 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Oc3wY-00030V-Sj for qemu-devel@nongnu.org; Thu, 22 Jul 2010 18:08:43 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1Oc3rk-0003YV-Rx for qemu-devel@nongnu.org; Thu, 22 Jul 2010 18:03:45 -0400 Received: from mail-qw0-f45.google.com ([209.85.216.45]:38306) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1Oc3rk-0003Vg-Pw for qemu-devel@nongnu.org; Thu, 22 Jul 2010 18:03:44 -0400 Received: by mail-qw0-f45.google.com with SMTP id 6so3335655qwf.4 for ; Thu, 22 Jul 2010 15:03:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:mime-version:received:from:date :message-id:subject:to:content-type; bh=YeJTdfKv0o5o1RAgzxAL3Tx8jhWaiwe1hY6OWLIuX2E=; b=LTVJ+DLmYToCQxwJ5L+Afd1IhIs/hTOPkbWK5t9kDJkE1ddMR+Znd6dbzKETk3mXgw VtwlVv8pjJEXQCaw5da3GMpqmWJTrHoPsvoDg1hpZgjO+yjv51zgI+xqmoW358gpFYRE JCJ3MIHAAEZTDUQG5Nok+X7rFBsL5Y6C2saVk= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:from:date:message-id:subject:to:content-type; b=UwbDx1ejOjWqGkjJZOKfCrWzyJr/ifis5y1D/WkEJG+cVCkjA7ZJs/Sw5dVtzY81B9 7RUEy8yG5+Po+0UMJRDPM0uBZ37Pid/DANBLufhxirP1y3h1CDp9dfaKo1eEySwEmmp2 atTC9yGtbUPvZRQnulcxLo/c3QgEA7bPRMnkE= Received: by 10.224.113.104 with SMTP id z40mr1691085qap.392.1279836224184; Thu, 22 Jul 2010 15:03:44 -0700 (PDT) MIME-Version: 1.0 Received: by 10.229.185.146 with HTTP; Thu, 22 Jul 2010 15:03:23 -0700 (PDT) From: Blue Swirl Date: Thu, 22 Jul 2010 22:03:23 +0000 Message-ID: To: qemu-devel X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) Subject: [Qemu-devel] [PATCH 31/34] vga: refactor vga_init X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Move common stuff not related to I/O port init from vga_init() to vga_common_init(). Signed-off-by: Blue Swirl --- hw/vga-isa-mm.c | 1 - hw/vga.c | 5 ++--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/hw/vga-isa-mm.c b/hw/vga-isa-mm.c index 680b557..d4b1e95 100644 --- a/hw/vga-isa-mm.c +++ b/hw/vga-isa-mm.c @@ -103,7 +103,6 @@ static void vga_mm_init(ISAVGAMMState *s, target_phys_addr_t vram_base, vmstate_register(NULL, 0, &vmstate_vga_common, s); cpu_register_physical_memory(ctrl_base, 0x100000, s_ioport_ctrl); - s->vga.bank_offset = 0; cpu_register_physical_memory(vram_base + 0x000a0000, 0x20000, vga_io_memory); qemu_register_coalesced_mmio(vram_base + 0x000a0000, 0x20000); } diff --git a/hw/vga.c b/hw/vga.c index b5c7ee7..b612529 100644 --- a/hw/vga.c +++ b/hw/vga.c @@ -2264,6 +2264,7 @@ void vga_common_init(VGACommonState *s, int vga_ram_size) s->vram_offset = qemu_ram_alloc(NULL, "vga.vram", vga_ram_size); s->vram_ptr = qemu_get_ram_ptr(s->vram_offset); s->vram_size = vga_ram_size; + s->bank_offset = 0; s->get_bpp = vga_get_bpp; s->get_offsets = vga_get_offsets; s->get_resolution = vga_get_resolution; @@ -2282,6 +2283,7 @@ void vga_common_init(VGACommonState *s, int vga_ram_size) s->update_retrace_info = vga_precise_update_retrace_info; break; } + qemu_register_reset(vga_reset, s); } /* used by both ISA and PCI */ @@ -2289,8 +2291,6 @@ void vga_init(VGACommonState *s) { int vga_io_memory; - qemu_register_reset(vga_reset, s); - register_ioport_write(0x3c0, 16, 1, vga_ioport_write, s); register_ioport_write(0x3b4, 2, 1, vga_ioport_write, s); @@ -2304,7 +2304,6 @@ void vga_init(VGACommonState *s) register_ioport_read(0x3d4, 2, 1, vga_ioport_read, s); register_ioport_read(0x3ba, 1, 1, vga_ioport_read, s); register_ioport_read(0x3da, 1, 1, vga_ioport_read, s); - s->bank_offset = 0; #ifdef CONFIG_BOCHS_VBE #if defined (TARGET_I386)