diff -urN linux-2.2.16-22-orig/drivers/scsi/aacraid/aachba.c linux-2.2.16-22-devel/drivers/scsi/aacraid/aachba.c
--- linux-2.2.16-22-orig/drivers/scsi/aacraid/aachba.c	Wed Oct 11 14:56:00 2000
+++ linux-2.2.16-22-devel/drivers/scsi/aacraid/aachba.c	Thu Nov  2 18:49:32 2000
@@ -23,6 +23,9 @@
  * Abstract: driver...
  *
 --*/
+
+static char *ident_aachba = "aacraid_ident aachba.c 1.0.6 2000/10/09 Adaptec, Inc.";
+
 /*------------------------------------------------------------------------------
  *              I N C L U D E S
  *----------------------------------------------------------------------------*/
diff -urN linux-2.2.16-22-orig/drivers/scsi/aacraid/aacid.c linux-2.2.16-22-devel/drivers/scsi/aacraid/aacid.c
--- linux-2.2.16-22-orig/drivers/scsi/aacraid/aacid.c	Wed Oct 11 14:56:00 2000
+++ linux-2.2.16-22-devel/drivers/scsi/aacraid/aacid.c	Thu Nov  2 18:54:13 2000
@@ -24,6 +24,8 @@
  *
 --*/
 
+static char *ident_aacid = "aacraid_ident aacid.c 1.0.6 2000/10/09 Adaptec, Inc.";
+
 #include "osheaders.h"
 
 #include "AacGenericTypes.h"
@@ -136,8 +138,8 @@
 	{ 0x1028, 0x0002, 0x1028, 0x0002, "afa", RxInitDevice, "percraid", "DELL    ", "PERCRAID        " }, /* PERC 3/Di */
 	{ 0x1028, 0x0003, 0x1028, 0x0003, "afa", RxInitDevice, "percraid", "DELL    ", "PERCRAID        " }, /* PERC 3/Si */
 	{ 0x1028, 0x0004, 0x1028, 0x00d0, "afa", RxInitDevice, "percraid", "DELL    ", "PERCRAID        " }, /* PERC 3/Si */
-	{ 0x1028, 0x0005, 0x1028, 0x00d1, "afa", RxInitDevice, "percraid", "DELL    ", "PERCRAID        " }, /* PERC 3/Di */
-	{ 0x1028, 0x0006, 0x1028, 0x00d9, "afa", RxInitDevice, "percraid", "DELL    ", "PERCRAID        " }, /* PERC 3/Di */
+	{ 0x1028, 0x0002, 0x1028, 0x00d1, "afa", RxInitDevice, "percraid", "DELL    ", "PERCRAID        " }, /* PERC 3/Di */
+	{ 0x1028, 0x0002, 0x1028, 0x00d9, "afa", RxInitDevice, "percraid", "DELL    ", "PERCRAID        " }, /* PERC 3/Di */
 	{ 0x1028, 0x0008, 0x1028, 0x00cf, "afa", RxInitDevice, "percraid", "DELL    ", "PERCRAID        " }, /* PERC 3/Di */
 	{ 0x1011, 0x0046, 0x9005, 0x1364, "afa", SaInitDevice, "percraid", "DELL    ", "PERCRAID        " }, /* Dell PERC2 "Quad Channel */
 	{ 0x1011, 0x0046, 0x103c, 0x10c2, "hpn", SaInitDevice, "hpnraid",  "HP      ", "NetRAID-4M      " }  /* HP NetRAID-4M */
diff -urN linux-2.2.16-22-orig/drivers/scsi/aacraid/commctrl.c linux-2.2.16-22-devel/drivers/scsi/aacraid/commctrl.c
--- linux-2.2.16-22-orig/drivers/scsi/aacraid/commctrl.c	Wed Oct 11 14:56:00 2000
+++ linux-2.2.16-22-devel/drivers/scsi/aacraid/commctrl.c	Thu Nov  2 18:49:32 2000
@@ -24,6 +24,8 @@
  *
 --*/
 
+static char *ident_commctrl = "aacraid_ident commctrl.c 1.0.7 2000/10/11 Adaptec, Inc.";
+
 #include "comprocs.h"
 #include "osheaders.h"
 #include "ostypes.h"
@@ -642,6 +644,11 @@
 		InitializeListHead(&AdapterFibContext->FibList);
 
 		//
+		// Overload FileObject with a time stamp.
+		//
+		AdapterFibContext->FileObject = (void *)OsGetSeconds();
+
+		//
 		// Now add this context onto the adapter's AdapterFibContext list.
 		//
 
@@ -696,9 +703,11 @@
 --*/
 {
 	GET_ADAPTER_FIB_IOCTL AdapterFibIoctl;
-	PGET_ADAPTER_FIB_CONTEXT AdapterFibContext;
+	PGET_ADAPTER_FIB_CONTEXT AdapterFibContext, aifcp;
 	PFIB Fib;
 	int Status;
+	PLIST_ENTRY Entry;
+	int found;
 
 	if (COPYIN( (caddr_t) IoctlCmdPtr->arg, (caddr_t) &AdapterFibIoctl,
 					sizeof(GET_ADAPTER_FIB_IOCTL), IoctlCmdPtr->flag )) {
@@ -714,8 +723,24 @@
 	//
 	// Verify that the HANDLE passed in was a valid AdapterFibContext
 	//
-	// rpbfix : determine if there is a way to validate the AdapterFibContext address.
-	//
+	// Search the list of AdapterFibContext addresses on the adapter to be sure
+	// this is a valid address
+
+	found = 0;
+	Entry = Adapter->AdapterFibContextList.Flink;
+
+	while ( Entry != &Adapter->AdapterFibContextList ) {
+			aifcp = CONTAINING_RECORD ( Entry, GET_ADAPTER_FIB_CONTEXT, NextContext );
+			if ( AdapterFibContext == aifcp ) {   // We found a winner
+					found = 1;
+					break;
+			}
+			Entry = Entry->Flink;
+	}
+
+	if ( found == 0 ) {
+			return ( EINVAL );;
+	}
 
 	if ( (AdapterFibContext->NodeTypeCode != FSAFS_NTC_GET_ADAPTER_FIB_CONTEXT) ||
 		 (AdapterFibContext->NodeByteSize != sizeof(GET_ADAPTER_FIB_CONTEXT)) ) {
@@ -762,6 +787,11 @@
 
         Status = 0;
 
+		//
+		// Overload FileObject with a time stamp
+		// 
+		AdapterFibContext->FileObject = ( void * )OsGetSeconds();
+
 	} else {
 
 		if (AdapterFibIoctl.Wait) {
@@ -812,9 +842,12 @@
 
 --*/
 {
-	PGET_ADAPTER_FIB_CONTEXT AdapterFibContext;
+	PGET_ADAPTER_FIB_CONTEXT AdapterFibContext, aifcp;
 	AAC_STATUS Status;
 
+	PLIST_ENTRY Entry;
+	int found;
+
 	//
 	// Extract the AdapterFibContext from the Input parameters
 	//
@@ -829,8 +862,24 @@
 	//
 	// Verify that the HANDLE passed in was a valid AdapterFibContext
 	//
-	//	rpbfix : verify pointer sent in from user.
-	//
+	// Search the list of AdapterFibContext addresses on the adapter to be sure
+	// this is a valid address
+
+	found = 0;
+	Entry = Adapter->AdapterFibContextList.Flink;
+
+	while ( Entry != &Adapter->AdapterFibContextList ) {
+			aifcp = CONTAINING_RECORD ( Entry, GET_ADAPTER_FIB_CONTEXT, NextContext );
+			if ( AdapterFibContext == aifcp ) {   // We found a winner
+					found = 1;
+					break;
+			}
+			Entry = Entry->Flink;
+	}
+
+	if ( found == 0 ) {
+		return ( 0 ); // Already Gone
+	}
 
 	if ( (AdapterFibContext->NodeTypeCode != FSAFS_NTC_GET_ADAPTER_FIB_CONTEXT) ||
 		 (AdapterFibContext->NodeByteSize != sizeof(GET_ADAPTER_FIB_CONTEXT)) ) {
diff -urN linux-2.2.16-22-orig/drivers/scsi/aacraid/comminit.c linux-2.2.16-22-devel/drivers/scsi/aacraid/comminit.c
--- linux-2.2.16-22-orig/drivers/scsi/aacraid/comminit.c	Wed Oct 11 14:56:00 2000
+++ linux-2.2.16-22-devel/drivers/scsi/aacraid/comminit.c	Thu Nov  2 18:49:32 2000
@@ -24,6 +24,9 @@
  *    This is a platform dependent module for the pci cyclone board.
  *
  --*/
+
+static char *ident_comminit = "aacraid_ident comminit.c 1.0.6 2000/10/09 Adaptec, Inc.";
+
 #include "comprocs.h"
 
 #define BugCheckFileId                   (FSAFS_BUG_CHECK_COMMINIT)
diff -urN linux-2.2.16-22-orig/drivers/scsi/aacraid/commsup.c linux-2.2.16-22-devel/drivers/scsi/aacraid/commsup.c
--- linux-2.2.16-22-orig/drivers/scsi/aacraid/commsup.c	Wed Oct 11 14:56:00 2000
+++ linux-2.2.16-22-devel/drivers/scsi/aacraid/commsup.c	Thu Nov  2 18:49:32 2000
@@ -25,6 +25,9 @@
  *
  *
  --*/
+
+static char *ident_commsup = "aacraid_ident commsup.c 1.0.7 2000/10/11 Adaptec, Inc.";
+
 #include "comprocs.h"
 
 #define BugCheckFileId                   (FSAFS_BUG_CHECK_COMMSUP)
@@ -1375,7 +1378,7 @@
 	PFIB Fib = FibContext->Fib;
     IN PCOMM_QUE OurQueue;
 
-//	cmn_err( CE_NOTE, "^SendFib entered\n");
+//	cmn_err( CE_DEBUG, "^SendFib entered\n");
 
     Timeout = FsaCommData.AdapterTimeout;
 
@@ -2056,7 +2059,7 @@
 		return (EINVAL);
 	}
 
-// cmn_err(CE_NOTE, "AIF thread started");
+// cmn_err(CE_DEBUG, "AIF thread started");
 
 	//
 	// Let the DPC know it has a place to send the AIF's to.
@@ -2092,7 +2095,7 @@
 			// do.
 			//
 			
-			// cmn_err(CE_NOTE, "Got Fib from the adapter with a NORMAL priority, command 0x%x.\n", Fib->Header.Command);
+			// cmn_err(CE_DEBUG, "Got Fib from the adapter with a NORMAL priority, command 0x%x.\n", Fib->Header.Command);
 
 			RtlZeroMemory( &FibContext, sizeof(COMM_FIB_CONTEXT) );
 
@@ -2120,6 +2123,8 @@
 				HandleDriverAif( Adapter, &FibContext );
 
 			} else {
+					AAC_UINT32 time_now, time_last;
+					time_now = (AAC_UINT32)OsGetSeconds();
 			
 
 				OsCvLockAcquire(Adapter->AdapterFibMutex);
@@ -2139,6 +2144,25 @@
 
 					AdapterFibContext = CONTAINING_RECORD( Entry, GET_ADAPTER_FIB_CONTEXT, NextContext );
 
+					//
+					// Check if the queue is getting backlogged
+					//
+					if ( AdapterFibContext->FibCount > 20 ) {
+						time_last = (AAC_UINT32)(AdapterFibContext->FileObject);
+
+						//
+						// has it been > 2 minutes since the last read off the queue?
+						//
+						if ((time_now - time_last) > 120) {
+							Entry = Entry->Flink;
+							// cmn_err (CE_WARN, "aifd: Flushing orphaned AdapterFibContext: idle %d seconds, %d fibs",
+							//		 time_now - time_last,
+							//		 AdapterFibContext->FibCount);
+							FsaCloseAdapterFibContext ( Adapter, AdapterFibContext );
+							continue;
+						}
+					}
+									
 //  Warning: sleep possible while holding spinlock
 					NewFib = OsAllocMemory(sizeof(FIB), OS_ALLOC_MEM_SLEEP);
 
@@ -2192,7 +2216,7 @@
 		// to process.
 		//
 
-		// cmn_err(CE_NOTE, "no more AIF's going to sleep\n");
+		// cmn_err(CE_DEBUG, "no more AIF's going to sleep\n");
 
 		if (OsCv_wait_sig( &(CommRegion->HostNormCmdQue.CommandReady), 
 						 CommRegion->HostNormCmdQue.QueueLock ) == 0) {
@@ -2201,13 +2225,13 @@
 
 			Adapter->AifThreadStarted = FALSE;
 
-			// cmn_err(CE_NOTE, "AifThread awoken by a signal\n");
+			// cmn_err(CE_DEBUG, "AifThread awoken by a signal\n");
 			
 			return (EINTR);
 			
 		}				 
 
-		// cmn_err(CE_NOTE, "^Aif thread awake, going to look for more AIF's\n");
+		// cmn_err(CE_DEBUG, "Aif thread awake, going to look for more AIF's\n");
 
 	}
 }
diff -urN linux-2.2.16-22-orig/drivers/scsi/aacraid/dpcsup.c linux-2.2.16-22-devel/drivers/scsi/aacraid/dpcsup.c
--- linux-2.2.16-22-orig/drivers/scsi/aacraid/dpcsup.c	Wed Oct 11 14:56:00 2000
+++ linux-2.2.16-22-devel/drivers/scsi/aacraid/dpcsup.c	Thu Nov  2 18:49:32 2000
@@ -24,6 +24,9 @@
  *
  *
  --*/
+
+static char *ident_dpcsup = "aacraid_ident dpcsup.c 1.0.6 2000/10/09 Adaptec, Inc.";
+
 #include "comprocs.h"
 
 
diff -urN linux-2.2.16-22-orig/drivers/scsi/aacraid/include/AacGenericTypes.h linux-2.2.16-22-devel/drivers/scsi/aacraid/include/AacGenericTypes.h
--- linux-2.2.16-22-orig/drivers/scsi/aacraid/include/AacGenericTypes.h	Wed Oct 11 14:56:00 2000
+++ linux-2.2.16-22-devel/drivers/scsi/aacraid/include/AacGenericTypes.h	Thu Nov  2 18:49:32 2000
@@ -26,8 +26,11 @@
  *     The module defines the generic data types that all of the other header files
  *     depend upon.
  --*/
+
 #ifndef _AAC_GENERIC_TYPES
 #define _AAC_GENERIC_TYPES
+
+static char *ident_AacGeneric = "aacraid_ident AacGenericTypes.h 1.0.6 2000/10/09 Adaptec, Inc.";
 
 typedef	char			AAC_INT8, *PAAC_INT8;
 typedef short			AAC_INT16, *PAAC_INT16;
diff -urN linux-2.2.16-22-orig/drivers/scsi/aacraid/include/aac_unix_defs.h linux-2.2.16-22-devel/drivers/scsi/aacraid/include/aac_unix_defs.h
--- linux-2.2.16-22-orig/drivers/scsi/aacraid/include/aac_unix_defs.h	Wed Oct 11 14:56:00 2000
+++ linux-2.2.16-22-devel/drivers/scsi/aacraid/include/aac_unix_defs.h	Thu Nov  2 18:49:32 2000
@@ -30,6 +30,8 @@
 #ifndef _AAC_UNIX_DEFS
 #define _AAC_UNIX_DEFS
 
+static char *ident_aac_unix = "aacraid_ident aac_unix_defs.h 1.0.6 2000/10/09 Adaptec, Inc.";
+
 #define 	AAC_MAX_ADAPTERS	64
 
 #ifndef	TRUE
diff -urN linux-2.2.16-22-orig/drivers/scsi/aacraid/include/adapter.h linux-2.2.16-22-devel/drivers/scsi/aacraid/include/adapter.h
--- linux-2.2.16-22-orig/drivers/scsi/aacraid/include/adapter.h	Wed Oct 11 14:56:00 2000
+++ linux-2.2.16-22-devel/drivers/scsi/aacraid/include/adapter.h	Thu Nov  2 18:49:32 2000
@@ -31,6 +31,7 @@
 #ifndef _ADAPTER_
 #define _ADAPTER_
 
+static char *ident_adapter = "aacraid_ident adapter.h 1.0.6 2000/10/09 Adaptec, Inc.";
 
 typedef struct _GET_ADAPTER_FIB_CONTEXT {
 
diff -urN linux-2.2.16-22-orig/drivers/scsi/aacraid/include/afacomm.h linux-2.2.16-22-devel/drivers/scsi/aacraid/include/afacomm.h
--- linux-2.2.16-22-orig/drivers/scsi/aacraid/include/afacomm.h	Wed Oct 11 14:56:00 2000
+++ linux-2.2.16-22-devel/drivers/scsi/aacraid/include/afacomm.h	Thu Nov  2 18:49:32 2000
@@ -29,6 +29,8 @@
 #ifndef _AFACOMM_
 #define _AFACOMM_
 
+static char *ident_afacomm = "aacraid_ident afacomm.h 1.0.6 2000/10/09 Adaptec, Inc.";
+
 #include "fsaport.h"
 
 typedef void	*PFIB_CONTEXT;
diff -urN linux-2.2.16-22-orig/drivers/scsi/aacraid/include/aifstruc.h linux-2.2.16-22-devel/drivers/scsi/aacraid/include/aifstruc.h
--- linux-2.2.16-22-orig/drivers/scsi/aacraid/include/aifstruc.h	Wed Oct 11 14:56:00 2000
+++ linux-2.2.16-22-devel/drivers/scsi/aacraid/include/aifstruc.h	Thu Nov  2 18:49:32 2000
@@ -31,6 +31,8 @@
 #ifndef _AIFSTRUC_H
 #define _AIFSTRUC_H
 
+static char *ident_aifstruc = "aacraid_ident aifstruc.h 1.0.6 2000/10/09 Adaptec, Inc.";
+
 #include <protocol.h>
 
 //
diff -urN linux-2.2.16-22-orig/drivers/scsi/aacraid/include/build_number.h linux-2.2.16-22-devel/drivers/scsi/aacraid/include/build_number.h
--- linux-2.2.16-22-orig/drivers/scsi/aacraid/include/build_number.h	Wed Oct 11 14:56:00 2000
+++ linux-2.2.16-22-devel/drivers/scsi/aacraid/include/build_number.h	Thu Nov  2 18:49:32 2000
@@ -30,6 +30,7 @@
 #ifndef _BUILD_NUMBER_H 
 #define _BUILD_NUMBER_H 
 
+static char *ident_build_num = "aacraid_ident build_number.h 1.0.6 2000/10/09 Adaptec, Inc.";
 
 #define REV_BUILD_NUMBER 3911 
 
diff -urN linux-2.2.16-22-orig/drivers/scsi/aacraid/include/commdata.h linux-2.2.16-22-devel/drivers/scsi/aacraid/include/commdata.h
--- linux-2.2.16-22-orig/drivers/scsi/aacraid/include/commdata.h	Wed Oct 11 14:56:00 2000
+++ linux-2.2.16-22-devel/drivers/scsi/aacraid/include/commdata.h	Thu Nov  2 18:49:32 2000
@@ -28,6 +28,8 @@
 #ifndef _COMMDATA_
 #define _COMMDATA_
 
+static char *ident_commdata = "aacraid_ident commdata.h 1.0.6 2000/10/09 Adaptec, Inc.";
+
 typedef struct _FSA_COMM_DATA {
   
   //
diff -urN linux-2.2.16-22-orig/drivers/scsi/aacraid/include/commerr.h linux-2.2.16-22-devel/drivers/scsi/aacraid/include/commerr.h
--- linux-2.2.16-22-orig/drivers/scsi/aacraid/include/commerr.h	Wed Oct 11 14:56:00 2000
+++ linux-2.2.16-22-devel/drivers/scsi/aacraid/include/commerr.h	Thu Nov  2 18:49:32 2000
@@ -28,6 +28,9 @@
 
 #ifndef _FSAERR_
 #define _FSAERR_
+
+static char *ident_commerr = "aacraid_ident commerr.h 1.0.6 2000/10/09 Adaptec, Inc.";
+
 //
 //  Note: comments in the .mc file must use both ";" and "//".
 //
diff -urN linux-2.2.16-22-orig/drivers/scsi/aacraid/include/commfibcontext.h linux-2.2.16-22-devel/drivers/scsi/aacraid/include/commfibcontext.h
--- linux-2.2.16-22-orig/drivers/scsi/aacraid/include/commfibcontext.h	Wed Oct 11 14:56:00 2000
+++ linux-2.2.16-22-devel/drivers/scsi/aacraid/include/commfibcontext.h	Thu Nov  2 18:49:32 2000
@@ -28,6 +28,8 @@
 #ifndef _COMM_FIB_CONTEXT_
 #define _COMM_FIB_CONTEXT_
 
+static char *ident_commfib = "aacraid_ident commfibcontext.h 1.0.6 2000/10/09 Adaptec, Inc.";
+
 typedef struct _COMM_FIB_CONTEXT {
 
 	PVOID		Next;	// this is used by the zone allocation
diff -urN linux-2.2.16-22-orig/drivers/scsi/aacraid/include/comprocs.h linux-2.2.16-22-devel/drivers/scsi/aacraid/include/comprocs.h
--- linux-2.2.16-22-orig/drivers/scsi/aacraid/include/comprocs.h	Wed Oct 11 14:56:00 2000
+++ linux-2.2.16-22-devel/drivers/scsi/aacraid/include/comprocs.h	Thu Nov  2 18:49:32 2000
@@ -28,6 +28,8 @@
 #ifndef _COMPROCS_
 #define _COMPROCS_
 
+static char *ident_comproc = "aacraid_ident comprocs.h 1.0.6 2000/10/09 Adaptec, Inc.";
+
 #include "osheaders.h"
 
 #include "AacGenericTypes.h"
diff -urN linux-2.2.16-22-orig/drivers/scsi/aacraid/include/comproto.h linux-2.2.16-22-devel/drivers/scsi/aacraid/include/comproto.h
--- linux-2.2.16-22-orig/drivers/scsi/aacraid/include/comproto.h	Wed Oct 11 14:56:00 2000
+++ linux-2.2.16-22-devel/drivers/scsi/aacraid/include/comproto.h	Thu Nov  2 18:49:32 2000
@@ -29,6 +29,8 @@
 #ifndef _COMM_PROTO
 #define _COMM_PROTO
 
+static char *ident_comproto = "aacraid_ident comproto.h 1.0.6 2000/10/09 Adaptec, Inc.";
+
 //
 // define the routines we need so we can commuicate with the
 // fsa adapter
diff -urN linux-2.2.16-22-orig/drivers/scsi/aacraid/include/comstruc.h linux-2.2.16-22-devel/drivers/scsi/aacraid/include/comstruc.h
--- linux-2.2.16-22-orig/drivers/scsi/aacraid/include/comstruc.h	Wed Oct 11 14:56:00 2000
+++ linux-2.2.16-22-devel/drivers/scsi/aacraid/include/comstruc.h	Thu Nov  2 18:49:32 2000
@@ -30,6 +30,8 @@
 #ifndef _COMM_STRUCT
 #define _COMM_STRUCT
 
+static char *ident_comstruc = "aacraid_ident comstruc.h 1.0.7 2000/10/11 Adaptec, Inc.";
+
 //
 // Define all the constants needed for the communication interface
 //
@@ -39,7 +41,6 @@
 // we support.
 
 #define NUMBER_OF_COMM_QUEUES  8   // 4 command; 4 response
-
 #define HOST_HIGH_CMD_ENTRIES  4
 #define HOST_NORM_CMD_ENTRIES  8
 #define ADAP_HIGH_CMD_ENTRIES  4
@@ -404,7 +405,29 @@
 } ADAPTER_INIT_STRUCT;
 typedef ADAPTER_INIT_STRUCT *PADAPTER_INIT_STRUCT;
 
+#ifdef AAC_32BIT_ENUMS
+typedef _E_FSA_ERRORS	FSA_ERRORS;
+#else
+typedef	AAC_UINT32		FSA_ERRORS;
+#endif
 
+typedef enum _LOG_LEVEL {
+	LOG_INIT				= 10,
+	LOG_INFORMATIONAL		= 20,
+	LOG_WARNING				= 30,
+	LOG_LOW_ERROR			= 40,
+	LOG_MEDIUM_ERROR		= 50,
+	LOG_HIGH_ERROR			= 60,
+	LOG_PANIC				= 70,
+	LOG_DEBUG				= 80,
+	LOG_WINDBG_PRINT		= 90
+} _E_LOG_LEVEL;
+
+#ifdef AAC_32BIT_ENUMS
+typedef _E_LOG_LEVEL	LOG_LEVEL;
+#else
+typedef	AAC_UINT32		LOG_LEVEL;
+#endif
 
 
 #endif //_COMM_STRUCT
diff -urN linux-2.2.16-22-orig/drivers/scsi/aacraid/include/comsup.h linux-2.2.16-22-devel/drivers/scsi/aacraid/include/comsup.h
--- linux-2.2.16-22-orig/drivers/scsi/aacraid/include/comsup.h	Wed Oct 11 14:56:00 2000
+++ linux-2.2.16-22-devel/drivers/scsi/aacraid/include/comsup.h	Thu Nov  2 18:49:32 2000
@@ -31,6 +31,7 @@
 #ifndef _COMM_SUP_DEF
 #define _COMM_SUP_DEF
 
+static char *ident_comsup = "aacraid_ident comsup.h 1.0.6 2000/10/09 Adaptec, Inc.";
 
 //
 // The adapter interface specs all queues to be located in the same physically
diff -urN linux-2.2.16-22-orig/drivers/scsi/aacraid/include/fsact.h linux-2.2.16-22-devel/drivers/scsi/aacraid/include/fsact.h
--- linux-2.2.16-22-orig/drivers/scsi/aacraid/include/fsact.h	Wed Oct 11 14:56:00 2000
+++ linux-2.2.16-22-devel/drivers/scsi/aacraid/include/fsact.h	Thu Nov  2 18:49:32 2000
@@ -28,6 +28,8 @@
 #ifndef _FSACT_H_
 #define	_FSACT_H_
 
+static char *ident_fsact = "aacraid_ident fsact.h 1.0.6 2000/10/09 Adaptec, Inc.";
+
 //#include <comstruc.h>
 //#include <fsatypes.h>
 #include <protocol.h> // definitions for FSASTATUS
diff -urN linux-2.2.16-22-orig/drivers/scsi/aacraid/include/fsafs.h linux-2.2.16-22-devel/drivers/scsi/aacraid/include/fsafs.h
--- linux-2.2.16-22-orig/drivers/scsi/aacraid/include/fsafs.h	Wed Oct 11 14:56:00 2000
+++ linux-2.2.16-22-devel/drivers/scsi/aacraid/include/fsafs.h	Thu Nov  2 18:49:32 2000
@@ -30,6 +30,7 @@
 #ifndef _FSAFS_H_
 #define	_FSAFS_H_ 1
 
+static char *ident_fsafs = "aacraid_ident fsafs.h 1.0.6 2000/10/09 Adaptec, Inc.";
 
 #include <fsatypes.h>   // core types, shared by client and server, eg, u_long
 
diff -urN linux-2.2.16-22-orig/drivers/scsi/aacraid/include/fsaioctl.h linux-2.2.16-22-devel/drivers/scsi/aacraid/include/fsaioctl.h
--- linux-2.2.16-22-orig/drivers/scsi/aacraid/include/fsaioctl.h	Wed Oct 11 14:56:00 2000
+++ linux-2.2.16-22-devel/drivers/scsi/aacraid/include/fsaioctl.h	Thu Nov  2 18:49:32 2000
@@ -30,6 +30,8 @@
 #ifndef _FSAIOCTL_H_
 #define _FSAIOCTL_H_
 
+static char *ident_fsaioctl = "aacraid_ident fsaioctl.h 1.0.6 2000/10/09 Adaptec, Inc.";
+
 #ifndef IOTRACEUSER
 
 #ifndef CTL_CODE
diff -urN linux-2.2.16-22-orig/drivers/scsi/aacraid/include/fsaport.h linux-2.2.16-22-devel/drivers/scsi/aacraid/include/fsaport.h
--- linux-2.2.16-22-orig/drivers/scsi/aacraid/include/fsaport.h	Wed Oct 11 14:56:00 2000
+++ linux-2.2.16-22-devel/drivers/scsi/aacraid/include/fsaport.h	Thu Nov  2 18:49:32 2000
@@ -29,6 +29,8 @@
 #ifndef _FSAPORT_
 #define _FSAPORT_
 
+static char *ident_fsaport = "aacraid_ident fsaport.h 1.0.6 2000/10/09 Adaptec, Inc.";
+
 //
 // The scatter/gather map context is the information we 
 // we need to keep the map and transfer data to and from the
diff -urN linux-2.2.16-22-orig/drivers/scsi/aacraid/include/fsatypes.h linux-2.2.16-22-devel/drivers/scsi/aacraid/include/fsatypes.h
--- linux-2.2.16-22-orig/drivers/scsi/aacraid/include/fsatypes.h	Wed Oct 11 14:56:00 2000
+++ linux-2.2.16-22-devel/drivers/scsi/aacraid/include/fsatypes.h	Thu Nov  2 18:49:32 2000
@@ -29,7 +29,7 @@
 #ifndef _FSATYPES_H
 #define _FSATYPES_H
 
-
+static char *ident_fsatype = "aacraid_ident fsatypes.h 1.0.6 2000/10/09 Adaptec, Inc.";
 
 typedef	AAC_UINT32		AAC_BOOLEAN;
 
diff -urN linux-2.2.16-22-orig/drivers/scsi/aacraid/include/linit.h linux-2.2.16-22-devel/drivers/scsi/aacraid/include/linit.h
--- linux-2.2.16-22-orig/drivers/scsi/aacraid/include/linit.h	Wed Oct 11 14:56:00 2000
+++ linux-2.2.16-22-devel/drivers/scsi/aacraid/include/linit.h	Thu Nov  2 18:49:33 2000
@@ -30,6 +30,8 @@
 #ifndef _LINIT_H_
 #define _LINIT_H_
 
+static char *ident_linith = "aacraid_ident linit.h 1.0.6 2000/10/09 Adaptec, Inc.";
+
 #include <linux/config.h>
 
 /*------------------------------------------------------------------------------
diff -urN linux-2.2.16-22-orig/drivers/scsi/aacraid/include/monkerapi.h linux-2.2.16-22-devel/drivers/scsi/aacraid/include/monkerapi.h
--- linux-2.2.16-22-orig/drivers/scsi/aacraid/include/monkerapi.h	Wed Oct 11 14:56:00 2000
+++ linux-2.2.16-22-devel/drivers/scsi/aacraid/include/monkerapi.h	Thu Nov  2 18:49:33 2000
@@ -38,6 +38,7 @@
 #ifndef MONKER_H
 #define MONKER_H
 
+static char *ident_monk = "aacraid_ident monkerapi.h 1.0.6 2000/10/09 Adaptec, Inc.";
 
 #define	BREAKPOINT_REQUEST					0x00000004
 #define	INIT_STRUCT_BASE_ADDRESS			0x00000005
diff -urN linux-2.2.16-22-orig/drivers/scsi/aacraid/include/nodetype.h linux-2.2.16-22-devel/drivers/scsi/aacraid/include/nodetype.h
--- linux-2.2.16-22-orig/drivers/scsi/aacraid/include/nodetype.h	Wed Oct 11 14:56:00 2000
+++ linux-2.2.16-22-devel/drivers/scsi/aacraid/include/nodetype.h	Thu Nov  2 18:49:33 2000
@@ -29,6 +29,8 @@
 #ifndef _NODETYPE_
 #define _NODETYPE_
 
+static char *ident_node = "aacraid_ident nodetype.h 1.0.6 2000/10/09 Adaptec, Inc.";
+
 typedef CSHORT NODE_TYPE_CODE;
 
 
diff -urN linux-2.2.16-22-orig/drivers/scsi/aacraid/include/nvramioctl.h linux-2.2.16-22-devel/drivers/scsi/aacraid/include/nvramioctl.h
--- linux-2.2.16-22-orig/drivers/scsi/aacraid/include/nvramioctl.h	Wed Oct 11 14:56:00 2000
+++ linux-2.2.16-22-devel/drivers/scsi/aacraid/include/nvramioctl.h	Thu Nov  2 18:49:33 2000
@@ -27,7 +27,7 @@
 #ifndef _NVRAMIOCTL_H_
 #define _NVRAMIOCTL_H_ 1
 
-
+static char *ident_nvram = "aacraid_ident nvramioctl.h 1.0.6 2000/10/09 Adaptec, Inc.";
 
 /*
  * NVRAM/Write Cache subsystem states
diff -urN linux-2.2.16-22-orig/drivers/scsi/aacraid/include/osheaders.h linux-2.2.16-22-devel/drivers/scsi/aacraid/include/osheaders.h
--- linux-2.2.16-22-orig/drivers/scsi/aacraid/include/osheaders.h	Wed Oct 11 14:56:00 2000
+++ linux-2.2.16-22-devel/drivers/scsi/aacraid/include/osheaders.h	Thu Nov  2 18:49:33 2000
@@ -26,6 +26,8 @@
 #ifndef _OSHEADERS_H_
 #define _OSHEADERS_H_
 
+static char *ident_oshead = "aacraid_ident osheaders.h 1.0.6 2000/10/09 Adaptec, Inc.";
+
 #include <linux/autoconf.h>	// retrieve the kernel configuration info
 #if defined( CONFIG_MODVERSIONS ) && !defined( MODVERSIONS )
 #define MODVERSIONS	// force it on
diff -urN linux-2.2.16-22-orig/drivers/scsi/aacraid/include/ostypes.h linux-2.2.16-22-devel/drivers/scsi/aacraid/include/ostypes.h
--- linux-2.2.16-22-orig/drivers/scsi/aacraid/include/ostypes.h	Wed Oct 11 14:56:00 2000
+++ linux-2.2.16-22-devel/drivers/scsi/aacraid/include/ostypes.h	Thu Nov  2 18:49:33 2000
@@ -29,6 +29,8 @@
 #ifndef _OSTYPES_H_
 #define _OSTYPES_H_
 
+static char *ident_ostypes = "aacraid_ident ostypes.h 1.0.7 2000/10/11 Adaptec, Inc.";
+
 #include <linux/types.h>
 
 #define MAXIMUM_NUM_CONTAINERS	64		// 4 Luns * 16 Targets
@@ -38,7 +40,7 @@
 
 #define Os_remove_softintr OsSoftInterruptRemove
 #define OsPrintf printk
-#define FsaCommPrint OsPrintf
+#define FsaCommPrint
 
 // the return values for copy_from_user & copy_to_user is the 
 // number of bytes not transferred. Thus if an internal error 
diff -urN linux-2.2.16-22-orig/drivers/scsi/aacraid/include/pcisup.h linux-2.2.16-22-devel/drivers/scsi/aacraid/include/pcisup.h
--- linux-2.2.16-22-orig/drivers/scsi/aacraid/include/pcisup.h	Wed Oct 11 14:56:00 2000
+++ linux-2.2.16-22-devel/drivers/scsi/aacraid/include/pcisup.h	Thu Nov  2 18:49:33 2000
@@ -26,7 +26,7 @@
 #ifndef _PCISUP_
 #define _PCISUP_
 
-
+static char *ident_pcisup = "aacraid_ident pcisup.h 1.0.6 2000/10/09 Adaptec, Inc.";
 
 	
 /*
diff -urN linux-2.2.16-22-orig/drivers/scsi/aacraid/include/perfpack.h linux-2.2.16-22-devel/drivers/scsi/aacraid/include/perfpack.h
--- linux-2.2.16-22-orig/drivers/scsi/aacraid/include/perfpack.h	Wed Oct 11 14:56:00 2000
+++ linux-2.2.16-22-devel/drivers/scsi/aacraid/include/perfpack.h	Thu Nov  2 18:49:33 2000
@@ -29,6 +29,7 @@
 #ifndef _FSA_PERFPACK_H_
 #define _FSA_PERFPACK_H_	1
 
+static char *ident_perf = "aacraid_ident perfpack.h 1.0.6 2000/10/09 Adaptec, Inc.";
 
 //#define FSA_DO_PERF		1		/* enable the engineering counters */
 
diff -urN linux-2.2.16-22-orig/drivers/scsi/aacraid/include/port.h linux-2.2.16-22-devel/drivers/scsi/aacraid/include/port.h
--- linux-2.2.16-22-orig/drivers/scsi/aacraid/include/port.h	Wed Oct 11 14:56:00 2000
+++ linux-2.2.16-22-devel/drivers/scsi/aacraid/include/port.h	Thu Nov  2 18:49:33 2000
@@ -28,6 +28,7 @@
 #ifndef _PORT_
 #define _PORT_
 
+static char *ident_porth = "aacraid_ident port.h 1.0.6 2000/10/09 Adaptec, Inc.";
 
 #ifdef DBG
 #define AfaPortPrint if (AfaPortPrinting) DbgPrint
diff -urN linux-2.2.16-22-orig/drivers/scsi/aacraid/include/protocol.h linux-2.2.16-22-devel/drivers/scsi/aacraid/include/protocol.h
--- linux-2.2.16-22-orig/drivers/scsi/aacraid/include/protocol.h	Wed Oct 11 14:56:00 2000
+++ linux-2.2.16-22-devel/drivers/scsi/aacraid/include/protocol.h	Thu Nov  2 18:49:33 2000
@@ -33,6 +33,7 @@
 #ifndef _PROTOCOL_H_
 #define _PROTOCOL_H_
 
+static char *ident_protocol = "aacraid_ident protocol.h 1.0.6 2000/10/09 Adaptec, Inc.";
 
 #include <fsafs.h>      // definition of FSAFID; includes fsatypes.h
 #include <nvramioctl.h> // for NVRAMINFO definition
diff -urN linux-2.2.16-22-orig/drivers/scsi/aacraid/include/revision.h linux-2.2.16-22-devel/drivers/scsi/aacraid/include/revision.h
--- linux-2.2.16-22-orig/drivers/scsi/aacraid/include/revision.h	Wed Oct 11 14:56:00 2000
+++ linux-2.2.16-22-devel/drivers/scsi/aacraid/include/revision.h	Thu Nov  2 18:49:33 2000
@@ -48,6 +48,7 @@
 #ifndef _REVISION_H
 #define _REVISION_H
 
+static char *ident_revision = "aacraid_ident revision.h 1.0.6 2000/10/09 Adaptec, Inc.";
 
 #include "version.h" // revision numbers kept separate so they can be used by resource compiler as well
 
diff -urN linux-2.2.16-22-orig/drivers/scsi/aacraid/include/rx.h linux-2.2.16-22-devel/drivers/scsi/aacraid/include/rx.h
--- linux-2.2.16-22-orig/drivers/scsi/aacraid/include/rx.h	Wed Oct 11 14:56:00 2000
+++ linux-2.2.16-22-devel/drivers/scsi/aacraid/include/rx.h	Thu Nov  2 18:49:33 2000
@@ -25,6 +25,7 @@
  *	
  --*/
 
+static char *ident_rxh = "aacraid_ident rx.h 1.0.6 2000/10/09 Adaptec, Inc.";
 
 typedef struct _Rx_ADAPTER_EXTENSION {
 
diff -urN linux-2.2.16-22-orig/drivers/scsi/aacraid/include/rxcommon.h linux-2.2.16-22-devel/drivers/scsi/aacraid/include/rxcommon.h
--- linux-2.2.16-22-orig/drivers/scsi/aacraid/include/rxcommon.h	Wed Oct 11 14:56:00 2000
+++ linux-2.2.16-22-devel/drivers/scsi/aacraid/include/rxcommon.h	Thu Nov  2 18:49:33 2000
@@ -28,7 +28,7 @@
 #ifndef _Rx_COMMON_H_
 #define _Rx_COMMON_H_
 
-
+static char *ident_rxcommon = "aacraid_ident rxcommon.h 1.0.6 2000/10/09 Adaptec, Inc.";
 
 //
 // Rx Message Unit Registers
diff -urN linux-2.2.16-22-orig/drivers/scsi/aacraid/include/sap1.h linux-2.2.16-22-devel/drivers/scsi/aacraid/include/sap1.h
--- linux-2.2.16-22-orig/drivers/scsi/aacraid/include/sap1.h	Wed Oct 11 14:56:00 2000
+++ linux-2.2.16-22-devel/drivers/scsi/aacraid/include/sap1.h	Thu Nov  2 18:49:33 2000
@@ -24,6 +24,10 @@
  *
  *	
  --*/
+#ifndef _SAP1_H_
+#define _SAP1_H_
+
+static char *ident_sap1h = "aacraid_ident sap1.h 1.0.6 2000/10/09 Adaptec, Inc.";
 
 #define Sa_MINIPORT_REVISION			1
 
@@ -76,3 +80,6 @@
 	);
 
  
+#endif /* _SAP1_H_ */
+
+
diff -urN linux-2.2.16-22-orig/drivers/scsi/aacraid/include/sap1common.h linux-2.2.16-22-devel/drivers/scsi/aacraid/include/sap1common.h
--- linux-2.2.16-22-orig/drivers/scsi/aacraid/include/sap1common.h	Wed Oct 11 14:56:00 2000
+++ linux-2.2.16-22-devel/drivers/scsi/aacraid/include/sap1common.h	Thu Nov  2 18:49:33 2000
@@ -27,6 +27,7 @@
 #ifndef _Sa_COMMON_H_
 #define _Sa_COMMON_H_
 
+static char *ident_sap1common = "aacraid_ident sap1common.h 1.0.6 2000/10/09 Adaptec, Inc.";
 
 //
 // SaP1 Message Unit Registers
diff -urN linux-2.2.16-22-orig/drivers/scsi/aacraid/include/version.h linux-2.2.16-22-devel/drivers/scsi/aacraid/include/version.h
--- linux-2.2.16-22-orig/drivers/scsi/aacraid/include/version.h	Wed Oct 11 14:56:00 2000
+++ linux-2.2.16-22-devel/drivers/scsi/aacraid/include/version.h	Thu Nov  2 18:49:33 2000
@@ -23,6 +23,10 @@
  * Abstract: Keeps track of build number for development purposes.
  *	
  --*/
+#ifndef _VERSION_H_
+#define _VERSION_H_
+
+static char *ident_version = "aacraid_ident version.h 1.0.6 2000/10/09 Adaptec, Inc.";
 
 #include "build_number.h"
 
@@ -33,3 +37,4 @@
 
 #define FSA_VERSION_STRING "2.1.5.3857\0"
 
+#endif /* _VERSION_H_ */
diff -urN linux-2.2.16-22-orig/drivers/scsi/aacraid/linit.c linux-2.2.16-22-devel/drivers/scsi/aacraid/linit.c
--- linux-2.2.16-22-orig/drivers/scsi/aacraid/linit.c	Wed Oct 11 14:56:00 2000
+++ linux-2.2.16-22-devel/drivers/scsi/aacraid/linit.c	Thu Nov  2 18:49:33 2000
@@ -32,6 +32,8 @@
  *	
  --*/
 
+static char *ident_linit = "aacraid_ident linit.c 1.0.6 2000/10/09 Adaptec, Inc.";
+
 /*------------------------------------------------------------------------------
  *              D E F I N E S
  *----------------------------------------------------------------------------*/
@@ -342,9 +344,9 @@
 			}
 			else
 			{
-				cmn_err( CE_NOTE, "%s:%d device initialization successful", DeviceName, host_ptr->unique_id  );
+				cmn_err( CE_DEBUG, "%s:%d device initialization successful", DeviceName, host_ptr->unique_id  );
 				AacHba_ClassDriverInit( CommonExtensionPtr );
-				cmn_err(CE_NOTE, "%d:%d AacHba_ClassDriverInit complete", DeviceName, host_ptr->unique_id);
+				cmn_err(CE_DEBUG, "%d:%d AacHba_ClassDriverInit complete", DeviceName, host_ptr->unique_id);
 				AacHba_ProbeContainers( CommonExtensionPtr );
 				cmn_err( CE_DEBUG, "Probe containers completed" );
 				g_CommonExtensionPtrArray[ g_HostAdapterCount - 1 ] = CommonExtensionPtr;
@@ -687,14 +689,14 @@
 		if( ( partition_number < 4 )  && ( partition_entry_end_sector == disk_parameters->sectors ) )
 		{
 			if( disk_parameters->cylinders != saved_cylinders )
-				cmn_err( CE_NOTE, "Adopting geometry: heads=%d, sectors=%d from partition table %d",
+				cmn_err( CE_DEBUG, "Adopting geometry: heads=%d, sectors=%d from partition table %d",
 					disk_parameters->heads, disk_parameters->sectors, partition_number );
 		}
 		else if( ( partition_entry_end_head > 0 ) || ( partition_entry_end_sector > 0 ) )
 		{
-			cmn_err( CE_NOTE, "Strange geometry: heads=%d, sectors=%d in partition table %d",
+			cmn_err( CE_DEBUG, "Strange geometry: heads=%d, sectors=%d in partition table %d",
 				partition_entry_end_head + 1, partition_entry_end_sector, partition_number );
-			cmn_err( CE_NOTE, "Using geometry: heads=%d, sectors=%d",
+			cmn_err( CE_DEBUG, "Using geometry: heads=%d, sectors=%d",
 					disk_parameters->heads, disk_parameters->sectors );
 		}
 	}
diff -urN linux-2.2.16-22-orig/drivers/scsi/aacraid/osddi.c linux-2.2.16-22-devel/drivers/scsi/aacraid/osddi.c
--- linux-2.2.16-22-orig/drivers/scsi/aacraid/osddi.c	Wed Oct 11 14:56:00 2000
+++ linux-2.2.16-22-devel/drivers/scsi/aacraid/osddi.c	Thu Nov  2 18:49:33 2000
@@ -24,6 +24,9 @@
  *		Driver Interfaces.
  *	
  --*/
+
+static char *ident_osddi = "aacraid_ident osddi.c 1.0.6 2000/10/09 Adaptec, Inc.";
+
 #include "osheaders.h"
 
 #include <linux/smp_lock.h>
diff -urN linux-2.2.16-22-orig/drivers/scsi/aacraid/osfuncs.c linux-2.2.16-22-devel/drivers/scsi/aacraid/osfuncs.c
--- linux-2.2.16-22-orig/drivers/scsi/aacraid/osfuncs.c	Wed Oct 11 14:56:00 2000
+++ linux-2.2.16-22-devel/drivers/scsi/aacraid/osfuncs.c	Thu Nov  2 18:49:33 2000
@@ -24,6 +24,8 @@
  *	
  --*/
 
+static char *ident_osfuncs = "aacraid_ident osfuncs.c 1.0.6 2000/10/09 Adaptec, Inc.";
+
 #include "osheaders.h"
 
 //static LKINFO_DECL(fsa_locks, "fsa_locks",0);
diff -urN linux-2.2.16-22-orig/drivers/scsi/aacraid/ossup.c linux-2.2.16-22-devel/drivers/scsi/aacraid/ossup.c
--- linux-2.2.16-22-orig/drivers/scsi/aacraid/ossup.c	Wed Oct 11 14:56:00 2000
+++ linux-2.2.16-22-devel/drivers/scsi/aacraid/ossup.c	Thu Nov  2 18:49:33 2000
@@ -24,6 +24,8 @@
  *
  --*/
 
+static char *ident_ossup = "aacraid_ident ossup.c 1.0.6 2000/10/09 Adaptec, Inc.";
+
 #include "osheaders.h"
 
 #include "aac_unix_defs.h"
diff -urN linux-2.2.16-22-orig/drivers/scsi/aacraid/port.c linux-2.2.16-22-devel/drivers/scsi/aacraid/port.c
--- linux-2.2.16-22-orig/drivers/scsi/aacraid/port.c	Wed Oct 11 14:56:00 2000
+++ linux-2.2.16-22-devel/drivers/scsi/aacraid/port.c	Thu Nov  2 18:49:33 2000
@@ -24,6 +24,8 @@
  *
  --*/
 
+static char *ident_port = "aacraid_ident port.c 1.0.7 2000/10/11 Adaptec, Inc.";
+
 #include "osheaders.h"
 
 
@@ -177,6 +179,7 @@
 	CommonExtension->PrintfBufferAddress = (PVOID)(BaseAddress);
 	InitStruct->PrintfBufferAddress = (PVOID)PhysicalBaseAddress.LowPart;
 	InitStruct->PrintfBufferSize = PrintfBufferSize;
+	bzero (BaseAddress, PrintfBufferSize);
 
 	AfaPortPrint("FsaAllocateAdapterCommArea: allocated a common buffer of 0x%x bytes from address 0x%x to address 0x%x\n",
 			 TotalSize, InitStruct->AdapterFibsVirtualAddress,
diff -urN linux-2.2.16-22-orig/drivers/scsi/aacraid/rx.c linux-2.2.16-22-devel/drivers/scsi/aacraid/rx.c
--- linux-2.2.16-22-orig/drivers/scsi/aacraid/rx.c	Wed Oct 11 14:56:00 2000
+++ linux-2.2.16-22-devel/drivers/scsi/aacraid/rx.c	Thu Nov  2 18:49:33 2000
@@ -24,6 +24,8 @@
  *
  --*/
 
+static char *ident_rx = "aacraid_ident rx.c 1.0.7 2000/10/11 Adaptec, Inc.";
+
 #include "osheaders.h"
 
 
@@ -135,8 +137,29 @@
 
 		if (DoorbellBits & DoorBellPrintfReady) {
 
+			ULONG Length, Level;
+			unsigned char *cp;
+
+			cp = AdapterExtension->Common->PrintfBufferAddress;
+
+			//
+			// The size of the Printfbuffer is set in port.c
+			// There is no variable or define for it
+			//
+			if (Length > 255)
+				Length = 255;
+
+			if (cp[Length] != 0) {
+				// cmn_err (CE_NOTE, "byte %d is 0x%x, should be 0", Length, cp[Length]);
+				cp[Length] = 0;
+			}
+
+			if (Level == LOG_HIGH_ERROR)
+				cmn_err (CE_WARN, "%s:%s", OsGetDeviceName(AdapterExtension), AdapterExtension->Common->PrintfBufferAddress);
+			else
+				cmn_err (CE_NOTE, "%s:%s", OsGetDeviceName(AdapterExtension), AdapterExtension->Common->PrintfBufferAddress);
 
-			cmn_err(CE_CONT, "%s:%s", OsGetDeviceName(AdapterExtension), AdapterExtension->Common->PrintfBufferAddress);
+			bzero (AdapterExtension->Common->PrintfBufferAddress, 256);
 
 			Rx_WRITE_ULONG(AdapterExtension, MUnit.ODR,DoorBellPrintfReady); //clear PrintfReady
 
diff -urN linux-2.2.16-22-orig/drivers/scsi/aacraid/sap1sup.c linux-2.2.16-22-devel/drivers/scsi/aacraid/sap1sup.c
--- linux-2.2.16-22-orig/drivers/scsi/aacraid/sap1sup.c	Wed Oct 11 14:56:00 2000
+++ linux-2.2.16-22-devel/drivers/scsi/aacraid/sap1sup.c	Thu Nov  2 18:49:33 2000
@@ -24,6 +24,8 @@
  *
  --*/
 
+static char *ident_sap1 = "aacraid_ident sap1sup.c 1.0.7 2000/10/11 Adaptec, Inc.";
+
 #include "osheaders.h"
 
 
@@ -140,8 +142,29 @@
 
 		if (InterruptStatus & PrintfReady) {
 
+			ULONG Length, Level;
+			unsigned char *cp;
+
+			cp = AdapterExtension->Common->PrintfBufferAddress;
+
+			//
+			// The size of the Printbuffer is set in port.c
+			// There is no variable or define for it
+			//
+			if (Length > 255)
+				Length = 255;
+
+			if (cp[Length] != 0) {
+				// cmn_err (CE_NOTE, "byte %d is 0x%x, should be 0", Length, cp[Length]);
+				cp[Length] = 0;
+			}
+
+			if (Level == LOG_HIGH_ERROR)
+				cmn_err (CE_WARN, "%s:%s", OsGetDeviceName(AdapterExtension), AdapterExtension->Common->PrintfBufferAddress);
+			else
+				cmn_err (CE_NOTE, "%s:%s", OsGetDeviceName(AdapterExtension), AdapterExtension->Common->PrintfBufferAddress);
 
-			cmn_err(CE_WARN, "%s:%s", OsGetDeviceName(AdapterExtension), AdapterExtension->Common->PrintfBufferAddress);
+			bzero (AdapterExtension->Common->PrintfBufferAddress, 256);
 
 			Sa_WRITE_USHORT( AdapterExtension, DoorbellClrReg_p,PrintfReady); //clear PrintfReady
 
@@ -350,7 +373,7 @@
 
     AfaPortPrint("In init device.\n");
 
-//	cmn_err(CE_NOTE, "SaInitDevice ");
+//	cmn_err(CE_DEBUG, "SaInitDevice ");
 
 //	AdapterExtension->Common->AdapterIndex = AdapterIndex;
 	CommonExtension->AdapterNumber = AdapterNumber;