From nobody Tue May 6 22:02:17 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 4ZsXSB6f1kz5vWcx; Tue, 06 May 2025 22:02:18 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZsXS95TZTz3NZh; Tue, 06 May 2025 22:02:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746568937; 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=9gE/hE9BsyNWi4tDBx8VmKF719zAP0eyAHSZonEnDDE=; b=rIqzm/y9srgQMb27EAd/TVcfiVexnjyaPfwjqU8koy/tP4WZGiJ1WZATH04AC5PzTRjrge lHDI2vADgdaxj6Jk+c+1BRdCu4RuBf44a03ATmJe2mgC5x0jZmCyVs4smZcHSP5QuWHsNQ 6FxOOsyJ5mn79ew+PlbTIMiisbN9W9ofoaYrtGHXrUM/qnbyrV/Aifh19Ih3/RXkk2cnwG gxxoQiOmd76uXJlgOTL0BkTUk0i1iGwcELXX1YNVXWG1we3vGikZxir9JkoJxZb2IzsqyJ U+6/0h0IdmaSdWToVvTxwn3s1FvivAK8uaex6XSCBkyRvRJl9l2lGVZLf3ykgQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746568937; 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=9gE/hE9BsyNWi4tDBx8VmKF719zAP0eyAHSZonEnDDE=; b=iEIffZ1JP10xm6+z6pqYgVUw4M+eCi0L7ClhCaynsxPasCwm+Z4VihLLCmOMUR5ph/7og5 AlxxFmvtcO/qxNp/xfCLZylqtEuMesPyvDd5p6dYKJfwh3rdlEy137lIFtUd9MIk8Kfymj kO8Vr+Xms84VYnHIEmp0HGEP3Si1u7JbiS5cXnwT7neTN4uVdOYlgYrbUFotuMdY3s9tqF cwewGovPGpJKoeKVeRP6nz7qtKI3nSCJo88E9A3m3Hyia6aETnITP4fUrgTtM3DWrhK9cp tmZSeeC4JJwBkHyILzPT9RC7scu7w0JazMqHwXZRvwfVOVjZXZUkz7u5v6UkYA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1746568937; a=rsa-sha256; cv=none; b=CWSDSIoXBbNPJP/S6LMjD6KchT5teKWvkdhv4rQ1TO7FRmjzl5pwfJlEOr291D+XIlEKJx lZbNcP9gu2RR8+GoTws8EgI80JWS5wuitJKWMfaZLibBF/NL68vVMaIkxwavSqkNT6NL3S VLvZCMfea2GCL7OhtCjr1qt896M/TAJ33b2EoIA2opP52N7XU4uQrYv6GGsUpEJgZVJ1+0 0pKu2hYtjYLw8ImzyfcxeI6gKKwAw2b8bC+8c7GZ+/Ri1ZjK8vFtoqZlR16lKrVfmZr4uk iOCZSJTAc9hHr0iC/4KqRJn0OGOfUIpOE1tXGEqxZARBqO9u8km5gzx+HndaNw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4ZsXS94SDWz1GMF; Tue, 06 May 2025 22:02:17 +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 546M2HUt042342; Tue, 6 May 2025 22:02:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 546M2Hu9042339; Tue, 6 May 2025 22:02:17 GMT (envelope-from git) Date: Tue, 6 May 2025 22:02:17 GMT Message-Id: <202505062202.546M2Hu9042339@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 9166666cc262 - main - devinfo: Restructure function in prep for libxo 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: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9166666cc26218b4e82f5b390705e1f5f09b1af5 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=9166666cc26218b4e82f5b390705e1f5f09b1af5 commit 9166666cc26218b4e82f5b390705e1f5f09b1af5 Author: ktullavik AuthorDate: 2024-10-17 18:32:46 +0000 Commit: Warner Losh CommitDate: 2025-05-06 22:01:46 +0000 devinfo: Restructure function in prep for libxo No functional change intended. Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/1480 --- usr.sbin/devinfo/devinfo.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/usr.sbin/devinfo/devinfo.c b/usr.sbin/devinfo/devinfo.c index 7fbb34277d47..686f4a09f73c 100644 --- a/usr.sbin/devinfo/devinfo.c +++ b/usr.sbin/devinfo/devinfo.c @@ -213,7 +213,8 @@ print_rman_resource(struct devinfo_res *res, void *arg __unused) struct devinfo_rman *rman; rman_res_t end; bool hexmode; - + + dev = devinfo_handle_to_device(res->dr_device); rman = devinfo_handle_to_rman(res->dr_rman); hexmode = (rman->dm_size > 1000) || (rman->dm_size == 0); end = res->dr_start + res->dr_size - 1; @@ -221,13 +222,15 @@ print_rman_resource(struct devinfo_res *res, void *arg __unused) printf(" "); if (hexmode) { - printf("0x%jx", res->dr_start); if (res->dr_size > 1) - printf("-0x%jx", end); + printf("0x%jx-0x%jx", res->dr_start, end); + else + printf("0x%jx", res->dr_start); } else { - printf("%ju", res->dr_start); if (res->dr_size > 1) - printf("-%ju", end); + printf("%ju-%ju", res->dr_start, end); + else + printf("%ju", res->dr_start); } dev = devinfo_handle_to_device(res->dr_device);