From 1da3ff4eea5253f4186b51d5651ff1f2ebeaa34c Mon Sep 17 00:00:00 2001 From: "Justin T. Gibbs" Date: Sun, 20 Sep 1998 07:19:53 +0000 Subject: Drop the maximum SG count to 32 from 1024. We can't make use of all of those extra ones yet, anyway. In dpttimeout, expect that the controller will complete aborted CCBs through the interrupt handler. This corrects a panic that was caused by completing the same transaction twice during timeout recovery. Honor the tag times types expressed by the user and pass them down to the controller. --- sys/dev/dpt/dpt.h | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'sys/dev/dpt/dpt.h') diff --git a/sys/dev/dpt/dpt.h b/sys/dev/dpt/dpt.h index b6f67318a345..79f4de409f47 100644 --- a/sys/dev/dpt/dpt.h +++ b/sys/dev/dpt/dpt.h @@ -40,7 +40,7 @@ */ -#ident "$Id: dpt.h,v 1.4 1998/08/05 00:54:37 eivind Exp $" +#ident "$Id: dpt.h,v 1.2 1998/09/15 08:33:31 gibbs Exp $" #ifndef _DPT_H #define _DPT_H @@ -100,7 +100,7 @@ typedef void *physaddr; * them in fixed increments, we need to put a practical limit on * these. A passed parameter (from kernel boot or lkm) would help */ -#define DPT_MAX_SEGS 1024 +#define DPT_MAX_SEGS 32 /* Debug levels */ @@ -898,9 +898,10 @@ typedef struct dpt_ccb { dccb_state state; union ccb *ccb; struct scsi_sense_data sense_data; + u_int8_t tag; u_int8_t retries; - u_int8_t status; /* status of this queueslot */ - u_int8_t *cmd; /* address of cmd */ + u_int8_t status; /* status of this queueslot */ + u_int8_t *cmd; /* address of cmd */ u_int32_t transaction_id; u_int32_t result; -- cgit v1.3