From patchwork Mon Mar 14 17:56:14 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pooja Dhannawat X-Patchwork-Id: 8582701 Return-Path: X-Original-To: patchwork-qemu-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id F10259F54C for ; Mon, 14 Mar 2016 17:59:51 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 3D115200FE for ; Mon, 14 Mar 2016 17:59:50 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 6DD7F2015E for ; Mon, 14 Mar 2016 17:59:49 +0000 (UTC) Received: from localhost ([::1]:43086 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1afWmS-0003Nz-Tx for patchwork-qemu-devel@patchwork.kernel.org; Mon, 14 Mar 2016 13:59:48 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33151) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1afWl5-0001B5-Ik for qemu-devel@nongnu.org; Mon, 14 Mar 2016 13:58:24 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1afWl2-0006hB-8O for qemu-devel@nongnu.org; Mon, 14 Mar 2016 13:58:23 -0400 Received: from mail-pa0-x243.google.com ([2607:f8b0:400e:c03::243]:34874) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1afWl1-0006gg-UJ for qemu-devel@nongnu.org; Mon, 14 Mar 2016 13:58:20 -0400 Received: by mail-pa0-x243.google.com with SMTP id fl4so15271847pad.2 for ; Mon, 14 Mar 2016 10:58:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:subject:date:message-id:in-reply-to:references; bh=1mBbPN4GBjz0gTB8JULoIhuWyhbOLSwOSSCcA0wyMsU=; b=icmnL/mf8PsI4kReCq41cJDFvn+A5CS8KP53VNTKgomLjB4ZTg1dT5byqIlm916Ml3 V4kfe5xEZ5MUSbGCXlk6FT9CTZ3lKoV5Duc7KoXaCrVaKMLsb5A3TCgh3LNsl1vAWtYd h9Heng1QdRTsXVHHTELrR6DdAP55wJdPsRRqzWeq0tVbVh97dcSc7GbxTiRri3nl8zoY gUwatA6vsDrVsOY51RVzbStSZAuKlKYQNJyTqh4/KYXjS+uKQ9rtl+lPlif4ZMwcbqCy LTJTspdr4L4/mO8D3lQIa29MKFyrdPOeKMSnMI4T+ckOhvjku8CtX4m2Pg+RA9NYeVYA yDjw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=1mBbPN4GBjz0gTB8JULoIhuWyhbOLSwOSSCcA0wyMsU=; b=YP+1GkUtpFGRNYhwyOdv8RbriWBrmmh08z+S0K3cLrt63CT4UgtE75d22oGZcbsUPL eR3l/4bOknrQY/4u89Gub/QHNXSJwnz6P/poyhORl2+fiGFP3rX2AFDaJK0cHwAlLkYt c23PgAuvADFYn7f/saFr5Odv05MjpDtg+TioZY7cqoUYfAnXm+4EYX0qL4XESgMrIRer JqXJNF4PprhkbmNtSVf1VyutzvGzcQ9el+3zGvsDVpys/RC7SqFJ3dz7utoGSixkNjCE EEcQ1gTFP6rOcXWfoGFo20DgJXNxAzMBvaREgSTCUt+RkhQAWkWBzjDSOQiP+b+jI4U4 m62A== X-Gm-Message-State: AD7BkJIXUIz71O/gDPl97aivWdyz9lpkpf83TBIgHZrgQQIze9dfQtm1YnQrv/+hz/vwtw== X-Received: by 10.67.23.161 with SMTP id ib1mr38704658pad.156.1457978298145; Mon, 14 Mar 2016 10:58:18 -0700 (PDT) Received: from localhost.localdomain ([183.87.60.98]) by smtp.gmail.com with ESMTPSA id 19sm33681995pfp.66.2016.03.14.10.58.16 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 14 Mar 2016 10:58:17 -0700 (PDT) From: Pooja Dhannawat To: qemu-devel@nongnu.org Date: Mon, 14 Mar 2016 23:26:14 +0530 Message-Id: <1457978174-28397-1-git-send-email-dhannawatpooja1@gmail.com> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1457967850-8537-1-git-send-email-dhannawatpooja1@gmail.com> References: <1457967850-8537-1-git-send-email-dhannawatpooja1@gmail.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2607:f8b0:400e:c03::243 Subject: [Qemu-devel] [PATCH v3] blizzard: Remove support for DEPTH != 32 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Removing support for DEPTH != 32 from blizzard template header and file that includes it, as macro DEPTH == 32 only used. Signed-off-by: Pooja Dhannawat --- hw/display/blizzard.c | 24 ------------------------ hw/display/blizzard_template.h | 30 +----------------------------- 2 files changed, 1 insertion(+), 53 deletions(-) diff --git a/hw/display/blizzard.c b/hw/display/blizzard.c index c231960..a72e789 100644 --- a/hw/display/blizzard.c +++ b/hw/display/blizzard.c @@ -925,14 +925,6 @@ static void blizzard_update_display(void *opaque) s->my[1] = 0; } -#define DEPTH 8 -#include "blizzard_template.h" -#define DEPTH 15 -#include "blizzard_template.h" -#define DEPTH 16 -#include "blizzard_template.h" -#define DEPTH 24 -#include "blizzard_template.h" #define DEPTH 32 #include "blizzard_template.h" @@ -956,22 +948,6 @@ void *s1d13745_init(qemu_irq gpio_int) s->line_fn_tab[0] = s->line_fn_tab[1] = g_malloc0(sizeof(blizzard_fn_t) * 0x10); break; - case 8: - s->line_fn_tab[0] = blizzard_draw_fn_8; - s->line_fn_tab[1] = blizzard_draw_fn_r_8; - break; - case 15: - s->line_fn_tab[0] = blizzard_draw_fn_15; - s->line_fn_tab[1] = blizzard_draw_fn_r_15; - break; - case 16: - s->line_fn_tab[0] = blizzard_draw_fn_16; - s->line_fn_tab[1] = blizzard_draw_fn_r_16; - break; - case 24: - s->line_fn_tab[0] = blizzard_draw_fn_24; - s->line_fn_tab[1] = blizzard_draw_fn_r_24; - break; case 32: s->line_fn_tab[0] = blizzard_draw_fn_32; s->line_fn_tab[1] = blizzard_draw_fn_r_32; diff --git a/hw/display/blizzard_template.h b/hw/display/blizzard_template.h index b7ef27c..bc38d7a 100644 --- a/hw/display/blizzard_template.h +++ b/hw/display/blizzard_template.h @@ -19,31 +19,7 @@ */ #define SKIP_PIXEL(to) (to += deststep) -#if DEPTH == 8 -# define PIXEL_TYPE uint8_t -# define COPY_PIXEL(to, from) do { *to = from; SKIP_PIXEL(to); } while (0) -# define COPY_PIXEL1(to, from) (*to++ = from) -#elif DEPTH == 15 || DEPTH == 16 -# define PIXEL_TYPE uint16_t -# define COPY_PIXEL(to, from) do { *to = from; SKIP_PIXEL(to); } while (0) -# define COPY_PIXEL1(to, from) (*to++ = from) -#elif DEPTH == 24 -# define PIXEL_TYPE uint8_t -# define COPY_PIXEL(to, from) \ - do { \ - to[0] = from; \ - to[1] = (from) >> 8; \ - to[2] = (from) >> 16; \ - SKIP_PIXEL(to); \ - } while (0) - -# define COPY_PIXEL1(to, from) \ - do { \ - *to++ = from; \ - *to++ = (from) >> 8; \ - *to++ = (from) >> 16; \ - } while (0) -#elif DEPTH == 32 +#if DEPTH == 32 # define PIXEL_TYPE uint32_t # define COPY_PIXEL(to, from) do { *to = from; SKIP_PIXEL(to); } while (0) # define COPY_PIXEL1(to, from) (*to++ = from) @@ -58,9 +34,6 @@ static void glue(blizzard_draw_line16_, DEPTH)(PIXEL_TYPE *dest, const uint16_t *src, unsigned int width) { -#if !defined(SWAP_WORDS) && DEPTH == 16 - memcpy(dest, src, width); -#else uint16_t data; unsigned int r, g, b; const uint16_t *end = (const void *) src + width; @@ -74,7 +47,6 @@ static void glue(blizzard_draw_line16_, DEPTH)(PIXEL_TYPE *dest, data >>= 5; COPY_PIXEL1(dest, glue(rgb_to_pixel, DEPTH)(r, g, b)); } -#endif } static void glue(blizzard_draw_line24mode1_, DEPTH)(PIXEL_TYPE *dest,