From nobody Sun Feb 19 03:16:29 2023 X-Original-To: dev-commits-src-branches@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 4PK9gf0x3gz3sLKy; Sun, 19 Feb 2023 03:16:30 +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 4PK9gd6zndz4KCZ; Sun, 19 Feb 2023 03:16:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676776590; 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=gDkK7GP2b23YbAFzuhK8nE9s0csZhawgj/nnbVfsiyo=; b=U8+0A1Y6ssPHyr4Tz0ctx8GwyqjUqpa8zMnsKNeXOwERCyuzEb+EsPYodkYt5QEPYC0d5o Ygy5YqPZ7nUo8vQ2XkS36AEFMKMfk0yehK8Qb7fakgqaXw3NoBL8hJhNjsFytvDLZE9pK7 hL333K7dSgObpiGfq7iBOK/14tl3UuCcsxbMhgDtNW0DUje2e3fWuzbGodQdXt3NvudyF+ aueeqjPX5wT2Ea1POEJuzQipeLT/+/f8Ouu5swgKLC32HQ2e8qaxE8ZBI6HMcC6jxPFLXr gS5ZDxdfc3I7sB/Y7qEZJgaAGuxRouiGxXeSQfxZ7IY9qqiW6txRWpWSzFw2uA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676776590; 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=gDkK7GP2b23YbAFzuhK8nE9s0csZhawgj/nnbVfsiyo=; b=BaqAT8BVjngVQ7q9Ave+MlEGk1wIgGzQO91LwSr7KE6LEk/GGWio8C0aUXm7BYDljUkssR kQdsc2/BP9QeoAy2niSf2HtnE27qNCpOgmPqLTISuVnf8HkWewPLaYsnjjoNtvLHuUAUXH fq4Fvj5EyYD0T3bLjzlvzdkenZa+0IgzxeR5/ykSlW21qF6LxKX5urabV6DmMnlGZGovpL pw/6ULi5xqU10WQp3Hoz+oCcqfEGM2Ikvi5dzAG4JO47ZAcA3dIfeHkx3+dR3WBGp1qIAi lVLw4kCZQvv0kB0aTDp52eWsl3aATYwNsEZt4jYeELtNGzIHbxfvAfj2nzTkfg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1676776590; a=rsa-sha256; cv=none; b=p3EQv4O4HcJv4QTKLo6DeCb321r/N4bZ/cNSQJ8MFp4J/+9UO3ahTpK0CFhurJ/AqF7LpY Q7kHCOXaZHvK+RuDeoCrn3rOVEOTeMysE2jobGbndavFgK2cg2KfD6PADPziPsh2F0Erkr z57modOu8OfGWNqs7/D4jaiW9PpVni02WsAi2i0xmo7Scs05MLput5Vd3y1qXgxEyzqc6h XSvPu0dr4VdVAJ5rIJ9ofzbqdwTQQ9AmNeLV8OVrsmxPeCs+b9gRmnisuJcCULMB2c6fm8 u2A+VoDY0SqcGWUcmkGmFod1MjCUBM+GU1FZeLENZXAYQA9pzXCGaf3Ew2QOwA== 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 4PK9gd4tPmzmjt; Sun, 19 Feb 2023 03:16:29 +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 31J3GTX9083805; Sun, 19 Feb 2023 03:16:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31J3GTpS083804; Sun, 19 Feb 2023 03:16:29 GMT (envelope-from git) Date: Sun, 19 Feb 2023 03:16:29 GMT Message-Id: <202302190316.31J3GTpS083804@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: fb22c140cc11 - releng/13.2 - usb: add new scsi_huawei eject3 & eject4 quirks List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/releng/13.2 X-Git-Reftype: branch X-Git-Commit: fb22c140cc11bec1e19f4825b54d1e8c8004fdf6 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch releng/13.2 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=fb22c140cc11bec1e19f4825b54d1e8c8004fdf6 commit fb22c140cc11bec1e19f4825b54d1e8c8004fdf6 Author: Michael Paepcke AuthorDate: 2023-02-16 16:58:30 +0000 Commit: Warner Losh CommitDate: 2023-02-19 03:12:45 +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 Approved by: re (cperciva) (cherry picked from commit 64fd867f8cdbad24d7af678ee17bd3893832b905) (cherry picked from commit 1d31c745cfe60d7a81fd91efdcfecd0405888af2) --- 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 */