? .dc395x_trm.o.flags
? dc395x_trm.c.flc
? Rules.make
Index: Makefile.dc395
===================================================================
RCS file: /home/cvsroot/dc395/Makefile.dc395,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Makefile.dc395	2000/09/29 20:00:43	1.3
+++ Makefile.dc395	2000/12/02 12:17:53	1.4
@@ -14,9 +14,19 @@
 
 CFLAGS := -I. -I $(KDIR)/drivers/scsi -I$(KDIR)/include $(CFLAGS) -DMODULE
 
+ifdef CONFIG_MODVERSIONS
+CFLAGS += -DMODVERSIONS -include $(KDIR)/include/linux/modversions.h
+endif
+
 dc395x_trm.o: dc395x_trm.c dc395x_trm.h arch Rules.make
 
+# 2.4 and later define PERL in the Makefile
+#ifdef PERL
+ifeq ($(PATCHLEVEL),4)
+MODLIB := $(DESTDIR)$(INSTALL_MOD_PATH)/lib/modules/$(KERNELRELEASE)/kernel/drivers
+else
 MODLIB := $(DESTDIR)$(INSTALL_MOD_PATH)/lib/modules/$(KERNELRELEASE)
+endif
 
 install_mod: $(MODLIB)/$(TARGETMODDIR)/dc395x_trm.o
 
Index: dc395x_trm.c
===================================================================
RCS file: /home/cvsroot/dc395/dc395x_trm.c,v
retrieving revision 1.66
retrieving revision 1.68
diff -u -r1.66 -r1.68
--- dc395x_trm.c	2000/11/24 14:16:53	1.66
+++ dc395x_trm.c	2000/12/03 22:34:15	1.68
@@ -12,7 +12,7 @@
 //* Kurt Garloff <garloff@suse.de>
 //* (C) 1999-2000 Kurt Garloff
 //* License: GNU GPL
-//* $Id: dc395x_trm.c,v 1.66 2000/11/24 14:16:53 garloff Exp $
+//* $Id: dc395x_trm.c,v 1.68 2000/12/03 22:34:15 garloff Exp $
 //***********************************************************************
 //*	Tekram PCI SCSI adapter (DC395/U/UW/F or DC315/U) revision history
 //*								 
@@ -85,6 +85,7 @@
 //*					2.4: Use get_options(). Add pci_dev_tbl[].
 //*	1.31  00/11/24	KG		Fix another NULL ptr. Allow overriding of
 //*					BIOS settings by cmd ln params.
+//*	1.32  00/12/02	KG		Another 2.4 fix: Remove TYPE_NODEV devices
 //***********************************************************************
 /*
 *************************************************************************
@@ -1461,6 +1462,7 @@
 #endif
 		, 3 /* 16 Tags per LUN */, 1 /* s delay after Reset */ 
 };
+
 /* Copy defaults over set values where missing */
 static void __init DC395x_fill_with_defaults (void)
 {
@@ -1473,9 +1475,9 @@
 			dc395x_trm[i] = dc395x_def[i];
 	}
 	/* Sanity checks */
-	if (dc395x_trm[0] < 0 || dc395x_trm[0] > 15) dc395x_trm[0] = 7;
-	if (dc395x_trm[1] < 0 || dc395x_trm[1] > 7)  dc395x_trm[1] = 4;
-	if (dc395x_trm[4] < 0 || dc395x_trm[4] > 5)  dc395x_trm[4] = 4;
+	if (dc395x_trm[0] >  15) dc395x_trm[0] =   7;
+	if (dc395x_trm[1] >   7) dc395x_trm[1] =   4;
+	if (dc395x_trm[4] >   5) dc395x_trm[4] =   4;
 	if (dc395x_trm[5] > 180) dc395x_trm[5] = 180;
 };
 
@@ -2875,20 +2877,20 @@
 		pSRB->SRBState = SRB_MSGOUT;
 #ifndef SYNC_FIRST		
 		if (pDCB->SyncMode & WIDE_NEGO_ENABLE && 
-		    pDCB->Inquiry7 & 0x20)
+		    pDCB->Inquiry7 & SCSI_INQ_WBUS16)
 		{
 			DC395x_Build_WDTR (pACB, pDCB, pSRB);
 			goto no_cmd;
 		}
 #endif
 		if (pDCB->SyncMode & SYNC_NEGO_ENABLE && 
-		    pDCB->Inquiry7 & 0x10)
+		    pDCB->Inquiry7 & SCSI_INQ_SYNC)
 		{
 			DC395x_Build_SDTR (pACB, pDCB, pSRB);
 			goto no_cmd;
 		}
 		if (pDCB->SyncMode & WIDE_NEGO_ENABLE && 
-		    pDCB->Inquiry7 & 0x20)
+		    pDCB->Inquiry7 & SCSI_INQ_WBUS16)
 		{
 			DC395x_Build_WDTR (pACB, pDCB, pSRB);
 			goto no_cmd;
@@ -5163,7 +5165,7 @@
 	if( pcmd->cmnd[0] == TEST_UNIT_READY ||
 	    pcmd->cmnd[0] == INQUIRY)
 	{
-#ifdef DC395x_DEBUG0
+#ifdef DC395x_DEBUG_KG
 	    printk ("\nDC395x:  %s: result: %08x",
 		    (pcmd->cmnd[0] == INQUIRY? "INQUIRY": "TEST_UNIT_READY"),
 		    pcmd->result);
@@ -5213,15 +5215,15 @@
 #endif
 	if ( (ptr->Vers & 0x07) >= 2 || (ptr->RDF & 0x0F) == 2 )
 		pDCB->Inquiry7 = ptr->Flags;
-	if ((ptr->DevType & SCSI_DEVTYPE) == TYPE_NODEV)
+	if ((ptr->DevType & SCSI_DEVTYPE) == TYPE_NODEV && !DCB_removed)
 	  {
+#ifdef DC395x_DEBUG_KG		  
 	     printk ("\nDC395x:  Device %02i-%i: TYPE_NODEV?\n",
 		     pDCB->TargetID, pDCB->TargetLUN);
+#endif
 	     /* device not present: remove */
-	     /*if (!DCB_removed) 
-		  DC395x_remove_dev (pACB, pDCB);
+	     DC395x_remove_dev (pACB, pDCB);
 	     DCB_removed = 1;
-	      */
 	  }
 	else
 	  {
Index: dc395x_trm.h
===================================================================
RCS file: /home/cvsroot/dc395/dc395x_trm.h,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- dc395x_trm.h	2000/11/24 00:53:41	1.30
+++ dc395x_trm.h	2000/12/02 13:12:35	1.31
@@ -8,7 +8,7 @@
 **		    				 
 **********************************************************************
 */
-/* $Id: dc395x_trm.h,v 1.30 2000/11/24 00:53:41 garloff Exp $ */
+/* $Id: dc395x_trm.h,v 1.31 2000/12/02 13:12:35 garloff Exp $ */
 /*
 *****************************************************
 **    Tekram TRM_S1040 for DC395x driver, header file
@@ -20,7 +20,7 @@
 #include <linux/config.h>
 
 #define DC395x_BANNER "Tekram DC395U/UW/F DC315/U"
-#define DC395x_VERSION "1.31, 2000-11-24"
+#define DC395x_VERSION "1.32, 2000-12-02"
 
 /* Kernel version autodetection */
 #include <linux/version.h>