aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--sys/cam/scsi/scsi_low.c9
-rw-r--r--sys/dev/advansys/advansys.c4
-rw-r--r--sys/dev/aha/aha.c4
-rw-r--r--sys/dev/ahci/ahci.c4
-rw-r--r--sys/dev/arcmsr/arcmsr.c7
-rw-r--r--sys/dev/ata/ata-all.c4
-rw-r--r--sys/dev/buslogic/bt.c4
-rw-r--r--sys/dev/hptmv/entry.c4
-rw-r--r--sys/dev/mvs/mvs.c4
-rw-r--r--sys/dev/ncr/ncr.c4
-rw-r--r--sys/dev/nvme/nvme_sim.c4
-rw-r--r--sys/dev/siis/siis.c4
-rw-r--r--sys/dev/sym/sym_hipd.c5
-rw-r--r--sys/dev/trm/trm.c162
14 files changed, 9 insertions, 214 deletions
diff --git a/sys/cam/scsi/scsi_low.c b/sys/cam/scsi/scsi_low.c
index 01ca86a0c2bc..ae59c08ab3a7 100644
--- a/sys/cam/scsi/scsi_low.c
+++ b/sys/cam/scsi/scsi_low.c
@@ -479,15 +479,6 @@ scsi_low_scsi_action_cam(sim, ccb)
#endif /* SCSI_LOW_DEBUG */
break;
- case XPT_EN_LUN: /* Enable LUN as a target */
- case XPT_TARGET_IO: /* Execute target I/O request */
- case XPT_ACCEPT_TARGET_IO: /* Accept Host Target Mode CDB */
- case XPT_CONT_TARGET_IO: /* Continue Host Target I/O Connection*/
- /* XXX Implement */
- ccb->ccb_h.status = CAM_REQ_INVALID;
- xpt_done(ccb);
- break;
-
case XPT_ABORT: /* Abort the specified CCB */
#ifdef SCSI_LOW_DIAGNOSTIC
if (target == CAM_TARGET_WILDCARD || lun == CAM_LUN_WILDCARD)
diff --git a/sys/dev/advansys/advansys.c b/sys/dev/advansys/advansys.c
index 8ca81ae55459..a875fe5ccb6a 100644
--- a/sys/dev/advansys/advansys.c
+++ b/sys/dev/advansys/advansys.c
@@ -232,10 +232,6 @@ adv_action(struct cam_sim *sim, union ccb *ccb)
break;
}
case XPT_RESET_DEV: /* Bus Device Reset the specified SCSI device */
- case XPT_TARGET_IO: /* Execute target I/O request */
- case XPT_ACCEPT_TARGET_IO: /* Accept Host Target Mode CDB */
- case XPT_CONT_TARGET_IO: /* Continue Host Target I/O Connection*/
- case XPT_EN_LUN: /* Enable LUN as a target */
case XPT_ABORT: /* Abort the specified CCB */
/* XXX Implement */
ccb->ccb_h.status = CAM_REQ_INVALID;
diff --git a/sys/dev/aha/aha.c b/sys/dev/aha/aha.c
index 233339f8c434..d2709a72e678 100644
--- a/sys/dev/aha/aha.c
+++ b/sys/dev/aha/aha.c
@@ -831,10 +831,6 @@ ahaaction(struct cam_sim *sim, union ccb *ccb)
}
break;
}
- case XPT_EN_LUN: /* Enable LUN as a target */
- case XPT_TARGET_IO: /* Execute target I/O request */
- case XPT_ACCEPT_TARGET_IO: /* Accept Host Target Mode CDB */
- case XPT_CONT_TARGET_IO: /* Continue Host Target I/O Connection*/
case XPT_ABORT: /* Abort the specified CCB */
/* XXX Implement */
ccb->ccb_h.status = CAM_REQ_INVALID;
diff --git a/sys/dev/ahci/ahci.c b/sys/dev/ahci/ahci.c
index 7083afb10cba..c5064f349e34 100644
--- a/sys/dev/ahci/ahci.c
+++ b/sys/dev/ahci/ahci.c
@@ -2578,10 +2578,6 @@ ahciaction(struct cam_sim *sim, union ccb *ccb)
}
ahci_begin_transaction(ch, ccb);
return;
- case XPT_EN_LUN: /* Enable LUN as a target */
- case XPT_TARGET_IO: /* Execute target I/O request */
- case XPT_ACCEPT_TARGET_IO: /* Accept Host Target Mode CDB */
- case XPT_CONT_TARGET_IO: /* Continue Host Target I/O Connection*/
case XPT_ABORT: /* Abort the specified CCB */
/* XXX Implement */
ccb->ccb_h.status = CAM_REQ_INVALID;
diff --git a/sys/dev/arcmsr/arcmsr.c b/sys/dev/arcmsr/arcmsr.c
index f293db0a7be3..6d6954ea1db3 100644
--- a/sys/dev/arcmsr/arcmsr.c
+++ b/sys/dev/arcmsr/arcmsr.c
@@ -2883,12 +2883,6 @@ static void arcmsr_action(struct cam_sim *psim, union ccb *pccb)
}
break;
}
- case XPT_TARGET_IO: {
- /* target mode not yet support vendor specific commands. */
- pccb->ccb_h.status |= CAM_REQ_CMP;
- xpt_done(pccb);
- break;
- }
case XPT_PATH_INQ: {
struct ccb_pathinq *cpi = &pccb->cpi;
@@ -2938,7 +2932,6 @@ static void arcmsr_action(struct cam_sim *psim, union ccb *pccb)
pabort_ccb = pccb->cab.abort_ccb;
switch (pabort_ccb->ccb_h.func_code) {
case XPT_ACCEPT_TARGET_IO:
- case XPT_IMMED_NOTIFY:
case XPT_CONT_TARGET_IO:
if(arcmsr_seek_cmd2abort(pabort_ccb)==TRUE) {
pabort_ccb->ccb_h.status |= CAM_REQ_ABORTED;
diff --git a/sys/dev/ata/ata-all.c b/sys/dev/ata/ata-all.c
index a4fcbc179c05..e336c444e97c 100644
--- a/sys/dev/ata/ata-all.c
+++ b/sys/dev/ata/ata-all.c
@@ -1013,10 +1013,6 @@ ataaction(struct cam_sim *sim, union ccb *ccb)
}
ata_cam_begin_transaction(dev, ccb);
return;
- case XPT_EN_LUN: /* Enable LUN as a target */
- case XPT_TARGET_IO: /* Execute target I/O request */
- case XPT_ACCEPT_TARGET_IO: /* Accept Host Target Mode CDB */
- case XPT_CONT_TARGET_IO: /* Continue Host Target I/O Connection*/
case XPT_ABORT: /* Abort the specified CCB */
/* XXX Implement */
ccb->ccb_h.status = CAM_REQ_INVALID;
diff --git a/sys/dev/buslogic/bt.c b/sys/dev/buslogic/bt.c
index c17c4f439b4c..9c32caebf493 100644
--- a/sys/dev/buslogic/bt.c
+++ b/sys/dev/buslogic/bt.c
@@ -1217,10 +1217,6 @@ btaction(struct cam_sim *sim, union ccb *ccb)
}
break;
}
- case XPT_EN_LUN: /* Enable LUN as a target */
- case XPT_TARGET_IO: /* Execute target I/O request */
- case XPT_ACCEPT_TARGET_IO: /* Accept Host Target Mode CDB */
- case XPT_CONT_TARGET_IO: /* Continue Host Target I/O Connection*/
case XPT_ABORT: /* Abort the specified CCB */
/* XXX Implement */
ccb->ccb_h.status = CAM_REQ_INVALID;
diff --git a/sys/dev/hptmv/entry.c b/sys/dev/hptmv/entry.c
index 8f60be25a2b8..b01fc9c917da 100644
--- a/sys/dev/hptmv/entry.c
+++ b/sys/dev/hptmv/entry.c
@@ -2289,10 +2289,6 @@ hpt_action(struct cam_sim *sim, union ccb *ccb)
break;
case XPT_RESET_DEV: /* Bus Device Reset the specified SCSI device */
- case XPT_EN_LUN: /* Enable LUN as a target */
- case XPT_TARGET_IO: /* Execute target I/O request */
- case XPT_ACCEPT_TARGET_IO: /* Accept Host Target Mode CDB */
- case XPT_CONT_TARGET_IO: /* Continue Host Target I/O Connection*/
case XPT_ABORT: /* Abort the specified CCB */
case XPT_TERM_IO: /* Terminate the I/O process */
/* XXX Implement */
diff --git a/sys/dev/mvs/mvs.c b/sys/dev/mvs/mvs.c
index 85c2247fd3a8..9b48d445acbc 100644
--- a/sys/dev/mvs/mvs.c
+++ b/sys/dev/mvs/mvs.c
@@ -2288,10 +2288,6 @@ mvsaction(struct cam_sim *sim, union ccb *ccb)
}
mvs_begin_transaction(dev, ccb);
return;
- case XPT_EN_LUN: /* Enable LUN as a target */
- case XPT_TARGET_IO: /* Execute target I/O request */
- case XPT_ACCEPT_TARGET_IO: /* Accept Host Target Mode CDB */
- case XPT_CONT_TARGET_IO: /* Continue Host Target I/O Connection*/
case XPT_ABORT: /* Abort the specified CCB */
/* XXX Implement */
ccb->ccb_h.status = CAM_REQ_INVALID;
diff --git a/sys/dev/ncr/ncr.c b/sys/dev/ncr/ncr.c
index b2bfcdba89e6..d6e1ddf637ca 100644
--- a/sys/dev/ncr/ncr.c
+++ b/sys/dev/ncr/ncr.c
@@ -4152,10 +4152,6 @@ ncr_action (struct cam_sim *sim, union ccb *ccb)
break;
}
case XPT_RESET_DEV: /* Bus Device Reset the specified SCSI device */
- case XPT_EN_LUN: /* Enable LUN as a target */
- case XPT_TARGET_IO: /* Execute target I/O request */
- case XPT_ACCEPT_TARGET_IO: /* Accept Host Target Mode CDB */
- case XPT_CONT_TARGET_IO: /* Continue Host Target I/O Connection*/
case XPT_ABORT: /* Abort the specified CCB */
/* XXX Implement */
ccb->ccb_h.status = CAM_REQ_INVALID;
diff --git a/sys/dev/nvme/nvme_sim.c b/sys/dev/nvme/nvme_sim.c
index 397a3bc7110a..91b6a7d5dbb7 100644
--- a/sys/dev/nvme/nvme_sim.c
+++ b/sys/dev/nvme/nvme_sim.c
@@ -143,10 +143,6 @@ nvme_sim_action(struct cam_sim *sim, union ccb *ccb)
*/
/*FALLTHROUGH*/
case XPT_ABORT: /* Abort the specified CCB */
- case XPT_EN_LUN: /* Enable LUN as a target */
- case XPT_TARGET_IO: /* Execute target I/O request */
- case XPT_ACCEPT_TARGET_IO: /* Accept Host Target Mode CDB */
- case XPT_CONT_TARGET_IO: /* Continue Host Target I/O Connection*/
/*
* Only target mode generates these, and only for SCSI. They are
* all invalid/unsupported for NVMe.
diff --git a/sys/dev/siis/siis.c b/sys/dev/siis/siis.c
index 976952f13c0c..8b5b3c69d1ba 100644
--- a/sys/dev/siis/siis.c
+++ b/sys/dev/siis/siis.c
@@ -1835,10 +1835,6 @@ siisaction(struct cam_sim *sim, union ccb *ccb)
}
siis_begin_transaction(dev, ccb);
return;
- case XPT_EN_LUN: /* Enable LUN as a target */
- case XPT_TARGET_IO: /* Execute target I/O request */
- case XPT_ACCEPT_TARGET_IO: /* Accept Host Target Mode CDB */
- case XPT_CONT_TARGET_IO: /* Continue Host Target I/O Connection*/
case XPT_ABORT: /* Abort the specified CCB */
/* XXX Implement */
ccb->ccb_h.status = CAM_REQ_INVALID;
diff --git a/sys/dev/sym/sym_hipd.c b/sys/dev/sym/sym_hipd.c
index a3a101ff5f06..76e658f5ee93 100644
--- a/sys/dev/sym/sym_hipd.c
+++ b/sys/dev/sym/sym_hipd.c
@@ -8090,11 +8090,6 @@ static void sym_action2(struct cam_sim *sim, union ccb *ccb)
sym_init (np, 1);
sym_xpt_done2(np, ccb, CAM_REQ_CMP);
break;
- case XPT_ACCEPT_TARGET_IO:
- case XPT_CONT_TARGET_IO:
- case XPT_EN_LUN:
- case XPT_NOTIFY_ACK:
- case XPT_IMMED_NOTIFY:
case XPT_TERM_IO:
default:
sym_xpt_done2(np, ccb, CAM_REQ_INVALID);
diff --git a/sys/dev/trm/trm.c b/sys/dev/trm/trm.c
index a205929c6ec9..5374807f2c11 100644
--- a/sys/dev/trm/trm.c
+++ b/sys/dev/trm/trm.c
@@ -543,11 +543,6 @@ trm_action(struct cam_sim *psim, union ccb *pccb)
target_lun = pccb->ccb_h.target_lun;
switch (pccb->ccb_h.func_code) {
- case XPT_NOOP:
- TRM_DPRINTF(" XPT_NOOP \n");
- pccb->ccb_h.status = CAM_REQ_INVALID;
- xpt_done(pccb);
- break;
/*
* Execute the requested I/O operation
*/
@@ -623,16 +618,6 @@ trm_action(struct cam_sim *psim, union ccb *pccb)
}
break;
}
- case XPT_GDEV_TYPE:
- TRM_DPRINTF(" XPT_GDEV_TYPE \n");
- pccb->ccb_h.status = CAM_REQ_INVALID;
- xpt_done(pccb);
- break;
- case XPT_GDEVLIST:
- TRM_DPRINTF(" XPT_GDEVLIST \n");
- pccb->ccb_h.status = CAM_REQ_INVALID;
- xpt_done(pccb);
- break;
/*
* Path routing inquiry
* Path Inquiry CCB
@@ -661,76 +646,33 @@ trm_action(struct cam_sim *psim, union ccb *pccb)
cpi->protocol_version = SCSI_REV_2;
cpi->ccb_h.status = CAM_REQ_CMP;
xpt_done(pccb);
- }
break;
+ }
/*
- * Release a frozen SIM queue
- * Release SIM Queue
+ * XPT_ABORT = 0x10, Abort the specified CCB
+ * Abort XPT request CCB
*/
- case XPT_REL_SIMQ:
- TRM_DPRINTF(" XPT_REL_SIMQ \n");
- pccb->ccb_h.status = CAM_REQ_INVALID;
- xpt_done(pccb);
- break;
- /*
- * Set Asynchronous Callback Parameters
- * Set Asynchronous Callback CCB
- */
- case XPT_SASYNC_CB:
- TRM_DPRINTF(" XPT_SASYNC_CB \n");
- pccb->ccb_h.status = CAM_REQ_INVALID;
- xpt_done(pccb);
- break;
- /*
- * Set device type information
- * Set Device Type CCB
- */
- case XPT_SDEV_TYPE:
- TRM_DPRINTF(" XPT_SDEV_TYPE \n");
- pccb->ccb_h.status = CAM_REQ_INVALID;
- xpt_done(pccb);
- break;
- /*
- * Get EDT entries matching the given pattern
- */
- case XPT_DEV_MATCH:
- TRM_DPRINTF(" XPT_DEV_MATCH \n");
- pccb->ccb_h.status = CAM_REQ_INVALID;
- xpt_done(pccb);
- break;
- /*
- * Turn on debugging for a bus, target or lun
- */
- case XPT_DEBUG:
- TRM_DPRINTF(" XPT_DEBUG \n");
- pccb->ccb_h.status = CAM_REQ_INVALID;
- xpt_done(pccb);
- break;
- /*
- * XPT_ABORT = 0x10, Abort the specified CCB
- * Abort XPT request CCB
- */
case XPT_ABORT:
TRM_DPRINTF(" XPT_ABORT \n");
pccb->ccb_h.status = CAM_REQ_INVALID;
xpt_done(pccb);
break;
/*
- * Reset the specified SCSI bus
- * Reset SCSI Bus CCB
- */
- case XPT_RESET_BUS: {
+ * Reset the specified SCSI bus
+ * Reset SCSI Bus CCB
+ */
+ case XPT_RESET_BUS: {
int i;
TRM_DPRINTF(" XPT_RESET_BUS \n");
- trm_reset(pACB);
+ trm_reset(pACB);
pACB->ACBFlag=0;
for (i=0; i<500; i++)
DELAY(1000);
pccb->ccb_h.status = CAM_REQ_CMP;
xpt_done(pccb);
- }
break;
+ }
/*
* Bus Device Reset the specified SCSI device
* Reset SCSI Device CCB
@@ -929,92 +871,6 @@ trm_action(struct cam_sim *psim, union ccb *pccb)
cam_calc_geometry(&pccb->ccg, /*extended*/1);
xpt_done(pccb);
break;
- case XPT_ENG_INQ:
- TRM_DPRINTF(" XPT_ENG_INQ \n");
- pccb->ccb_h.status = CAM_REQ_INVALID;
- xpt_done(pccb);
- break;
- /*
- * HBA execute engine request
- * This structure must match SCSIIO size
- */
- case XPT_ENG_EXEC:
- TRM_DPRINTF(" XPT_ENG_EXEC \n");
- pccb->ccb_h.status = CAM_REQ_INVALID;
- xpt_done(pccb);
- break;
- /*
- * XPT_EN_LUN = 0x30, Enable LUN as a target
- * Target mode structures.
- */
- case XPT_EN_LUN:
- /*
- * Don't (yet?) support vendor
- * specific commands.
- */
- TRM_DPRINTF(" XPT_EN_LUN \n");
- pccb->ccb_h.status = CAM_REQ_INVALID;
- xpt_done(pccb);
- break;
- /*
- * Execute target I/O request
- */
- case XPT_TARGET_IO:
- /*
- * Don't (yet?) support vendor
- * specific commands.
- */
- TRM_DPRINTF(" XPT_TARGET_IO \n");
- pccb->ccb_h.status = CAM_REQ_INVALID;
- xpt_done(pccb);
- break;
- /*
- * Accept Host Target Mode CDB
- */
- case XPT_ACCEPT_TARGET_IO:
- /*
- * Don't (yet?) support vendor
- * specific commands.
- */
- TRM_DPRINTF(" XPT_ACCEPT_TARGET_IO \n");
- pccb->ccb_h.status = CAM_REQ_INVALID;
- xpt_done(pccb);
- break;
- /*
- * Continue Host Target I/O Connection
- */
- case XPT_CONT_TARGET_IO:
- /*
- * Don't (yet?) support vendor
- * specific commands.
- */
- TRM_DPRINTF(" XPT_CONT_TARGET_IO \n");
- pccb->ccb_h.status = CAM_REQ_INVALID;
- xpt_done(pccb);
- break;
- /*
- * Notify Host Target driver of event
- */
- case XPT_IMMED_NOTIFY:
- TRM_DPRINTF(" XPT_IMMED_NOTIFY \n");
- pccb->ccb_h.status = CAM_REQ_INVALID;
- xpt_done(pccb);
- break;
- /*
- * Acknowledgement of event
- */
- case XPT_NOTIFY_ACK:
- TRM_DPRINTF(" XPT_NOTIFY_ACK \n");
- pccb->ccb_h.status = CAM_REQ_INVALID;
- xpt_done(pccb);
- break;
- /*
- * XPT_VUNIQUE = 0x80
- */
- case XPT_VUNIQUE:
- pccb->ccb_h.status = CAM_REQ_INVALID;
- xpt_done(pccb);
- break;
default:
pccb->ccb_h.status = CAM_REQ_INVALID;
xpt_done(pccb);
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-21 06:47:35 +0000