Messages in this thread Patch in this message |  | | Date | Sat, 4 May 1996 22:42:13 +0000 (GMT) | From | Gerard Roudier <> | Subject | ncrBsd2Linux-1.9 update for 1.3.98 |
| |
ncrBsd2Linux-1.9 must be updated for linux-1.3.98.
You can edit ncr53c8xx.h and apply the following change: - #include <linux/scsicam.h> + #include <scsi/scsicam.h>
For version 1.8, the above modification should work, and the following patch donnot work.
I recommend for the package 1.9 to not apply the above modification, but to update it as follow, in order to keep it compatible with linux versions 1.2.13 and 1.3.45 to 1.3.97 and some future linux versions.
Just cut the following patch that replace the file Patch-Current.ncr53c8xx, Uninstall and reinstall the driver. (Uninstall.ncr53c8xx, then Install.ncr53c8xx)
Gerard
--------------- cut here : Patch-Current.ncr53c8xx ---------------------- --- SAVE_53/Makefile Sat May 4 20:36:48 1996 +++ Makefile Sat May 4 20:36:48 1996 @@ -243,10 +243,10 @@ endif ifeq ($(CONFIG_SCSI_NCR53C7xx),y) -L_OBJS += 53c7,8xx.o +L_OBJS += ncr53c8xx.o else ifeq ($(CONFIG_SCSI_NCR53C7xx),m) - M_OBJS += 53c7,8xx.o + M_OBJS += ncr53c8xx.o endif endif @@ -339,15 +339,8 @@ $(CC) $(CFLAGS) -DARBITRATE -DSLOW_HANDSHAKE -DFAST32 -c seagate.c # For debugging, use the -g flag -53c7,8xx.o : 53c7,8xx.c - $(CC) $(CFLAGS) -g -c 53c7,8xx.c - -53c8xx_d.h 53c8xx_u.h : 53c7,8xx.scr script_asm.pl - ln -sf 53c7,8xx.scr fake.c - $(CPP) -traditional -DCHIP=810 fake.c | grep -v '^#' | perl script_asm.pl - mv script.h 53c8xx_d.h - mv scriptu.h 53c8xx_u.h - rm fake.c +ncr53c8xx.o : ncr53c8xx.c + $(CC) $(CFLAGS) -c ncr53c8xx.c scsi_mod.o: $(MX_OBJS) hosts.o scsi.o scsi_ioctl.o constants.o \ scsicam.o scsi_proc.o --- /devel/NcrDriver/1.9/ncr53c8xx.h Thu Apr 25 21:35:48 1996 +++ ncr53c8xx.h Sat May 4 22:06:55 1996 @@ -2,7 +2,7 @@ ** ** Device driver for the NCR 53C810 PCI-SCSI-Controller. ** -** Linux 1.2.13 / Linux 1.3.45 to Linux 1.3.94 +** Linux 1.2.13 / Linux 1.3.45 to Linux 1.3.98 ** **------------------------------------------------------------------------- ** @@ -155,11 +155,23 @@ */ #if defined(HOSTS_C) || defined(MODULE) + +#if LINUX_VERSION_CODE >= LinuxVersionCode(1,3,98) +#include <scsi/scsicam.h> +#else #include <linux/scsicam.h> +#endif + int ncr53c8xx_abort(Scsi_Cmnd *); int ncr53c8xx_detect(Scsi_Host_Template *tpnt); int ncr53c8xx_queue_command(Scsi_Cmnd *, void (*done)(Scsi_Cmnd *)); + +#if LINUX_VERSION_CODE >= LinuxVersionCode(1,3,98) +int ncr53c8xx_reset(Scsi_Cmnd *, unsigned int); +#else int ncr53c8xx_reset(Scsi_Cmnd *); +#endif + #ifdef MODULE int ncr53c8xx_release(struct Scsi_Host *); #else --- /devel/NcrDriver/1.9/ncr53c8xx.c Thu Apr 25 20:48:08 1996 +++ ncr53c8xx.c Sat May 4 22:07:13 1996 @@ -2,7 +2,7 @@ ** ** Device driver for the NCR 53C810 PCI-SCSI-Controller. ** -** Linux 1.2.13 / Linux 1.3.45 to Linux 1.3.94 +** Linux 1.2.13 / Linux 1.3.45 to Linux 1.3.98 ** **------------------------------------------------------------------------- ** @@ -7540,7 +7540,11 @@ ** Linux entry point of reset() function */ +#if LINUX_VERSION_CODE >= LinuxVersionCode(1,3,98) +int ncr53c8xx_reset(Scsi_Cmnd *cmd, unsigned int reset_flags) +#else int ncr53c8xx_reset(Scsi_Cmnd *cmd) +#endif { #ifdef DEBUG printk("ncr53c8xx_reset : reset call\n"); --------------- cut here : End of Patch-Current.ncr53c8xx ---------------
|  |