From patchwork Mon Feb 17 20:48:10 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guenter Roeck X-Patchwork-Id: 1239574 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=roeck-us.net Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=phPSBihY; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 48Lx100cnHz9sPK for ; Tue, 18 Feb 2020 07:49:08 +1100 (AEDT) Received: from localhost ([::1]:52732 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j3nKD-00065a-U7 for incoming@patchwork.ozlabs.org; Mon, 17 Feb 2020 15:49:05 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:38205) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j3nJU-0005Y9-AE for qemu-devel@nongnu.org; Mon, 17 Feb 2020 15:48:21 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j3nJT-0007R1-AF for qemu-devel@nongnu.org; Mon, 17 Feb 2020 15:48:20 -0500 Received: from mail-pf1-x444.google.com ([2607:f8b0:4864:20::444]:43551) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1j3nJR-0007Pd-6M; Mon, 17 Feb 2020 15:48:17 -0500 Received: by mail-pf1-x444.google.com with SMTP id s1so9507407pfh.10; Mon, 17 Feb 2020 12:48:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=jUTT4M0L8QDIDF54nsaAa0WO27b/nakwYQvzOrU6Ztw=; b=phPSBihY8AJQIjrwsRfg0abA5X9X77YiZkwqdMrRCdzwDPTKiH7KXB77ryFCyFAFI1 OlAo3z2JfUYoPbevHU+JOLabkT1Ez+SpR/6jVo4Z3DzkZH/XdAEK1fVMv/phRludrSDa SlCiTOfs45ZUQR8ByC+QDNI9781bwH75+Ai2IbOLCqf5QbmcAKHfWxA1LOIDI2wmzNtE NPNDhPFlUNIJ4fuzjqaIEpuAiisHOygj3/4BpVGb09z/Fv4eFvAQ7lQ9ucjwV86EMvg/ Co/oOIhJ4ftHhnl8YV12hWk7Lt80C2lBVWFNmT61k88EVvSQPpuaUCP4GaYneDDWy+R+ PZIg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=jUTT4M0L8QDIDF54nsaAa0WO27b/nakwYQvzOrU6Ztw=; b=an6Ldt3i86gjR+QOZ+jT7gu5Tg+v4zToGfkBR6DEh+ldESPlQAs7PDIvz7rcmtu3Nr B8PHvYV/0IUnDesyNwCWhF2CFyhJAvYEaxPNbTR2WTwOiFvUEW15P0tLHWb5PAf7359O io2h8mgIGOmQE/rYbpe9YFgvis60eXLAZfqgC09c5v22ZjEiYDsFDk0BCPYIAxCilBGN 5G0xkYm+hBt5fqINBFVDA4YpNKVvnV2ZPvBnT7WXccjURMfmrdYsg7y9RVA/6yVuSAJy gnpzrWNgvJ57+qC3nfNmY0GRdJqfZlLccDAKaI2XBFWXF1W61g+fVGXSVhkH+voMIxjV fpbg== X-Gm-Message-State: APjAAAXHsakbyHnLZZUhNGq6ssNjR/5bIfP3xrk0RtKgn8ZC4c1fk77z S/4bBkWqtFFiYGWZJU4iBHI= X-Google-Smtp-Source: APXvYqxP6Oi0A8J6gvapYkqPB3AV9FXqDOGBnPoUbwWVzrhm8+AY5ecBDM2Mq9ob4gU64xfqK3Z5rQ== X-Received: by 2002:aa7:8ec1:: with SMTP id b1mr18030005pfr.95.1581972496332; Mon, 17 Feb 2020 12:48:16 -0800 (PST) Received: from localhost ([2600:1700:e321:62f0:329c:23ff:fee3:9d7c]) by smtp.gmail.com with ESMTPSA id r14sm1327729pfh.10.2020.02.17.12.48.15 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 17 Feb 2020 12:48:15 -0800 (PST) From: Guenter Roeck To: Peter Maydell Subject: [PATCH v3 1/3] hw: usb: hcd-ohci: Move OHCISysBusState and TYPE_SYSBUS_OHCI to include file Date: Mon, 17 Feb 2020 12:48:10 -0800 Message-Id: <20200217204812.9857-2-linux@roeck-us.net> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200217204812.9857-1-linux@roeck-us.net> References: <20200217204812.9857-1-linux@roeck-us.net> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::444 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: Beniamino Galvani , qemu-arm@nongnu.org, Gerd Hoffmann , Guenter Roeck , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" We need to be able to use OHCISysBusState outside hcd-ohci.c, so move it to its include file. Reviewed-by: Gerd Hoffmann Signed-off-by: Guenter Roeck --- v3: Rebased to master Added Gerd's Reviewed-by: tag v2: no changes hw/usb/hcd-ohci.c | 15 --------------- hw/usb/hcd-ohci.h | 16 ++++++++++++++++ 2 files changed, 16 insertions(+), 15 deletions(-) diff --git a/hw/usb/hcd-ohci.c b/hw/usb/hcd-ohci.c index 8a94bd004a..1e6e85e86a 100644 --- a/hw/usb/hcd-ohci.c +++ b/hw/usb/hcd-ohci.c @@ -1870,21 +1870,6 @@ void ohci_sysbus_die(struct OHCIState *ohci) ohci_bus_stop(ohci); } -#define TYPE_SYSBUS_OHCI "sysbus-ohci" -#define SYSBUS_OHCI(obj) OBJECT_CHECK(OHCISysBusState, (obj), TYPE_SYSBUS_OHCI) - -typedef struct { - /*< private >*/ - SysBusDevice parent_obj; - /*< public >*/ - - OHCIState ohci; - char *masterbus; - uint32_t num_ports; - uint32_t firstport; - dma_addr_t dma_offset; -} OHCISysBusState; - static void ohci_realize_pxa(DeviceState *dev, Error **errp) { OHCISysBusState *s = SYSBUS_OHCI(dev); diff --git a/hw/usb/hcd-ohci.h b/hw/usb/hcd-ohci.h index 16e3f1e13a..5c8819aedf 100644 --- a/hw/usb/hcd-ohci.h +++ b/hw/usb/hcd-ohci.h @@ -22,6 +22,7 @@ #define HCD_OHCI_H #include "sysemu/dma.h" +#include "hw/usb.h" /* Number of Downstream Ports on the root hub: */ #define OHCI_MAX_PORTS 15 @@ -90,6 +91,21 @@ typedef struct OHCIState { void (*ohci_die)(struct OHCIState *ohci); } OHCIState; +#define TYPE_SYSBUS_OHCI "sysbus-ohci" +#define SYSBUS_OHCI(obj) OBJECT_CHECK(OHCISysBusState, (obj), TYPE_SYSBUS_OHCI) + +typedef struct { + /*< private >*/ + SysBusDevice parent_obj; + /*< public >*/ + + OHCIState ohci; + char *masterbus; + uint32_t num_ports; + uint32_t firstport; + dma_addr_t dma_offset; +} OHCISysBusState; + extern const VMStateDescription vmstate_ohci_state; void usb_ohci_init(OHCIState *ohci, DeviceState *dev, uint32_t num_ports,