Index: dc390.h =================================================================== RCS file: /home/cvsroot/dc390/dc390.h,v retrieving revision 2.43.2.13 retrieving revision 2.43.2.14 diff -u -r2.43.2.13 -r2.43.2.14 --- dc390.h 2000/05/23 13:12:55 2.43.2.13 +++ dc390.h 2000/05/25 15:18:37 2.43.2.14 @@ -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.13 2000/05/23 13:12:55 garloff Exp $ */ +/* $Id: dc390.h,v 2.43.2.14 2000/05/25 15:18:37 garloff Exp $ */ /* * DC390/AMD 53C974 driver, header file @@ -19,7 +19,7 @@ #endif #define DC390_BANNER "Tekram DC390/AM53C974" -#define DC390_VERSION "2.0e 2000/05/23" +#define DC390_VERSION "2.0e1 2000/05/25" /* 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.10 retrieving revision 2.55.2.11 diff -u -r2.55.2.10 -r2.55.2.11 --- scsiiom.c 2000/05/22 19:26:47 2.55.2.10 +++ scsiiom.c 2000/05/25 15:18:37 2.55.2.11 @@ -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.10 2000/05/22 19:26:47 garloff Exp $ */ +/* $Id: scsiiom.c,v 2.55.2.11 2000/05/25 15:18:37 garloff Exp $ */ static void __inline__ dc390_freetag (PDCB pDCB, PSRB pSRB) @@ -1613,7 +1613,7 @@ }; #if LINUX_VERSION_CODE > KERNEL_VERSION(2,3,30) - pcmd->resid = pSRB->request_bufflen - pSRB->TotalXferredLen; + pcmd->resid = pcmd->request_bufflen - pSRB->TotalXferredLen; #endif if (!DCB_removed) dc390_Going_remove (pDCB, pSRB); Index: tmscsim.c =================================================================== RCS file: /home/cvsroot/dc390/tmscsim.c,v retrieving revision 2.60.2.19 retrieving revision 2.60.2.20 diff -u -r2.60.2.19 -r2.60.2.20 --- tmscsim.c 2000/05/23 13:12:04 2.60.2.19 +++ tmscsim.c 2000/05/25 15:18:37 2.60.2.20 @@ -7,7 +7,7 @@ ***********************************************************************/ /* (C) Copyright: put under GNU GPL in 10/96 (see README.tmscsim) * *************************************************************************/ -/* $Id: tmscsim.c,v 2.60.2.19 2000/05/23 13:12:04 garloff Exp $ */ +/* $Id: tmscsim.c,v 2.60.2.20 2000/05/25 15:18:37 garloff Exp $ */ /* Enhancements and bugfixes by * * Kurt Garloff * ***********************************************************************/ @@ -153,6 +153,7 @@ * Reset: Unlock, but refuse to queue * * 2.3 __setup function * * 2.0e 00/05/22 KG Return residual for 2.3 * + * 2.0e1 00/02/25 KG Compile fixes for 2.3.99 * ***********************************************************************/ /* Uncomment SA_INTERRUPT, if the driver refuses to share its IRQ with other devices */ @@ -1948,7 +1949,11 @@ psh->io_port = io_port; psh->n_io_port = 0x80; psh->irq = Irq; +#if LINUX_VERSION_CODE > KERNEL_VERSION(2,3,50) + psh->base = io_port; +#else psh->base = (char*)io_port; +#endif psh->unique_id = io_port; psh->dma_channel = -1; psh->last_reset = jiffies;