From nobody Tue Apr 08 13:41:01 2025 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 4ZX6fj4BhMz5sQLP; Tue, 08 Apr 2025 13:41:01 +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 4ZX6fj1tVNz3DJ9; Tue, 08 Apr 2025 13:41:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1744119661; 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=rLYk1tsEOM5UCDKikJzPX7cObIxZRuXVNvJx7Q6QFV0=; b=ACSbzFFSZiLriFaVoSA8odkMf1WBwmrf3RPb/adS0LEoUY7wnlFlc2mSf8DToGGEVv1Cer qQFnMBkFIOUE6mmBSiVyDvM+k1Y9W4h0q/PHn6APimX1hjLo1v/UZh98kM3a9F3rKaJSNW VSlJdD33IrpBOkT8Ii/rMN6LF2IW5hA9vuoJglpK0GDUjpdStmi9GTiahEcU/HZYWzArH+ wyI8mjh+JXDedWcR4ZHH5y4EZH5wbopskHPDClHqMTY1018V6GoEcFBf0sAw0SvY5sae4c VrGgkUqCy3zV79bLRPheJpH8wmIHitixNT+CojlVDBi1BIvFi873DAhGQNoVjQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1744119661; a=rsa-sha256; cv=none; b=Wge9ck8fmybu0VqVQaCJMcEySXKZec9Z17Q7CgVaz2+Xe4wdPvoCFmSatHtkSqo2etF1yh Q6IcK9P8bC1LB2ZwJn/WHXsyVhQ2uAAHHBYrAfMeqZSWcFo3PW+M1pnVvUIjRDoRBbtsMD 33cG6kXkDJLgNjzsNcNGNkdzHerxymhlPzpJ6gN6L0KVW6+ixEMPrWqi2zeFRwQ3LW3E5j IuI5pNBa+QgmohQpw4ZuZuIiolHdyopBCd+arZS8fTAsfSTQ1C6sWG5QrGnfUeZ4nvI25/ IF9EHJXh4vBEYQiSmmgsX+chAPpw6+EhpuhurV/6cfunEMWjVWzgi/6BAVo5Zw== 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=1744119661; 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=rLYk1tsEOM5UCDKikJzPX7cObIxZRuXVNvJx7Q6QFV0=; b=eyXA53JRSUGfdWluHr1PkbvmXtAN2Ixz0aapGkyMXVoWDuShO2VveqA8kFQ9sLrXJ+PK4a 2rZuCI8j2V140dmEaK+JjQNO18hA5rLt1Rak+hMsDwkIXP2baXRhM6ALK+dwGL6K9e2xr9 qB78QmHpGAl+P/gdIUolH1v/yzN+thjUHKX1XeCLe9JYZFVSwCP8ih8CW8w8vik0zdhxAm X7pY0wCJ7OGzC46YIRjRueqrzbx0EG8E4tVh4vsgxU/koee3Hy+OIhVsQk0y/wbhfana3n Cjy0AkNepYssqy/98EFi0B6EMHvmBmoY4XMtj8WHMrVR+dceQI/Kvpa6dPyhfg== 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 4ZX6fj1SggzZgy; Tue, 08 Apr 2025 13:41:01 +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 538Df19e032393; Tue, 8 Apr 2025 13:41:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 538Df1P7032390; Tue, 8 Apr 2025 13:41:01 GMT (envelope-from git) Date: Tue, 8 Apr 2025 13:41:01 GMT Message-Id: <202504081341.538Df1P7032390@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Olivier Certner Subject: git: 0a2c8f66919d - stable/14 - libsa: smbios: Rename 64-bit entry point's guards 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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/stable/14 X-Git-Reftype: branch X-Git-Commit: 0a2c8f66919dbf5288faed8a73efd3905aa3d8e3 Auto-Submitted: auto-generated The branch stable/14 has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=0a2c8f66919dbf5288faed8a73efd3905aa3d8e3 commit 0a2c8f66919dbf5288faed8a73efd3905aa3d8e3 Author: Olivier Certner AuthorDate: 2025-03-03 16:52:20 +0000 Commit: Olivier Certner CommitDate: 2025-04-08 13:38:26 +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 (cherry picked from commit 2aa0067548a9dd68af263b3154923c0c25d8f600) --- 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 */