Index: Makefile.dc390 =================================================================== RCS file: /home/cvsroot/dc390/Attic/Makefile.dc390,v retrieving revision 1.1.2.3 retrieving revision 1.1.2.4 diff -u -r1.1.2.3 -r1.1.2.4 --- Makefile.dc390 2000/09/29 20:01:47 1.1.2.3 +++ Makefile.dc390 2000/12/02 12:22:04 1.1.2.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 + tmscsim.o: dc390.h tmscsim.h scsiiom.c tmscsim.c 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)/tmscsim.o Index: README.tmscsim =================================================================== RCS file: /home/cvsroot/dc390/README.tmscsim,v retrieving revision 2.25.2.6 retrieving revision 2.25.2.7 diff -u -r2.25.2.6 -r2.25.2.7 --- README.tmscsim 2000/11/28 22:34:39 2.25.2.6 +++ README.tmscsim 2000/12/20 01:07:12 2.25.2.7 @@ -260,7 +260,7 @@ ------------------------------------------- With the DC390, the driver reads its EEPROM settings and tries to use them. But you may want to override the settings prior to being able to change the -driver cofniguration via /proc/scso/tmscsim/?. +driver configuration via /proc/scsi/tmscsim/?. If you do have another AM53C974 based adapter, that's even the only possibility to adjust settings before you are able to write to the /proc/scsi/tmscsim/? pseudo-file, e.g. if you want to use another @@ -338,7 +338,7 @@ and the Delay after a reset to the defaults. As you can see, you don't need to specify all of the six params. -If you want values to be ignore (i.e. the EEprom settings or the defaults +If you want values to be ignored (i.e. the EEprom settings or the defaults will be used), you may pass -2 (not 0!) at the corresponding position. The defaults (7,0,31,15,3,1) are aggressive to allow good performance. You @@ -446,4 +446,4 @@ ------------------------------------------------------------------------- Written by Kurt Garloff 1998/06/11 Last updated 2000/11/28, driver revision 2.0e7 -$Id: README.tmscsim,v 2.25.2.6 2000/11/28 22:34:39 garloff Exp $ +$Id: README.tmscsim,v 2.25.2.7 2000/12/20 01:07:12 garloff Exp $ Index: dc390.h =================================================================== RCS file: /home/cvsroot/dc390/dc390.h,v retrieving revision 2.43.2.21 retrieving revision 2.43.2.22 diff -u -r2.43.2.21 -r2.43.2.22 --- dc390.h 2000/11/28 22:23:35 2.43.2.21 +++ dc390.h 2000/12/20 00:39:36 2.43.2.22 @@ -4,7 +4,7 @@ * Description: Device Driver for Tekram DC-390(T) PCI SCSI * * Bus Master Host Adapter * ***********************************************************************/ -/* $Id: dc390.h,v 2.43.2.21 2000/11/28 22:23:35 garloff Exp $ */ +/* $Id: dc390.h,v 2.43.2.22 2000/12/20 00:39:36 garloff Exp $ */ /* * DC390/AMD 53C974 driver, header file @@ -19,7 +19,7 @@ #endif #define DC390_BANNER "Tekram DC390/AM53C974" -#define DC390_VERSION "2.0e7 2000-11-28" +#define DC390_VERSION "2.0f 2000-12-20" /* We don't have eh_abort_handler, eh_device_reset_handler, * eh_bus_reset_handler, eh_host_reset_handler yet! Index: scsiiom.c =================================================================== RCS file: /home/cvsroot/dc390/scsiiom.c,v retrieving revision 2.55.2.16 retrieving revision 2.55.2.17 diff -u -r2.55.2.16 -r2.55.2.17 --- scsiiom.c 2000/11/17 20:52:27 2.55.2.16 +++ scsiiom.c 2000/12/20 00:39:37 2.55.2.17 @@ -4,7 +4,7 @@ * Description: Device Driver for Tekram DC-390 (T) PCI SCSI * * Bus Master Host Adapter * ***********************************************************************/ -/* $Id: scsiiom.c,v 2.55.2.16 2000/11/17 20:52:27 garloff Exp $ */ +/* $Id: scsiiom.c,v 2.55.2.17 2000/12/20 00:39:37 garloff Exp $ */ static void __inline__ dc390_freetag (PDCB pDCB, PSRB pSRB) @@ -1507,6 +1507,7 @@ pSRB->AdaptStatus = 0; if( pSRB->RetryCnt ) { /* Retry */ + //printk ("DC390: retry\n"); pSRB->RetryCnt--; pSRB->TargetStatus = 0; pSRB->SGIndex = 0; @@ -1568,8 +1569,8 @@ ckc_e: if( pACB->scan_devices ) { - if( pcmd->cmnd[0] == TEST_UNIT_READY /*|| - pcmd->cmnd[0] == INQUIRY*/) + if( pcmd->cmnd[0] == TEST_UNIT_READY || + pcmd->cmnd[0] == INQUIRY) { #ifdef DC390_DEBUG0 printk (KERN_INFO "DC390: %s: result: %08x", @@ -1585,6 +1586,7 @@ (pcmd->sense_buffer[2] & 0xf) == ILLEGAL_REQUEST) || host_byte(pcmd->result) & DID_ERROR ) { /* device not present: remove */ + //dc390_Going_remove (pDCB, pSRB); dc390_remove_dev (pACB, pDCB); DCB_removed = 1; if( (pcmd->target == pACB->pScsiHost->max_id - 1) && @@ -1607,9 +1609,11 @@ if( pcmd->cmnd[0] == INQUIRY && (pcmd->result == (DID_OK << 16) || status_byte(pcmd->result) & CHECK_CONDITION) ) { - if ((ptr->DevType & SCSI_DEVTYPE) == TYPE_NODEV) + if ((ptr->DevType & SCSI_DEVTYPE) == TYPE_NODEV && !DCB_removed) { + //printk ("DC390: Type = nodev! (%02i-%i)\n", pcmd->target, pcmd->lun); /* device not present: remove */ + //dc390_Going_remove (pDCB, pSRB); dc390_remove_dev (pACB, pDCB); DCB_removed = 1; } else Index: tmscsim.c =================================================================== RCS file: /home/cvsroot/dc390/tmscsim.c,v retrieving revision 2.60.2.28 retrieving revision 2.60.2.30 diff -u -r2.60.2.28 -r2.60.2.30 --- tmscsim.c 2000/11/28 22:23:35 2.60.2.28 +++ tmscsim.c 2000/12/20 01:07:12 2.60.2.30 @@ -7,7 +7,7 @@ ***********************************************************************/ /* (C) Copyright: put under GNU GPL in 10/96 (see README.tmscsim) * *************************************************************************/ -/* $Id: tmscsim.c,v 2.60.2.28 2000/11/28 22:23:35 garloff Exp $ */ +/* $Id: tmscsim.c,v 2.60.2.30 2000/12/20 01:07:12 garloff Exp $ */ /* Enhancements and bugfixes by * * Kurt Garloff * ***********************************************************************/ @@ -163,6 +163,7 @@ * 2.0e6 00/11/22 KG 2.4 init function (Thx to O.Schumann) * * 2.4 PCI device table (Thx to A.Richter) * * 2.0e7 00/11/28 KG Allow overriding of BIOS settings * + * 2.0f 00/12/20 KG Handle failed INQUIRYs during scan * ***********************************************************************/ /* Uncomment SA_INTERRUPT, if the driver refuses to share its IRQ with other devices */ @@ -629,7 +630,7 @@ #ifndef CONFIG_SCSI_DC390T_NOGENSUPP -int __initdata tmscsim_def[] = {7, 1 /* 8MHz */, +int __initdata tmscsim_def[] = {7, 0 /* 10MHz */, PARITY_CHK_ | SEND_START_ | EN_DISCONNECT_ | SYNC_NEGO_ | TAG_QUEUEING_, MORE2_DRV | GREATER_1G | RST_SCSI_BUS | ACTIVE_NEGATION