jimzah/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src.git synced 2024-12-03 14:48:57 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Use the more proper term of SATL instead of ATA_BEHIND_SCSI.

Browse Source 
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.

Suggested by: scottl@
This commit is contained in:
Warner Losh 2019-07-15 20:25:41 +00:00
parent 9f7b7da5bf
commit 40152db5d3
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=350008
5 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sbin/camcontrol/camcontrol.c
View File

@ -5391,7 +5391,7 @@ get_device_type(struct cam_device *dev, int retry_count, int timeout,
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;

2
sbin/camcontrol/camcontrol.h
View File

@ -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,

2
sbin/camcontrol/epc.c
View File

@ -767,7 +767,7 @@ epc(struct cam_device *device, int argc, char **argv, char *combinedopt,
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 "

6
sbin/camcontrol/fwdownload.c
View File

@ -694,7 +694,7 @@ fw_check_device_ready(struct cam_device *dev, camcontrol_devtype devtype,
/*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_vendor *vp,
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 **argv,
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");

4
sbin/camcontrol/zone.c
View File

@ -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;