From patchwork Mon Aug 31 14:07:27 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juan Quintela X-Patchwork-Id: 32656 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 bilbo.ozlabs.org (Postfix) with ESMTPS id 2F58BB7088 for ; Tue, 1 Sep 2009 00:49:48 +1000 (EST) Received: from localhost ([127.0.0.1]:55305 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Mi8CV-0005Co-9Z for incoming@patchwork.ozlabs.org; Mon, 31 Aug 2009 10:49:43 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Mi7af-0004um-M2 for qemu-devel@nongnu.org; Mon, 31 Aug 2009 10:10:37 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1Mi7ab-0004sP-N8 for qemu-devel@nongnu.org; Mon, 31 Aug 2009 10:10:36 -0400 Received: from [199.232.76.173] (port=43341 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Mi7aZ-0004rf-NR for qemu-devel@nongnu.org; Mon, 31 Aug 2009 10:10:32 -0400 Received: from mx1.redhat.com ([209.132.183.28]:52750) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1Mi7aZ-0003Gj-Ap for qemu-devel@nongnu.org; Mon, 31 Aug 2009 10:10:31 -0400 Received: from int-mx04.intmail.prod.int.phx2.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.17]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id n7VEAU2p007080; Mon, 31 Aug 2009 10:10:30 -0400 Received: from localhost.localdomain (vpn1-4-222.ams2.redhat.com [10.36.4.222]) by int-mx04.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id n7VEA0ob003480; Mon, 31 Aug 2009 10:10:29 -0400 From: Juan Quintela To: qemu-devel@nongnu.org Date: Mon, 31 Aug 2009 16:07:27 +0200 Message-Id: <2020b872ce1cc3d764502b2d877acbbab044f5ac.1251725416.git.quintela@redhat.com> In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.67 on 10.5.11.17 X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. Cc: aliguori@us.ibm.com Subject: [Qemu-devel] [PATCH 17/23] cirrus_vga: rename cirrus_hook_read_palette() cirrus_vga_read_palette() 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 Simplify the logic to do everything inside the function Signed-off-by: Juan Quintela --- hw/cirrus_vga.c | 27 ++++++++++++--------------- 1 files changed, 12 insertions(+), 15 deletions(-) diff --git a/hw/cirrus_vga.c b/hw/cirrus_vga.c index b369849..4c75569 100644 --- a/hw/cirrus_vga.c +++ b/hw/cirrus_vga.c @@ -1419,18 +1419,21 @@ static void cirrus_write_hidden_dac(CirrusVGAState * s, int reg_value) * ***************************************/ -static int cirrus_hook_read_palette(CirrusVGAState * s, int *reg_value) +static int cirrus_vga_read_palette(CirrusVGAState * s) { - if (!(s->vga.sr[0x12] & CIRRUS_CURSOR_HIDDENPEL)) - return CIRRUS_HOOK_NOT_HANDLED; - *reg_value = - s->cirrus_hidden_palette[(s->vga.dac_read_index & 0x0f) * 3 + - s->vga.dac_sub_index]; + int val; + + if ((s->vga.sr[0x12] & CIRRUS_CURSOR_HIDDENPEL)) { + val = s->cirrus_hidden_palette[(s->vga.dac_read_index & 0x0f) * 3 + + s->vga.dac_sub_index]; + } else { + val = s->vga.palette[s->vga.dac_read_index * 3 + s->vga.dac_sub_index]; + } if (++s->vga.dac_sub_index == 3) { s->vga.dac_sub_index = 0; s->vga.dac_read_index++; } - return CIRRUS_HOOK_HANDLED; + return val; } static int cirrus_hook_write_palette(CirrusVGAState * s, int reg_value) @@ -2698,14 +2701,8 @@ static uint32_t cirrus_vga_ioport_read(void *opaque, uint32_t addr) c->cirrus_hidden_dac_lockindex = 0; break; case 0x3c9: - if (cirrus_hook_read_palette(c, &val)) - break; - val = s->palette[s->dac_read_index * 3 + s->dac_sub_index]; - if (++s->dac_sub_index == 3) { - s->dac_sub_index = 0; - s->dac_read_index++; - } - break; + val = cirrus_vga_read_palette(c); + break; case 0x3ca: val = s->fcr; break;