From nobody Tue May 6 22:02:16 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 4ZsXSB46J2z5vWH7; 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 4ZsXS84ZClz3NLL; Tue, 06 May 2025 22:02:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746568936; 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=8nC9SykB4VYUFazsY8O0agkD8biflhCg6NFU6bHA06A=; b=tZE/pTz9cWFVIIQnR6RSWy1Wu4ycA9q8k4Ci/h6/3tdUH+EeNJ03fr3uo3UQ0vJ6sxNsbk h5Gyh9o/VJlE0AA5/n7wsIiheOuJARnadiVZZDSWQoURsxqDKMlUW0lkCanp1tVFEhq2yf CN4YfXzaxY5t5M6N7501LAw9aK0fZqAhgt8a8gLeuA5Rq2LqPLNIRHGLKa30NUiLTCG6wj HmTDOWgQiTYDnGhKrA2mfIGImku3G9+b1TIP227rqOcu7JmS1vRQa9HhgLvTohU/NfQqeD O9ao4gbWisHnnCqlW0h8pG94vcmwzuFo/LdGka4ExDnVtVN7kc9Veziteh0t8Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746568936; 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=8nC9SykB4VYUFazsY8O0agkD8biflhCg6NFU6bHA06A=; b=HyNlXpl0hvBPon8tgm8bM8CAo10XnEF+LLektiUjMGXUJS1WrzKxji+TnGcK3qJPkyrAPh zLdkwRHaK/r+Da0I5MHu2ayD8K2fKjUZtR12pEWUxomp4T6tRzNA0TviEg147p0aQnFOq9 SkmNo49XihbWVZxzfMmhCtRgOYQ3KaUMWbvwq9MwvB9A+lZXmiV6/QbFSxL2GAQtlQ02Xu i5BEjI29BRw7jvIhgfYaIdRNqE9egvqJd2FrbUbOHhG/SQrmwY3Rm4JcvWknkELxWVOsrk goWU2Rsp6L1OJmhRSit+Nn60y1uLi1AS3iPJX4UwTWVCfGEI2p9SyBfgJexa5w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1746568936; a=rsa-sha256; cv=none; b=s3IIaUsyZjEN56XnGM4MYNpr9oHpwSy1KFFSh08gjhAQjjXGU/15bqS9ncbvaSoKgtHr0A ewZgsl64S7YeywadkBFlURmGoWeQ9FtpJfKZ04PktuUniRZ570V7g5T+ifSc5WWyrorlCY vxGyUYdQeVoQxrJkQKDTrqZFOaBV50wbtn0owpIjsdmehp3poOWO4KGaCCWLE2OfNAPbF+ eyIevcCuTNkTwlyGpqDFhvbqrdGuMrjB7R2OPlC1gHBKUhfGTmGqt36Zpyoy7j0eME8ZIS BJHMo5OllOResvFieoFr1GxFr6Ug4PL0bRC0PB3Srp8Y6N+90DgeOdkTSwcF9A== 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 4ZsXS83jLvz1GwW; Tue, 06 May 2025 22:02:16 +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 546M2Gtq042308; Tue, 6 May 2025 22:02:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 546M2Gea042305; Tue, 6 May 2025 22:02:16 GMT (envelope-from git) Date: Tue, 6 May 2025 22:02:16 GMT Message-Id: <202505062202.546M2Gea042305@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: 50d1d4d4bfb0 - main - devinfo: Inline the code from print_resource() 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: 50d1d4d4bfb0292fb9b23ed84cdd333649a69880 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=50d1d4d4bfb0292fb9b23ed84cdd333649a69880 commit 50d1d4d4bfb0292fb9b23ed84cdd333649a69880 Author: ktullavik AuthorDate: 2024-10-17 18:17:40 +0000 Commit: Warner Losh CommitDate: 2025-05-06 22:01:46 +0000 devinfo: Inline the code from print_resource() The code will diverge when libxo is added. Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/1480 --- usr.sbin/devinfo/devinfo.c | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/usr.sbin/devinfo/devinfo.c b/usr.sbin/devinfo/devinfo.c index a4fa6892981f..7fbb34277d47 100644 --- a/usr.sbin/devinfo/devinfo.c +++ b/usr.sbin/devinfo/devinfo.c @@ -210,9 +210,26 @@ int print_rman_resource(struct devinfo_res *res, void *arg __unused) { struct devinfo_dev *dev; + struct devinfo_rman *rman; + rman_res_t end; + bool hexmode; + 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; + printf(" "); - print_resource(res); + + if (hexmode) { + printf("0x%jx", res->dr_start); + if (res->dr_size > 1) + printf("-0x%jx", end); + } else { + printf("%ju", res->dr_start); + if (res->dr_size > 1) + printf("-%ju", end); + } + dev = devinfo_handle_to_device(res->dr_device); if (dev != NULL) { if (dev->dd_name[0] != 0) {