From owner-svn-src-all@FreeBSD.ORG Tue Oct 12 09:41:42 2010 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B7C2B106566B; Tue, 12 Oct 2010 09:41:42 +0000 (UTC) (envelope-from glebius@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id A61FF8FC08; Tue, 12 Oct 2010 09:41:42 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o9C9fgIm043818; Tue, 12 Oct 2010 09:41:42 GMT (envelope-from glebius@svn.freebsd.org) Received: (from glebius@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o9C9fgd8043816; Tue, 12 Oct 2010 09:41:42 GMT (envelope-from glebius@svn.freebsd.org) Message-Id: <201010120941.o9C9fgd8043816@svn.freebsd.org> From: Gleb Smirnoff Date: Tue, 12 Oct 2010 09:41:42 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r213717 - head/sys/dev/usb X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 12 Oct 2010 09:41:42 -0000 Author: glebius Date: Tue Oct 12 09:41:42 2010 New Revision: 213717 URL: http://svn.freebsd.org/changeset/base/213717 Log: We already have dummy receive buffer in sc->buffer. Suggested by: hselasky Modified: head/sys/dev/usb/usb_msctest.c Modified: head/sys/dev/usb/usb_msctest.c ============================================================================== --- head/sys/dev/usb/usb_msctest.c Tue Oct 12 09:18:17 2010 (r213716) +++ head/sys/dev/usb/usb_msctest.c Tue Oct 12 09:41:42 2010 (r213717) @@ -98,7 +98,6 @@ static uint8_t scsi_huawei_eject[] = { 0 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; static uint8_t scsi_tct_eject[] = { 0x06, 0xf5, 0x04, 0x02, 0x52, 0x70 }; -static uint8_t scsi_tct_dummy[4]; #define BULK_SIZE 64 /* dummy */ #define ERR_CSW_FAILED -1 @@ -621,8 +620,12 @@ usb_msc_eject(struct usb_device *udev, u USB_MS_HZ); break; case MSC_EJECT_TCT: - err = bbb_command_start(sc, DIR_IN, 0, &scsi_tct_dummy, - sizeof(scsi_tct_dummy), &scsi_tct_eject, + /* + * TCTMobile needs DIR_IN flag. To get it, we + * supply a dummy data with the command. + */ + err = bbb_command_start(sc, DIR_IN, 0, &sc->buffer, + sizeof(sc->buffer), &scsi_tct_eject, sizeof(scsi_tct_eject), USB_MS_HZ); break; default: