From owner-svn-src-all@FreeBSD.ORG  Fri Dec 23 19:53:29 2011
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
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 67ABB106566C;
	Fri, 23 Dec 2011 19:53:29 +0000 (UTC) (envelope-from mav@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 56B8D8FC15;
	Fri, 23 Dec 2011 19:53:29 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id pBNJrTQF080745;
	Fri, 23 Dec 2011 19:53:29 GMT (envelope-from mav@svn.freebsd.org)
Received: (from mav@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id pBNJrTt2080743;
	Fri, 23 Dec 2011 19:53:29 GMT (envelope-from mav@svn.freebsd.org)
Message-Id: <201112231953.pBNJrTt2080743@svn.freebsd.org>
From: Alexander Motin <mav@FreeBSD.org>
Date: Fri, 23 Dec 2011 19:53:29 +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: r228847 - head/sys/cam/scsi
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 &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 23 Dec 2011 19:53:29 -0000

Author: mav
Date: Fri Dec 23 19:53:28 2011
New Revision: 228847
URL: http://svn.freebsd.org/changeset/base/228847

Log:
  Addition to r228808:
  READ CD is a 12 byte command. So fill additional bytes and update CDB length
  when patching READ(10).
  
  MFC after:	1 month

Modified:
  head/sys/cam/scsi/scsi_cd.c

Modified: head/sys/cam/scsi/scsi_cd.c
==============================================================================
--- head/sys/cam/scsi/scsi_cd.c	Fri Dec 23 19:12:02 2011	(r228846)
+++ head/sys/cam/scsi/scsi_cd.c	Fri Dec 23 19:53:28 2011	(r228847)
@@ -1487,6 +1487,9 @@ cdstart(struct cam_periph *periph, union
 			if (softc->params.blksize == 2352) {
 				start_ccb->csio.cdb_io.cdb_bytes[0] = READ_CD;
 				start_ccb->csio.cdb_io.cdb_bytes[9] = 0xf8;
+				start_ccb->csio.cdb_io.cdb_bytes[10] = 0;
+				start_ccb->csio.cdb_io.cdb_bytes[11] = 0;
+				start_ccb->csio.cdb_len = 12;
 			}
 			start_ccb->ccb_h.ccb_state = CD_CCB_BUFFER_IO;