Author: mav
Date: Thu Jun 14 14:46:20 2018
New Revision: 335138
URL: https://svnweb.freebsd.org/changeset/base/335138
Log:
MFC r311351 (by rpokala):
In the same vein as r311350, fix whitespace in handling of XPT_PATH_INQ in
several more drivers.
Modified:
stable/11/sys/dev/aha/aha.c
stable/11/sys/dev/ahb/ahb.c
stable/11/sys/dev/aic/aic.c
stable/11/sys/dev/ciss/ciss.c
stable/11/sys/dev/dpt/dpt_scsi.c
stable/11/sys/dev/firewire/sbp.c
stable/11/sys/dev/mly/mly.c
stable/11/sys/dev/ncr/ncr.c
stable/11/sys/dev/nvme/nvme_sim.c
stable/11/sys/dev/twa/tw_osl_cam.c
Directory Properties:
stable/11/ (props changed)
Modified: stable/11/sys/dev/aha/aha.c
==============================================================================
--- stable/11/sys/dev/aha/aha.c Thu Jun 14 14:45:08 2018 (r335137)
+++ stable/11/sys/dev/aha/aha.c Thu Jun 14 14:46:20 2018 (r335138)
@@ -947,10 +947,10 @@ ahaaction(struct cam_sim *sim, union ccb *ccb)
strlcpy(cpi->hba_vid, "Adaptec", HBA_IDLEN);
strlcpy(cpi->dev_name, cam_sim_name(sim), DEV_IDLEN);
cpi->unit_number = cam_sim_unit(sim);
- cpi->transport = XPORT_SPI;
- cpi->transport_version = 2;
- cpi->protocol = PROTO_SCSI;
- cpi->protocol_version = SCSI_REV_2;
+ cpi->transport = XPORT_SPI;
+ cpi->transport_version = 2;
+ cpi->protocol = PROTO_SCSI;
+ cpi->protocol_version = SCSI_REV_2;
cpi->ccb_h.status = CAM_REQ_CMP;
xpt_done(ccb);
break;
Modified: stable/11/sys/dev/ahb/ahb.c
==============================================================================
--- stable/11/sys/dev/ahb/ahb.c Thu Jun 14 14:45:08 2018 (r335137)
+++ stable/11/sys/dev/ahb/ahb.c Thu Jun 14 14:46:20 2018 (r335138)
@@ -1182,10 +1182,10 @@ ahbaction(struct cam_sim *sim, union ccb *ccb)
strlcpy(cpi->hba_vid, "Adaptec", HBA_IDLEN);
strlcpy(cpi->dev_name, cam_sim_name(sim), DEV_IDLEN);
cpi->unit_number = cam_sim_unit(sim);
- cpi->transport = XPORT_SPI;
- cpi->transport_version = 2;
- cpi->protocol = PROTO_SCSI;
- cpi->protocol_version = SCSI_REV_2;
+ cpi->transport = XPORT_SPI;
+ cpi->transport_version = 2;
+ cpi->protocol = PROTO_SCSI;
+ cpi->protocol_version = SCSI_REV_2;
cpi->ccb_h.status = CAM_REQ_CMP;
xpt_done(ccb);
break;
Modified: stable/11/sys/dev/aic/aic.c
==============================================================================
--- stable/11/sys/dev/aic/aic.c Thu Jun 14 14:45:08 2018 (r335137)
+++ stable/11/sys/dev/aic/aic.c Thu Jun 14 14:46:20 2018 (r335138)
@@ -280,7 +280,7 @@ aic_action(struct cam_sim *sim, union ccb *ccb)
cpi->max_lun = 7;
cpi->initiator_id = aic->initiator;
cpi->bus_id = cam_sim_bus(sim);
- cpi->base_transfer_speed = 3300;
+ cpi->base_transfer_speed = 3300;
strlcpy(cpi->sim_vid, "FreeBSD", SIM_IDLEN);
strlcpy(cpi->hba_vid, "Adaptec", HBA_IDLEN);
strlcpy(cpi->dev_name, cam_sim_name(sim), DEV_IDLEN);
Modified: stable/11/sys/dev/ciss/ciss.c
==============================================================================
--- stable/11/sys/dev/ciss/ciss.c Thu Jun 14 14:45:08 2018
(r335137)
+++ stable/11/sys/dev/ciss/ciss.c Thu Jun 14 14:46:20 2018
(r335138)
@@ -3027,10 +3027,10 @@ ciss_cam_action(struct cam_sim *sim, union ccb *ccb)
cpi->max_lun = 0; /* 'logical drive' channel only */
cpi->initiator_id = sc->ciss_cfg->max_logical_supported;
strlcpy(cpi->sim_vid, "FreeBSD", SIM_IDLEN);
- strlcpy(cpi->hba_vid, "CISS", HBA_IDLEN);
- strlcpy(cpi->dev_name, cam_sim_name(sim), DEV_IDLEN);
- cpi->unit_number = cam_sim_unit(sim);
- cpi->bus_id = cam_sim_bus(sim);
+ strlcpy(cpi->hba_vid, "CISS", HBA_IDLEN);
+ strlcpy(cpi->dev_name, cam_sim_name(sim), DEV_IDLEN);
+ cpi->unit_number = cam_sim_unit(sim);
+ cpi->bus_id = cam_sim_bus(sim);
cpi->base_transfer_speed = 132 * 1024; /* XXX what to set this to? */
cpi->transport = XPORT_SPI;
cpi->transport_version = 2;
Modified: stable/11/sys/dev/dpt/dpt_scsi.c
==============================================================================
--- stable/11/sys/dev/dpt/dpt_scsi.c Thu Jun 14 14:45:08 2018
(r335137)
+++ stable/11/sys/dev/dpt/dpt_scsi.c Thu Jun 14 14:46:20 2018
(r335138)
@@ -1031,10 +1031,10 @@ dpt_action(struct cam_sim *sim, union ccb *ccb)
strlcpy(cpi->hba_vid, "DPT", HBA_IDLEN);
strlcpy(cpi->dev_name, cam_sim_name(sim), DEV_IDLEN);
cpi->unit_number = cam_sim_unit(sim);
- cpi->transport = XPORT_SPI;
- cpi->transport_version = 2;
- cpi->protocol = PROTO_SCSI;
- cpi->protocol_version = SCSI_REV_2;
+ cpi->transport = XPORT_SPI;
+ cpi->transport_version = 2;
+ cpi->protocol = PROTO_SCSI;
+ cpi->protocol_version = SCSI_REV_2;
cpi->ccb_h.status = CAM_REQ_CMP;
xpt_done(ccb);
break;
Modified: stable/11/sys/dev/firewire/sbp.c
==============================================================================
--- stable/11/sys/dev/firewire/sbp.c Thu Jun 14 14:45:08 2018
(r335137)
+++ stable/11/sys/dev/firewire/sbp.c Thu Jun 14 14:46:20 2018
(r335138)
@@ -2512,10 +2512,10 @@ END_DEBUG
strlcpy(cpi->hba_vid, "SBP", HBA_IDLEN);
strlcpy(cpi->dev_name, sim->sim_name, DEV_IDLEN);
cpi->unit_number = sim->unit_number;
- cpi->transport = XPORT_SPI; /* XX should have a FireWire */
- cpi->transport_version = 2;
- cpi->protocol = PROTO_SCSI;
- cpi->protocol_version = SCSI_REV_2;
+ cpi->transport = XPORT_SPI; /* XX should have a FireWire */
+ cpi->transport_version = 2;
+ cpi->protocol = PROTO_SCSI;
+ cpi->protocol_version = SCSI_REV_2;
cpi->ccb_h.status = CAM_REQ_CMP;
xpt_done(ccb);
Modified: stable/11/sys/dev/mly/mly.c
==============================================================================
--- stable/11/sys/dev/mly/mly.c Thu Jun 14 14:45:08 2018 (r335137)
+++ stable/11/sys/dev/mly/mly.c Thu Jun 14 14:46:20 2018 (r335138)
@@ -2110,10 +2110,10 @@ mly_cam_action(struct cam_sim *sim, union ccb *ccb)
cpi->max_lun = MLY_MAX_LUNS - 1;
cpi->initiator_id = sc->mly_controllerparam->initiator_id;
strlcpy(cpi->sim_vid, "FreeBSD", SIM_IDLEN);
- strlcpy(cpi->hba_vid, "Mylex", HBA_IDLEN);
- strlcpy(cpi->dev_name, cam_sim_name(sim), DEV_IDLEN);
- cpi->unit_number = cam_sim_unit(sim);
- cpi->bus_id = cam_sim_bus(sim);
+ strlcpy(cpi->hba_vid, "Mylex", HBA_IDLEN);
+ strlcpy(cpi->dev_name, cam_sim_name(sim), DEV_IDLEN);
+ cpi->unit_number = cam_sim_unit(sim);
+ cpi->bus_id = cam_sim_bus(sim);
cpi->base_transfer_speed = 132 * 1024; /* XXX what to set this to? */
cpi->transport = XPORT_SPI;
cpi->transport_version = 2;
Modified: stable/11/sys/dev/ncr/ncr.c
==============================================================================
--- stable/11/sys/dev/ncr/ncr.c Thu Jun 14 14:45:08 2018 (r335137)
+++ stable/11/sys/dev/ncr/ncr.c Thu Jun 14 14:46:20 2018 (r335138)
@@ -4347,10 +4347,10 @@ ncr_action (struct cam_sim *sim, union ccb *ccb)
strlcpy(cpi->hba_vid, "Symbios", HBA_IDLEN);
strlcpy(cpi->dev_name, cam_sim_name(sim), DEV_IDLEN);
cpi->unit_number = cam_sim_unit(sim);
- cpi->transport = XPORT_SPI;
- cpi->transport_version = 2;
- cpi->protocol = PROTO_SCSI;
- cpi->protocol_version = SCSI_REV_2;
+ cpi->transport = XPORT_SPI;
+ cpi->transport_version = 2;
+ cpi->protocol = PROTO_SCSI;
+ cpi->protocol_version = SCSI_REV_2;
cpi->ccb_h.status = CAM_REQ_CMP;
xpt_done(ccb);
break;
Modified: stable/11/sys/dev/nvme/nvme_sim.c
==============================================================================
--- stable/11/sys/dev/nvme/nvme_sim.c Thu Jun 14 14:45:08 2018
(r335137)
+++ stable/11/sys/dev/nvme/nvme_sim.c Thu Jun 14 14:46:20 2018
(r335138)
@@ -196,10 +196,10 @@ nvme_sim_action(struct cam_sim *sim, union ccb *ccb)
strncpy(cpi->hba_vid, "NVMe", HBA_IDLEN);
strncpy(cpi->dev_name, cam_sim_name(sim), DEV_IDLEN);
cpi->unit_number = cam_sim_unit(sim);
- cpi->transport = XPORT_NVME; /* XXX XPORT_PCIE ? */
- cpi->transport_version = 1; /* XXX Get PCIe spec ?
*/
- cpi->protocol = PROTO_NVME;
- cpi->protocol_version = NVME_REV_1; /* Groks all 1.x NVMe
cards */
+ cpi->transport = XPORT_NVME; /* XXX XPORT_PCIE ? */
+ cpi->transport_version = 1; /* XXX Get PCIe spec ?
*/
+ cpi->protocol = PROTO_NVME;
+ cpi->protocol_version = NVME_REV_1; /* Groks all 1.x NVMe
cards */
cpi->xport_specific.nvme.nsid = ns->id;
cpi->xport_specific.nvme.domain = pci_get_domain(dev);
cpi->xport_specific.nvme.bus = pci_get_bus(dev);
Modified: stable/11/sys/dev/twa/tw_osl_cam.c
==============================================================================
--- stable/11/sys/dev/twa/tw_osl_cam.c Thu Jun 14 14:45:08 2018
(r335137)
+++ stable/11/sys/dev/twa/tw_osl_cam.c Thu Jun 14 14:46:20 2018
(r335138)
@@ -427,11 +427,11 @@ twa_action(struct cam_sim *sim, union ccb *ccb)
strlcpy(path_inq->sim_vid, "FreeBSD", SIM_IDLEN);
strlcpy(path_inq->hba_vid, "3ware", HBA_IDLEN);
strlcpy(path_inq->dev_name, cam_sim_name(sim), DEV_IDLEN);
- path_inq->transport = XPORT_SPI;
- path_inq->transport_version = 2;
- path_inq->protocol = PROTO_SCSI;
- path_inq->protocol_version = SCSI_REV_2;
- path_inq->maxio = TW_CL_MAX_IO_SIZE;
+ path_inq->transport = XPORT_SPI;
+ path_inq->transport_version = 2;
+ path_inq->protocol = PROTO_SCSI;
+ path_inq->protocol_version = SCSI_REV_2;
+ path_inq->maxio = TW_CL_MAX_IO_SIZE;
ccb_h->status = CAM_REQ_CMP;
xpt_done(ccb);
break;
_______________________________________________
[email protected] mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "[email protected]"
