aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sbin/camcontrol/camcontrol.c2
-rw-r--r--sbin/camcontrol/camcontrol.h2
-rw-r--r--sbin/camcontrol/epc.c2
-rw-r--r--sbin/camcontrol/fwdownload.c6
-rw-r--r--sbin/camcontrol/zone.c4
5 files changed, 8 insertions, 8 deletions
diff --git a/sbin/camcontrol/camcontrol.c b/sbin/camcontrol/camcontrol.c
index 5b8d47a66b1c..58319eb58936 100644
--- a/sbin/camcontrol/camcontrol.c
+++ b/sbin/camcontrol/camcontrol.c
@@ -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;
diff --git a/sbin/camcontrol/camcontrol.h b/sbin/camcontrol/camcontrol.h
index 7c3f7da1f5c9..438331c49458 100644
--- a/sbin/camcontrol/camcontrol.h
+++ b/sbin/camcontrol/camcontrol.h
@@ -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,
diff --git a/sbin/camcontrol/epc.c b/sbin/camcontrol/epc.c
index 3b74d08a4eb1..8b42f63c7523 100644
--- a/sbin/camcontrol/epc.c
+++ b/sbin/camcontrol/epc.c
@@ -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 "
diff --git a/sbin/camcontrol/fwdownload.c b/sbin/camcontrol/fwdownload.c
index ef6fe98015d5..53a76084115e 100644
--- a/sbin/camcontrol/fwdownload.c
+++ b/sbin/camcontrol/fwdownload.c
@@ -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");
diff --git a/sbin/camcontrol/zone.c b/sbin/camcontrol/zone.c
index 853607d7ea8c..130f53226f57 100644
--- a/sbin/camcontrol/zone.c
+++ b/sbin/camcontrol/zone.c
@@ -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;