aboutsummaryrefslogtreecommitdiff
path: root/sys/dev/firewire
diff options
context:
space:
mode:
authorKenneth D. Merry <ken@FreeBSD.org>2012-06-26 14:51:35 +0000
committerKenneth D. Merry <ken@FreeBSD.org>2012-06-26 14:51:35 +0000
commitb79dc8a8da264fafa98697a39a967e56ed8647d1 (patch)
tree7b016bc8afd686b682aaffe21bfcace67afaf0e7 /sys/dev/firewire
parent8405fe86627bd23303e30797ec2e5ec37f493491 (diff)
Notes
Diffstat (limited to 'sys/dev/firewire')
-rw-r--r--sys/dev/firewire/sbp_targ.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/sys/dev/firewire/sbp_targ.c b/sys/dev/firewire/sbp_targ.c
index 3a7438916891..34a75cbbc1d0 100644
--- a/sys/dev/firewire/sbp_targ.c
+++ b/sys/dev/firewire/sbp_targ.c
@@ -533,7 +533,7 @@ sbp_targ_send_lstate_events(struct sbp_targ_softc *sc,
{
#if 0
struct ccb_hdr *ccbh;
- struct ccb_immed_notify *inot;
+ struct ccb_immediate_notify *inot;
printf("%s: not implemented yet\n", __func__);
#endif
@@ -908,7 +908,7 @@ sbp_targ_abort_ccb(struct sbp_targ_softc *sc, union ccb *ccb)
if (accb->ccb_h.func_code == XPT_ACCEPT_TARGET_IO)
list = &lstate->accept_tios;
- else if (accb->ccb_h.func_code == XPT_IMMED_NOTIFY)
+ else if (accb->ccb_h.func_code == XPT_IMMEDIATE_NOTIFY)
list = &lstate->immed_notifies;
else
return (CAM_UA_ABORT);
@@ -1301,8 +1301,8 @@ sbp_targ_action1(struct cam_sim *sim, union ccb *ccb)
}
}
break;
- case XPT_NOTIFY_ACK: /* recycle notify ack */
- case XPT_IMMED_NOTIFY: /* Add Immediate Notify Resource */
+ case XPT_NOTIFY_ACKNOWLEDGE: /* recycle notify ack */
+ case XPT_IMMEDIATE_NOTIFY: /* Add Immediate Notify Resource */
if (status != CAM_REQ_CMP) {
ccb->ccb_h.status = status;
xpt_done(ccb);
@@ -1349,7 +1349,7 @@ sbp_targ_action1(struct cam_sim *sim, union ccb *ccb)
switch (accb->ccb_h.func_code) {
case XPT_ACCEPT_TARGET_IO:
- case XPT_IMMED_NOTIFY:
+ case XPT_IMMEDIATE_NOTIFY:
ccb->ccb_h.status = sbp_targ_abort_ccb(sc, ccb);
break;
case XPT_CONT_TARGET_IO: