From nobody Thu Feb 16 16:54:37 2023 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 4PHgz14Yxmz3r9nQ; Thu, 16 Feb 2023 16:54:37 +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 4PHgz13ZJJz45qJ; Thu, 16 Feb 2023 16:54:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676566477; 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=Tam1Sdr2VMSIeSyHmuTrQBV4CwBFAYmr/vOdMZiHCJA=; b=UMyDg/fKAS0aHHXuq6fUUx76oKmY+sEJBufdPabU0e2GCewLMzXLIkyPHZjXnm0d50lp0P 9xtIKPfztUflaHlv6pqqIhpgpELDxX5S9xmF2w8YsDyYFj3pjntqCjSHQMhhjJ7wONlDND RUCxUfjecxSGCCD7z9/buUXKpK25HlX+6jKVDo5OIoE+b/4MsBq/vmiMGAApxfbZzpf2xf nCkg1aRlY3foCJHQNKc6k1/vrgSDdO7YWyMddUzQyvHczpmBgpzKQOjJ9YjSJhGpod4/i7 FrQa6QTqmySNBc0WHgS933h2cppH9bwNF5Swmcd/TBjaxkDNugXLbUoVCqlgpQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676566477; 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=Tam1Sdr2VMSIeSyHmuTrQBV4CwBFAYmr/vOdMZiHCJA=; b=mAHp4cGVU570KPOzYfPolCyn3YgvDITWCtdWdpScQRHG/CsuV0shAEbgCjSVMdOhS4F+vl 1K2F5zA3u1K0ikn/RQvtydv4wuqD3TCkWYydFw68Nip/dkpGQit2V5P5ARcwXG6l5CiwB8 wFNzpk2lsR9DMnyeGu/TQFwFaqi0vi7rhZONEcuPBprfIQDgsaA8qeOFlkSSqrVNVIRUHR EuFunESqCp5RwwleCZWxzCXaVEy0pywPFyO9LgVRgIvTVW1llB9HENznwVM0E+HOd2DpK4 Qnz70TkY+NsHDEh70UolTdkMtZt3nEVTTVCJsq+P32xhCrf57Xwn9kQfJljR1A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1676566477; a=rsa-sha256; cv=none; b=JA/nrnC0+4MxfVtaQLV21iol7IHidh/ZpnycWfJswxDLFxy/edFo32NY7VE0Ri169rkea/ soFPhpXz2Ot0qYHctk/wKDKN8Gkaf7fb29lpJ57hpUsyb2mw3E002xEZis6ZEb9M5M8S1L tW7CitGWTywBcfFXgyaX/uf6ja/3Gfx+hg1kM4jGxWMacfvVlVw5gqVRpyDCF9vqRTdb8L xvxHqsLjGIySe9/6vWI3xQGNKDw9SJ9skDEnOJvwvexHF29xiMAbZA+XuHLyb6F+WQUQmO 58rVl2RfgkCCIq4PqYwVBPMOH/QSmYab2QiiW4XYjFvTlw/LBqN/DxUu/EfzsQ== 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 4PHgz12gbyz19yq; Thu, 16 Feb 2023 16:54:37 +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 31GGsbJA085468; Thu, 16 Feb 2023 16:54:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31GGsbSc085467; Thu, 16 Feb 2023 16:54:37 GMT (envelope-from git) Date: Thu, 16 Feb 2023 16:54:37 GMT Message-Id: <202302161654.31GGsbSc085467@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: 1d31c745cfe6 - stable/13 - usb: add new scsi_huawei eject3 & eject4 quirks 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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/stable/13 X-Git-Reftype: branch X-Git-Commit: 1d31c745cfe60d7a81fd91efdcfecd0405888af2 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=1d31c745cfe60d7a81fd91efdcfecd0405888af2 commit 1d31c745cfe60d7a81fd91efdcfecd0405888af2 Author: Michael Paepcke AuthorDate: 2023-02-16 16:36:03 +0000 Commit: Warner Losh CommitDate: 2023-02-16 16:36:34 +0000 usb: add new scsi_huawei eject3 & eject4 quirks Add new scsi_huawei eject3 & eject4 mode driver to usb quirks Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/633 (cherry picked from commit 64fd867f8cdbad24d7af678ee17bd3893832b905) --- sys/dev/usb/quirk/usb_quirk.c | 2 ++ sys/dev/usb/quirk/usb_quirk.h | 2 ++ 2 files changed, 4 insertions(+) diff --git a/sys/dev/usb/quirk/usb_quirk.c b/sys/dev/usb/quirk/usb_quirk.c index 3dd2aa735fb3..bb02b90ba4bd 100644 --- a/sys/dev/usb/quirk/usb_quirk.c +++ b/sys/dev/usb/quirk/usb_quirk.c @@ -696,6 +696,8 @@ static const char *usb_quirk_str[USB_QUIRK_MAX] = { [UQ_MSC_EJECT_SAEL_M460] = "UQ_MSC_EJECT_SAEL_M460", [UQ_MSC_EJECT_HUAWEISCSI] = "UQ_MSC_EJECT_HUAWEISCSI", [UQ_MSC_EJECT_HUAWEISCSI2] = "UQ_MSC_EJECT_HUAWEISCSI2", + [UQ_MSC_EJECT_HUAWEISCSI3] = "UQ_MSC_EJECT_HUAWEISCSI3", + [UQ_MSC_EJECT_HUAWEISCSI4] = "UQ_MSC_EJECT_HUAWEISCSI4", [UQ_MSC_EJECT_TCT] = "UQ_MSC_EJECT_TCT", [UQ_BAD_MIDI] = "UQ_BAD_MIDI", [UQ_AU_VENDOR_CLASS] = "UQ_AU_VENDOR_CLASS", diff --git a/sys/dev/usb/quirk/usb_quirk.h b/sys/dev/usb/quirk/usb_quirk.h index 755465576684..399c8d3f65b4 100644 --- a/sys/dev/usb/quirk/usb_quirk.h +++ b/sys/dev/usb/quirk/usb_quirk.h @@ -108,6 +108,8 @@ enum { UQ_MSC_EJECT_SAEL_M460, /* ejects after Sael USB commands */ UQ_MSC_EJECT_HUAWEISCSI, /* ejects after Huawei SCSI command */ UQ_MSC_EJECT_HUAWEISCSI2, /* ejects after Huawei SCSI 2 command */ + UQ_MSC_EJECT_HUAWEISCSI3, /* ejects after Huawei SCSI 3 command */ + UQ_MSC_EJECT_HUAWEISCSI4, /* ejects after Huawei SCSI 4 command */ UQ_MSC_EJECT_TCT, /* ejects after TCT SCSI command */ UQ_BAD_MIDI, /* device claims MIDI class, but isn't */