From owner-dev-commits-src-branches@freebsd.org Wed Jul 21 16:14:16 2021 Return-Path: Delivered-To: dev-commits-src-branches@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 051FC666808; Wed, 21 Jul 2021 16:14:16 +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 4GVLHq1FlDz3LxD; Wed, 21 Jul 2021 16:14:14 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 9744F21235; Wed, 21 Jul 2021 16:14:14 +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 16LGEE4O080612; Wed, 21 Jul 2021 16:14:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 16LGEEan080611; Wed, 21 Jul 2021 16:14:14 GMT (envelope-from git) Date: Wed, 21 Jul 2021 16:14:14 GMT Message-Id: <202107211614.16LGEEan080611@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: 5b194853b9a2 - stable/13 - devd: remove pccard entries 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/stable/13 X-Git-Reftype: branch X-Git-Commit: 5b194853b9a292dea0d3939bad8c7de777185909 Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-branches@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the stable branches of the FreeBSD src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 21 Jul 2021 16:14:16 -0000 The branch stable/13 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=5b194853b9a292dea0d3939bad8c7de777185909 commit 5b194853b9a292dea0d3939bad8c7de777185909 Author: Warner Losh AuthorDate: 2021-07-15 22:17:33 +0000 Commit: Warner Losh CommitDate: 2021-07-21 16:13:12 +0000 devd: remove pccard entries The pccard entries are now obsolete, remove them. Sponsored by: Netflix Differential Revision: https://reviews.freebsd.org/D31184 (cherry picked from commit a53541355645080cb6d94466f5363db0941da4fa) --- sbin/devd/devd.conf | 37 +------------------------------------ 1 file changed, 1 insertion(+), 36 deletions(-) diff --git a/sbin/devd/devd.conf b/sbin/devd/devd.conf index 9d23b77fe96a..d88f1fde743c 100644 --- a/sbin/devd/devd.conf +++ b/sbin/devd/devd.conf @@ -179,23 +179,8 @@ nomatch 10 { bus $bus"; }; -# Some PC-CARDs don't offer numerical manufacturer/product IDs, just +# Some Cardbus cards don't offer numerical manufacturer/product IDs, just # show the CIS info there. -nomatch 20 { - match "bus" "pccard[0-9]+"; - match "manufacturer" "0xffffffff"; - match "product" "0xffffffff"; - action "logger Unknown PCCARD device: CISproduct $cisproduct \ - CIS-vendor $cisvendor bus $bus"; -}; - -nomatch 10 { - match "bus" "pccard[0-9]+"; - action "logger Unknown PCCARD device: manufacturer $manufacturer \ - product $product CISproduct $cisproduct CIS-vendor \ - $cisvendor bus $bus"; -}; - nomatch 10 { match "bus" "cardbus[0-9]+"; action "logger Unknown Cardbus device: device $device class $class \ @@ -234,26 +219,6 @@ notify 10 { /* EXAMPLES TO END OF FILE -# An example of something that a vendor might install if you were to -# add their device. This might reside in /usr/local/etc/devd/deqna.conf. -# A deqna is, in this hypothetical example, a pccard ethernet-like device. -# Students of history may know other devices by this name, and will get -# the in-jokes in this entry. -nomatch 10 { - match "bus" "pccard[0-9]+"; - match "manufacturer" "0x1234"; - match "product" "0x2323"; - action "kldload -n if_deqna"; -}; -attach 10 { - device-name "deqna[0-9]+"; - action "/etc/pccard_ether $device-name start"; -}; -detach 10 { - device-name "deqna[0-9]+"; - action "/etc/pccard_ether $device-name stop"; -}; - # Examples of notify hooks. A notify is a generic way for a kernel # subsystem to send event notification to userland.