From nobody Tue Jan 24 04:46:35 2023 X-Original-To: dev-commits-src-branches@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 4P1Dvb6C83z3bGH6; Tue, 24 Jan 2023 04:46:35 +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 4P1Dvb5HLqz4Khc; Tue, 24 Jan 2023 04:46:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674535595; 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=QaSCI+fW8stemS7EkKUkLQBpOnXaZCyUAyHVH2h8SVY=; b=PPJqqFZ/Isu55F/zq1TYTmF/RvHQxim2Cw9z8KfOISfTrQp5QwNMz0dG4n1d7vnIv61oI8 dqJBd5LFnxRRfOqDX0CFA8/ajLXDdnSstQhwawgwBt6TNrG7MINUhfnZ1/ZpdjFC6171gA qPwRxnljsT6DWTPPPrXZBJCDV2OlglaTBYbEDmlrVYlS93/KTxmO8Bd/FsbjHxC+UP1rzJ p+R426R/aPM+Sg58/Wj5/BrV6IVYH90OBodtjBNvG5iE/uOXYN/V7Lz8ja3hsM1mOouQOb EhdPc7ihHEK2m/6GOnp2YcVkeDQjSsbxRpFppZhpM56vAvk8EuBCspIrerNP2A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674535595; 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=QaSCI+fW8stemS7EkKUkLQBpOnXaZCyUAyHVH2h8SVY=; b=kePvhb+9DDkZpwf7X4zRym0KTDb5V1dyjh7CBlphh/R0GlysQ35h9u73qevplP+19d5K64 LsQDOkd7G0i1w18LL3khM5D4kAQlllzo+lb/zt6kJf+cqmiudFHmZKla6k3a0HY3v+vgqV t6R5SUejYeH9ne7CrialqCLLZTBtVtJRr2wLSv3/IN/4IU/2+v5BKWSkFnxQORLzji3NTe w3kcwxnwxROmUuFJpaNZ345/u75MQbJMin1DDGExZGRsKySrB/qAzSw/hb23Zfxizy7PyJ PmP53y4+gsTNWyNpzhkw9VetByQTl81KgIrzbjU+WnBjwJRQbtBMMaLeDcGJYg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674535595; a=rsa-sha256; cv=none; b=XpzPk90sUyJUBHNP74LTOFDUKYZnwLn9KfIA1sXUpK+33KnpLZPrBpiuWagVfJLXmv+sJ9 7l6QWav3eQrsQCaXNgcJmLEo9nTRkQrUBNAJwdCHHuyZGuXFMKXmkSrrJMc4/uajZOyAfI +QzRji760Gm9qKNgEvow63thD+i8pjrxRj/6rdIZgLSUIXcaqnN8hb/8RO2DlU4Bt0wJJN bp5U6nDc5vHBtEuqAxV3Yb/n5sqfA/TCwMZTmv2D5edrhLH4dvFrVOa1eXL97OTDZ4+WvZ sy4rx0i9qqQFVzLbesV9EbDxeKuTJ557a+SXcGJMwZUCmpu1U7FOjIj0g2zWGQ== 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 4P1Dvb3XDPzwsk; Tue, 24 Jan 2023 04:46:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 30O4kZ57076113; Tue, 24 Jan 2023 04:46:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30O4kZug076112; Tue, 24 Jan 2023 04:46:35 GMT (envelope-from git) Date: Tue, 24 Jan 2023 04:46:35 GMT Message-Id: <202301240446.30O4kZug076112@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: ac44dcce625e - stable/13 - smc: Rename constants for control register from CTR* to CTRL*. List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: ac44dcce625e1091cf126b16a1608cb079d68234 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=ac44dcce625e1091cf126b16a1608cb079d68234 commit ac44dcce625e1091cf126b16a1608cb079d68234 Author: John Baldwin AuthorDate: 2022-04-13 00:11:28 +0000 Commit: John Baldwin CommitDate: 2023-01-24 04:34:43 +0000 smc: Rename constants for control register from CTR* to CTRL*. This avoids a conflict with the recently-added CTR macro in . (cherry picked from commit 613e07c07f3b069eae08d9c5f5642713621c4a43) --- sys/dev/smc/if_smc.c | 6 +++--- sys/dev/smc/if_smcreg.h | 18 +++++++++--------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/sys/dev/smc/if_smc.c b/sys/dev/smc/if_smc.c index c8cd345596ce..830a8af82923 100644 --- a/sys/dev/smc/if_smc.c +++ b/sys/dev/smc/if_smc.c @@ -1175,9 +1175,9 @@ smc_reset(struct smc_softc *sc) * Set up the control register. */ smc_select_bank(sc, 1); - ctr = smc_read_2(sc, CTR); - ctr |= CTR_LE_ENABLE | CTR_AUTO_RELEASE; - smc_write_2(sc, CTR, ctr); + ctr = smc_read_2(sc, CTRL); + ctr |= CTRL_LE_ENABLE | CTRL_AUTO_RELEASE; + smc_write_2(sc, CTRL, ctr); /* * Reset the MMU. diff --git a/sys/dev/smc/if_smcreg.h b/sys/dev/smc/if_smcreg.h index 4642966f0d49..2705cff1dee5 100644 --- a/sys/dev/smc/if_smcreg.h +++ b/sys/dev/smc/if_smcreg.h @@ -140,15 +140,15 @@ #define GPR 0xa /* Bank 1, Offset 0xc: Control Register */ -#define CTR 0xa -#define CTR_STORE 0x0001 /* Store registers to EEPROM */ -#define CTR_RELOAD 0x0002 /* Reload registers from EEPROM */ -#define CTR_EEPROM_SELECT 0x0004 /* Select registers to store/reload */ -#define CTR_TE_ENABLE 0x0020 /* TX error causes EPH interrupt */ -#define CTR_CR_ENABLE 0x0040 /* Ctr rollover causes EPH interrupt */ -#define CTR_LE_ENABLE 0x0080 /* Link error causes EPH interrupt */ -#define CTR_AUTO_RELEASE 0x0800 /* Automatically release TX packets */ -#define CTR_RCV_BAD 0x4000 /* Receive/discard bad CRC packets */ +#define CTRL 0xa +#define CTRL_STORE 0x0001 /* Store registers to EEPROM */ +#define CTRL_RELOAD 0x0002 /* Reload registers from EEPROM */ +#define CTRL_EEPROM_SELECT 0x0004 /* Select registers to store/reload */ +#define CTRL_TE_ENABLE 0x0020 /* TX error causes EPH interrupt */ +#define CTRL_CR_ENABLE 0x0040 /* Ctr rollover causes EPH interrupt */ +#define CTRL_LE_ENABLE 0x0080 /* Link error causes EPH interrupt */ +#define CTRL_AUTO_RELEASE 0x0800 /* Automatically release TX packets */ +#define CTRL_RCV_BAD 0x4000 /* Receive/discard bad CRC packets */ /* Bank 2, Offset 0x0: MMU Command Register */ #define MMUCR 0x0