4c4,5
< * Copyright (c) 1997, 1998, 1999, 2000, 2001 by Matthew Jacob
---
> * Copyright (c) 1997-2006 by Matthew Jacob
> * All rights reserved.
29c30
< __FBSDID("$FreeBSD: head/sys/dev/isp/isp_freebsd.c 151834 2005-10-29 02:46:59Z mjacob $");
---
> __FBSDID("$FreeBSD: head/sys/dev/isp/isp_freebsd.c 154704 2006-01-23 06:23:37Z mjacob $");
509a511
> u_int16_t loopid;
519c521,524
<
---
> loopid = fct->loopid;
> if (IS_2KLOGIN(isp) == 0) {
> loopid <<= 8;
> }
523c528
< mbs.param[1] = fct->loopid << 8;
---
> mbs.param[1] = loopid;
528c533
< mbs.param[1] = fct->loopid << 8;
---
> mbs.param[1] = loopid;
533c538
< mbs.param[1] = fct->loopid << 8;
---
> mbs.param[1] = loopid;
539c544
< mbs.param[1] = fct->loopid << 8;
---
> mbs.param[1] = loopid;
545c550
< mbs.param[1] = fct->loopid << 8;
---
> mbs.param[1] = loopid;
609d613
< static void isp_handle_platform_ctio_fastpost(struct ispsoftc *, u_int32_t);
1799,1811d1802
< static void
< isp_handle_platform_ctio_fastpost(struct ispsoftc *isp, u_int32_t token)
< {
< union ccb *ccb;
< ccb = isp_find_xs_tgt(isp, token & 0xffff);
< KASSERT((ccb != NULL),
< ("null ccb in isp_handle_platform_ctio_fastpost"));
< isp_destroy_tgt_handle(isp, token & 0xffff);
< isp_prt(isp, ISP_LOGTDEBUG1, "CTIOx[%x] fastpost complete",
< token & 0xffff);
< isp_complete_ctio(ccb);
< }
<
3084c3075
< case ISPASYNC_TARGET_MESSAGE:
---
> case ISPASYNC_TARGET_NOTIFY:
3086c3077
< tmd_msg_t *mp = arg;
---
> tmd_notify_t *nt = arg;
3088,3091c3079
< "bus %d iid %d tgt %d lun %d ttype %x tval %x msg[0]=%x",
< mp->nt_bus, (int) mp->nt_iid, (int) mp->nt_tgt,
< (int) mp->nt_lun, mp->nt_tagtype, mp->nt_tagval,
< mp->nt_msg[0]);
---
> "target notify code 0x%x", nt->nt_ncode);
3094,3109d3081
< case ISPASYNC_TARGET_EVENT:
< {
< tmd_event_t *ep = arg;
< if (ep->ev_event == ASYNC_CTIO_DONE) {
< /*
< * ACK the interrupt first
< */
< ISP_WRITE(isp, BIU_SEMA, 0);
< ISP_WRITE(isp, HCCR, HCCR_CMD_CLEAR_RISC_INT);
< isp_handle_platform_ctio_fastpost(isp, ep->ev_bus);
< break;
< }
< isp_prt(isp, ISP_LOGALL,
< "bus %d event code 0x%x", ep->ev_bus, ep->ev_event);
< break;
< }