From patchwork Thu Feb 14 12:50:58 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 158370 Delivered-To: patches@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp1325802jaa; Thu, 14 Feb 2019 04:51:15 -0800 (PST) X-Received: by 2002:adf:e641:: with SMTP id b1mr2667266wrn.213.1550148675550; Thu, 14 Feb 2019 04:51:15 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1550148675; cv=none; d=google.com; s=arc-20160816; b=bPCO7JY5qef1x+c34MU4ojw6OzxSX4OJ2wKtJIUKmzHjTdYFnDBqxlT/cvJlhoHaK9 NDWtufGWD9WtWsmoh3kkT4WAY9qefU0lL3vlupFvtbHLyLIupOTruzxaD4DgRelpSZxX uO0Y5owwQG9P0hzyd7t37VtTVhqd5HoxHlY72fatfSP9g3MY1ow6y7qrcPC4QiVHf5AI E4sZ/odb7S9awbInEPA4QGVTRx3sAmBZUFoGSmEmSKIiczkuYEMtW4+fkWsJEt0QqmbO +as0PfLxhAq8NX3k4JhEatSKDQhHAp/ExnEfW+YnLqy/qYAeINtuT1Bsl2Iq2+2xUN6O qtxg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=1OLWN1Os/7gGDPurXe5cQamlogPhIwB9LbNuZjXBuKI=; b=BynWi5Kb+6rtjSJf4V54S5bWntBuopW3LPlA1swL3BmKoW9Hist6JAin6Mycvtrqi2 6obj9faPn5AoUVxQGPs4oI9Um5f2qoFx8VlYn8ns+e4iZbwYeyK6TsS18Hm9bzcNqsVd 26zv4g5ldNDjPcjo7HYzT8l44nEos1S1JszoqpZg4PDsROuzmNCtLjmBxuAnvYo3X2zh CmwNdfUc9KvozaUPQMkk1cTPFbbEjalU+c0NkcdMDbMlrIQVtvEcH+eLanKglMI4NgE0 wbOLqBmBmH1wzX2EyZZv0OwY2uEm2sJ+G2kQt04xKlHlzlyRdvBfgyr4h5zE61clvvaP IbGQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=lJpNLusD; spf=pass (google.com: domain of peter.maydell@linaro.org designates 209.85.220.65 as permitted sender) smtp.mailfrom=peter.maydell@linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id v18sor1608043wrn.45.2019.02.14.04.51.15 for (Google Transport Security); Thu, 14 Feb 2019 04:51:15 -0800 (PST) Received-SPF: pass (google.com: domain of peter.maydell@linaro.org designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=lJpNLusD; spf=pass (google.com: domain of peter.maydell@linaro.org designates 209.85.220.65 as permitted sender) smtp.mailfrom=peter.maydell@linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=1OLWN1Os/7gGDPurXe5cQamlogPhIwB9LbNuZjXBuKI=; b=lJpNLusDpQh2PHjl/4+ywixCD1ZJT8eezUQkNViObLwuuvQBjT/L1xNnqIK8p1aGoa z+7NGf2bU7yJRRWYRlbo8peZ5jboTUY50DEzI9kU88JM24elAwrezjARbH40do8RhJse 6/DUxbhtEDHlTJyr7IQrexHv/2jvpEZqOlSOu/i5esjeFPq344SFFHWNPb8b7Zp5M200 i26uBp0ZhNTEULGWAHCVzPX05ObqhJ3xUN+KKRJm03j/kMmBNkjnziPLhRCdgOaDsPIG +hSXKcxPugQBvVevviu9h/K7kdjtCN3H/qSvdLPEe6f6JAufQsHyTz+nnumfEajcHULj WMpQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=1OLWN1Os/7gGDPurXe5cQamlogPhIwB9LbNuZjXBuKI=; b=J/sFHoPY1Ms4zd77Uodtdn0g0fMzn6xp/abpeMlsxXU7QuJbnGqO28QNfslNxv8GYV flrrWKAcU4GlAAQD8iu2sfMMVF0nsIg+c1pGnrhEXkB47OLRNXrchpe8fQIPYVwOBTsp snpQJb+1k8TgJH2tPWJfJsiCqSFUt3e5oTFcg4tnLC2EO/iXVb5MLR91KY3nvu7dGJM3 1XM7QIag0nr3Ble/HMPFP+OpRhnhH/e+KjkFr5k3TsvFa6dDMqz2HJ5o6MJ1oCfju/Tm 8iHZICXft5mUjnlvpqJ6dYEagMC1e8PtDcjUkdx5k0on1+eqEUFWsxItm/KmblMAnZbE Bh1A== X-Gm-Message-State: AHQUAuaYBdHckKiMZkQvLsJTMgeY0okKdzniEjrBTQ9rF+TfHX6A65Ig FYonffZ6FmhgJFpiYCRmP7j/IpyM8H6AKi49 X-Google-Smtp-Source: AHgI3Ian8aZkei2dU7yGnU6bv/Rr2iM818Ac5w+1BY9+4zno94j54x0kqkiGPAzSGFdsl5NpZxWVsQ== X-Received: by 2002:adf:fc87:: with SMTP id g7mr2710183wrr.136.1550148675171; Thu, 14 Feb 2019 04:51:15 -0800 (PST) Return-Path: Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id j3sm1488073wmb.39.2019.02.14.04.51.14 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 14 Feb 2019 04:51:14 -0800 (PST) From: Peter Maydell To: qemu-arm@nongnu.org, qemu-devel@nongnu.org Cc: patches@linaro.org Subject: [PATCH 05/14] hw/char/pl011: Allow use as an embedded-struct device Date: Thu, 14 Feb 2019 12:50:58 +0000 Message-Id: <20190214125107.22178-6-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190214125107.22178-1-peter.maydell@linaro.org> References: <20190214125107.22178-1-peter.maydell@linaro.org> MIME-Version: 1.0 Create a new include file for the pl011's device struct, type macros, etc, so that it can be instantiated using the "embedded struct" coding style. Signed-off-by: Peter Maydell --- include/hw/char/pl011.h | 34 ++++++++++++++++++++++++++++++++++ hw/char/pl011.c | 31 ++----------------------------- 2 files changed, 36 insertions(+), 29 deletions(-) -- 2.20.1 Reviewed-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daudé diff --git a/include/hw/char/pl011.h b/include/hw/char/pl011.h index 83649324b6a..1b52bfd5c90 100644 --- a/include/hw/char/pl011.h +++ b/include/hw/char/pl011.h @@ -15,6 +15,40 @@ #ifndef HW_PL011_H #define HW_PL011_H +#include "hw/sysbus.h" +#include "chardev/char-fe.h" + +#define TYPE_PL011 "pl011" +#define PL011(obj) OBJECT_CHECK(PL011State, (obj), TYPE_PL011) + +/* This shares the same struct (and cast macro) as the base pl011 device */ +#define TYPE_PL011_LUMINARY "pl011_luminary" + +typedef struct PL011State { + SysBusDevice parent_obj; + + MemoryRegion iomem; + uint32_t readbuff; + uint32_t flags; + uint32_t lcr; + uint32_t rsr; + uint32_t cr; + uint32_t dmacr; + uint32_t int_enabled; + uint32_t int_level; + uint32_t read_fifo[16]; + uint32_t ilpr; + uint32_t ibrd; + uint32_t fbrd; + uint32_t ifl; + int read_pos; + int read_count; + int read_trigger; + CharBackend chr; + qemu_irq irq; + const unsigned char *id; +} PL011State; + static inline DeviceState *pl011_create(hwaddr addr, qemu_irq irq, Chardev *chr) diff --git a/hw/char/pl011.c b/hw/char/pl011.c index 2aa277fc4f2..0c4711e4027 100644 --- a/hw/char/pl011.c +++ b/hw/char/pl011.c @@ -8,39 +8,12 @@ */ #include "qemu/osdep.h" +#include "hw/char/pl011.h" #include "hw/sysbus.h" #include "chardev/char-fe.h" #include "qemu/log.h" #include "trace.h" -#define TYPE_PL011 "pl011" -#define PL011(obj) OBJECT_CHECK(PL011State, (obj), TYPE_PL011) - -typedef struct PL011State { - SysBusDevice parent_obj; - - MemoryRegion iomem; - uint32_t readbuff; - uint32_t flags; - uint32_t lcr; - uint32_t rsr; - uint32_t cr; - uint32_t dmacr; - uint32_t int_enabled; - uint32_t int_level; - uint32_t read_fifo[16]; - uint32_t ilpr; - uint32_t ibrd; - uint32_t fbrd; - uint32_t ifl; - int read_pos; - int read_count; - int read_trigger; - CharBackend chr; - qemu_irq irq; - const unsigned char *id; -} PL011State; - #define PL011_INT_TX 0x20 #define PL011_INT_RX 0x10 @@ -357,7 +330,7 @@ static void pl011_luminary_init(Object *obj) } static const TypeInfo pl011_luminary_info = { - .name = "pl011_luminary", + .name = TYPE_PL011_LUMINARY, .parent = TYPE_PL011, .instance_init = pl011_luminary_init, };