From nobody Thu Apr 21 17:30:16 2022 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 2950E19914E3; Thu, 21 Apr 2022 17:30:17 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Kkl1435ZRz4WqD; Thu, 21 Apr 2022 17:30:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650562216; 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=+OpbV1USLNyX8TgJS7Ks7DOTtVh0u+IRf642sxujm6Y=; b=fZK8ht9NAingd1cGuV8wZ0aV5W+U98QBnB49DKAcFAhVsacr4aoVBuOYF9MaoeYLZHQkLz 0ERvNTiFkBQahyvcjsxaTz2xHUGMsseXp74kC+JdgyBQYa8wMLWInlbgCUc3Fa7Cr4xpcM BdTU68mvbJZRb1YWG4PXjcTHcBeNnzkh9ybD93zN1i3l57nZi+YXEAd7R7pCk8SaKcnlfN AEgr0f7Ph2BQcHiVbxYXESLhhpQZHHb9wBZWuJ8dcU+DilpmbAuVLDtPcKTMz00INdK56s nqXDMaDa7I31a2Ic5LdDQSyL5uw7rFOJT8aYyexOZN+HnMzX6LoMkLXgffZb4Q== 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 4763A4ED2; Thu, 21 Apr 2022 17:30:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 23LHUGgl005644; Thu, 21 Apr 2022 17:30:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23LHUGFX005638; Thu, 21 Apr 2022 17:30:16 GMT (envelope-from git) Date: Thu, 21 Apr 2022 17:30:16 GMT Message-Id: <202204211730.23LHUGFX005638@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 6b06f746db1a - main - sc: Use devclass_find to lookup the sc devclass. 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6b06f746db1ad5a6ebb85d68f4418784e53d59e5 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650562216; 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=+OpbV1USLNyX8TgJS7Ks7DOTtVh0u+IRf642sxujm6Y=; b=ZhgNFziw6sqvG1/plarajAQI0OCMQO0eNLWqX9cCukRm5dbmfmIiVk/xscGtFsXK4BYiRh kcJPI5V4w3cBM3UNJqCRa6ewQ9RvcqPe6N3SqOAD98bM7gBBYtqFPnyFR2/w4yM0aI3IYk hrT3gviFjbRJnZevNFMCEcPaXT9elwPbia7tujsl84VYeSvfzQSrK0CiMV0CcuSU5EL9PQ UCdPQG8hIIkyJUyVM7NSLDMxrs6akRKmiNswryNHu14X/IMFEg/omK2KOk13NBe571g55a amW8s1hHILpPIb/FsiEQv8U1ScebZyl10C1emouh4FYCdC2ObeTYCACsoDciEQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1650562216; a=rsa-sha256; cv=none; b=fmbj6Lsz7Y6vZbkCFnS1ykf0+TJpjQBbRSomhD70GBsPtyf6m9enl2Acb9vhwH2i2IeN8+ zZQY1WivX/fWg7hN9+n9oH1UWHKtnBMJQLLKgdhNUYsEfMQItI19aV/+wfAnC532X08JS/ aQy4qXBC+luUTGyyOvh/A2QTC/SSk3BBQv5VRig+my8xFUapNWElWHSYEf/5nsJilATHKy LgiMSRnSbJRfrTSd7g5rlETIZU8ulVhm8ULQZTk3/HqBcqtqj3JNyZ0N7VoW8d0mZvOTDZ v1awQVeDw08tRtStF2X34UOidjvD9gqBDDjHMTccmrjpTA3WffnAi0b/sqmjcQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=6b06f746db1ad5a6ebb85d68f4418784e53d59e5 commit 6b06f746db1ad5a6ebb85d68f4418784e53d59e5 Author: John Baldwin AuthorDate: 2022-04-21 17:29:14 +0000 Commit: John Baldwin CommitDate: 2022-04-21 17:29:14 +0000 sc: Use devclass_find to lookup the sc devclass. Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D35007 --- sys/isa/syscons_isa.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/sys/isa/syscons_isa.c b/sys/isa/syscons_isa.c index d69652abe26a..862b6f31c62c 100644 --- a/sys/isa/syscons_isa.c +++ b/sys/isa/syscons_isa.c @@ -97,7 +97,7 @@ int sc_max_unit(void) { - return (devclass_get_maxunit(sc_devclass)); + return (devclass_get_maxunit(devclass_find("sc"))); } sc_softc_t @@ -111,7 +111,8 @@ sc_softc_t /* FIXME: clear if it is wired to another unit! */ sc = &main_softc; } else { - sc = device_get_softc(devclass_get_device(sc_devclass, unit)); + sc = device_get_softc(devclass_get_device(devclass_find("sc"), + unit)); if (sc == NULL) return (NULL); } @@ -127,6 +128,7 @@ sc_softc_t sc_softc_t *sc_find_softc(struct video_adapter *adp, struct keyboard *kbd) { + devclass_t dc; sc_softc_t *sc; int i; int units; @@ -135,9 +137,10 @@ sc_softc_t if ((adp == NULL || adp == sc->adp) && (kbd == NULL || kbd == sc->kbd)) return (sc); - units = devclass_get_maxunit(sc_devclass); + dc = devclass_find("sc"); + units = devclass_get_maxunit(dc); for (i = 0; i < units; ++i) { - sc = device_get_softc(devclass_get_device(sc_devclass, i)); + sc = device_get_softc(devclass_get_device(dc, i)); if (sc == NULL) continue; if ((adp == NULL || adp == sc->adp) &&