Skip site navigation (1)Skip section navigation (2) 
Date:      Thu, 12 Jan 2012 15:02:51 +0000 (UTC)
From:      Alexander Motin <mav@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
Subject:   svn commit: r230015 - stable/8/sys/cam/scsi
Message-ID:  <201201121502.q0CF2pwg014634@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: mav
Date: Thu Jan 12 15:02:51 2012
New Revision: 230015
URL: http://svn.freebsd.org/changeset/base/230015

Log:
  MFC r228808, r228847, 229395:
  
  r228808, r228847:
  Make cd driver to handle Audio CDs, reporting their 2352 bytes sectors to
  GEOM and using READ CD command for reading data, same as acd driver does.
  Audio CDs identified by checking respective bit of the control field of
  the first track in TOC.
  
  229395:
  Add support for CDRIOCGETBLOCKSIZE and CDRIOCSETBLOCKSIZE IOCTLs to control
  sector size same as acd driver does. Together with r228808 and r228847 this
  allows existing multimedia/vlc to play Audio CDs via CAM cd driver.
  
  PR:		ports/162190
  Sponsored by:	iXsystems, Inc.

Modified:
  stable/8/sys/cam/scsi/scsi_all.h
  stable/8/sys/cam/scsi/scsi_cd.c
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)

Modified: stable/8/sys/cam/scsi/scsi_all.h
==============================================================================
--- stable/8/sys/cam/scsi/scsi_all.h	Thu Jan 12 14:53:08 2012	(r230014)
+++ stable/8/sys/cam/scsi/scsi_all.h	Thu Jan 12 15:02:51 2012	(r230015)
@@ -611,6 +611,7 @@ struct ata_pass_16 {
 #define	READ_12			0xA8
 #define	WRITE_12		0xAA
 #define	READ_ELEMENT_STATUS	0xB8
+#define	READ_CD			0xBE
 
 /* Maintenance In Service Action Codes */
 #define	REPORT_IDENTIFYING_INFRMATION		0x05

Modified: stable/8/sys/cam/scsi/scsi_cd.c
==============================================================================
--- stable/8/sys/cam/scsi/scsi_cd.c	Thu Jan 12 14:53:08 2012	(r230014)
+++ stable/8/sys/cam/scsi/scsi_cd.c	Thu Jan 12 15:02:51 2012	(r230015)
@@ -1475,6 +1475,14 @@ cdstart(struct cam_periph *periph, union
 					/* dxfer_len */ bp->bio_bcount,
 					/* sense_len */ SSD_FULL_SIZE,
 					/* timeout */ 30000);
+			/* Use READ CD command for audio tracks. */
+			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;
 
 			
@@ -2668,6 +2676,16 @@ cdioctl(struct disk *dp, u_long cmd, voi
 		error = cdsetspeed(periph, CDR_MAX_SPEED, *(u_int32_t *)addr);
 		cam_periph_unlock(periph);
 		break;
+	case CDRIOCGETBLOCKSIZE:
+		*(int *)addr = softc->params.blksize;
+		break;
+	case CDRIOCSETBLOCKSIZE:
+		if (*(int *)addr <= 0) {
+			error = EINVAL;
+			break;
+		}
+		softc->disk->d_sectorsize = softc->params.blksize = *(int *)addr;
+		break;
 	case DVDIOCSENDKEY:
 	case DVDIOCREPORTKEY: {
 		struct dvd_authinfo *authinfo;
@@ -2871,6 +2889,13 @@ cdcheckmedia(struct cam_periph *periph)
 
 	softc->flags |= CD_FLAG_VALID_TOC;
 
+	/* If the first track is audio, correct sector size. */
+	if ((softc->toc.entries[0].control & 4) == 0) {
+		softc->disk->d_sectorsize = softc->params.blksize = 2352;
+		softc->disk->d_mediasize =
+		    (off_t)softc->params.blksize * softc->params.disksize;
+	}
+
 bailout:
 
 	/*

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201201121502.q0CF2pwg014634>