From nobody Tue Mar 11 14:04:37 2025 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 4ZBwVt2LWTz5qbpx; Tue, 11 Mar 2025 14:04: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZBwVs66d5z3qfS; Tue, 11 Mar 2025 14:04:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1741701877; 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=Z87erjhf8b8ReC95N97NDa5qO4EPcJlGd0VRUnIOAUs=; b=mXA9YaLKtL+R9d6g2DgwTy+cNs3na44nQAiO0e/C+zSlTPZbxvQuqzC3wykgM9dp4mAeJf Cw51RnET9g2awNWakkF6V7d4yrWseNZFNL+aIL8Vlh7uiHcIrUKeo8LJnGi2/amYpO2QtG z+aemV6H7Vn2+7MJn5CDF7AYl0XttEX5JRQr8XdsJvk6jgKoEz9DjetcJIMihQSE4Xh60P bCrtE1v3xL78Uh4PcXqLFBZQ9lcoImA568OEeZVcohR5VYJSJ3omtJrow2dgjksG+8O8Pi XHlsFu9BfPsmZnYBPzTxOcWZD59VDze5Nb8L6mTjFpSzjEo/oEG9hhojPXEytg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1741701877; a=rsa-sha256; cv=none; b=czFnOaZopC6DQBzN4ACipP0KJwtNopjHt9TuZG4vDtpR1j7B5PKdHxuiqC/zUZkx9Z8IA5 duyWRQOWkWkiq4Iy7jfAPzd8yZPnNSie3nYx/S0vmSnGb+zuzkUdrWRYU7++ejRaV11g+E QrcreIllmbODUimH+k9f9m2ZEttCPCdHAVz+q3K2NzElHWkuH5BlMeIJ8uTks/2cUET40u 3HC8I3IcNrj9bDY0wKr+TBCLrlSiyzHv+tz/zkxbWw024huRpJWoAlYsq7LiuA71MsQ+g2 dL7JMcPn952DIllJTnUvrT+4f/Q2z/KY7TUHavABHoGjsYkDTgtxtb0YSDPR1A== 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=1741701877; 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=Z87erjhf8b8ReC95N97NDa5qO4EPcJlGd0VRUnIOAUs=; b=YMN3y3ucKLCIyjAkMi/wxSLxbMs7eZf9ESU13Q8hpewlelZcnHV8ChX5e6tqapskix/Hr5 Vzx9jsLjUK5QM0UDS9jC03LAlwUvnnJlKEmJ85MhfuIj7lQen4Fffr8AdGhr9b23085TLM x1B/4Saj46nzCMz/hYKqoah1Q4Pec/IwGy88XN0eDfMsixyLn/Xi//RjKcDjvRXjqVJ5AT Q5ATv1Z93aL93GO+JQDoE9k20Q/pvlHwf397HC6lyTb20DZZGjXvze4QF7X0CkoH2lgWvg yxZBIpBPGG+aW3SvIHirFDsQzr2aJwBAYLgKlEl5pEVFYCl0+xFLrZLc1B9wrw== 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 4ZBwVs5jBLzD04; Tue, 11 Mar 2025 14:04:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52BE4b7g028624; Tue, 11 Mar 2025 14:04:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52BE4b5g028621; Tue, 11 Mar 2025 14:04:37 GMT (envelope-from git) Date: Tue, 11 Mar 2025 14:04:37 GMT Message-Id: <202503111404.52BE4b5g028621@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Certner Subject: git: 2aa0067548a9 - main - libsa: smbios: Rename 64-bit entry point's guards 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2aa0067548a9dd68af263b3154923c0c25d8f600 Auto-Submitted: auto-generated The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=2aa0067548a9dd68af263b3154923c0c25d8f600 commit 2aa0067548a9dd68af263b3154923c0c25d8f600 Author: Olivier Certner AuthorDate: 2025-03-03 16:52:20 +0000 Commit: Olivier Certner CommitDate: 2025-03-11 13:54:08 +0000 libsa: smbios: Rename 64-bit entry point's guards Rename HAS_SMBV3 to SMBIOS_64BIT_EP, as it will soon be externally defined in some cases, and 'isv3' to 'is_64bit_ep'. These are more accurate names for what they actually control/indicate. No functional change. Reviewed by: imp, markj MFC after: 2 weeks Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D49281 --- stand/libsa/smbios.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/stand/libsa/smbios.c b/stand/libsa/smbios.c index 4faec8c3aa01..a45bc78b7ad0 100644 --- a/stand/libsa/smbios.c +++ b/stand/libsa/smbios.c @@ -31,7 +31,7 @@ /* Only enable 64-bit entry point if it makes sense */ #if __SIZEOF_POINTER__ > 4 -#define HAS_SMBV3 1 +#define SMBIOS_64BIT_EP 1 #endif /* @@ -144,7 +144,7 @@ SMBIOS_GET64(const caddr_t base, int off) struct smbios_attr { int probed; - caddr_t addr; + caddr_t addr; size_t length; size_t count; int major; @@ -160,8 +160,8 @@ struct smbios_attr { }; static struct smbios_attr smbios; -#ifdef HAS_SMBV3 -static int isv3; +#ifdef SMBIOS_64BIT_EP +static int is_64bit_ep; #endif static uint8_t @@ -189,11 +189,11 @@ smbios_sigsearch(const caddr_t addr, const uint32_t len) smbios_checksum(cp + 0x10, 0x0f) == 0) return (cp); -#ifdef HAS_SMBV3 +#ifdef SMBIOS_64BIT_EP /* v3.0, 64-bit Entry point */ if (strncmp(cp, SMBIOS3_SIG, sizeof(SMBIOS3_SIG) - 1) == 0 && smbios_checksum(cp, SMBIOS_GET8(cp, 0x06)) == 0) { - isv3 = 1; + is_64bit_ep = 1; return (cp); } #endif @@ -561,8 +561,8 @@ smbios_probe(const caddr_t addr) if (saddr == NULL) return; -#ifdef HAS_SMBV3 - if (isv3) { +#ifdef SMBIOS_64BIT_EP + if (is_64bit_ep) { /* Structure Table Length */ smbios.length = SMBIOS_GET32(saddr, 0x0c); /* Structure Table Address */