patch-2.4.22 linux-2.4.22/drivers/message/fusion/mptscsih.h
Next file: linux-2.4.22/drivers/message/fusion/scsi3.h
Previous file: linux-2.4.22/drivers/message/fusion/mptscsih.c
Back to the patch index
Back to the overall index
- Lines: 132
- Date:
2003-08-25 04:44:42.000000000 -0700
- Orig file:
linux-2.4.21/drivers/message/fusion/mptscsih.h
- Orig date:
2003-06-13 07:51:34.000000000 -0700
diff -urN linux-2.4.21/drivers/message/fusion/mptscsih.h linux-2.4.22/drivers/message/fusion/mptscsih.h
@@ -17,10 +17,10 @@
*
* Copyright (c) 1999-2002 LSI Logic Corporation
* Originally By: Steven J. Ralston
- * (mailto:netscape.net)
- * (mailto:Pam.Delaney@lsil.com)
+ * (mailto:sjralston1@netscape.net)
+ * (mailto:lstephens@lsil.com)
*
- * $Id: mptscsih.h,v 1.22 2002/12/16 15:28:48 pdelaney Exp $
+ * $Id: mptscsih.h,v 1.1.2.2 2003/05/07 14:08:35 pdelaney Exp $
*/
/*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/
/*
@@ -72,7 +72,7 @@
/*
* Try to keep these at 2^N-1
*/
-#define MPT_FC_CAN_QUEUE 63
+#define MPT_FC_CAN_QUEUE 127
#if defined MPT_SCSI_USE_NEW_EH
#define MPT_SCSI_CAN_QUEUE 127
#else
@@ -217,11 +217,7 @@
#define x_scsi_taskmgmt_bh mptscsih_taskmgmt_bh
#define x_scsi_old_abort mptscsih_old_abort
#define x_scsi_old_reset mptscsih_old_reset
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,44)
-#define x_scsi_slave_attach mptscsih_slave_attach
-#else
#define x_scsi_select_queue_depths mptscsih_select_queue_depths
-#endif
#define x_scsi_proc_info mptscsih_proc_info
/*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/
@@ -241,86 +237,18 @@
extern int x_scsi_old_abort(Scsi_Cmnd *);
extern int x_scsi_old_reset(Scsi_Cmnd *, unsigned int);
#endif
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,45)
-extern int x_scsi_bios_param(struct scsi_device * sdev, struct block_device *bdev,
- sector_t capacity, int *ip);
-#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,28)
-extern int x_scsi_bios_param(Disk *, struct block_device *, int *);
-#else
extern int x_scsi_bios_param(Disk *, kdev_t, int *);
-#endif
extern void x_scsi_taskmgmt_bh(void *);
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,44)
-extern int x_scsi_slave_attach(Scsi_Device *);
-#else
extern void x_scsi_select_queue_depths(struct Scsi_Host *, Scsi_Device *);
-#endif
-
extern int x_scsi_proc_info(char *, char **, off_t, int, int, int);
#if LINUX_VERSION_CODE < KERNEL_VERSION(2,3,0)
#define PROC_SCSI_DECL
#else
-#define PROC_SCSI_DECL proc_name: "mptscsih",
+#define PROC_SCSI_DECL .proc_name = "mptscsih",
#endif
#ifdef MPT_SCSI_USE_NEW_EH
-
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,44)
-
-#define MPT_SCSIHOST { \
- PROC_SCSI_DECL \
- .proc_info = x_scsi_proc_info, \
- .name = "MPT SCSI Host", \
- .detect = x_scsi_detect, \
- .release = x_scsi_release, \
- .info = x_scsi_info, \
- .command = NULL, \
- .queuecommand = x_scsi_queuecommand, \
- .slave_attach = x_scsi_slave_attach, \
- .eh_strategy_handler = NULL, \
- .eh_abort_handler = x_scsi_abort, \
- .eh_device_reset_handler = x_scsi_dev_reset, \
- .eh_bus_reset_handler = x_scsi_bus_reset, \
- .eh_host_reset_handler = x_scsi_host_reset, \
- .bios_param = x_scsi_bios_param, \
- .can_queue = MPT_SCSI_CAN_QUEUE, \
- .this_id = -1, \
- .sg_tablesize = MPT_SCSI_SG_DEPTH, \
- .max_sectors = MPT_SCSI_MAX_SECTORS, \
- .cmd_per_lun = MPT_SCSI_CMD_PER_LUN, \
- .unchecked_isa_dma = 0, \
- .use_clustering = ENABLE_CLUSTERING, \
-}
-
-#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,1)
-
-#define MPT_SCSIHOST { \
- PROC_SCSI_DECL \
- .proc_info = x_scsi_proc_info, \
- .name = "MPT SCSI Host", \
- .detect = x_scsi_detect, \
- .release = x_scsi_release, \
- .info = x_scsi_info, \
- .command = NULL, \
- .queuecommand = x_scsi_queuecommand, \
- .eh_strategy_handler = NULL, \
- .eh_abort_handler = x_scsi_abort, \
- .eh_device_reset_handler = x_scsi_dev_reset, \
- .eh_bus_reset_handler = x_scsi_bus_reset, \
- .eh_host_reset_handler = x_scsi_host_reset, \
- .bios_param = x_scsi_bios_param, \
- .can_queue = MPT_SCSI_CAN_QUEUE, \
- .this_id = -1, \
- .sg_tablesize = MPT_SCSI_SG_DEPTH, \
- .max_sectors = MPT_SCSI_MAX_SECTORS, \
- .cmd_per_lun = MPT_SCSI_CMD_PER_LUN, \
- .unchecked_isa_dma = 0, \
- .use_clustering = ENABLE_CLUSTERING, \
-}
-
-#else /* LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,1) */
-
#define MPT_SCSIHOST { \
.next = NULL, \
PROC_SCSI_DECL \
@@ -346,8 +274,6 @@
.use_new_eh_code = 1 \
}
-#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,1) */
-
#else /* MPT_SCSI_USE_NEW_EH */
#define MPT_SCSIHOST { \
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)