From nobody Mon Feb 9 11:45:20 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1488667744677602.0427673206678; Sat, 4 Mar 2017 14:49:04 -0800 (PST) Received: from localhost ([::1]:36824 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ckIU3-0007Mr-99 for importer@patchew.org; Sat, 04 Mar 2017 17:49:03 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35382) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ckIO1-0003HT-Vp for qemu-devel@nongnu.org; Sat, 04 Mar 2017 17:42:52 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ckINz-0000uz-HR for qemu-devel@nongnu.org; Sat, 04 Mar 2017 17:42:49 -0500 Received: from zero.eik.bme.hu ([152.66.115.2]:26780) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ckINz-0000t1-5a; Sat, 04 Mar 2017 17:42:47 -0500 Received: from zero.eik.bme.hu (blah.eik.bme.hu [152.66.115.182]) by localhost (Postfix) with SMTP id 80657745977; Sat, 4 Mar 2017 23:42:38 +0100 (CET) Received: by zero.eik.bme.hu (Postfix, from userid 432) id D1EEF745968; Sat, 4 Mar 2017 23:42:37 +0100 (CET) Message-Id: In-Reply-To: References: From: BALATON Zoltan Date: Sat, 25 Feb 2017 20:19:18 +0100 To: qemu-devel@nongnu.org, qemu-trivial@nongnu.org X-detected-operating-system: by eggs.gnu.org: FreeBSD 9.x [fuzzy] X-Received-From: 152.66.115.2 Subject: [Qemu-devel] [PATCH v4 09/13] sm501: Misc clean ups X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , Magnus Damm , Aurelien Jarno , David Gibson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" - Rename a variable - Move variable declarations out of loop to the beginning in draw_hwc_line Signed-off-by: BALATON Zoltan Reviewed-by: Peter Maydell --- hw/display/sm501.c | 10 +++++----- hw/display/sm501_template.h | 10 ++++------ 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/hw/display/sm501.c b/hw/display/sm501.c index dc806a3..2385f59 100644 --- a/hw/display/sm501.c +++ b/hw/display/sm501.c @@ -1313,7 +1313,7 @@ static void sm501_draw_crt(SM501State *s) uint32_t *palette =3D (uint32_t *)&s->dc_palette[SM501_DC_CRT_PALETTE - SM501_DC_PANEL_PALETTE]; uint8_t hwc_palette[3 * 3]; - int ds_depth_index =3D get_depth_index(surface); + int dst_depth_index =3D get_depth_index(surface); draw_line_func *draw_line =3D NULL; draw_hwc_line_func *draw_hwc_line =3D NULL; int full_update =3D 0; @@ -1325,13 +1325,13 @@ static void sm501_draw_crt(SM501State *s) /* choose draw_line function */ switch (src_bpp) { case 1: - draw_line =3D draw_line8_funcs[ds_depth_index]; + draw_line =3D draw_line8_funcs[dst_depth_index]; break; case 2: - draw_line =3D draw_line16_funcs[ds_depth_index]; + draw_line =3D draw_line16_funcs[dst_depth_index]; break; case 4: - draw_line =3D draw_line32_funcs[ds_depth_index]; + draw_line =3D draw_line32_funcs[dst_depth_index]; break; default: printf("sm501 draw crt : invalid DC_CRT_CONTROL=3D%x.\n", @@ -1343,7 +1343,7 @@ static void sm501_draw_crt(SM501State *s) /* set up to draw hardware cursor */ if (is_hwc_enabled(s, 1)) { /* choose cursor draw line function */ - draw_hwc_line =3D draw_hwc_line_funcs[ds_depth_index]; + draw_hwc_line =3D draw_hwc_line_funcs[dst_depth_index]; hwc_src =3D get_hwc_address(s, 1); c_x =3D get_hwc_x(s, 1); c_y =3D get_hwc_y(s, 1); diff --git a/hw/display/sm501_template.h b/hw/display/sm501_template.h index 39f2b67..c57f91a 100644 --- a/hw/display/sm501_template.h +++ b/hw/display/sm501_template.h @@ -108,7 +108,7 @@ static void glue(draw_hwc_line_, PIXEL_NAME)(uint8_t *d= , const uint8_t *s, int width, const uint8_t *palette, int c_x, int c_y) { int i; - uint8_t bitset =3D 0; + uint8_t r, g, b, v, bitset =3D 0; =20 /* get cursor position */ assert(0 <=3D c_y && c_y < SM501_HWC_HEIGHT); @@ -116,8 +116,6 @@ static void glue(draw_hwc_line_, PIXEL_NAME)(uint8_t *d= , const uint8_t *s, d +=3D c_x * BPP; =20 for (i =3D 0; i < SM501_HWC_WIDTH && c_x + i < width; i++) { - uint8_t v; - /* get pixel value */ if (i % 4 =3D=3D 0) { bitset =3D ldub_p(s); @@ -129,9 +127,9 @@ static void glue(draw_hwc_line_, PIXEL_NAME)(uint8_t *d= , const uint8_t *s, /* write pixel */ if (v) { v--; - uint8_t r =3D palette[v * 3 + 0]; - uint8_t g =3D palette[v * 3 + 1]; - uint8_t b =3D palette[v * 3 + 2]; + r =3D palette[v * 3 + 0]; + g =3D palette[v * 3 + 1]; + b =3D palette[v * 3 + 2]; *(PIXEL_TYPE *)d =3D glue(rgb_to_pixel, PIXEL_NAME)(r, g, b); } d +=3D BPP; --=20 2.7.4