Attachment 14171 Details for Bug 26644 – file.diff

[patch] file.diff

file.diff (text/plain), 6.10 KB, created by un1i on 2001-04-17 13:50:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: un1i

Created: 2001-04-17 13:50:01 UTC

Size: 6.10 KB

patch

obsolete

>Index: atapi-cd.c
>===================================================================
>RCS file: /ncvs/src/sys/dev/ata/atapi-cd.c,v
>retrieving revision 1.88
>diff -u -r1.88 atapi-cd.c
>--- atapi-cd.c	2001/04/05 11:17:33	1.88
>+++ atapi-cd.c	2001/04/17 10:31:09
>@@ -726,6 +726,8 @@
> 	    struct ioc_read_subchannel *args =
> 		(struct ioc_read_subchannel *)addr;
> 	    struct cd_sub_channel_info data;
>+	    u_int8_t format;
>+	    int i;
> 	    int len = args->data_len;
> 	    int32_t abslba, rellba;
> 	    int8_t ccb[16] = { ATAPI_READ_SUBCHANNEL, 0, 0x40, 1, 0, 0, 0,
>@@ -738,31 +740,108 @@
> 		break;
> 	    }
> 
>+	    format=args->data_format;
>+	    if ((format != CD_CURRENT_POSITION) &&
>+		(format != CD_MEDIA_CATALOG) && (format != CD_TRACK_INFO)) {
>+		error = EINVAL;
>+		break;
>+	    }
>+
> 	    if ((error = atapi_queue_cmd(cdp->atp, ccb, (caddr_t)&cdp->subchan, 
> 					 sizeof(cdp->subchan), ATPR_F_READ, 10,
> 					 NULL, NULL))) {
> 		break;
> 	    }
>-	    abslba = cdp->subchan.abslba;
>-	    rellba = cdp->subchan.rellba;
>-	    if (args->address_format == CD_MSF_FORMAT) {
>-		lba2msf(ntohl(abslba),
>-		    &data.what.position.absaddr.msf.minute,
>-		    &data.what.position.absaddr.msf.second,
>-		    &data.what.position.absaddr.msf.frame);
>-		lba2msf(ntohl(rellba),
>-		    &data.what.position.reladdr.msf.minute,
>-		    &data.what.position.reladdr.msf.second,
>-		    &data.what.position.reladdr.msf.frame);
>-	    } else {
>-		data.what.position.absaddr.lba = abslba;
>-		data.what.position.reladdr.lba = rellba;
>+
>+	    /*
>+	     * Ask for media catalogue or track info only if no audio play
>+	     * operation is in progress or the drive will return an error.
>+	     */
>+
>+	    if ((format == CD_MEDIA_CATALOG) || (format == CD_TRACK_INFO)) {
>+		if (cdp->subchan.header.audio_status == 0x11) {
>+		    error = EINVAL;
>+		    break;
>+		}
>+
>+		ccb[3] = format;
>+		if (format == CD_TRACK_INFO)
>+		    ccb[6] = args->track;
>+
>+		if ((error = atapi_queue_cmd(cdp->atp, ccb,
>+					     (caddr_t)&cdp->subchan, 
>+					     sizeof(cdp->subchan), ATPR_F_READ,
>+					     10, NULL, NULL))) {
>+		    break;
>+		}
>+	    }
>+
>+	    data.header.audio_status = cdp->subchan.header.audio_status;
>+	    data.header.data_len[0] = cdp->subchan.header.data_length >> 8;
>+	    data.header.data_len[1] = cdp->subchan.header.data_length & 255;
>+
>+	    switch (format) {
>+	    case CD_CURRENT_POSITION:
>+		{
>+		    abslba = cdp->subchan.what.position.abslba;
>+		    rellba = cdp->subchan.what.position.rellba;
>+		    if (args->address_format == CD_MSF_FORMAT) {
>+			lba2msf(ntohl(abslba),
>+			    &data.what.position.absaddr.msf.minute,
>+			    &data.what.position.absaddr.msf.second,
>+			    &data.what.position.absaddr.msf.frame);
>+			lba2msf(ntohl(rellba - 150),
>+			    &data.what.position.reladdr.msf.minute,
>+			    &data.what.position.reladdr.msf.second,
>+			    &data.what.position.reladdr.msf.frame);
>+		    } else {
>+			data.what.position.absaddr.lba = abslba;
>+			data.what.position.reladdr.lba = rellba;
>+		    }
>+		    data.what.position.data_format =
>+			cdp->subchan.what.position.data_format;
>+		    data.what.position.control =
>+			cdp->subchan.what.position.control & 0xf;
>+		    data.what.position.addr_type =
>+			cdp->subchan.what.position.control >> 4;
>+		    data.what.position.track_number =
>+			cdp->subchan.what.position.track;
>+		    data.what.position.index_number =
>+			cdp->subchan.what.position.indx;
>+		    break;
>+		}
>+
>+	    case CD_MEDIA_CATALOG:
>+		{
>+		    data.what.media_catalog.data_format =
>+			cdp->subchan.what.media_catalog.data_format;
>+		    data.what.media_catalog.mc_valid =
>+			cdp->subchan.what.media_catalog.mc_valid;
>+		    for(i = 0; i < 15; i++)
>+			    data.what.media_catalog.mc_number[i] =
>+				cdp->subchan.what.media_catalog.mc_number[i];
>+		    break;
>+		}
>+		
>+	    case CD_TRACK_INFO:
>+		{
>+		    data.what.track_info.data_format =
>+			cdp->subchan.what.track_info.data_format;
>+		    data.what.track_info.control =
>+			cdp->subchan.what.track_info.control & 0xf;
>+		    data.what.track_info.addr_type =
>+			cdp->subchan.what.track_info.control >> 4;
>+		    data.what.track_info.track_number =
>+			cdp->subchan.what.track_info.track;
>+		    data.what.track_info.ti_valid =
>+			cdp->subchan.what.track_info.ti_valid;
>+		    for(i = 0; i < 15; i++)
>+			    data.what.track_info.ti_number[i] =
>+				cdp->subchan.what.track_info.ti_number[i];
>+		    break;
>+
>+		}
> 	    }
>-	    data.header.audio_status = cdp->subchan.audio_status;
>-	    data.what.position.control = cdp->subchan.control & 0xf;
>-	    data.what.position.addr_type = cdp->subchan.control >> 4;
>-	    data.what.position.track_number = cdp->subchan.track;
>-	    data.what.position.index_number = cdp->subchan.indx;
> 	    error = copyout(&data, args->data, len);
> 	    break;
> 	}
>Index: atapi-cd.h
>===================================================================
>RCS file: /ncvs/src/sys/dev/ata/atapi-cd.h,v
>retrieving revision 1.25
>diff -u -r1.25 atapi-cd.h
>--- atapi-cd.h	2001/03/21 14:59:38	1.25
>+++ atapi-cd.h	2001/04/17 10:19:46
>@@ -311,16 +311,40 @@
>     struct audiopage		au;		/* audio page info */
>     struct audiopage		aumask;		/* audio page mask */
>     struct cappage		cap;		/* capabilities page info */
>-    struct {					/* subchannel info */
>-	u_int8_t	void0;
>-	u_int8_t	audio_status;
>-	u_int16_t	data_length;
>-	u_int8_t	data_format;
>-	u_int8_t	control;
>-	u_int8_t	track;
>-	u_int8_t	indx;
>-	u_int32_t	abslba;
>-	u_int32_t	rellba;
>+    struct {
>+	struct {
>+		u_int8_t	void0;
>+		u_int8_t	audio_status;
>+		u_int16_t	data_length;
>+	} header;
>+	union {					/* subchannel info */
>+	    struct {
>+		u_int8_t	data_format;
>+		u_int8_t	control;
>+		u_int8_t	track;
>+		u_int8_t	indx;
>+		u_int32_t	abslba;
>+		u_int32_t	rellba;
>+	    } position;
>+	    struct {
>+		u_int8_t	data_format;
>+		u_int8_t	:8;
>+		u_int8_t	:8;
>+		u_int8_t	:8;
>+		u_int8_t	:7;
>+		u_int8_t	mc_valid:1;
>+		u_int8_t	mc_number[15];
>+	    } media_catalog;
>+	    struct {
>+		u_int8_t	data_format;
>+		u_int8_t	control;
>+		u_int8_t	track;
>+		u_int8_t	:8;
>+		u_int8_t	:7;
>+		u_int8_t	ti_valid:1;
>+		u_int8_t	ti_number[15];
>+	    } track_info;
>+	} what;
>     } subchan;
>     struct changer		*changer_info;	/* changer info */
>     struct acd_softc		**driver;	/* softc's of changer slots */

Actions: View | Diff

Attachments on bug 26644: 14171 | 14172