Author: mav
Date: Mon Oct 5 11:39:43 2015
New Revision: 288813
URL: https://svnweb.freebsd.org/changeset/base/288813
Log:
MFC r288359: Report that we can read all flavours of DVD. Why not?
Modified:
stable/10/sys/cam/ctl/ctl.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/sys/cam/ctl/ctl.c
==============================================================================
--- stable/10/sys/cam/ctl/ctl.c Mon Oct 5 11:38:51 2015 (r288812)
+++ stable/10/sys/cam/ctl/ctl.c Mon Oct 5 11:39:43 2015 (r288813)
@@ -10273,6 +10273,10 @@ ctl_get_config(struct ctl_scsiio *ctsio)
sizeof(struct scsi_get_config_feature) + 8 +
sizeof(struct scsi_get_config_feature) +
sizeof(struct scsi_get_config_feature) + 4 +
+ sizeof(struct scsi_get_config_feature) + 4 +
+ sizeof(struct scsi_get_config_feature) + 4 +
+ sizeof(struct scsi_get_config_feature) + 4 +
+ sizeof(struct scsi_get_config_feature) + 4 +
sizeof(struct scsi_get_config_feature) + 4;
ctsio->kern_data_ptr = malloc(data_len, M_CTL, M_WAITOK | M_ZERO);
ctsio->kern_sg_entries = 0;
@@ -10286,8 +10290,16 @@ ctl_get_config(struct ctl_scsiio *ctsio)
scsi_ulto2b(0x0010, hdr->current_profile);
feature = (struct scsi_get_config_feature *)(hdr + 1);
- if (starting > 0x001f)
+ if (starting > 0x003b)
goto done;
+ if (starting > 0x003a)
+ goto f3b;
+ if (starting > 0x002b)
+ goto f3a;
+ if (starting > 0x002a)
+ goto f2b;
+ if (starting > 0x001f)
+ goto f2a;
if (starting > 0x001e)
goto f1f;
if (starting > 0x001d)
@@ -10384,6 +10396,48 @@ f1f: /* DVD Read */
feature = (struct scsi_get_config_feature *)
&feature->feature_data[feature->add_length];
+f2a: /* DVD+RW */
+ scsi_ulto2b(0x002A, feature->feature_code);
+ feature->flags = 0x04;
+ if ((lun->flags & CTL_LUN_NO_MEDIA) == 0)
+ feature->flags |= SGC_F_CURRENT;
+ feature->add_length = 4;
+ feature->feature_data[0] = 0x00;
+ feature->feature_data[1] = 0x00;
+ feature = (struct scsi_get_config_feature *)
+ &feature->feature_data[feature->add_length];
+
+f2b: /* DVD+R */
+ scsi_ulto2b(0x002B, feature->feature_code);
+ feature->flags = 0x00;
+ if ((lun->flags & CTL_LUN_NO_MEDIA) == 0)
+ feature->flags |= SGC_F_CURRENT;
+ feature->add_length = 4;
+ feature->feature_data[0] = 0x00;
+ feature = (struct scsi_get_config_feature *)
+ &feature->feature_data[feature->add_length];
+
+f3a: /* DVD+RW Dual Layer */
+ scsi_ulto2b(0x003A, feature->feature_code);
+ feature->flags = 0x00;
+ if ((lun->flags & CTL_LUN_NO_MEDIA) == 0)
+ feature->flags |= SGC_F_CURRENT;
+ feature->add_length = 4;
+ feature->feature_data[0] = 0x00;
+ feature->feature_data[1] = 0x00;
+ feature = (struct scsi_get_config_feature *)
+ &feature->feature_data[feature->add_length];
+
+f3b: /* DVD+R Dual Layer */
+ scsi_ulto2b(0x003B, feature->feature_code);
+ feature->flags = 0x00;
+ if ((lun->flags & CTL_LUN_NO_MEDIA) == 0)
+ feature->flags |= SGC_F_CURRENT;
+ feature->add_length = 4;
+ feature->feature_data[0] = 0x00;
+ feature = (struct scsi_get_config_feature *)
+ &feature->feature_data[feature->add_length];
+
done:
data_len = (uint8_t *)feature - (uint8_t *)hdr;
if (rt == SGC_RT_SPECIFIC && data_len > 4) {
_______________________________________________
svn-src-stable-10@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10
To unsubscribe, send any mail to "svn-src-stable-10-unsubscr...@freebsd.org"
