From patchwork Mon Apr 29 17:00:23 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 163072 Delivered-To: patch@linaro.org Received: by 2002:a92:7e86:0:0:0:0:0 with SMTP id q6csp2156381ill; Mon, 29 Apr 2019 10:24:02 -0700 (PDT) X-Google-Smtp-Source: APXvYqxuEesVb82vXJOl7qnynyBzl0BUv30l02ZpIua672DvzZDdj+yf/IjHwqTRe5fSfvudCXQv X-Received: by 2002:adf:de0c:: with SMTP id b12mr18871111wrm.297.1556558642528; Mon, 29 Apr 2019 10:24:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1556558642; cv=none; d=google.com; s=arc-20160816; b=FGuSZJl270gALIGPwB6bxm/XrUClSEYdJl99dvmBKrWHGY1sqA6VQEkZwfTjKQ+H08 Psb2DhXSNFoRV4FsG1an1GvEhvYe7pQqWj+MqRAxHd9v6YSNGmQRZvNiCSq8aw0HlJGf td6Qbmw+LUF3Vo3nhbF8Vcd+bO9b/IZv3E3KkQGBSojL5J2CkYqlZuCzyX2zN8HEynBL V8hRy7EoNYvI/x0wt6SA6qu/A++xCKXRlsSybkYMiI6zCfGsWNA4bAlxoBmodDiiUxeq 2UFwRwkK2Sl7p1YARb2uETo36EGwxrjKNSXBABh5/qD1MGUsEEvkBUlUqyboyFZtfEId xmuw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=LFxDP5DlLX7UdxaNBUv4+0seLwMZU662ZJKbH+YTDbw=; b=D4BkVpjYTtMsjZb8U/CwaSw04sFp7GiSnLEKuBnU7lOG+u/hz3q8LiAflRSi1mdxEn SL7SWF09YMFIne/kqCUFBwoiKoNu5eUArf+bADd1msP5z3tAILemxotUjEiFDTmQwDsG A1giLsqU1QDHts1vTZV5VwnopG8PpXqwWpvPMx4WmRBlfFvoEVHBOg2g2yLTQCeoS+9f GNlX+3xB+Jv4m4H2AchG3SbMahnQgiQGJr0LUOhTMJhzZswjCr3WBZpY47S8QVMrmop6 8mNkVyTX4BHtEz20ct2GDD6z0iL/mESTlP4dW/L4lgNC5jWNMl66BvJbZoYo2W77D3WH 9qRQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b="SK6/ZGP+"; 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"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id k9si3248274wrn.271.2019.04.29.10.24.02 for (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 29 Apr 2019 10:24:02 -0700 (PDT) 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=@linaro.org header.s=google header.b="SK6/ZGP+"; 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"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([127.0.0.1]:60920 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hLA0X-0006vB-Dd for patch@linaro.org; Mon, 29 Apr 2019 13:24:01 -0400 Received: from eggs.gnu.org ([209.51.188.92]:34516) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hL9ew-0004yL-9Q for qemu-devel@nongnu.org; Mon, 29 Apr 2019 13:01:43 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hL9eu-0006oi-2a for qemu-devel@nongnu.org; Mon, 29 Apr 2019 13:01:41 -0400 Received: from mail-wr1-x42d.google.com ([2a00:1450:4864:20::42d]:35942) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hL9et-0006dD-D2 for qemu-devel@nongnu.org; Mon, 29 Apr 2019 13:01:39 -0400 Received: by mail-wr1-x42d.google.com with SMTP id o4so5180747wra.3 for ; Mon, 29 Apr 2019 10:01:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=LFxDP5DlLX7UdxaNBUv4+0seLwMZU662ZJKbH+YTDbw=; b=SK6/ZGP+QY6T7j4UMqwdE8DfxWEFEoypywWGy5kkAULh7CvkjIZr+rhafL1DG06nI4 TIcixZQf7xlT8mo0D848du94qKkBqp9lIXG0e29/hzxke4ZMPfC0xKYGsBt7BUybDZQX kbsDq8XGhmB7WHFpfgBvdtaUJdI+rzal9TeXKJZye9fM5fh59HpzWWI54u9HdjtLvBN/ 2G/cy7tDYozzXiNxXrGpb2D7mo+52YtByzR8iyKl/Jxwf41l4IG9D6ZRPMDA0HDZY9tB 7G7OhMde51rU6bt9gYpxI6e5ZDmlATtVZyefq1VsdhNu1rPYQ4y0Yuq6/oKzkryTvzt7 JPEA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=LFxDP5DlLX7UdxaNBUv4+0seLwMZU662ZJKbH+YTDbw=; b=Ipt6QwbgJUEPUCVxHqt07prIJrOF0IKDLSnkrAncksDV4j3EtZsfrNwyqPRmofadrZ swocE7y81NBExcpLCzAVPgkGbVPIJRf9wr/EcEha6JvwB+g5J0dg996g18k+DYDPFKuh O1naWEB+xNTQ6KNqBwpfAvpGfLtYe/ylGTy4He/Ad/MXvS111p/5RjHcumX9YQFBK8P8 sCJtT+IECVsOmW8VAVAKGSeguohplOr0WwKUEKouDipAA55WjRC1sn8jwHpXOSWAnTSJ Nm2wZ2mkWDED9gNCZKjdaviXmk55K68X1ggynBX40o59gk6PHI1iVvfOOzm/3JP5O2sj NZpg== X-Gm-Message-State: APjAAAXyZQ88+7REum5FIzPQCJUBDKcNKdUW6ZW4WwgkfEO9O4EjaOFi aia2Pt2Gay+jp0goL3KG6uf4CRDWr+Q= X-Received: by 2002:adf:dbc1:: with SMTP id e1mr25434481wrj.203.1556557277646; Mon, 29 Apr 2019 10:01:17 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id a13sm36896wmj.39.2019.04.29.10.01.16 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 29 Apr 2019 10:01:16 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Date: Mon, 29 Apr 2019 18:00:23 +0100 Message-Id: <20190429170030.11323-36-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190429170030.11323-1-peter.maydell@linaro.org> References: <20190429170030.11323-1-peter.maydell@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::42d Subject: [Qemu-devel] [PULL 35/42] hw/devices: Move Blizzard declarations into a new header 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: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé Add an entries the Blizzard device in MAINTAINERS. Reviewed-by: Thomas Huth Reviewed-by: Markus Armbruster Signed-off-by: Philippe Mathieu-Daudé Message-id: 20190412165416.7977-6-philmd@redhat.com Signed-off-by: Peter Maydell --- include/hw/devices.h | 7 ------- include/hw/display/blizzard.h | 22 ++++++++++++++++++++++ hw/arm/nseries.c | 1 + hw/display/blizzard.c | 2 +- MAINTAINERS | 2 ++ 5 files changed, 26 insertions(+), 8 deletions(-) create mode 100644 include/hw/display/blizzard.h -- 2.20.1 diff --git a/include/hw/devices.h b/include/hw/devices.h index 1e2141caad1..77d66113021 100644 --- a/include/hw/devices.h +++ b/include/hw/devices.h @@ -29,13 +29,6 @@ void tsc2005_set_transform(void *opaque, MouseTransformInfo *info); /* stellaris_input.c */ void stellaris_gamepad_init(int n, qemu_irq *irq, const int *keycode); -/* blizzard.c */ -void *s1d13745_init(qemu_irq gpio_int); -void s1d13745_write(void *opaque, int dc, uint16_t value); -void s1d13745_write_block(void *opaque, int dc, - void *buf, size_t len, int pitch); -uint16_t s1d13745_read(void *opaque, int dc); - /* cbus.c */ typedef struct { qemu_irq clk; diff --git a/include/hw/display/blizzard.h b/include/hw/display/blizzard.h new file mode 100644 index 00000000000..ef72bbc1865 --- /dev/null +++ b/include/hw/display/blizzard.h @@ -0,0 +1,22 @@ +/* + * Epson S1D13744/S1D13745 (Blizzard/Hailstorm/Tornado) LCD/TV controller. + * + * Copyright (C) 2008 Nokia Corporation + * Written by Andrzej Zaborowski + * + * This work is licensed under the terms of the GNU GPL, version 2 or later. + * See the COPYING file in the top-level directory. + */ + +#ifndef HW_DISPLAY_BLIZZARD_H +#define HW_DISPLAY_BLIZZARD_H + +#include "hw/irq.h" + +void *s1d13745_init(qemu_irq gpio_int); +void s1d13745_write(void *opaque, int dc, uint16_t value); +void s1d13745_write_block(void *opaque, int dc, + void *buf, size_t len, int pitch); +uint16_t s1d13745_read(void *opaque, int dc); + +#endif diff --git a/hw/arm/nseries.c b/hw/arm/nseries.c index 2b710c3d49f..ef09b3bf79f 100644 --- a/hw/arm/nseries.c +++ b/hw/arm/nseries.c @@ -31,6 +31,7 @@ #include "hw/boards.h" #include "hw/i2c/i2c.h" #include "hw/devices.h" +#include "hw/display/blizzard.h" #include "hw/misc/tmp105.h" #include "hw/block/flash.h" #include "hw/hw.h" diff --git a/hw/display/blizzard.c b/hw/display/blizzard.c index 291abe6fcae..471bd0ed997 100644 --- a/hw/display/blizzard.c +++ b/hw/display/blizzard.c @@ -21,7 +21,7 @@ #include "qemu/osdep.h" #include "qemu-common.h" #include "ui/console.h" -#include "hw/devices.h" +#include "hw/display/blizzard.h" #include "ui/pixel_ops.h" typedef void (*blizzard_fn_t)(uint8_t *, const uint8_t *, unsigned int); diff --git a/MAINTAINERS b/MAINTAINERS index 51eecd0ac19..c069c274ec0 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -663,10 +663,12 @@ M: Peter Maydell L: qemu-arm@nongnu.org S: Odd Fixes F: hw/arm/nseries.c +F: hw/display/blizzard.c F: hw/input/lm832x.c F: hw/input/tsc2005.c F: hw/misc/cbus.c F: hw/timer/twl92230.c +F: include/hw/display/blizzard.h Palm M: Andrzej Zaborowski