From owner-dev-commits-src-all@freebsd.org Thu Sep 30 04:03:47 2021 Return-Path: Delivered-To: dev-commits-src-all@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 73E826A9D4E; Thu, 30 Sep 2021 04:03:47 +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 4HKfkC2m1cz4TxX; Thu, 30 Sep 2021 04:03:47 +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 3ECAD24DD9; Thu, 30 Sep 2021 04:03:47 +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 18U43l0N053711; Thu, 30 Sep 2021 04:03:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 18U43lQ9053710; Thu, 30 Sep 2021 04:03:47 GMT (envelope-from git) Date: Thu, 30 Sep 2021 04:03:47 GMT Message-Id: <202109300403.18U43lQ9053710@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: 24ccef81405e - main - bluetooth: Remove stray btccc references 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: 24ccef81405eb25efc65f16b6e9a787f3a51151a Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 30 Sep 2021 04:03:47 -0000 The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=24ccef81405eb25efc65f16b6e9a787f3a51151a commit 24ccef81405eb25efc65f16b6e9a787f3a51151a Author: Warner Losh AuthorDate: 2021-09-30 03:58:27 +0000 Commit: Warner Losh CommitDate: 2021-09-30 03:58:27 +0000 bluetooth: Remove stray btccc references The 3com bluetooth PC Card adapter was removed from the tree when PC Card support was removed earlier this year. Remove stray references to it still in the tree. Sponsored by: Netflix --- lib/libbluetooth/hci.c | 1 - libexec/rc/rc.d/bluetooth | 4 ---- 2 files changed, 5 deletions(-) diff --git a/lib/libbluetooth/hci.c b/lib/libbluetooth/hci.c index 3a524cebc3ae..95e96c479157 100644 --- a/lib/libbluetooth/hci.c +++ b/lib/libbluetooth/hci.c @@ -762,7 +762,6 @@ static char * bt_dev2node(char const *devname, char *nodename, int nnlen) { static char const * bt_dev_prefix[] = { - "btccc", /* 3Com Bluetooth PC-CARD */ "h4", /* UART/serial Bluetooth devices */ "ubt", /* Bluetooth USB devices */ NULL /* should be last */ diff --git a/libexec/rc/rc.d/bluetooth b/libexec/rc/rc.d/bluetooth index b89a2c328048..ca83792ab96c 100755 --- a/libexec/rc/rc.d/bluetooth +++ b/libexec/rc/rc.d/bluetooth @@ -296,10 +296,6 @@ bluetooth_stop() # Try to figure out device type by looking at device name case "${dev}" in - # 3Com Bluetooth Adapter 3CRWB60-A - btccc*) - ;; - # USB Bluetooth adapters ubt*) ;;