From nobody Fri Oct 17 16:46:44 2025 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 4cp9hN2yQmz6CKG7; Fri, 17 Oct 2025 16:46:44 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cp9hN270Zz3L5P; Fri, 17 Oct 2025 16:46:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760719604; 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=DMJYZQvEm1GdcVltl07G6nDyoI1axAUmFIyutDFg19k=; b=pFYylM1ANXdZa9Q+62txay6zml89MRvjYfs+eB93Y2K2Hthw0hb0cXNkWYwVLc1tWJTdUv 53Q0Y8A2Ihzv8limKRSOQXVAQ0FOqVWZw60guWc/m4mbsf5ciGdfbmLPMn2JJJBSGExrmZ 3BEIPKlI02gmSLeeZQ1iVLlvzPT5IDJmPvqL0kj/LHY/DZPZJO0RtCOidN5dyfotL9/z7N tlWf+OLr0mn4Th0PE93rL2iB1+St/8igu9fRfslVdnj4eAE6vOsrwMVZEpAnZEPlV4bFVR hTkd8ZU5yrO6WLXMqdzMvT02HqRltmj6yQ8z5Pa+xz+aHnH28/UaKJbmjqGarg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760719604; 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=DMJYZQvEm1GdcVltl07G6nDyoI1axAUmFIyutDFg19k=; b=jVX4SfJYXkxwoFKyY45IZUkLjFFwoeSHADaNUOg4Rrq/9JY1Nf2RrwDTUqlMm/6DZ/tqNw AgTzrcj/bzfZzxCiGl5h/i8nn1HM4Or44XR1OMbJmnlm/2EjVxvYqytSOilh+rOVdZHANs 643tWGnV7AITRbvO/FnlDgafjjgzF7pufEFEYah/CCAKgzMKIiL7FD3h1IvK34cXs2VHgM hT4KMasIDpCVBFblMHH9IAAXQbhiaC1f3Se4xuS/y8h5Z5EemgXlx/Gdqh1HubnIcaiQRa LsQ0ugbVn6p8KtMcaNGGGu9QBgknYi0X0KJgt9WTKYGp1wQvNVJUVKxC6+rVCQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1760719604; a=rsa-sha256; cv=none; b=KRISq2kyOY4l+EYdh3CSSqhqMjqam4+6/jQAwzo9npNFWTD7NGYVE4wohqEo/lp/pe63A9 uB7KdvLSVtsf5j2aqOOOklquP9ITrTH+GqTVf+m6kmH5a8jdrvdlDcFdsIXXofv+J3iFQg a3UOmv2F+2jvhlZSiNVyp94GFixqlF977qycVcqvzIxxCsSRP6AwWNO7bnrZTODvC/+cQk COh/8Ulm7EodrE2XiYC5r22V7ksWtgR7cFm6hJKppVq2yY9UKht69u5thqp0C54SAk5CK0 Hndy9nl9kIbqd0NsSo4KEAzYN9OrdxqSQBQChS6I6raU3IJmKVSNgVZ9BxYCVA== 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 4cp9hN1H5hz12Sl; Fri, 17 Oct 2025 16:46:44 +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 59HGkiLg052837; Fri, 17 Oct 2025 16:46:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59HGki79052834; Fri, 17 Oct 2025 16:46:44 GMT (envelope-from git) Date: Fri, 17 Oct 2025 16:46:44 GMT Message-Id: <202510171646.59HGki79052834@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 0ee6e36ea9b2 - main - bluetooth: ng_ubt_rtl/rtlbtfw: remove duplicate entry in device table 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0ee6e36ea9b2dd959b0fb9f04ab98a01f93729fc Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=0ee6e36ea9b2dd959b0fb9f04ab98a01f93729fc commit 0ee6e36ea9b2dd959b0fb9f04ab98a01f93729fc Author: Bjoern A. Zeeb AuthorDate: 2025-09-01 18:27:02 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-10-17 16:45:58 +0000 bluetooth: ng_ubt_rtl/rtlbtfw: remove duplicate entry in device table Remove the single 8822CU entry in all three places. It seems the only entry referencing a USB device. The same device is listed with the 8822CE devices. MFC after: 3 days Reviewed by: wulf Differential Revision: https://reviews.freebsd.org/D52324 --- sys/netgraph/bluetooth/drivers/ubt/ng_ubt_rtl.c | 3 --- usr.sbin/bluetooth/rtlbtfw/main.c | 3 --- usr.sbin/bluetooth/rtlbtfw/rtlbtfw.conf | 10 ---------- 3 files changed, 16 deletions(-) diff --git a/sys/netgraph/bluetooth/drivers/ubt/ng_ubt_rtl.c b/sys/netgraph/bluetooth/drivers/ubt/ng_ubt_rtl.c index 0181a67ac604..f35712cc8f69 100644 --- a/sys/netgraph/bluetooth/drivers/ubt/ng_ubt_rtl.c +++ b/sys/netgraph/bluetooth/drivers/ubt/ng_ubt_rtl.c @@ -81,9 +81,6 @@ const STRUCT_USB_HOST_ID ubt_rtl_devs[] = { USB_VPI(0x0bda, 0xb00c, 0) }, { USB_VPI(0x0bda, 0xc822, 0) }, - /* Realtek 8822CU Bluetooth devices */ - { USB_VPI(0x13d3, 0x3549, 0) }, - /* Realtek 8851BE Bluetooth devices */ { USB_VPI(0x13d3, 0x3600, 0) }, diff --git a/usr.sbin/bluetooth/rtlbtfw/main.c b/usr.sbin/bluetooth/rtlbtfw/main.c index e87a98036265..280045a6aa25 100644 --- a/usr.sbin/bluetooth/rtlbtfw/main.c +++ b/usr.sbin/bluetooth/rtlbtfw/main.c @@ -64,9 +64,6 @@ static struct rtlbt_devid rtlbt_list[] = { { .vendor_id = 0x0bda, .product_id = 0xb00c }, { .vendor_id = 0x0bda, .product_id = 0xc822 }, - /* Realtek 8822CU Bluetooth devices */ - { .vendor_id = 0x13d3, .product_id = 0x3549 }, - /* Realtek 8851BE Bluetooth devices */ { .vendor_id = 0x13d3, .product_id = 0x3600 }, diff --git a/usr.sbin/bluetooth/rtlbtfw/rtlbtfw.conf b/usr.sbin/bluetooth/rtlbtfw/rtlbtfw.conf index 61ae53db8f39..2ef56d2af93a 100644 --- a/usr.sbin/bluetooth/rtlbtfw/rtlbtfw.conf +++ b/usr.sbin/bluetooth/rtlbtfw/rtlbtfw.conf @@ -36,16 +36,6 @@ notify 100 { action "/usr/sbin/rtlbtfw -d $cdev -f /usr/local/share/rtlbt-firmware"; }; -# Realtek 8822CU Bluetooth devices -notify 100 { - match "system" "USB"; - match "subsystem" "DEVICE"; - match "type" "ATTACH"; - match "vendor" "0x13d3"; - match "product" "0x3549"; - action "/usr/sbin/rtlbtfw -d $cdev -f /usr/local/share/rtlbt-firmware"; -}; - # Realtek 8851BE Bluetooth devices notify 100 { match "system" "USB";