? .tmscsim.o.flags ? scsiiom.c.flc ? Rules.make ? tmscsim.c.flc Index: dc390.h =================================================================== RCS file: /home/cvsroot/dc390/dc390.h,v retrieving revision 2.43.2.18 retrieving revision 2.43.2.20 diff -u -r2.43.2.18 -r2.43.2.20 --- dc390.h 2000/11/17 20:52:27 2.43.2.18 +++ dc390.h 2000/11/22 22:39:47 2.43.2.20 @@ -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.18 2000/11/17 20:52:27 garloff Exp $ */ +/* $Id: dc390.h,v 2.43.2.20 2000/11/22 22:39:47 garloff Exp $ */ /* * DC390/AMD 53C974 driver, header file @@ -19,7 +19,7 @@ #endif #define DC390_BANNER "Tekram DC390/AM53C974" -#define DC390_VERSION "2.0e5 2000-11-17" +#define DC390_VERSION "2.0e6 2000-11-22" /* We don't have eh_abort_handler, eh_device_reset_handler, * eh_bus_reset_handler, eh_host_reset_handler yet! Index: tmscsim.c =================================================================== RCS file: /home/cvsroot/dc390/tmscsim.c,v retrieving revision 2.60.2.25 retrieving revision 2.60.2.27 diff -u -r2.60.2.25 -r2.60.2.27 --- tmscsim.c 2000/11/17 20:52:27 2.60.2.25 +++ tmscsim.c 2000/11/22 22:39:47 2.60.2.27 @@ -7,7 +7,7 @@ ***********************************************************************/ /* (C) Copyright: put under GNU GPL in 10/96 (see README.tmscsim) * *************************************************************************/ -/* $Id: tmscsim.c,v 2.60.2.25 2000/11/17 20:52:27 garloff Exp $ */ +/* $Id: tmscsim.c,v 2.60.2.27 2000/11/22 22:39:47 garloff Exp $ */ /* Enhancements and bugfixes by * * Kurt Garloff * ***********************************************************************/ @@ -160,6 +160,8 @@ * Recognise INQUIRY as scanning command. * * 2.0e4 00/10/13 KG Allow compilation into 2.4 kernel * * 2.0e5 00/11/17 KG Store Inq.flags in DCB * + * 2.0e6 00/11/22 KG 2.4 init function (Thx to O.Schumann) * + * 2.4 PCI device table (Thx to A.Richter) * ***********************************************************************/ /* Uncomment SA_INTERRUPT, if the driver refuses to share its IRQ with other devices */ @@ -275,6 +277,19 @@ # endif #endif +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,3,99) +static struct pci_device_id tmscsim_pci_tbl[] __initdata = { + { + vendor: PCI_VENDOR_ID_AMD, + device: PCI_DEVICE_ID_AMD53C974, + subvendor: PCI_ANY_ID, + subdevice: PCI_ANY_ID, + }, + { } /* Terminating entry */ +}; +MODULE_DEVICE_TABLE(pci, tmscsim_pci_tbl); +#endif + #ifdef USE_SPINLOCKS # if USE_SPINLOCKS == 3 /* both */ @@ -625,9 +640,18 @@ /* Override defaults on cmdline: * tmscsim: AdaptID, MaxSpeed (Index), DevMode (Bitmapped), AdaptMode (Bitmapped) */ +#if LINUX_VERSION_CODE > KERNEL_VERSION(2,3,13) +void __init dc390_setup (char *str) +{ + int ints[8]; + int i, im; + (void)get_options (str, ARRAY_SIZE(ints), ints); + im = ints[0]; +#else void __init dc390_setup (char *str, int *ints) { int i, im = ints[0]; +#endif if (im > 6) { printk (KERN_NOTICE "DC390: ignore extra params!\n"); @@ -1836,6 +1860,7 @@ pDCB->CtrlR3 = pDCB2->CtrlR3; pDCB->CtrlR4 = pDCB2->CtrlR4; + pDCB->Inquiry7 = pDCB2->Inquiry7; } else { @@ -1850,6 +1875,7 @@ pDCB->CtrlR4 = pACB->glitch_cfg | CTRL4_RESERVED; if( dc390_eepromBuf[index][EE_MODE2] & ACTIVE_NEGATION) pDCB->CtrlR4 |= NEGATE_REQACKDATA | NEGATE_REQACK; + pDCB->Inquiry7 = 0; } pACB->DCBmap[id] |= (1 << lun);