From nobody Tue Feb 27 22:10:38 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TksB66bdDz5Bmwk; Tue, 27 Feb 2024 22:10:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TksB664Gvz49tQ; Tue, 27 Feb 2024 22:10:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709071838; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ol6vt9FYfYEahFetvk08EV8OAQSqX2/RpJ2DysCZnrk=; b=ndVEu9s0HxrPxmrdiBTkM3N1/VHm5bF70DdLMkDTdNFtq75CF9vcKB1fiS6MZhAYFVKVeN v88m/QfMx1G2cQz2r5bwTunPcAQnTEyCX0stMJvhtO17B8jCHBIC+jxhvrbL10jRwmlUjy VkFN6qyLQBRESArTsi75xrFynS/+yHpnINcBh2Kn1BNJvbOFdn4JHOMScZJKcjxf+IyUdR HzC9DTYWT7DGYvVSDLqEHBq/qsNm9p5V3KbG2rPtxyQwSiLtjiSx2+wguTB6vTNFPPrA1D WEKxnsDgDi9VJrs/DefcrQCGn9xliXOMDTDU7BueQvC0DN4VdLgmC5Hu/NDYlQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709071838; a=rsa-sha256; cv=none; b=sbiir9d9iGlq12X4PPIUMu6HLvlCHpNyyYOKKWwy4OMhTCH6h2hOXDfmpR/srT7BjQSOEu ZdMFNrt1BVb6N0NoOG/Q2QkUPyyqR42jYw40s2QooyIDKKi9pLecMtZTZ80ubKLusuGAhU edZ6rBQy32ihJ+LqsH9okhLo0OCI5NmdSfpUjRzyUpUyQXTavmdBNxbOJBQlu8NQNqUHmo 7sYs0TZQnf8HnZPNVPvOhqKW9cky+loUjZ9e1eeL52TCGD1ZeehpqmxRwAv5Z/xm1EMLpp /PM0nfZfwkDlVlLsg1BqMURom3+45DuTdFn7r3M+6q+pmX1FqxViuWYp6jVPpA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709071838; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ol6vt9FYfYEahFetvk08EV8OAQSqX2/RpJ2DysCZnrk=; b=cdphOE2fUU2Q5tXDDHABx2VzPop2VLd2E6hk8W77btqj5VSeen/SISzlt67+k/IDEhuI6y jAM263rIlletnlqV9ujHdJeYiQ9P2xlfOUFF9V84QKPnDSsAs8e2kr7S5gNQjTWgpuzeSS wg98NP5LBldOKsapkQZYV59Jz1wf0A4s9KuTJus0F7HpjZ8QvWnEADDnY/qIIE3oqdiywx oTr/MIIlM2zAt7EACJMEbK/Uy7EMhqwChfxQqMMsJJUkP81D8XZkYBjA/k6aigPF6hCz4U U1GfNgcyf+v0z0rXUP3PnJqDWosaT26/hoFnMQOHYvZg6zDj+efqG7XlLJPBdw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TksB656r9zWjq; Tue, 27 Feb 2024 22:10:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41RMAcap040273; Tue, 27 Feb 2024 22:10:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41RMAcXW040271; Tue, 27 Feb 2024 22:10:38 GMT (envelope-from git) Date: Tue, 27 Feb 2024 22:10:38 GMT Message-Id: <202402272210.41RMAcXW040271@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mitchell Horne Subject: git: fae39d8da9d5 - main - dwc: fix DEBUG macro name List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fae39d8da9d5ddf4239fc2143522340c941f6612 Auto-Submitted: auto-generated The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=fae39d8da9d5ddf4239fc2143522340c941f6612 commit fae39d8da9d5ddf4239fc2143522340c941f6612 Author: Mitchell Horne AuthorDate: 2024-02-27 21:59:24 +0000 Commit: Mitchell Horne CommitDate: 2024-02-27 22:10:14 +0000 dwc: fix DEBUG macro name It conflicts with the general "DEBUG" macro defined as an option in LINT builds. Since this is actually unused, just rename it to GMAC_DEBUG. Reviewed by: manu MFC after: 3 days Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D44102 --- sys/dev/dwc/dwc1000_reg.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/dwc/dwc1000_reg.h b/sys/dev/dwc/dwc1000_reg.h index f581bf135cd8..5b67da2447ac 100644 --- a/sys/dev/dwc/dwc1000_reg.h +++ b/sys/dev/dwc/dwc1000_reg.h @@ -70,7 +70,7 @@ #define FLOW_CONTROL_TX (1 << 1) /* TX Flow control enable */ #define GMAC_VLAN_TAG 0x1C #define VERSION 0x20 -#define DEBUG 0x24 +#define GMAC_DEBUG 0x24 #define LPI_CONTROL_STATUS 0x30 #define LPI_TIMERS_CONTROL 0x34 #define INTERRUPT_STATUS 0x38