Author: mav
Date: Thu Aug 8 21:55:49 2019
New Revision: 350796
URL: https://svnweb.freebsd.org/changeset/base/350796
Log:
MFC r350008 (by imp):
Use the more proper term of SATL instead of ATA_BEHIND_SCSI.
Most people know SAS attached SATA devices by the name SAT or SATL
(with the latter being a little more common). Change the device type
ATA_BEHIND_SCSI to SATL since it's more specific and meaningful.
Modified:
stable/11/sbin/camcontrol/camcontrol.c
stable/11/sbin/camcontrol/camcontrol.h
stable/11/sbin/camcontrol/epc.c
stable/11/sbin/camcontrol/fwdownload.c
stable/11/sbin/camcontrol/zone.c
Directory Properties:
stable/11/ (props changed)
Modified: stable/11/sbin/camcontrol/camcontrol.c
==============================================================================
--- stable/11/sbin/camcontrol/camcontrol.c Thu Aug 8 21:54:31 2019
(r350795)
+++ stable/11/sbin/camcontrol/camcontrol.c Thu Aug 8 21:55:49 2019
(r350796)
@@ -5214,7 +5214,7 @@ get_device_type(struct cam_device *dev, int retry_coun
retval = dev_has_vpd_page(dev, SVPD_ATA_INFORMATION, retry_count,
timeout, verbosemode);
if (retval == 1)
- *devtype = CC_DT_ATA_BEHIND_SCSI;
+ *devtype = CC_DT_SATL;
else
*devtype = CC_DT_SCSI;
Modified: stable/11/sbin/camcontrol/camcontrol.h
==============================================================================
--- stable/11/sbin/camcontrol/camcontrol.h Thu Aug 8 21:54:31 2019
(r350795)
+++ stable/11/sbin/camcontrol/camcontrol.h Thu Aug 8 21:55:49 2019
(r350796)
@@ -42,7 +42,7 @@ typedef enum {
typedef enum {
CC_DT_NONE,
CC_DT_SCSI,
- CC_DT_ATA_BEHIND_SCSI,
+ CC_DT_SATL,
CC_DT_ATA,
CC_DT_NVME,
CC_DT_MMCSD,
Modified: stable/11/sbin/camcontrol/epc.c
==============================================================================
--- stable/11/sbin/camcontrol/epc.c Thu Aug 8 21:54:31 2019
(r350795)
+++ stable/11/sbin/camcontrol/epc.c Thu Aug 8 21:55:49 2019
(r350796)
@@ -767,7 +767,7 @@ epc(struct cam_device *device, int argc, char **argv,
switch (devtype) {
case CC_DT_ATA:
- case CC_DT_ATA_BEHIND_SCSI:
+ case CC_DT_SATL:
break;
default:
warnx("The epc subcommand only works with ATA protocol "
Modified: stable/11/sbin/camcontrol/fwdownload.c
==============================================================================
--- stable/11/sbin/camcontrol/fwdownload.c Thu Aug 8 21:54:31 2019
(r350795)
+++ stable/11/sbin/camcontrol/fwdownload.c Thu Aug 8 21:55:49 2019
(r350796)
@@ -694,7 +694,7 @@ fw_check_device_ready(struct cam_device *dev, camcontr
/*sense_len*/ SSD_FULL_SIZE,
/*timeout*/ 5000);
break;
- case CC_DT_ATA_BEHIND_SCSI:
+ case CC_DT_SATL:
case CC_DT_ATA: {
retval = build_ata_cmd(ccb,
/*retries*/ 1,
@@ -853,7 +853,7 @@ fw_download_img(struct cam_device *cam_dev, struct fw_
timeout ? timeout : WB_TIMEOUT); /* timeout*/
break;
case CC_DT_ATA:
- case CC_DT_ATA_BEHIND_SCSI: {
+ case CC_DT_SATL: {
uint32_t off;
off = (uint32_t)(pkt_ptr - buf);
@@ -969,7 +969,7 @@ fwdownload(struct cam_device *device, int argc, char *
errx(1, "Unable to determine device type");
if ((devtype == CC_DT_ATA)
- || (devtype == CC_DT_ATA_BEHIND_SCSI)) {
+ || (devtype == CC_DT_SATL)) {
ccb = cam_getccb(device);
if (ccb == NULL) {
warnx("couldn't allocate CCB");
Modified: stable/11/sbin/camcontrol/zone.c
==============================================================================
--- stable/11/sbin/camcontrol/zone.c Thu Aug 8 21:54:31 2019
(r350795)
+++ stable/11/sbin/camcontrol/zone.c Thu Aug 8 21:55:49 2019
(r350796)
@@ -466,7 +466,7 @@ restart_report:
/*timeout*/ timeout ? timeout : 60000);
break;
case CC_DT_ATA:
- case CC_DT_ATA_BEHIND_SCSI: {
+ case CC_DT_SATL: {
uint8_t command = 0;
uint8_t protocol = 0;
uint16_t features = 0, sector_count = 0;
@@ -558,7 +558,7 @@ restart_report:
/*timeout*/ timeout ? timeout : 60000);
break;
case CC_DT_ATA:
- case CC_DT_ATA_BEHIND_SCSI: {
+ case CC_DT_SATL: {
uint8_t command = 0;
uint8_t protocol = 0;
uint16_t features = 0, sector_count = 0;
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
