patch-2.2.18 linux/drivers/scsi/atp870u.h

• Lines: 89
• Date: Sat Dec 9 21:22:29 2000
• Orig file: v2.2.17/drivers/scsi/atp870u.h
• Orig date: Fri Apr 21 23:20:06 2000

diff -u --new-file --recursive --exclude-from /usr/src/exclude v2.2.17/drivers/scsi/atp870u.h linux/drivers/scsi/atp870u.h
@@ -1,7 +1,7 @@
 #ifndef _ATP870U_H
 
 /* $Id: atp870u.h,v 1.0 1997/05/07 15:09:00 root Exp root $
-
+ *
  * Header file for the ACARD 870U/W driver for Linux
  *
  * $Log: atp870u.h,v $
@@ -13,6 +13,14 @@
 #include <linux/types.h>
 #include <linux/kdev_t.h>
 
+#ifndef LINUX_VERSION_CODE
+#include <linux/version.h>
+#endif
+
+#ifndef KERNEL_VERSION
+#define KERNEL_VERSION(x,y,z) (((x)<<16)+((y)<<8)+(z))
+#endif
+
 /* I/O Port */
 
 #define MAX_CDB 12
@@ -20,10 +28,10 @@
 
 int atp870u_detect(Scsi_Host_Template *);
 int atp870u_command(Scsi_Cmnd *);
-int atp870u_queuecommand(Scsi_Cmnd *, void (*done) (Scsi_Cmnd *));
+int atp870u_queuecommand(Scsi_Cmnd *, void (*done)(Scsi_Cmnd *));
 int atp870u_abort(Scsi_Cmnd *);
 int atp870u_reset(Scsi_Cmnd *, unsigned int);
-int atp870u_biosparam(Disk *, kdev_t, int *);
+int atp870u_biosparam(Disk *, kdev_t, int*);
 int atp870u_release(struct Scsi_Host *);
 void send_s870(unsigned char);
 
@@ -32,18 +40,20 @@
 #define ATP870U_CMDLUN 1
 
 #ifndef NULL
-#define NULL 0
+	#define NULL 0
 #endif
 
+extern struct proc_dir_entry proc_scsi_atp870u;
+
 extern const char *atp870u_info(struct Scsi_Host *);
 
 extern int atp870u_proc_info(char *, char **, off_t, int, int, int);
-extern struct proc_dir_entry proc_scsi_atp870u;
 
+#if LINUX_VERSION_CODE > KERNEL_VERSION(2,1,65)
 #define ATP870U {						\
 	next: NULL,						\
 	module: NULL,						\
-	proc_dir:			&proc_scsi_atp870u,	\
+	proc_dir: &proc_scsi_atp870u,/* proc_dir_entry */	\
 	proc_info: atp870u_proc_info,				\
 	name: NULL,						\
 	detect: atp870u_detect, 				\
@@ -69,5 +79,26 @@
 	use_clustering: ENABLE_CLUSTERING,			\
 	use_new_eh_code: 0					\
 }
-
+#else
+#define ATP870U {  NULL, NULL,				\
+		     &proc_scsi_atp870u,/* proc_dir_entry */ \
+		     atp870u_proc_info, 		\
+		     NULL,				\
+		     atp870u_detect,			\
+		     NULL,				\
+		     atp870u_info,			\
+		     atp870u_command,			\
+		     atp870u_queuecommand,		\
+		     atp870u_abort,			\
+		     atp870u_reset,			\
+		     NULL,				\
+		     atp870u_biosparam, 		\
+		     qcnt,				\
+		     7, 				\
+		     ATP870U_SCATTER,			\
+		     ATP870U_CMDLUN,			\
+		     0, 				\
+		     0, 				\
+		     ENABLE_CLUSTERING}
+#endif
 #endif