d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Honor CAM_TAG_ACTION_NONE.

Browse Source
This commit is contained in:
Justin T. Gibbs 1998-10-15 23:17:58 +00:00
parent bb1f2fe47f
commit 0a42741c4a
4 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sys/dev/buslogic/bt.c
View File

@ -29,7 +29,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: bt.c,v 1.4 1998/09/20 05:08:15 gibbs Exp $
* $Id: bt.c,v 1.5 1998/10/09 21:38:34 gibbs Exp $
*/
/*
@ -1013,7 +1013,8 @@ btaction(struct cam_sim *sim, union ccb *ccb)
return;
}
hccb->sense_len = csio->sense_len;
if ((ccbh->flags & CAM_TAG_ACTION_VALID) != 0) {
if ((ccbh->flags & CAM_TAG_ACTION_VALID) != 0
&& ccb->csio.tag_action != CAM_TAG_ACTION_NONE) {
hccb->tag_enable = TRUE;
hccb->tag_type = (ccb->csio.tag_action & 0x3);
} else {
@ -2119,7 +2120,7 @@ bttimeout(void *arg)
if ((bccb->flags & BCCB_DEVICE_RESET) != 0
|| bt->cur_outbox->action_code != BMBO_FREE
|| ((ccb->ccb_h.flags & CAM_TAG_ACTION_VALID) != 0
|| ((bccb->hccb.tag_enable == TRUE)
&& (bt->firmware_ver[0] < '5'))) {
/*
* Try a full host adapter/SCSI bus reset.

5
sys/dev/dpt/dpt_scsi.c
View File

@ -43,7 +43,7 @@
* arrays that span controllers (Wow!).
*/
#ident "$Id: dpt_scsi.c,v 1.17 1998/10/02 03:40:53 gibbs Exp $"
#ident "$Id: dpt_scsi.c,v 1.18 1998/10/09 21:42:19 gibbs Exp $"
#define _DPT_C_
@ -779,7 +779,8 @@ dpt_action(struct cam_sim *sim, union ccb *ccb)
? 0 : 1;
eccb->cp_identify = 1;
if ((ccb->ccb_h.flags & CAM_TAG_ACTION_VALID) != 0) {
if ((ccb->ccb_h.flags & CAM_TAG_ACTION_VALID) != 0
&& csio->tag_action != CAM_TAG_ACTION_NONE) {
eccb->cp_msg[0] = csio->tag_action;
eccb->cp_msg[1] = dccb->tag;
} else {

3
sys/dev/isp/isp_freebsd_cam.h
View File

@ -178,7 +178,8 @@ struct isposinfo {
* Can we tag?
*/
#define XS_CANTAG(ccb) ((ccb)->ccb_h.flags & CAM_TAG_ACTION_VALID)
#define XS_CANTAG(ccb) (((ccb)->ccb_h.flags & CAM_TAG_ACTION_VALID) \
&& (ccb)->tag_action != CAM_TAG_ACTION_NONE)
/*
* And our favorite tag is....
*/

5
sys/pci/ncr.c
View File

@ -1,6 +1,6 @@
/**************************************************************************
**
** $Id: ncr.c,v 1.135 1998/09/26 14:37:49 dfr Exp $
** $Id: ncr.c,v 1.136 1998/09/29 09:14:52 bde Exp $
**
** Device driver for the NCR 53C8XX PCI-SCSI-Controller Family.
**
@ -1357,7 +1357,7 @@ static void ncr_attach (pcici_t tag, int unit);
static char ident[] =
"\n$Id: ncr.c,v 1.135 1998/09/26 14:37:49 dfr Exp $\n";
"\n$Id: ncr.c,v 1.136 1998/09/29 09:14:52 bde Exp $\n";
static const u_long ncr_version = NCR_VERSION * 11
+ (u_long) sizeof (struct ncb) * 7
@ -4023,6 +4023,7 @@ ncr_action (struct cam_sim *sim, union ccb *ccb)
lp = tp->lp[ccb->ccb_h.target_lun];
if ((ccb->ccb_h.flags & CAM_TAG_ACTION_VALID) != 0
&& (ccb->csio.tag_action != CAM_TAG_ACTION_NONE)
&& (nego == 0)) {
/*
** assign a tag to this nccb