From nobody Sat Feb 4 21:29:47 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 4P8Qf36Mb9z3nsLK; Sat, 4 Feb 2023 21:29:47 +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 4P8Qf35rVkz3lw5; Sat, 4 Feb 2023 21:29:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675546187; 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=1Uhr4Dq2Me5qr7B4rIRCmjGXBDIU63gSBViR+gT2Tec=; b=ClIiShmOULBJif8ncJqfvju1zzBPeWAOavCZErQTknBX2wanktTKgskguYPOaPG+pTHNrG 8WFSTqPzFC0P4MjDKsrV+tT8Pc97dRF/UXw+VBS04J0hMIJqWnO1U8H42jouhdcYfxkpVk gmBjQAAzRC6ccIDmk8h9F1c0b0meH0a8wZDtg6LzbeSS32O/OSuPetTEG6pHp4d3vJ9pHL 7324Ee1cubkV20qCNKNmVbRZ7AZbw4B1Y4nB55Gf+9sBExJf5jmtttjjKh1h1PVEQyOmnh +4QeS6bdrGM959OZ2yFxvUQL3BmcqSwSl2TNganxQfwElmzKMpZj9sRqsEWr2g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675546187; 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=1Uhr4Dq2Me5qr7B4rIRCmjGXBDIU63gSBViR+gT2Tec=; b=SxwQQZ/MWYON4X5Kpg/bl1uxl1uiE2mr4iJSaO1Ud6HeR29dwjDHWmlFDFMCW/EKJskP4s zZd4vgoG+ulj5xtK23mHb1kMFypAAYi6sI/K42iEBY6t1d8c0jQdN+d2VW7KueFFt7ORee QBkCLJukNU+4qzxjvZ5ep8R4xCLtmE8ofYPDfv4BjXQul8fJnBvgHdp0gP9t5kWFGiyXL+ 7ELUTLbH39cPbg3tmwHmyY79F8kpncr21rA6ChAWftmUQjUXzYyKiGYpJ1FIgBetcwqC2C aMkEs/xc8gbssN9jRWa/isQ0Hzj8M0HKiNgXpTwOcC1/1NjmunFi1Rpnsm6mig== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675546187; a=rsa-sha256; cv=none; b=WICQYWuV7LichH+4vVvFcALsyIeKbOYFbH6Kcg0Wpy38P3DKiPvta2Atf2ccmYJlFW0/Jh NCEUp3DDryYxNPZ0ZCGMdWley/2sZxcP2gxM/qKFU4CkXobREFYlrsjMHJqf0pcpTVcvaN 8bLGrce2PhoCWJMkofxQOUZFPABIEePGtLxnXH1d/Oh+5zi5hGWKpnVDqZYzIYAmdkYshE 1vdYlHHOYVX3suwisK6W00IaVM5I+24Lz1toS0TfaeDhHVVowV473xyGgPK01LCl3un034 p7WaSrvw6vn/kge4dx6vYSVm/9OPXbMBmzVOgzZX8K8a7o6lhCSSOesDwz+bpA== 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 4P8Qf34vp7zVkh; Sat, 4 Feb 2023 21:29:47 +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 314LTlCG047425; Sat, 4 Feb 2023 21:29:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 314LTlPP047424; Sat, 4 Feb 2023 21:29:47 GMT (envelope-from git) Date: Sat, 4 Feb 2023 21:29:47 GMT Message-Id: <202302042129.314LTlPP047424@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 7d4b2b5834db - main - 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/main X-Git-Reftype: branch X-Git-Commit: 7d4b2b5834dba66732596d68d7f817d18affb67f Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=7d4b2b5834dba66732596d68d7f817d18affb67f commit 7d4b2b5834dba66732596d68d7f817d18affb67f Author: Michael Paepcke AuthorDate: 2022-12-16 10:21:14 +0000 Commit: Warner Losh CommitDate: 2023-02-04 21:27:08 +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 --- 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 bf60e5852598..887756c17a31 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, };