From nobody Tue Nov 26 10:28:40 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1707799204; cv=none; d=zohomail.com; s=zohoarc; b=hNbWpHqrDwR4uxOALLKrlhrLrHH3M++w+oTpr44pPC23ea66Ezok/YpvBmXtP5MNPDNQkYcbVFOvhzupIJdAFf8wxE/8hMDXOsV8LzCD5xgzgU28Qicczcuc2XNrglkKfx+cJHMboKHZjqni308byFk7KVcjA9OsveWKNk+Truc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1707799204; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=o6pxcy83+qY+qqR1JfeBd83QWY3SHzfnMOli7CsxV1g=; b=oH4TmWM85KO9LtYhBmEK0gZdL6+Pz5bYSDBbuJWeEaukbZ7OOriC/q38HAHkF57gthQfRCqlpD1Ng8ZH5DecWTcjmmfjw0P+FgcVyACdwEUWzfAB2emsGf7Gh4oS3zHZCrMkjbU9KIeQtN467ZMpZydADzRFt/xu1fmwi3rdlLo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1707799204634413.9358189234315; Mon, 12 Feb 2024 20:40:04 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rZkZi-0008V5-85; Mon, 12 Feb 2024 23:39:18 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rZkZd-0008SZ-Jq for qemu-devel@nongnu.org; Mon, 12 Feb 2024 23:39:14 -0500 Received: from mail-lj1-x234.google.com ([2a00:1450:4864:20::234]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rZkZa-0005zc-F9 for qemu-devel@nongnu.org; Mon, 12 Feb 2024 23:39:11 -0500 Received: by mail-lj1-x234.google.com with SMTP id 38308e7fff4ca-2d107900457so3886111fa.1 for ; Mon, 12 Feb 2024 20:39:08 -0800 (PST) Received: from m1x-phil.lan ([176.176.128.243]) by smtp.gmail.com with ESMTPSA id em8-20020a056402364800b00561740859b3sm3096177edb.19.2024.02.12.20.39.05 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 12 Feb 2024 20:39:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1707799147; x=1708403947; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=o6pxcy83+qY+qqR1JfeBd83QWY3SHzfnMOli7CsxV1g=; b=hl7fXCZXi7maccqm24r5IDkfVPS5OZN0PVEKoLkD30rvSZLDxf4AKtd5oFNqs+wjEP 5zxqrS7fQdG3KjO4FLfL0Qsn1fcpnwx55ABx/qUuHw8A/WVzF0YfnvkN066J3Fxf0RT3 ewptUWYlfPB8Rs4VMhqk2mIrYolr5hfCC0rByUggs37qoTI7+obrjTQDlBBG85bhqFEr 1G37k80v1J7uRezQdcE+2ErRTGhm1GSfu4Mn4oepfv6dNSs+3qVT+YGFt7HO/lXLyc5E 7AfNm8UiMTTj4ZBslWM2ZQGL7wTbauvWc7cuPSdphW6oqjlBCx3l58At236ZtARSGlWp auFQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707799147; x=1708403947; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=o6pxcy83+qY+qqR1JfeBd83QWY3SHzfnMOli7CsxV1g=; b=kBGkgRva3yf9nGme/hcldu65fQjSICJKdB5B7fYD8NLLYnEwY4vq69U4V84wrHT9ST IY7tgNtJp2Z1tW7yipMBww/J7kz3d+35G9nG8Zu0CUGA5mHqz/NeayeTRZI1ZtGW47iM azde3zLrEzZ+h1yDhgcSooRqPPiXNUaxDH3AnEqkAlM2l7i8UJi7vge5h5VnqNJProo0 nl23aWSbYhUfIzVUXpDp1jop7XSTt/aLKOFQXl+kACM9cxHETzCNjBxNkZmCOGWZGqQd eG9rh7Ha2wZHSmz5+R99CSebgq4IiRkkqEv46FxMh7fOSikmrTZfrpuODN1KnmnccDzW kAOw== X-Gm-Message-State: AOJu0Yy/9wlUk91tMf8BB0wvqGopvt0ZEkfQepW/PgaM6HM520mvikkJ +wC5tHAKYOnZD+MGLEEW/ABcrmXZTBZZHUZboh+/7X9FqI7vN0UHM7A/xaqxZ+gW0o+wXj2uBhd 9 X-Google-Smtp-Source: AGHT+IF1YM6VspSFl6mXJhbfidWjAJDV1Te+VtIvos2AAaj+/nyLYm4HDpvbtxFr4APXjlbXOrCXFA== X-Received: by 2002:a05:651c:a12:b0:2d1:749:c85f with SMTP id k18-20020a05651c0a1200b002d10749c85fmr526820ljq.47.1707799146683; Mon, 12 Feb 2024 20:39:06 -0800 (PST) X-Forwarded-Encrypted: i=1; AJvYcCWelYw+K+czkwcdHJjSKFRz8AzTHcxEzN5x7MjPxiZwA4JRoNdiQl8OQR9ApRI2okuGK/u6ji/kRMcoZak3PUW57zQPM0+ZsIzpNzAhMJP2kZ7wdzk= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-trivial@nongnu.org, Gerd Hoffmann , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH 1/3] hw/usb: Style cleanup Date: Tue, 13 Feb 2024 05:38:57 +0100 Message-ID: <20240213043859.61019-2-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240213043859.61019-1-philmd@linaro.org> References: <20240213043859.61019-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::234; envelope-from=philmd@linaro.org; helo=mail-lj1-x234.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1707799206420100003 We are going to modify these lines, fix their style in order to avoid checkpatch.pl warning. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- hw/usb/hcd-ehci.c | 3 ++- hw/usb/hcd-uhci.c | 6 ++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/hw/usb/hcd-ehci.c b/hw/usb/hcd-ehci.c index 870c72cb59..98a2860069 100644 --- a/hw/usb/hcd-ehci.c +++ b/hw/usb/hcd-ehci.c @@ -1086,8 +1086,9 @@ static void ehci_opreg_write(void *ptr, hwaddr addr, case CONFIGFLAG: val &=3D 0x1; if (val) { - for(i =3D 0; i < NB_PORTS; i++) + for (i =3D 0; i < NB_PORTS; i++) { handle_port_owner_write(s, i, 0); + } } break; =20 diff --git a/hw/usb/hcd-uhci.c b/hw/usb/hcd-uhci.c index 7d3c026dae..b95b47f6a4 100644 --- a/hw/usb/hcd-uhci.c +++ b/hw/usb/hcd-uhci.c @@ -457,8 +457,9 @@ static void uhci_port_write(void *opaque, hwaddr addr, int n; =20 n =3D (addr >> 1) & 7; - if (n >=3D NB_PORTS) + if (n >=3D NB_PORTS) { return; + } port =3D &s->ports[n]; dev =3D port->port.dev; if (dev && dev->attached) { @@ -513,8 +514,9 @@ static uint64_t uhci_port_read(void *opaque, hwaddr add= r, unsigned size) UHCIPort *port; int n; n =3D (addr >> 1) & 7; - if (n >=3D NB_PORTS) + if (n >=3D NB_PORTS) { goto read_default; + } port =3D &s->ports[n]; val =3D port->ctrl; } --=20 2.41.0 From nobody Tue Nov 26 10:28:40 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1707799222; cv=none; d=zohomail.com; s=zohoarc; b=ZgVXpcQOh/HL7hn9XtMFst4ssV/7nVO8KZhUDNH9dPhpEl4y86VYE9dM7AWVF+lQRRhcOsljn8fvSR4GC06B5EyIZ/UydAxOwYmP5b1qFU2i45PVY7tGlQN3vE+81MVd9Rw5KMDLdXYCSpaO/9UYxX4/35PulRH8MV1pbiKDG5Y= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1707799222; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=Vj8qKfoHRQQSQjKf28SMVg7GGjhkAsn0wq6WSyRxVjw=; b=M7WmrrPeZPgS8hLRPwVNDALrahBCjm3U5GRy/PH/8ec5YBvv9eljEii/a4LwiB0H04LkICAgSzQVBZJ7mV4bBWzi/d/qWe5r4WqchnHvk9qkRTN4XKeSRtPIKy3LxSeBbEffMQWseQacN7LxP2aRW45OzvucnPOKzek+95/VuwA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1707799222405250.75325995449282; Mon, 12 Feb 2024 20:40:22 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rZkZj-0008Vi-7C; Mon, 12 Feb 2024 23:39:19 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rZkZf-0008Ug-CT for qemu-devel@nongnu.org; Mon, 12 Feb 2024 23:39:16 -0500 Received: from mail-ed1-x52a.google.com ([2a00:1450:4864:20::52a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rZkZd-0005zr-Nq for qemu-devel@nongnu.org; Mon, 12 Feb 2024 23:39:15 -0500 Received: by mail-ed1-x52a.google.com with SMTP id 4fb4d7f45d1cf-55f0b2c79cdso5275029a12.3 for ; Mon, 12 Feb 2024 20:39:13 -0800 (PST) Received: from m1x-phil.lan ([176.176.128.243]) by smtp.gmail.com with ESMTPSA id p10-20020a1709061b4a00b00a3c09f3aea8sm872522ejg.211.2024.02.12.20.39.10 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 12 Feb 2024 20:39:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1707799152; x=1708403952; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Vj8qKfoHRQQSQjKf28SMVg7GGjhkAsn0wq6WSyRxVjw=; b=PwlymzBn0akUrQZRWrVQ7kHLcyz9ruGCnccql5NMkjY4GXPVtcMjFq0JBKzYr47+7k 4Iw2w2/C6LlK8ISm8wtejQnbN921QSBv4P3Wj3oZT/3OldGddOj74E5MdwwEWtTTuowR BEjxrPhsxn2ltB4UutAQLInRgX1qSTv56WTLuMyJLJ7SkP3Hb3VpOc8F09u8GpY9PlE7 Bce06f9rrsZSjDELpSnrz7l23ru8NiTpaj45HNP+KNio7KYhexAMVdmUpPISYwHgBwVe GJEJ5eM9pukPJvlBh6w7RmlLKhkycjlWwo8aM2k4iP83zI0z9/2nBDoMWFjlLb498w2C L0Fg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707799152; x=1708403952; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Vj8qKfoHRQQSQjKf28SMVg7GGjhkAsn0wq6WSyRxVjw=; b=H4jfFPC3DB0sw/gIKYYTFKtLK88ooAXvKpRDAgxg8CQrpPgDE5xu+XLx4SM1ObuJmo 5HkzysPAjjpYeaNFo6jkwjwMjvzq4WrM4HBSmfp1rJyBz8V1x4RsOVT5nN4G1kTMvGQS lTqwVo73D4SsiuEq+3cbtQLRBZLEVUFHToWnsIrv4hdmbYebuArlScteONpCIGblsEHP +LNDIhk2fq+Q1kXEcODGXX5PykYVRgZGbgMjMhYC3diPy0FG7vuG2YYu69IH/+xzedIs I7EPbcu+nMrYpYIuAJlYvnCs30Vf3TRHZVrfyrW3xaVKD2SkCWUXmtoOHSk+jIcJmYY/ IBbg== X-Gm-Message-State: AOJu0YySVRel3PrMN7oGX81lBZjHY1PRrhsF6deRxzbZoVQ2l4c4w61g UM+RThyK+OrQvmF+5NyC40ypgVXgYV3J0XaPYLsq1ITKQCGXYc0yFH0SL9HBIO+o6Hsd/Nfu+XD 1 X-Google-Smtp-Source: AGHT+IG2ASL8Im0/nKG8gnnkdSwT58a8CNDfrwBZw3mrlSphdWGOZmw+J1Ax49oKLmSyncHkL/qTsA== X-Received: by 2002:a17:906:4719:b0:a3c:1291:224 with SMTP id y25-20020a170906471900b00a3c12910224mr5878460ejq.42.1707799151879; Mon, 12 Feb 2024 20:39:11 -0800 (PST) X-Forwarded-Encrypted: i=1; AJvYcCW/aEpcgd6hIbqAc/+248471nD5BATvinlkB0wy7tUUPAZtkFgu6Z5yoM2/xA78qfcs6bcxGGaPSEv8qmWyKgcE5j4UPFK9SBT43b2Tt9QDjGdPisI= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-trivial@nongnu.org, Gerd Hoffmann , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH 2/3] hw/usb/uhci: Rename NB_PORTS -> UHCI_PORTS Date: Tue, 13 Feb 2024 05:38:58 +0100 Message-ID: <20240213043859.61019-3-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240213043859.61019-1-philmd@linaro.org> References: <20240213043859.61019-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::52a; envelope-from=philmd@linaro.org; helo=mail-ed1-x52a.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1707799224223100001 Rename NB_PORTS as UHCI_PORTS to avoid definition clash with EHCI equivalent: hw/usb/hcd-uhci.h:38:9: error: 'NB_PORTS' macro redefined [-Werror,-Wmacr= o-redefined] #define NB_PORTS 2 ^ hw/usb/hcd-ehci.h:40:9: note: previous definition is here #define NB_PORTS 6 /* Max. Number of downstream ports */ ^ Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- hw/usb/hcd-uhci.h | 4 ++-- hw/usb/hcd-uhci.c | 22 +++++++++++----------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/hw/usb/hcd-uhci.h b/hw/usb/hcd-uhci.h index 69f8b40c49..6d26b94e92 100644 --- a/hw/usb/hcd-uhci.h +++ b/hw/usb/hcd-uhci.h @@ -35,7 +35,7 @@ =20 typedef struct UHCIQueue UHCIQueue; =20 -#define NB_PORTS 2 +#define UHCI_PORTS 2 =20 typedef struct UHCIPort { USBPort port; @@ -59,7 +59,7 @@ typedef struct UHCIState { uint32_t frame_bytes; uint32_t frame_bandwidth; bool completions_only; - UHCIPort ports[NB_PORTS]; + UHCIPort ports[UHCI_PORTS]; qemu_irq irq; /* Interrupts that should be raised at the end of the current frame. = */ uint32_t pending_int_mask; diff --git a/hw/usb/hcd-uhci.c b/hw/usb/hcd-uhci.c index b95b47f6a4..a03cf22e69 100644 --- a/hw/usb/hcd-uhci.c +++ b/hw/usb/hcd-uhci.c @@ -322,7 +322,7 @@ static void uhci_reset(DeviceState *dev) s->fl_base_addr =3D 0; s->sof_timing =3D 64; =20 - for(i =3D 0; i < NB_PORTS; i++) { + for(i =3D 0; i < UHCI_PORTS; i++) { port =3D &s->ports[i]; port->ctrl =3D 0x0080; if (port->port.dev && port->port.dev->attached) { @@ -364,7 +364,7 @@ static const VMStateDescription vmstate_uhci =3D { .fields =3D (const VMStateField[]) { VMSTATE_PCI_DEVICE(dev, UHCIState), VMSTATE_UINT8_EQUAL(num_ports_vmstate, UHCIState, NULL), - VMSTATE_STRUCT_ARRAY(ports, UHCIState, NB_PORTS, 1, + VMSTATE_STRUCT_ARRAY(ports, UHCIState, UHCI_PORTS, 1, vmstate_uhci_port, UHCIPort), VMSTATE_UINT16(cmd, UHCIState), VMSTATE_UINT16(status, UHCIState), @@ -404,7 +404,7 @@ static void uhci_port_write(void *opaque, hwaddr addr, int i; =20 /* send reset on the USB bus */ - for(i =3D 0; i < NB_PORTS; i++) { + for(i =3D 0; i < UHCI_PORTS; i++) { port =3D &s->ports[i]; usb_device_reset(port->port.dev); } @@ -457,7 +457,7 @@ static void uhci_port_write(void *opaque, hwaddr addr, int n; =20 n =3D (addr >> 1) & 7; - if (n >=3D NB_PORTS) { + if (n >=3D UHCI_PORTS) { return; } port =3D &s->ports[n]; @@ -514,7 +514,7 @@ static uint64_t uhci_port_read(void *opaque, hwaddr add= r, unsigned size) UHCIPort *port; int n; n =3D (addr >> 1) & 7; - if (n >=3D NB_PORTS) { + if (n >=3D UHCI_PORTS) { goto read_default; } port =3D &s->ports[n]; @@ -609,7 +609,7 @@ static USBDevice *uhci_find_device(UHCIState *s, uint8_= t addr) USBDevice *dev; int i; =20 - for (i =3D 0; i < NB_PORTS; i++) { + for (i =3D 0; i < UHCI_PORTS; i++) { UHCIPort *port =3D &s->ports[i]; if (!(port->ctrl & UHCI_PORT_EN)) { continue; @@ -1173,11 +1173,11 @@ void usb_uhci_common_realize(PCIDevice *dev, Error = **errp) s->irq =3D pci_allocate_irq(dev); =20 if (s->masterbus) { - USBPort *ports[NB_PORTS]; - for(i =3D 0; i < NB_PORTS; i++) { + USBPort *ports[UHCI_PORTS]; + for(i =3D 0; i < UHCI_PORTS; i++) { ports[i] =3D &s->ports[i].port; } - usb_register_companion(s->masterbus, ports, NB_PORTS, + usb_register_companion(s->masterbus, ports, UHCI_PORTS, s->firstport, s, &uhci_port_ops, USB_SPEED_MASK_LOW | USB_SPEED_MASK_FULL, &err); @@ -1187,14 +1187,14 @@ void usb_uhci_common_realize(PCIDevice *dev, Error = **errp) } } else { usb_bus_new(&s->bus, sizeof(s->bus), &uhci_bus_ops, DEVICE(dev)); - for (i =3D 0; i < NB_PORTS; i++) { + for (i =3D 0; i < UHCI_PORTS; i++) { usb_register_port(&s->bus, &s->ports[i].port, s, i, &uhci_port= _ops, USB_SPEED_MASK_LOW | USB_SPEED_MASK_FULL); } } s->bh =3D qemu_bh_new_guarded(uhci_bh, s, &DEVICE(dev)->mem_reentrancy= _guard); s->frame_timer =3D timer_new_ns(QEMU_CLOCK_VIRTUAL, uhci_frame_timer, = s); - s->num_ports_vmstate =3D NB_PORTS; + s->num_ports_vmstate =3D UHCI_PORTS; QTAILQ_INIT(&s->queues); =20 memory_region_init_io(&s->io_bar, OBJECT(s), &uhci_ioport_ops, s, --=20 2.41.0 From nobody Tue Nov 26 10:28:40 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1707799222; cv=none; d=zohomail.com; s=zohoarc; b=UZ2+4iycIkgiJ97T8gJ3lBWVHnn2hG/RwYBfII/7eWOlHT3ZK2s3YsUUN0uPIsijfDUQYyvjiapNjc4rXHzX4wKOFfyqhSOIOmRdRoLQCawcuagW3kDxfo2qDfoId84StCJhsbPyRGfAUCUbBgwb7Y2cYpuNKb8bkjEwyCzGh2Y= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1707799222; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=ShumMCIaTbveateThFlQmvKVfpqfzquzqsEpvHvEiZU=; b=fXboOAry77afKw5YVM8zXHTzVvR53YZnX9rUNpH9PVDNpzPMQ1uFIueZxeX/vTHlc29RHQ4WW1hpZYwaVhS+mIFrFw5q9YVNge7RZARIOK+mwLnW54SfLbZoGxLZKi7iL38P7ZTENVsltuVd/Whh+veBD2iNG9sMmOKQ9/E+1Yw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1707799222667886.7288988797385; Mon, 12 Feb 2024 20:40:22 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rZkZn-0000A7-9f; Mon, 12 Feb 2024 23:39:23 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rZkZl-00007A-HS for qemu-devel@nongnu.org; Mon, 12 Feb 2024 23:39:21 -0500 Received: from mail-ed1-x52a.google.com ([2a00:1450:4864:20::52a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rZkZi-00062P-UM for qemu-devel@nongnu.org; Mon, 12 Feb 2024 23:39:21 -0500 Received: by mail-ed1-x52a.google.com with SMTP id 4fb4d7f45d1cf-560c696ccffso8460374a12.1 for ; Mon, 12 Feb 2024 20:39:18 -0800 (PST) Received: from m1x-phil.lan ([176.176.128.243]) by smtp.gmail.com with ESMTPSA id vo2-20020a170907a80200b00a3cf66ec008sm376172ejc.166.2024.02.12.20.39.16 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 12 Feb 2024 20:39:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1707799157; x=1708403957; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=ShumMCIaTbveateThFlQmvKVfpqfzquzqsEpvHvEiZU=; b=UMg71gBLWVaSPx3KQ+EzTDptITgCqKZTLmWq8MqBjSJXztXZk9bNgyttWxz0+cjaTy BMwnf+/SN+kHfygeT/6XTNLr5vMcNXcrS2HRTCHXirw3aM2SXdnmfpM+QLR+d7r9ZdPW uxn8ExWFGARYoI4fOkgj+2YfSuJx1sy9j+DM3xg+TusyZB6A5/vi5TrIlaBwx5Bf0M9q t/9sZd5uSAiNiGkfi6b+alyZwXRR2g1dmpEJn/zBmnDDgddLBbHWB2dzESh4IZxy1Hoa aq3oX8qD75DX4lX+/3XczpvtyQFXJYmBVAlvqlYYVtiHGGH48vA81f66Ri4aV8hegpu9 i6vQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707799157; x=1708403957; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ShumMCIaTbveateThFlQmvKVfpqfzquzqsEpvHvEiZU=; b=uKAhSuFV8lYGe49P3FoOTxMsNy9EA6FWycVNsQYFRrrR4zXS8c2x8clXAz7ipFJq4m BhwTHs1ezSzCAm1Y5x1DcThzF4isaCDiuxL4QkIc/ZHVYeoTRPERyn3DGYyeuZu1agzR vlVCISxbSlTgqp8INEgBctSLNC7S3fcpfO0u+6xscBRdb1IYiqDgMfZRThqh7S/FOJb3 BGKNdp4DPDCIyxQbs9L+V8sNOuabL7dTs0Yz1KXfgswdAba3p3ScdxyJaFwp3QZqB4Ch T5oRQ/sZy4kTpmQbNG0DGNSRBgPX5Q0Pk0efbD/BxBB9S81xzSAG211uAujr+FRKlGaK 5brg== X-Gm-Message-State: AOJu0YyLkhHzraiSmgMIBGgEzZEJHvAYfk43dPTNw/zvBpLsYLZeCPmA 9bjTIGvrqrd7uBc6Sj11LPx0njE0MhbId0b169OtUuIRciS6NHtuEfORxPxukrx/vP/5VfEWHMg 7 X-Google-Smtp-Source: AGHT+IFDyLzafmOnrsN3fwWun8MGFcNxvN/EWUyhawQAx8O37OyNNu/i3Ox4nInO6ZBB11/RhJa3bg== X-Received: by 2002:a17:906:c144:b0:a3c:afe1:7d4e with SMTP id dp4-20020a170906c14400b00a3cafe17d4emr1523737ejc.8.1707799157089; Mon, 12 Feb 2024 20:39:17 -0800 (PST) X-Forwarded-Encrypted: i=1; AJvYcCWVdsejrfcMWqE6T0Me2zYUKPaZe2TmhsZvninkP5xrhx9Vl6FMNAhwS25RF/96p0AoyiradO2bgRC6fXwJS1LF81X3OIk8rXP9LCk8QhgA1Py/wdg= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-trivial@nongnu.org, Gerd Hoffmann , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH 3/3] hw/usb/ehci: Rename NB_PORTS -> EHCI_PORTS Date: Tue, 13 Feb 2024 05:38:59 +0100 Message-ID: <20240213043859.61019-4-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240213043859.61019-1-philmd@linaro.org> References: <20240213043859.61019-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::52a; envelope-from=philmd@linaro.org; helo=mail-ed1-x52a.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1707799224246100002 Rename NB_PORTS as EHCI_PORTS to avoid definition clash with UHCI equivalent: hw/usb/hcd-ehci.h:40:9: error: 'NB_PORTS' macro redefined [-Werror,-Wmacr= o-redefined] #define NB_PORTS 6 /* Max. Number of downstream ports */ ^ hw/usb/hcd-uhci.h:38:9: note: previous definition is here #define NB_PORTS 2 ^ Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- hw/usb/hcd-ehci.h | 8 ++++---- hw/usb/hcd-ehci-pci.c | 2 +- hw/usb/hcd-ehci-sysbus.c | 2 +- hw/usb/hcd-ehci.c | 20 ++++++++++---------- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/hw/usb/hcd-ehci.h b/hw/usb/hcd-ehci.h index 2cd821f49e..56a1c09d1f 100644 --- a/hw/usb/hcd-ehci.h +++ b/hw/usb/hcd-ehci.h @@ -37,7 +37,7 @@ #define MMIO_SIZE 0x1000 #define CAPA_SIZE 0x10 =20 -#define NB_PORTS 6 /* Max. Number of downstream ports */ +#define EHCI_PORTS 6 /* Max. Number of downstream ports */ =20 typedef struct EHCIPacket EHCIPacket; typedef struct EHCIQueue EHCIQueue; @@ -288,7 +288,7 @@ struct EHCIState { uint32_t configflag; }; }; - uint32_t portsc[NB_PORTS]; + uint32_t portsc[EHCI_PORTS]; =20 /* * Internal states, shadow registers, etc @@ -298,8 +298,8 @@ struct EHCIState { bool working; uint32_t astate; /* Current state in asynchronous schedule */ uint32_t pstate; /* Current state in periodic schedule */ - USBPort ports[NB_PORTS]; - USBPort *companion_ports[NB_PORTS]; + USBPort ports[EHCI_PORTS]; + USBPort *companion_ports[EHCI_PORTS]; uint32_t usbsts_pending; uint32_t usbsts_frindex; EHCIQueueHead aqueues; diff --git a/hw/usb/hcd-ehci-pci.c b/hw/usb/hcd-ehci-pci.c index 0b26db74d8..3ff54edf62 100644 --- a/hw/usb/hcd-ehci-pci.c +++ b/hw/usb/hcd-ehci-pci.c @@ -83,7 +83,7 @@ static void usb_ehci_pci_init(Object *obj) s->capsbase =3D 0x00; s->opregbase =3D 0x20; s->portscbase =3D 0x44; - s->portnr =3D NB_PORTS; + s->portnr =3D EHCI_PORTS; =20 if (!dc->hotpluggable) { s->companion_enable =3D true; diff --git a/hw/usb/hcd-ehci-sysbus.c b/hw/usb/hcd-ehci-sysbus.c index bfb774504c..fe1dabd0bb 100644 --- a/hw/usb/hcd-ehci-sysbus.c +++ b/hw/usb/hcd-ehci-sysbus.c @@ -88,7 +88,7 @@ static void ehci_sysbus_class_init(ObjectClass *klass, vo= id *data) SysBusEHCIClass *sec =3D SYS_BUS_EHCI_CLASS(klass); =20 sec->portscbase =3D 0x44; - sec->portnr =3D NB_PORTS; + sec->portnr =3D EHCI_PORTS; =20 dc->realize =3D usb_ehci_sysbus_realize; dc->vmsd =3D &vmstate_ehci_sysbus; diff --git a/hw/usb/hcd-ehci.c b/hw/usb/hcd-ehci.c index 98a2860069..01864d4649 100644 --- a/hw/usb/hcd-ehci.c +++ b/hw/usb/hcd-ehci.c @@ -783,9 +783,9 @@ static void ehci_register_companion(USBBus *bus, USBPor= t *ports[], EHCIState *s =3D container_of(bus, EHCIState, bus); uint32_t i; =20 - if (firstport + portcount > NB_PORTS) { + if (firstport + portcount > EHCI_PORTS) { error_setg(errp, "firstport must be between 0 and %u", - NB_PORTS - portcount); + EHCI_PORTS - portcount); return; } =20 @@ -831,7 +831,7 @@ static USBDevice *ehci_find_device(EHCIState *ehci, uin= t8_t addr) USBPort *port; int i; =20 - for (i =3D 0; i < NB_PORTS; i++) { + for (i =3D 0; i < EHCI_PORTS; i++) { port =3D &ehci->ports[i]; if (!(ehci->portsc[i] & PORTSC_PED)) { DPRINTF("Port %d not enabled\n", i); @@ -850,7 +850,7 @@ void ehci_reset(void *opaque) { EHCIState *s =3D opaque; int i; - USBDevice *devs[NB_PORTS]; + USBDevice *devs[EHCI_PORTS]; =20 trace_usb_ehci_reset(); =20 @@ -858,7 +858,7 @@ void ehci_reset(void *opaque) * Do the detach before touching portsc, so that it correctly gets sen= d to * us or to our companion based on PORTSC_POWNER before the reset. */ - for(i =3D 0; i < NB_PORTS; i++) { + for(i =3D 0; i < EHCI_PORTS; i++) { devs[i] =3D s->ports[i].dev; if (devs[i] && devs[i]->attached) { usb_detach(&s->ports[i]); @@ -877,7 +877,7 @@ void ehci_reset(void *opaque) s->astate =3D EST_INACTIVE; s->pstate =3D EST_INACTIVE; =20 - for(i =3D 0; i < NB_PORTS; i++) { + for(i =3D 0; i < EHCI_PORTS; i++) { if (s->companion_ports[i]) { s->portsc[i] =3D PORTSC_POWNER | PORTSC_PPOWER; } else { @@ -1086,7 +1086,7 @@ static void ehci_opreg_write(void *ptr, hwaddr addr, case CONFIGFLAG: val &=3D 0x1; if (val) { - for (i =3D 0; i < NB_PORTS; i++) { + for (i =3D 0; i < EHCI_PORTS; i++) { handle_port_owner_write(s, i, 0); } } @@ -2427,7 +2427,7 @@ static int usb_ehci_post_load(void *opaque, int versi= on_id) EHCIState *s =3D opaque; int i; =20 - for (i =3D 0; i < NB_PORTS; i++) { + for (i =3D 0; i < EHCI_PORTS; i++) { USBPort *companion =3D s->companion_ports[i]; if (companion =3D=3D NULL) { continue; @@ -2509,9 +2509,9 @@ void usb_ehci_realize(EHCIState *s, DeviceState *dev,= Error **errp) { int i; =20 - if (s->portnr > NB_PORTS) { + if (s->portnr > EHCI_PORTS) { error_setg(errp, "Too many ports! Max. port number is %d.", - NB_PORTS); + EHCI_PORTS); return; } if (s->maxframes < 8 || s->maxframes > 512) { --=20 2.41.0