From nobody Tue Mar 11 14:04:47 2025 X-Original-To: dev-commits-src-all@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 4ZBwW51L5Vz5qc1h; Tue, 11 Mar 2025 14:04:49 +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 4ZBwW41LVLz3qxX; Tue, 11 Mar 2025 14:04:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1741701888; 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=OKoaSfp1bOY3a5xUIhffLMRJ8EaSRTor3Ss2g4wcLw8=; b=fP1JZtuDrrgpAqzL+SX64ktASFJpYHCDZK68qbcTu83JfCEIGpQa+thMffMGvR+jhIRuFQ BFH88d5gvAZ5iOcJAxWa5h9AeRI3uFYR4Gzjkr3T1PLhVMkomq1FgXkA4w+a6bjM/Oj85Y F7rLrJvnvwKKd9laz6H0YUfBkW+Dzj1amSWpVD/Ufd/8RhGUG8XIR09RHIaDAEMzORSF5v Cfym2MU8mFXMrjpNE2w43nn+tkevABrMlgnIlr3yxNHWyP/Dy8Uz+aP/N8n/EfCpy9BMUQ 4aH4DZW/RCwulQuT8038wwCAV92bsQIdnmbGaUQFotK0zZ4toBhAqYE3TsWtTw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1741701888; a=rsa-sha256; cv=none; b=cFrfTbk1PYczzpexTLPRpy1JH+MmqG4nCwYw1B0b+MktAwUZyIoEKE+TUzkF3qusAjoV/r DhRAD5jTxEQ1Bn2hMvBshs85fRptRO35I4UlDx7eeSOroaMXQLWWoCLcqjX1FHZsMmSm1E AP49TpoBa0SdrhOFntZ8i1qZuJQ3PHQT6DCBTwzkSYfuR/dqwEfw1DAE1aPtNoWw4B2Z5D sH0qrYoVCQAXZQK2UXS9xFVpFWdRtRwfB8BcYalxGiqqLaSR4lRxt1A2mOhLnyNNWKey5Z vcdkGTsHLJgpz6upE66YP2yBqUc9UTeOkhkHmdjAOkMLwchv4ASlwvPzpWZF+Q== 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=1741701888; 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=OKoaSfp1bOY3a5xUIhffLMRJ8EaSRTor3Ss2g4wcLw8=; b=pZh9mA1m439OFpgxoaYNc61cbX8ZJ4DqGLv7bu+B1XRYVKfzTshRlzw+iyUW0eVIizcHPu FexLptnYGFskZviiNrVTw2NAIxPoUOV/rKL8eEjrtvvyKIBpD7qsAE4dQVnOYhXGTlt7J6 c3cHuS4vzvUQs6y2DSUvj/NIkG4uFqdf8v22JsV0wu9o6X7H4lZaj47eN8x0RPtd8f3LFa wKtV2cNZrWOwfBg/j61CsG+wNq4DbeJztJ5g6lRrXpmwfZHeu2IuS4dRdzTv5A7gR/34C8 jTtkZmx22tC/YriMGX9EPndu/PspJE+KIf4gLByf1piYNBmFa3wiNYqaG5nqHQ== 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 4ZBwW36X6fzCmL; Tue, 11 Mar 2025 14:04:47 +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 52BE4lb3028938; Tue, 11 Mar 2025 14:04:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52BE4luw028935; Tue, 11 Mar 2025 14:04:47 GMT (envelope-from git) Date: Tue, 11 Mar 2025 14:04:47 GMT Message-Id: <202503111404.52BE4luw028935@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: 9dad0ba28680 - main - libsa: smbios_detect(): Return the entry point address List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: 9dad0ba286807c4aa2886f13705fca2334bb4759 Auto-Submitted: auto-generated The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=9dad0ba286807c4aa2886f13705fca2334bb4759 commit 9dad0ba286807c4aa2886f13705fca2334bb4759 Author: Olivier Certner AuthorDate: 2025-03-05 10:27:50 +0000 Commit: Olivier Certner CommitDate: 2025-03-11 13:54:10 +0000 libsa: smbios_detect(): Return the entry point address In particular, this allows the caller to know whether the detection was successful. Reviewed by: imp, markj MFC after: 2 weeks Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D49290 --- stand/libsa/smbios.c | 6 ++++-- stand/libsa/smbios.h | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/stand/libsa/smbios.c b/stand/libsa/smbios.c index c7d9f1074fad..54cfac58b19e 100644 --- a/stand/libsa/smbios.c +++ b/stand/libsa/smbios.c @@ -635,7 +635,7 @@ smbios_probe(const caddr_t addr) } } -void +caddr_t smbios_detect(const caddr_t addr) { char buf[16]; @@ -644,7 +644,7 @@ smbios_detect(const caddr_t addr) smbios_probe(addr); if (smbios.addr == NULL) - return; + return (NULL); for (dmi = smbios.addr, i = 0; dmi != NULL && dmi < smbios.addr + smbios.length && i < smbios.count; i++) @@ -667,6 +667,8 @@ smbios_detect(const caddr_t addr) sprintf(buf, "%u", smbios.populated_sockets); setenv("smbios.socket.populated", buf, 1); } + + return (smbios.addr); } static int diff --git a/stand/libsa/smbios.h b/stand/libsa/smbios.h index 77dd6bd52a7e..f3fd394ec7fc 100644 --- a/stand/libsa/smbios.h +++ b/stand/libsa/smbios.h @@ -26,7 +26,7 @@ #ifndef _SMBIOS_H_ #define _SMBIOS_H_ -void smbios_detect(const caddr_t); +caddr_t smbios_detect(const caddr_t); int smbios_match(const char *, const char *, const char *); #endif /* _SMBIOS_H_ */