From nobody Tue Mar 11 14:04:38 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 4ZBwVv2HQxz5qbsB; Tue, 11 Mar 2025 14:04:39 +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 4ZBwVt6cJWz3qhV; Tue, 11 Mar 2025 14:04:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1741701878; 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=/lydH/herk1ksgPjqhXtMupBGVQy4PxxtEv7xci2lyU=; b=Hr+1SWWn7cCAN+Og6mLxMnrBqhKs/N5e6SjB4Jbc0wiKtvBO4q4Oii9HaDMijE2aA3kSx5 M5Y6zOnUd43YJD3QfkmqmUFAql8YXUFHt5EgwMy+Kf4iMmTKy0rU8OqvSkxDlag9xVwGxS y+2QXe8dwvs4+38W79mnWSDh3cQvBaBrcI2z6fl1NR2AXHGB6wk1gSzLNuArr2IqcNEKHW OqDjVOFGfEtTxN5Czvgewq0XfWAi3TjqEAf0sTYkhzM9MJRlLtYOSfRABsgOC574t03kPT yudF01uOj82fQpv2BxuDdKUHQZgvHgLA61SNZDFtaY2HihacJO26MVcFeRkEYw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1741701878; a=rsa-sha256; cv=none; b=kIj7xvTE/H+7mmoDb3gjdELaSEy1WmZLWbXove9m33GP3rXOB0XBoX8fRnpuq/8c4fxESW 7JISOB7aAfb3BCJusQS3dDkOMsK8GUQmdEf6A9gNJKZkqhBKLpGNxh427IldBuXvjJuaqN 9r7RTSuTUI9yKUJ5TqGN186VMO7WWc9HcuYt9z3sABL4ZYpuVnSsszbME+v5K0Xiq7tA6k 1cLXzugSaLbEefNB+Mx7/ASmZmzUQ3R6VuSxBTqtezlZA934fTV/OeZAJx6UEK5s+/jhTO UH2HOcGkGi7/w9gZyBL1DO/+2qtj/IbieahsyAvyUVCA5rzenzEdu82+QlCVhQ== 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=1741701878; 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=/lydH/herk1ksgPjqhXtMupBGVQy4PxxtEv7xci2lyU=; b=Nhvh9O73h2FHKYwpFm1acaJjrfGHCHsaMJHw20jR6S8sCKRd7mtM3M/QfhPEee3CY4V4Iu 8KVZzmtvGr+558BUrETL6L4DLlQumsSyA5LdT3uBr+NIczpcHBQdtRvFtfXg5ckClQSJdN Ut6jMezeuWLsNDHu+Y5OcRGBI9uOuFD3JftVznNQQiML6hof1xWKkSRsrKokmuQleLruKa dVdNHuFh3PK7u6lYxi7yBaMxI8G0Mb9Z796hRlAjd7oZx4BPfxPJDgsSggbfC6x5e4EgWG 86mG4PcoJDvvYKnA9jiSwFz4iS89xUFZNezU1f6iEQKxMkwrfHQ9dpyR/c7zrg== 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 4ZBwVt6BtYzDFF; Tue, 11 Mar 2025 14:04:38 +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 52BE4cvw028662; Tue, 11 Mar 2025 14:04:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52BE4cY7028659; Tue, 11 Mar 2025 14:04:38 GMT (envelope-from git) Date: Tue, 11 Mar 2025 14:04:38 GMT Message-Id: <202503111404.52BE4cY7028659@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: a39ab17c9abb - main - libsa: smbios: Make 'is_64bit_ep' a field of 'smbios' 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: a39ab17c9abb74019f15b02970d8739c97d4185c Auto-Submitted: auto-generated The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=a39ab17c9abb74019f15b02970d8739c97d4185c commit a39ab17c9abb74019f15b02970d8739c97d4185c Author: Olivier Certner AuthorDate: 2025-03-03 16:29:04 +0000 Commit: Olivier Certner CommitDate: 2025-03-11 13:54:08 +0000 libsa: smbios: Make 'is_64bit_ep' a field of 'smbios' No functional change. Reviewed by: imp, markj MFC after: 2 weeks Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D49282 --- stand/libsa/smbios.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/stand/libsa/smbios.c b/stand/libsa/smbios.c index a45bc78b7ad0..a334e39e9eff 100644 --- a/stand/libsa/smbios.c +++ b/stand/libsa/smbios.c @@ -144,6 +144,9 @@ SMBIOS_GET64(const caddr_t base, int off) struct smbios_attr { int probed; +#ifdef SMBIOS_64BIT_EP + int is_64bit_ep; +#endif caddr_t addr; size_t length; size_t count; @@ -160,9 +163,6 @@ struct smbios_attr { }; static struct smbios_attr smbios; -#ifdef SMBIOS_64BIT_EP -static int is_64bit_ep; -#endif static uint8_t smbios_checksum(const caddr_t addr, const uint8_t len) @@ -193,7 +193,7 @@ smbios_sigsearch(const caddr_t addr, const uint32_t len) /* v3.0, 64-bit Entry point */ if (strncmp(cp, SMBIOS3_SIG, sizeof(SMBIOS3_SIG) - 1) == 0 && smbios_checksum(cp, SMBIOS_GET8(cp, 0x06)) == 0) { - is_64bit_ep = 1; + smbios.is_64bit_ep = 1; return (cp); } #endif @@ -562,7 +562,7 @@ smbios_probe(const caddr_t addr) return; #ifdef SMBIOS_64BIT_EP - if (is_64bit_ep) { + if (smbios.is_64bit_ep) { /* Structure Table Length */ smbios.length = SMBIOS_GET32(saddr, 0x0c); /* Structure Table Address */