Replace '.response_format = 2' with '.response_format = SID_SCSI2_RESPONSE'.

14 files changed, 28 insertions, 28 deletions

diff --git a/sys/arch/sparc64/dev/vdsk.c b/sys/arch/sparc64/dev/vdsk.c
index 0e4852c43e0..4f811f4c9e9 100644
--- a/sys/arch/sparc64/dev/vdsk.c
+++ b/sys/arch/sparc64/dev/vdsk.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vdsk.c,v 1.65 2020/09/02 21:16:29 krw Exp $	*/
+/*	$OpenBSD: vdsk.c,v 1.66 2020/09/03 12:41:28 krw Exp $	*/
 /*
  * Copyright (c) 2009, 2011 Mark Kettenis
  *
@@ -1170,7 +1170,7 @@ vdsk_scsi_inquiry(struct scsi_xfer *xs)
 	}
 
 	inq.version = SCSI_REV_SPC3;
-	inq.response_format = 2;
+	inq.response_format = SID_SCSI2_RESPONSE;
 	inq.additional_length = 32;
 	inq.flags |= SID_CmdQue;
 	bcopy("SUN     ", inq.vendor, sizeof(inq.vendor));
diff --git a/sys/dev/ata/atascsi.c b/sys/dev/ata/atascsi.c
index defd41063b2..ec1e371d329 100644
--- a/sys/dev/ata/atascsi.c
+++ b/sys/dev/ata/atascsi.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: atascsi.c,v 1.146 2020/09/02 21:16:29 krw Exp $ */
+/*	$OpenBSD: atascsi.c,v 1.147 2020/09/03 12:41:29 krw Exp $ */
 
 /*
  * Copyright (c) 2007 David Gwynne <dlg@openbsd.org>
@@ -709,7 +709,7 @@ atascsi_disk_inquiry(struct scsi_xfer *xs)
 
 	inq.device = T_DIRECT;
 	inq.version = SCSI_REV_SPC3;
-	inq.response_format = 2;
+	inq.response_format = SID_SCSI2_RESPONSE;
 	inq.additional_length = 32;
 	inq.flags |= SID_CmdQue;
 	bcopy("ATA     ", inq.vendor, sizeof(inq.vendor));
@@ -1734,7 +1734,7 @@ atascsi_pmp_inq(struct scsi_xfer *xs)
 	bzero(&inq, sizeof(inq));
 	inq.device = 0x1E;	/* "well known logical unit" seems reasonable */
 	inq.version = SCSI_REV_SPC3;
-	inq.response_format = 2;
+	inq.response_format = SID_SCSI2_RESPONSE;
 	inq.additional_length = 32;
 	inq.flags |= SID_CmdQue;
 	bcopy("ATA     ", inq.vendor, sizeof(inq.vendor));
diff --git a/sys/dev/ic/aac.c b/sys/dev/ic/aac.c
index f6964c88671..2e1b2e72c3a 100644
--- a/sys/dev/ic/aac.c
+++ b/sys/dev/ic/aac.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: aac.c,v 1.87 2020/09/02 21:16:29 krw Exp $	*/
+/*	$OpenBSD: aac.c,v 1.88 2020/09/03 12:41:29 krw Exp $	*/
 
 /*-
  * Copyright (c) 2000 Michael Smith
@@ -2158,7 +2158,7 @@ aac_internal_cache_cmd(struct scsi_xfer *xs)
 		inq.device = T_DIRECT;
 		inq.dev_qual2 = 0;
 		inq.version = SCSI_REV_2;
-		inq.response_format = 2;
+		inq.response_format = SID_SCSI2_RESPONSE;
 		inq.additional_length = 32;
 		inq.flags |= SID_CmdQue;
 		strlcpy(inq.vendor, "Adaptec", sizeof inq.vendor);
diff --git a/sys/dev/ic/ami.c b/sys/dev/ic/ami.c
index 50dc54918ce..6e828ba1dd6 100644
--- a/sys/dev/ic/ami.c
+++ b/sys/dev/ic/ami.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ami.c,v 1.256 2020/09/02 21:16:29 krw Exp $	*/
+/*	$OpenBSD: ami.c,v 1.257 2020/09/03 12:41:29 krw Exp $	*/
 
 /*
  * Copyright (c) 2001 Michael Shalayeff
@@ -1402,7 +1402,7 @@ ami_scsi_cmd(struct scsi_xfer *xs)
 		inq.device = T_DIRECT;
 		inq.dev_qual2 = 0;
 		inq.version = SCSI_REV_2;
-		inq.response_format = 2;
+		inq.response_format = SID_SCSI2_RESPONSE;
 		inq.additional_length = 32;
 		inq.flags |= SID_CmdQue;
 		strlcpy(inq.vendor, "AMI    ", sizeof(inq.vendor));
diff --git a/sys/dev/ic/cac.c b/sys/dev/ic/cac.c
index a2ca08cadd5..298bed596c0 100644
--- a/sys/dev/ic/cac.c
+++ b/sys/dev/ic/cac.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cac.c,v 1.69 2020/09/02 21:16:29 krw Exp $	*/
+/*	$OpenBSD: cac.c,v 1.70 2020/09/03 12:41:29 krw Exp $	*/
 /*	$NetBSD: cac.c,v 1.15 2000/11/08 19:20:35 ad Exp $	*/
 
 /*
@@ -631,7 +631,7 @@ cac_scsi_cmd(xs)
 		inq.device = T_DIRECT;
 		inq.dev_qual2 = 0;
 		inq.version = SCSI_REV_2;
-		inq.response_format = 2;
+		inq.response_format = SID_SCSI2_RESPONSE;
 		inq.additional_length = 32;
 		inq.flags |= SID_CmdQue;
 		strlcpy(inq.vendor, "Compaq  ", sizeof inq.vendor);
diff --git a/sys/dev/ic/gdt_common.c b/sys/dev/ic/gdt_common.c
index 58f56a5af3f..ef799e41b82 100644
--- a/sys/dev/ic/gdt_common.c
+++ b/sys/dev/ic/gdt_common.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: gdt_common.c,v 1.79 2020/09/02 21:16:29 krw Exp $	*/
+/*	$OpenBSD: gdt_common.c,v 1.80 2020/09/03 12:41:29 krw Exp $	*/
 
 /*
  * Copyright (c) 1999, 2000, 2003 Niklas Hallqvist.  All rights reserved.
@@ -913,7 +913,7 @@ gdt_internal_cache_cmd(struct scsi_xfer *xs)
 		inq.dev_qual2 =
 		    (sc->sc_hdr[target].hd_devtype & 1) ? SID_REMOVABLE : 0;
 		inq.version = SCSI_REV_2;
-		inq.response_format = 2;
+		inq.response_format = SID_SCSI2_RESPONSE;
 		inq.additional_length = 32;
 		inq.flags |= SID_CmdQue;
 		strlcpy(inq.vendor, "ICP	   ", sizeof inq.vendor);
diff --git a/sys/dev/ic/nvme.c b/sys/dev/ic/nvme.c
index 75e1f31731f..ba5ff214121 100644
--- a/sys/dev/ic/nvme.c
+++ b/sys/dev/ic/nvme.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: nvme.c,v 1.85 2020/09/02 21:16:29 krw Exp $ */
+/*	$OpenBSD: nvme.c,v 1.86 2020/09/03 12:41:29 krw Exp $ */
 
 /*
  * Copyright (c) 2014 David Gwynne <dlg@openbsd.org>
@@ -780,7 +780,7 @@ nvme_scsi_inquiry(struct scsi_xfer *xs)
 
 	inq.device = T_DIRECT;
 	inq.version = SCSI_REV_SPC4;
-	inq.response_format = 2;
+	inq.response_format = SID_SCSI2_RESPONSE;
 	inq.additional_length = 32;
 	inq.flags |= SID_CmdQue;
 	memcpy(inq.vendor, "NVMe    ", sizeof(inq.vendor));
diff --git a/sys/dev/ic/twe.c b/sys/dev/ic/twe.c
index 497eca1d8eb..6d4b17442ad 100644
--- a/sys/dev/ic/twe.c
+++ b/sys/dev/ic/twe.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: twe.c,v 1.60 2020/09/02 22:00:26 krw Exp $	*/
+/*	$OpenBSD: twe.c,v 1.61 2020/09/03 12:41:29 krw Exp $	*/
 
 /*
  * Copyright (c) 2000-2002 Michael Shalayeff.  All rights reserved.
@@ -830,7 +830,7 @@ twe_scsi_cmd(xs)
 		inq.dev_qual2 =
 		    (sc->sc_hdr[target].hd_devtype & 1) ? SID_REMOVABLE : 0;
 		inq.version = SCSI_REV_2;
-		inq.response_format = 2;
+		inq.response_format = SID_SCSI2_RESPONSE;
 		inq.additional_length = 32;
 		strlcpy(inq.vendor, "3WARE  ", sizeof inq.vendor);
 		snprintf(inq.product, sizeof inq.product, "Host drive  #%02d",
diff --git a/sys/dev/pci/ips.c b/sys/dev/pci/ips.c
index cda5513639d..363fc98db8f 100644
--- a/sys/dev/pci/ips.c
+++ b/sys/dev/pci/ips.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ips.c,v 1.129 2020/09/02 21:16:29 krw Exp $	*/
+/*	$OpenBSD: ips.c,v 1.130 2020/09/03 12:41:29 krw Exp $	*/
 
 /*
  * Copyright (c) 2006, 2007, 2009 Alexander Yurchenko <grange@openbsd.org>
@@ -915,7 +915,7 @@ ips_scsi_cmd(struct scsi_xfer *xs)
 		bzero(&inq, sizeof(inq));
 		inq.device = T_DIRECT;
 		inq.version = SCSI_REV_2;
-		inq.response_format = 2;
+		inq.response_format = SID_SCSI2_RESPONSE;
 		inq.additional_length = 32;
 		inq.flags |= SID_CmdQue;
 		strlcpy(inq.vendor, "IBM", sizeof(inq.vendor));
diff --git a/sys/dev/pv/hvs.c b/sys/dev/pv/hvs.c
index a6d1c5864d9..271d7270455 100644
--- a/sys/dev/pv/hvs.c
+++ b/sys/dev/pv/hvs.c
@@ -600,7 +600,7 @@ fixup_inquiry(struct scsi_xfer *xs, struct hvs_srb *srb)
 	    !is_inquiry_valid(inq) && datalen >= 4 &&
 	    (inq->version == 0 || inq->response_format == 0)) {
 		inq->version = SCSI_REV_SPC3;
-		inq->response_format = 2;
+		inq->response_format = SID_SCSI2_RESPONSE;
 	} else if (datalen >= SID_INQUIRY_HDR + SID_SCSI2_ALEN) {
 		/*
 		 * Upgrade SPC2 to SPC3 if host is Win8 or WS2012 R2
diff --git a/sys/dev/pv/vioblk.c b/sys/dev/pv/vioblk.c
index f399474f05c..dc68145ea50 100644
--- a/sys/dev/pv/vioblk.c
+++ b/sys/dev/pv/vioblk.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vioblk.c,v 1.28 2020/09/02 22:00:26 krw Exp $	*/
+/*	$OpenBSD: vioblk.c,v 1.29 2020/09/03 12:41:29 krw Exp $	*/
 
 /*
  * Copyright (c) 2012 Stefan Fritsch.
@@ -574,7 +574,7 @@ vioblk_scsi_inq(struct scsi_xfer *xs)
 
 	inqd.device = T_DIRECT;
 	inqd.version = SCSI_REV_SPC3;
-	inqd.response_format = 2;
+	inqd.response_format = SID_SCSI2_RESPONSE;
 	inqd.additional_length = 32;
 	inqd.flags |= SID_CmdQue;
 	bcopy("VirtIO  ", inqd.vendor, sizeof(inqd.vendor));
diff --git a/sys/dev/pv/xbf.c b/sys/dev/pv/xbf.c
index 87d49cfe962..b2f5a760b55 100644
--- a/sys/dev/pv/xbf.c
+++ b/sys/dev/pv/xbf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: xbf.c,v 1.46 2020/09/02 21:16:29 krw Exp $	*/
+/*	$OpenBSD: xbf.c,v 1.47 2020/09/03 12:41:29 krw Exp $	*/
 
 /*
  * Copyright (c) 2016, 2017 Mike Belopuhov
@@ -836,7 +836,7 @@ xbf_scsi_inquiry(struct scsi_xfer *xs)
 	}
 
 	inq.version = SCSI_REV_SPC3;
-	inq.response_format = 2;
+	inq.response_format = SID_SCSI2_RESPONSE;
 	inq.additional_length = 32;
 	inq.flags |= SID_CmdQue;
 	bcopy("Xen     ", inq.vendor, sizeof(inq.vendor));
diff --git a/sys/dev/sdmmc/sdmmc_scsi.c b/sys/dev/sdmmc/sdmmc_scsi.c
index 4a5594d437d..38609ec53fc 100644
--- a/sys/dev/sdmmc/sdmmc_scsi.c
+++ b/sys/dev/sdmmc/sdmmc_scsi.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sdmmc_scsi.c,v 1.55 2020/09/02 21:16:29 krw Exp $	*/
+/*	$OpenBSD: sdmmc_scsi.c,v 1.56 2020/09/03 12:41:29 krw Exp $	*/
 
 /*
  * Copyright (c) 2006 Uwe Stuehler <uwe@openbsd.org>
@@ -437,7 +437,7 @@ sdmmc_inquiry(struct scsi_xfer *xs)
 	inq.device = T_DIRECT;
 	inq.dev_qual2 = SID_REMOVABLE;
 	inq.version = SCSI_REV_2;
-	inq.response_format = 2;
+	inq.response_format = SID_SCSI2_RESPONSE;
 	inq.additional_length = 32;
 	memcpy(inq.vendor, vendor, sizeof(inq.vendor));
 	memcpy(inq.product, product, sizeof(inq.product));
diff --git a/sys/dev/softraid.c b/sys/dev/softraid.c
index f734d51326e..0fc0003a768 100644
--- a/sys/dev/softraid.c
+++ b/sys/dev/softraid.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: softraid.c,v 1.412 2020/09/02 21:16:29 krw Exp $ */
+/* $OpenBSD: softraid.c,v 1.413 2020/09/03 12:41:28 krw Exp $ */
 /*
  * Copyright (c) 2007, 2008, 2009 Marco Peereboom <marco@peereboom.us>
  * Copyright (c) 2008 Chris Kuethe <ckuethe@openbsd.org>
@@ -4026,7 +4026,7 @@ sr_raid_inquiry(struct sr_workunit *wu)
 	inq.device = T_DIRECT;
 	inq.dev_qual2 = 0;
 	inq.version = SCSI_REV_2;
-	inq.response_format = 2;
+	inq.response_format = SID_SCSI2_RESPONSE;
 	inq.additional_length = 32;
 	inq.flags |= SID_CmdQue;
 	strlcpy(inq.vendor, sd->sd_meta->ssdi.ssd_vendor,