From patchwork Wed Mar 10 04:09:45 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Gibson X-Patchwork-Id: 396662 Delivered-To: patch@linaro.org Received: by 2002:a02:8562:0:0:0:0:0 with SMTP id g89csp59863jai; Tue, 9 Mar 2021 20:16:07 -0800 (PST) X-Google-Smtp-Source: ABdhPJzVYarMq6qRxF2b08R2hWI3wpo18l7F/DvyPTBZx8NzPOkbHinyMA/MyVjI27gaR6RQJpyH X-Received: by 2002:a5d:80d5:: with SMTP id h21mr1152187ior.11.1615349767507; Tue, 09 Mar 2021 20:16:07 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1615349767; cv=none; d=google.com; s=arc-20160816; b=JlYRq4ZZmqh2ecJnjAjEh1a3od0732Q0UAGwEH+mYbmeWgh+wN9oTe5fZgvSvfVary yEbI6Gr7c/2sH3I+AASM0dfoAxPm3e/DqsAoJF1t6kd+91NYG6sXgvndMNpH8rmkL3nX K4+lATb2bkpJuuDA4tCfS6/U+85TK1kZPEvksNM5LUXnxLxoDu8Brny7veh/vk1p0YAe cQZycdMSZzoXIDx9c2kG9rIfd1Wvv9yOYtpItsWki9Og6ewHzV6yUT2Gp7LJVq2ExgbS NxZ1iSzZQ8Bf6XNfTHc5skWNWcSNQDrbJcA13B70ea8QswlwVwQBGd21jGOokJH9mxuq QkUw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=VtP5VwHgrHYCK1+F597u0rAJgvGOdUgtJx6PvZp9gOI=; b=TPq62IzIsOQU+8gV2fKzyzI8JP96SxXt8VZcDKoDSGG0W6qK88a26sah1iY/EOlP73 eBrTIMivszY/9/cK/Egd7+KW4LZ6tl91ecfLAzR5UdiNosxzpZMs0FhC1J84ZhBX66H0 vDls7t0/lwGvKm6jP+yshe3DZePOMBAegzNN92D8HEOTb8XuLQIqBS4sPt/C5ZGBfh67 LbIpNRqhx1CIHAbXKK8JTZ0XkPo4/BmQu/FsAWPVWRqxL6g2iYxUICYH7xqpn8RwacCh c/2dZEukCC8lOYeRJe1tI41NDxvIuj2Xs+GTVuhA7r59xYyjikuASRUTuM/fIowkXMZE M7Fg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@gibson.dropbear.id.au header.s=201602 header.b=ViKCR+QB; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org" Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id c12si15281791jaq.69.2021.03.09.20.16.07 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 09 Mar 2021 20:16:07 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@gibson.dropbear.id.au header.s=201602 header.b=ViKCR+QB; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org" Received: from localhost ([::1]:54090 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lJqGU-00037M-SV for patch@linaro.org; Tue, 09 Mar 2021 23:16:06 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:48114) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lJqAn-0003UC-E9; Tue, 09 Mar 2021 23:10:15 -0500 Received: from bilbo.ozlabs.org ([203.11.71.1]:53019 helo=ozlabs.org) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lJqAk-000479-Bb; Tue, 09 Mar 2021 23:10:12 -0500 Received: by ozlabs.org (Postfix, from userid 1007) id 4DwJWd2bB8z9sWR; Wed, 10 Mar 2021 15:10:05 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gibson.dropbear.id.au; s=201602; t=1615349405; bh=HP6BC7ZgaqPiHS+GRbApM2a5OYHOkhJ4BhBo3OvB/GQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ViKCR+QB8jJwL648gkhqmescYVZKdsUVfqZddXvvocBWnFQoku8fTJI7dvd2T2hb4 lDWbj0dDfVGGbEjtUZx5+0vZKUs7i+indkrrVxPDq8byaJpI6eP82Rza1S1EaZKxOw rWTW99QCxK3QUjE/G8V5kroprGJTgAD/+7jYzJkY= From: David Gibson To: peter.maydell@linaro.org, groug@kaod.org Subject: [PULL 03/20] hw/display/sm501: Inline template header into C file Date: Wed, 10 Mar 2021 15:09:45 +1100 Message-Id: <20210310041002.333813-4-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210310041002.333813-1-david@gibson.dropbear.id.au> References: <20210310041002.333813-1-david@gibson.dropbear.id.au> MIME-Version: 1.0 Received-SPF: pass client-ip=203.11.71.1; envelope-from=dgibson@ozlabs.org; helo=ozlabs.org X-Spam_score_int: -17 X-Spam_score: -1.8 X-Spam_bar: - X-Spam_report: (-1.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, HEADER_FROM_DIFFERENT_DOMAINS=0.249, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: David Gibson , qemu-ppc@nongnu.org, qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Peter Maydell We no longer need to include sm501_template.h multiple times, so we can simply inline its contents into sm501.c. Signed-off-by: Peter Maydell Message-Id: <20210212180653.27588-4-peter.maydell@linaro.org> Acked-by: BALATON Zoltan Signed-off-by: David Gibson --- hw/display/sm501.c | 83 +++++++++++++++++++++++++++- hw/display/sm501_template.h | 105 ------------------------------------ 2 files changed, 81 insertions(+), 107 deletions(-) delete mode 100644 hw/display/sm501_template.h -- 2.29.2 diff --git a/hw/display/sm501.c b/hw/display/sm501.c index aba447c18b..8789722ef2 100644 --- a/hw/display/sm501.c +++ b/hw/display/sm501.c @@ -1558,8 +1558,87 @@ typedef void draw_hwc_line_func(uint8_t *d, const uint8_t *s, int width, const uint8_t *palette, int c_x, int c_y); -#define DEPTH 32 -#include "sm501_template.h" +static void draw_line8_32(uint8_t *d, const uint8_t *s, int width, + const uint32_t *pal) +{ + uint8_t v, r, g, b; + do { + v = ldub_p(s); + r = (pal[v] >> 16) & 0xff; + g = (pal[v] >> 8) & 0xff; + b = (pal[v] >> 0) & 0xff; + *(uint32_t *)d = rgb_to_pixel32(r, g, b); + s++; + d += 4; + } while (--width != 0); +} + +static void draw_line16_32(uint8_t *d, const uint8_t *s, int width, + const uint32_t *pal) +{ + uint16_t rgb565; + uint8_t r, g, b; + + do { + rgb565 = lduw_le_p(s); + r = (rgb565 >> 8) & 0xf8; + g = (rgb565 >> 3) & 0xfc; + b = (rgb565 << 3) & 0xf8; + *(uint32_t *)d = rgb_to_pixel32(r, g, b); + s += 2; + d += 4; + } while (--width != 0); +} + +static void draw_line32_32(uint8_t *d, const uint8_t *s, int width, + const uint32_t *pal) +{ + uint8_t r, g, b; + + do { + r = s[2]; + g = s[1]; + b = s[0]; + *(uint32_t *)d = rgb_to_pixel32(r, g, b); + s += 4; + d += 4; + } while (--width != 0); +} + +/** + * Draw hardware cursor image on the given line. + */ +static void draw_hwc_line_32(uint8_t *d, const uint8_t *s, int width, + const uint8_t *palette, int c_x, int c_y) +{ + int i; + uint8_t r, g, b, v, bitset = 0; + + /* get cursor position */ + assert(0 <= c_y && c_y < SM501_HWC_HEIGHT); + s += SM501_HWC_WIDTH * c_y / 4; /* 4 pixels per byte */ + d += c_x * 4; + + for (i = 0; i < SM501_HWC_WIDTH && c_x + i < width; i++) { + /* get pixel value */ + if (i % 4 == 0) { + bitset = ldub_p(s); + s++; + } + v = bitset & 3; + bitset >>= 2; + + /* write pixel */ + if (v) { + v--; + r = palette[v * 3 + 0]; + g = palette[v * 3 + 1]; + b = palette[v * 3 + 2]; + *(uint32_t *)d = rgb_to_pixel32(r, g, b); + } + d += 4; + } +} static void sm501_update_display(void *opaque) { diff --git a/hw/display/sm501_template.h b/hw/display/sm501_template.h deleted file mode 100644 index 28537a05d9..0000000000 --- a/hw/display/sm501_template.h +++ /dev/null @@ -1,105 +0,0 @@ -/* - * Pixel drawing function templates for QEMU SM501 Device - * - * Copyright (c) 2008 Shin-ichiro KAWASAKI - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ - -static void draw_line8_32(uint8_t *d, const uint8_t *s, int width, - const uint32_t *pal) -{ - uint8_t v, r, g, b; - do { - v = ldub_p(s); - r = (pal[v] >> 16) & 0xff; - g = (pal[v] >> 8) & 0xff; - b = (pal[v] >> 0) & 0xff; - *(uint32_t *)d = rgb_to_pixel32(r, g, b); - s++; - d += 4; - } while (--width != 0); -} - -static void draw_line16_32(uint8_t *d, const uint8_t *s, int width, - const uint32_t *pal) -{ - uint16_t rgb565; - uint8_t r, g, b; - - do { - rgb565 = lduw_le_p(s); - r = (rgb565 >> 8) & 0xf8; - g = (rgb565 >> 3) & 0xfc; - b = (rgb565 << 3) & 0xf8; - *(uint32_t *)d = rgb_to_pixel32(r, g, b); - s += 2; - d += 4; - } while (--width != 0); -} - -static void draw_line32_32(uint8_t *d, const uint8_t *s, int width, - const uint32_t *pal) -{ - uint8_t r, g, b; - - do { - r = s[2]; - g = s[1]; - b = s[0]; - *(uint32_t *)d = rgb_to_pixel32(r, g, b); - s += 4; - d += 4; - } while (--width != 0); -} - -/** - * Draw hardware cursor image on the given line. - */ -static void draw_hwc_line_32(uint8_t *d, const uint8_t *s, int width, - const uint8_t *palette, int c_x, int c_y) -{ - int i; - uint8_t r, g, b, v, bitset = 0; - - /* get cursor position */ - assert(0 <= c_y && c_y < SM501_HWC_HEIGHT); - s += SM501_HWC_WIDTH * c_y / 4; /* 4 pixels per byte */ - d += c_x * 4; - - for (i = 0; i < SM501_HWC_WIDTH && c_x + i < width; i++) { - /* get pixel value */ - if (i % 4 == 0) { - bitset = ldub_p(s); - s++; - } - v = bitset & 3; - bitset >>= 2; - - /* write pixel */ - if (v) { - v--; - r = palette[v * 3 + 0]; - g = palette[v * 3 + 1]; - b = palette[v * 3 + 2]; - *(uint32_t *)d = rgb_to_pixel32(r, g, b); - } - d += 4; - } -}