From nobody Sun Feb 19 03:16:30 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 4PK9gg1nmlz3sb4C; Sun, 19 Feb 2023 03:16:31 +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 4PK9gf725qz4K9t; Sun, 19 Feb 2023 03:16:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676776591; 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=HQynv5GrDUryHgI2q9i8krZ1ISsL2a2V/T1eEPJrJA8=; b=hpBmSeyWZWNSWdtFMkdKNim7WZg0CLtFlJ9zdY8fjyVTWOflfbvb1hAQhLZrFG0whRijhI TK7r9uqc7pxNyJr8XtD3QvuY0OvHOdYzBbXvTOnC+eXz6+g+Vh/VakfFl3TzY6zlz16dzw MQXLdPLCQuJeF4SKcedqTLsLVz9k/8eMfXVJ331eZuQcuOHzcdAyp78WSkfDan4SBhNYWU 9z1LeDFUARfIWWxRS7QDLxmpBHCRSLqZjmqJcsCwdTibPT2FHmfybMxW/jps6opStN3SPv jSvFmib+hd6ucaDSPllGMQozC+QrMCmzThg1bQW66iIZKFEF4y4Yq9gWswFPPQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676776591; 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=HQynv5GrDUryHgI2q9i8krZ1ISsL2a2V/T1eEPJrJA8=; b=wGHBkh4nOp9glIOf+1XmmFC2+Yh5zlF21PFIJk16RLEDVFum8djDmCieb1FL427Q8DGvRw EIxykU6hcjCLiHA4lMQrlTyffCxYVq9rhpspQ+DpBchEWavGCIzqt0Epf8/bqgN3yzqKX0 mS18u02NNHhL7b8dnXymkC2OCgto+54A00M2voFJxQ0iOdHSQ4jePbpcwXJx3C543CgIb9 6CCaxFBotzwNapyPaqNwVfEwDseDykOPu4Ghfogxw1lZUVPnvdmLCb0tugwY8rMz+8qs6q hudgHAI67acwadxfPN0rEVJkKS+GC2m/iDJm1LGQgchROADMBN9pa/BsNT+Bjg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1676776591; a=rsa-sha256; cv=none; b=cS2dujbglbScn9f9UU41R/icxmMQctzFhc7W4QCMXM/Ah2eHrRnAwij1quzqOPxf8QyXLR Qx3z4wnNXY+7I9HqdDMllxXvXcTl5n2A4wBoQi7hQnDHBaaPGeELDHw39dXEttlJm2wZ/U 07eKXMP/R8gC5gmc3f8J551XmIB9/V7GFtcO2Ptiufzpi4jaCKbKEamRp4fx8n0Mer0e9h mo1ECKfihcBPbqR7WuFKXE2/u6LpIi6lEROQN2qENoSKNyr1+cZ0g6fuI08kVKgbzxjv/t 2dnT2FrOkFBkZzNSLjuHnM2oF51KyCXXHtHQnKXezleTriKXx+9jM7QqjzoTBQ== 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 4PK9gf5q1kzmTR; Sun, 19 Feb 2023 03:16:30 +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 31J3GUgX083829; Sun, 19 Feb 2023 03:16:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31J3GUpT083828; Sun, 19 Feb 2023 03:16:30 GMT (envelope-from git) Date: Sun, 19 Feb 2023 03:16:30 GMT Message-Id: <202302190316.31J3GUpT083828@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: dbfdc2fdb092 - releng/13.2 - usb: add new scsi_huawei eject3 & eject4 sequences 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/releng/13.2 X-Git-Reftype: branch X-Git-Commit: dbfdc2fdb0924ae6810153a7fb030b2582a31a12 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=dbfdc2fdb0924ae6810153a7fb030b2582a31a12 commit dbfdc2fdb0924ae6810153a7fb030b2582a31a12 Author: Michael Paepcke AuthorDate: 2023-02-16 16:58:30 +0000 Commit: Warner Losh CommitDate: 2023-02-19 03:12:56 +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 Approved by: re (cperciva) (cherry picked from commit 7d4b2b5834dba66732596d68d7f817d18affb67f) (cherry picked from commit 356e03eace327e3b255834d4a1e6a7278663ce85) --- 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, };