From nobody Thu Feb 16 16:54:38 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 4PHgz25HkYz3r9qw; Thu, 16 Feb 2023 16:54:38 +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 4PHgz24cqwz45j5; Thu, 16 Feb 2023 16:54:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676566478; 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=TBYwRyVKf8LxNdlRSUPKsVnjBvvysckXWa5HoYhvBvI=; b=SBBYysAe++dT2YC+NJxaAUhyjx2K86cMo6lXiO0P10lJ1Vho3C+TtCHnQAzFQIuypfVAXa iTPdf8kWKJ5sexHXAZ8xmSGU9lVSRtf6+7v0ZviPllufsZaP6NI5h9J6e8fDoF90Zod7aS vAPvdoJg9uBNQeg50p9HSCZHBPoxhcwE8tM1h/kxWkO2jnlbkfPG2jxTCDxbOMEbA3nJvR YgdmIygNJM8Fzw8TQ6mogpxB2bhGnAFgW+8nkrVNECaM1dy7hxMj3V7abngd1wGjYT14tr Z7hR7J/3cfuz/7lHHjvPuCWXAJK+2NZQF1wtfass/15P1fq/ukliaEdJzBD7GQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676566478; 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=TBYwRyVKf8LxNdlRSUPKsVnjBvvysckXWa5HoYhvBvI=; b=v/tvVJSPW95idnKnWbs+plsqHWpz82EFtY1pk0rvgk1fugDw5rM11je7X/vSo7kY0ePY90 FNR9tybxzUsb5FGHRRMzpIocTizWFjxz3pz1CgBDMd8Qhg0fJiicwLXMnjVWy8hLQtNDtC yKnbLRkNBxqV3s2g36+9U8UvrEBNDEGOK5HRWkG4oYTZm2Dsnl8UIPvJ2GQ73WTcN+R9+b PTb1wARABShpgqqxho0j+r98W7n8AOEQt1zs+ZVRYxXs7NRXASHpSRYIhTm6FftOybTQlu +CjcQlXglV9K3vmjDU8tFwvj7ASp5A30B8WcLwjRlL5ZgFoI5alvrBrieQNsfA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1676566478; a=rsa-sha256; cv=none; b=oAn6XkquzQyXtxc8/zWQWhK3sm0mZH5zv6o28LNYJ8YvnYxUCclN0q5p8VCUiDcjc2pvmU DfOiCsxW/rJrqcxzAZN3FSuoSAoJfxcQqC4bfbbLvRvnDudkBrHe0eTfKfHkW3diTviydh fyrr5wT/TIHxnozo3tXLjk5GFXarPFrKLrLeRPwGXE0JpS9e6zA/RAU3kij+jX6hdPG6+2 wgViidONbAcOF028ADl6SUpbPaQ8OKBeuA/4DYmrdYBNnd/TvgC7QJYOF26gEaM0Qjo/16 IfFQlWMsDtgnNVI2WbX7x5x6Q/Vz6qSISAhX+l2k6Ok2LkszrcHyiMLc8QOAUA== 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 4PHgz23Xpnz19yr; Thu, 16 Feb 2023 16:54:38 +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 31GGscb0085492; Thu, 16 Feb 2023 16:54:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31GGscmF085491; Thu, 16 Feb 2023 16:54:38 GMT (envelope-from git) Date: Thu, 16 Feb 2023 16:54:38 GMT Message-Id: <202302161654.31GGscmF085491@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: 356e03eace32 - stable/13 - usb: add new scsi_huawei eject3 & eject4 sequences 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/stable/13 X-Git-Reftype: branch X-Git-Commit: 356e03eace327e3b255834d4a1e6a7278663ce85 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=356e03eace327e3b255834d4a1e6a7278663ce85 commit 356e03eace327e3b255834d4a1e6a7278663ce85 Author: Michael Paepcke AuthorDate: 2023-02-16 16:36:03 +0000 Commit: Warner Losh CommitDate: 2023-02-16 16:36:37 +0000 usb: add new scsi_huawei eject3 & eject4 sequences Add new Huawei eject3 and eject4 command sequences. Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/633 (cherry picked from commit 7d4b2b5834dba66732596d68d7f817d18affb67f) --- sys/dev/usb/usb_msctest.c | 16 ++++++++++++++++ sys/dev/usb/usb_msctest.h | 2 ++ 2 files changed, 18 insertions(+) diff --git a/sys/dev/usb/usb_msctest.c b/sys/dev/usb/usb_msctest.c index 5dcf8d151119..338c17983d92 100644 --- a/sys/dev/usb/usb_msctest.c +++ b/sys/dev/usb/usb_msctest.c @@ -107,6 +107,12 @@ static uint8_t scsi_huawei_eject[] = { 0x11, 0x06, 0x00, 0x00, 0x00, 0x00, static uint8_t scsi_huawei_eject2[] = { 0x11, 0x06, 0x20, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; +static uint8_t scsi_huawei_eject3[] = { 0x11, 0x06, 0x20, 0x00, 0x00, 0x01, + 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00 }; +static uint8_t scsi_huawei_eject4[] = { 0x11, 0x06, 0x30, 0x00, 0x00, 0x00, + 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00 }; static uint8_t scsi_tct_eject[] = { 0x06, 0xf5, 0x04, 0x02, 0x52, 0x70 }; static uint8_t scsi_sync_cache[] = { 0x35, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; @@ -1005,6 +1011,16 @@ usb_msc_eject(struct usb_device *udev, uint8_t iface_index, int method) &scsi_huawei_eject2, sizeof(scsi_huawei_eject2), USB_MS_HZ); break; + case MSC_EJECT_HUAWEI3: + err = bbb_command_start(sc, DIR_IN, 0, NULL, 0, + &scsi_huawei_eject3, sizeof(scsi_huawei_eject3), + USB_MS_HZ); + break; + case MSC_EJECT_HUAWEI4: + err = bbb_command_start(sc, DIR_IN, 0, NULL, 0, + &scsi_huawei_eject4, sizeof(scsi_huawei_eject4), + USB_MS_HZ); + break; case MSC_EJECT_TCT: /* * TCTMobile needs DIR_IN flag. To get it, we diff --git a/sys/dev/usb/usb_msctest.h b/sys/dev/usb/usb_msctest.h index ba4e094bab60..08a7de1b5b9c 100644 --- a/sys/dev/usb/usb_msctest.h +++ b/sys/dev/usb/usb_msctest.h @@ -36,6 +36,8 @@ enum { MSC_EJECT_CMOTECH, MSC_EJECT_HUAWEI, MSC_EJECT_HUAWEI2, + MSC_EJECT_HUAWEI3, + MSC_EJECT_HUAWEI4, MSC_EJECT_TCT, };