patch-2.4.10 linux/drivers/scsi/qlogicfc.c
Next file: linux/drivers/scsi/qlogicfc_asm.c
Previous file: linux/drivers/scsi/qla1280.h
Back to the patch index
Back to the overall index
- Lines: 44
- Date:
Fri Sep 7 09:28:37 2001
- Orig file:
v2.4.9/linux/drivers/scsi/qlogicfc.c
- Orig date:
Mon Aug 27 12:41:44 2001
diff -u --recursive --new-file v2.4.9/linux/drivers/scsi/qlogicfc.c linux/drivers/scsi/qlogicfc.c
@@ -98,8 +98,6 @@
isp2200's firmware.
*/
-#define RELOAD_FIRMWARE 0
-
#define USE_NVRAM_DEFAULTS 1
#define ISP2x00_PORTDB 1
@@ -440,7 +438,16 @@
#define MBOX_SEND_CHANGE_REQUEST 0x0070
#define MBOX_PORT_LOGOUT 0x0071
-//#include "qlogicfc_asm.c"
+/*
+ * Firmware if needed (note this is a hack, it belongs in a seperate
+ * module.
+ */
+
+#ifdef CONFIG_SCSI_QLOGIC_FC_FIRMWARE
+#include "qlogicfc_asm.c"
+#else
+static unsigned short risc_code_addr01 = 0x1000 ;
+#endif
/* Each element in mbox_param is an 8 bit bitmap where each bit indicates
if that mbox should be copied as input. For example 0x2 would mean
@@ -1853,7 +1860,6 @@
struct isp2x00_hostdata *hostdata;
int loop_count;
dma64_addr_t busaddr;
- unsigned short risc_code_addr01 = 0x1000 ;
ENTER("isp2x00_reset_hardware");
@@ -1892,7 +1898,7 @@
DEBUG(printk("qlogicfc%d : verifying checksum\n", hostdata->host_id));
-#if RELOAD_FIRMWARE
+#if defined(CONFIG_SCSI_QLOGIC_FC_FIRMWARE)
{
int i;
unsigned short * risc_code = NULL;
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)