patch-1.3.5 linux/drivers/scsi/aic7xxx.h

Next file: linux/drivers/scsi/aic7xxx.seq
Previous file: linux/drivers/scsi/aic7xxx.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v1.3.4/linux/drivers/scsi/aic7xxx.h linux/drivers/scsi/aic7xxx.h
@@ -1,37 +1,55 @@
-/* @(#)aic7xxx.h 1.14 94/11/30 jda */
-
-/*
+/*+M*************************************************************************
  * Adaptec 274x/284x/294x device driver for Linux.
- * Copyright (c) 1994 The University of Calgary Department of Computer Science.
- * 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ *
+ * Copyright (c) 1994 John Aycock
+ *   The University of Calgary Department of Computer Science.
+ *   All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions, and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *      This product includes software developed by the University of Calgary
+ *      Department of Computer Science and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
  * 
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#ifndef aic7xxx_h
-#define aic7xxx_h
+ * $Id: aic7xxx.h,v 1.18 1995/06/22 04:17:56 deang Exp $
+ *-M*************************************************************************/
+#ifndef _aic7xxx_h
+#define _aic7xxx_h
 
-#define AIC7XXX_H_VERSION	"1.14"
+#define AIC7XXX_H_VERSION  "$Revision: 1.18 $"
 
 /*
- *  Scsi_Host_Template (see hosts.h) for 274x - some fields
- *  to do with card config are filled in after the card is
- *  detected.
+ * Scsi_Host_Template (see hosts.h) for AIC-7770/AIC-7870 - some fields
+ * to do with card config are filled in after the card is detected.
  */
 #define AIC7XXX	{						\
 	NULL,							\
 	NULL,							\
+	generic_proc_info,					\
+	"aic7xxx",						\
+	PROC_SCSI_AIC7XXX,					\
 	NULL,							\
 	aic7xxx_detect,						\
 	NULL,							\
@@ -45,10 +63,10 @@
 	-1,			/* max simultaneous cmds      */\
 	-1,			/* scsi id of host adapter    */\
 	SG_ALL,			/* max scatter-gather cmds    */\
-	1,			/* cmds per lun (linked cmds) */\
-	0,			/* number of 274x's present   */\
+	2,			/* cmds per lun (linked cmds) */\
+	0,			/* number of 7xxx's present   */\
 	0,			/* no memory DMA restrictions */\
-	DISABLE_CLUSTERING					\
+	ENABLE_CLUSTERING					\
 }
 
 extern int aic7xxx_queue(Scsi_Cmnd *, void (*)(Scsi_Cmnd *));
@@ -60,4 +78,6 @@
 
 extern const char *aic7xxx_info(struct Scsi_Host *);
 
-#endif
+extern int generic_proc_info(char *, char **, off_t, int, int, int);
+
+#endif /* _aic7xxx_h */

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov with Sam's (original) version
of this