From nobody Wed Apr 13 00:12:35 2022 X-Original-To: dev-commits-src-main@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 ABF5F1B0925D; Wed, 13 Apr 2022 00:12: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 4KdNMR4PLlz3tnG; Wed, 13 Apr 2022 00:12:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649808755; 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=+kE6DD3PvIIzsVIGDDZwEeTFwRIFJ6vV72eHm84JV4s=; b=F2cMwxQ3/JQMEEjQi/97cUS9v28jO58EJQKBg44S9A5QI4b0nRkR6FSK/k4WWkT8uGK2Cx kWQ4xYS/sESSpUdNyh0P0uMAFYopwnTbKej9uaUntQ0ceHwRz1S7X9HlWriBeofHNa/bpf HocsF4SLpZGkjQHHwzR3Yosk0XubXrEa57rUBU+Fus1PDcb2QArM7ZameRwQDa0ONK8cnu koswZ358eEnn/WEJSKLxIfhjQbBfh0BABBSW/vf+LxGRRNjdlRO4xTKwVMxKzYyFXIGnbJ XdBxw3kRsX4kenp5ZziTI9lq8THibXuqD92H2QhqSoznhs/GCb3zTy0h711Cow== 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 77F272164C; Wed, 13 Apr 2022 00:12: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 23D0CZ35024574; Wed, 13 Apr 2022 00:12:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23D0CZa1024573; Wed, 13 Apr 2022 00:12:35 GMT (envelope-from git) Date: Wed, 13 Apr 2022 00:12:35 GMT Message-Id: <202204130012.23D0CZa1024573@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 613e07c07f3b - main - smc: Rename constants for control register from CTR* to CTRL*. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 613e07c07f3b069eae08d9c5f5642713621c4a43 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649808755; 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=+kE6DD3PvIIzsVIGDDZwEeTFwRIFJ6vV72eHm84JV4s=; b=Rkmt8B6KYRNWjA9pSwjcN4JSXLucGsSbrm2VN2+6yJTIdRb/ksyYLDMBx3nQsDBodr5RP7 HQrPyPgE8Y/OuW8RoYyjI+OWxsOec85Qa/96V/tw0uQ6GIxkD+Faei2rt0YCoM9KFkrjpo 05s4HhhxRY4yu9q6QqtcPHgqCtJ6qZY808OvSok7V/udTnsz1sAvEewPxhbJy2yrn8DVmw cGKPjKG2QMgAJlmltdDlXs/t68KHH36Xk/icGj7NDZWpDWZZebMrU2jHSjJUHLuTHDUQDa 8huQZtPsmak64Bn8yfyssmmvy1MKjfl10hmA+wRbMJpfJ/xGm0IPGq5z2F//Yg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1649808755; a=rsa-sha256; cv=none; b=aECiqq9nx/PGL/7M9+qqHhIYy1bn8MUct4YQed7/dqPmW2CVXkXLWwypYhhCjjRzzN+PSV soDwJ537qMReJ2eD8Xc/00uKm0+7ZTEelm6SSKiDiU1OnCedycFYRaY7GU605WrH2Z5KXw A0CO19yupHLhNBZjXxIbM2tgUKBdBWCRQLf+uz+vs/hRPDagEDz9gzO44JFBhtxnxKsZ40 khtLMQEXwk7L/3MIATIjIvOymaiCCjYjtglgW3L//MkrJGXnmuJaZziyzhBU+qaX4K55ZY qKAfggIa6VRsVLWGdycrIflEOCxg7HG4L6u/JOKD/JIYps8nh5/kwAMdsCOeiQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=613e07c07f3b069eae08d9c5f5642713621c4a43 commit 613e07c07f3b069eae08d9c5f5642713621c4a43 Author: John Baldwin AuthorDate: 2022-04-13 00:11:28 +0000 Commit: John Baldwin CommitDate: 2022-04-13 00:11:28 +0000 smc: Rename constants for control register from CTR* to CTRL*. This avoids a conflict with the recently-added CTR macro in . --- 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